diff options
author | Chet Ramey <chet.ramey@case.edu> | 2014-01-29 17:00:07 -0500 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2014-01-29 17:00:07 -0500 |
commit | b6e23235f28b1c85e18e9a2b7ba8c6b6c46aecbc (patch) | |
tree | 00fdd9c37c261d89c994fc1856252df719afec3a | |
parent | 8581f42df9a1b1d848e2d4bdf3cc951b8d14b5be (diff) | |
download | bash-4.3-testing.tar.gz |
bash-4.3-rc2 overlaybash-4.3-rc2bash-4.3-testing
-rw-r--r-- | CHANGES | 70 | ||||
-rw-r--r-- | CWRU/changelog | 337 | ||||
-rw-r--r-- | MANIFEST | 6 | ||||
-rw-r--r-- | Makefile.in | 10 | ||||
-rw-r--r-- | bashline.c | 7 | ||||
-rw-r--r-- | braces.c | 46 | ||||
-rw-r--r-- | builtins/declare.def | 47 | ||||
-rw-r--r-- | builtins/evalfile.c | 2 | ||||
-rw-r--r-- | builtins/evalstring.c | 12 | ||||
-rw-r--r-- | builtins/gen-helpfiles.c | 10 | ||||
-rw-r--r-- | builtins/jobs.def | 2 | ||||
-rw-r--r-- | builtins/printf.def | 15 | ||||
-rw-r--r-- | builtins/setattr.def | 4 | ||||
-rwxr-xr-x | configure | 39 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | doc/._texinfo.tex | bin | 0 -> 4096 bytes | |||
-rw-r--r-- | doc/bash.1 | 27 | ||||
-rw-r--r-- | doc/bashref.info | 402 | ||||
-rw-r--r-- | doc/bashref.texi | 29 | ||||
-rw-r--r-- | doc/texinfo.tex | 2723 | ||||
-rw-r--r-- | doc/version.texi | 8 | ||||
-rw-r--r-- | error.c | 30 | ||||
-rw-r--r-- | error.h | 1 | ||||
-rw-r--r-- | execute_cmd.c | 24 | ||||
-rw-r--r-- | expr.c | 11 | ||||
-rw-r--r-- | externs.h | 7 | ||||
-rw-r--r-- | jobs.c | 6 | ||||
-rw-r--r-- | lib/readline/display.c | 7 | ||||
-rw-r--r-- | lib/readline/doc/history.texi | 2 | ||||
-rw-r--r-- | lib/readline/doc/hstech.texi | 2 | ||||
-rw-r--r-- | lib/readline/doc/hsuser.texi | 2 | ||||
-rw-r--r-- | lib/readline/doc/rlman.texi | 2 | ||||
-rw-r--r-- | lib/readline/doc/rltech.texi | 2 | ||||
-rw-r--r-- | lib/readline/doc/rluser.texi | 16 | ||||
-rw-r--r-- | lib/readline/doc/rluserman.texi | 2 | ||||
-rw-r--r-- | lib/readline/doc/version.texi | 8 | ||||
-rw-r--r-- | lib/readline/histexpand.c | 2 | ||||
-rw-r--r-- | lib/readline/parse-colors.c | 20 | ||||
-rw-r--r-- | lib/readline/search.c | 5 | ||||
-rw-r--r-- | lib/readline/signals.c | 2 | ||||
-rw-r--r-- | lib/readline/undo.c | 13 | ||||
-rw-r--r-- | lib/sh/Makefile.in | 2 | ||||
-rw-r--r-- | lib/sh/itos.c | 12 | ||||
-rw-r--r-- | lib/sh/strdup.c | 42 | ||||
-rw-r--r-- | lib/sh/stringvec.c | 16 | ||||
-rw-r--r-- | parse.y | 68 | ||||
-rw-r--r-- | pathexp.c | 26 | ||||
-rw-r--r-- | po/af.gmo | bin | 1244 -> 1244 bytes | |||
-rw-r--r-- | po/af.po | 258 | ||||
-rw-r--r-- | po/bash.pot | 258 | ||||
-rw-r--r-- | po/bg.gmo | bin | 34668 -> 34668 bytes | |||
-rw-r--r-- | po/bg.po | 258 | ||||
-rw-r--r-- | po/ca.gmo | bin | 9739 -> 9739 bytes | |||
-rw-r--r-- | po/ca.po | 258 | ||||
-rw-r--r-- | po/cs.gmo | bin | 168005 -> 168005 bytes | |||
-rw-r--r-- | po/cs.po | 258 | ||||
-rw-r--r-- | po/da.gmo | bin | 102350 -> 102350 bytes | |||
-rw-r--r-- | po/da.po | 258 | ||||
-rw-r--r-- | po/de.gmo | bin | 71280 -> 71280 bytes | |||
-rw-r--r-- | po/de.po | 258 | ||||
-rw-r--r-- | po/el.gmo | bin | 37185 -> 37185 bytes | |||
-rw-r--r-- | po/el.po | 258 | ||||
-rw-r--r-- | po/en@boldquot.gmo | bin | 165240 -> 165718 bytes | |||
-rw-r--r-- | po/en@boldquot.po | 266 | ||||
-rw-r--r-- | po/en@quot.gmo | bin | 163656 -> 164126 bytes | |||
-rw-r--r-- | po/en@quot.po | 266 | ||||
-rw-r--r-- | po/eo.gmo | bin | 156067 -> 156067 bytes | |||
-rw-r--r-- | po/eo.po | 258 | ||||
-rw-r--r-- | po/es.gmo | bin | 124201 -> 124201 bytes | |||
-rw-r--r-- | po/es.po | 258 | ||||
-rw-r--r-- | po/et.gmo | bin | 12133 -> 12133 bytes | |||
-rw-r--r-- | po/et.po | 258 | ||||
-rw-r--r-- | po/fi.gmo | bin | 104376 -> 104376 bytes | |||
-rw-r--r-- | po/fi.po | 258 | ||||
-rw-r--r-- | po/fr.gmo | bin | 128012 -> 128012 bytes | |||
-rw-r--r-- | po/fr.po | 258 | ||||
-rw-r--r-- | po/ga.gmo | bin | 58471 -> 58471 bytes | |||
-rw-r--r-- | po/ga.po | 258 | ||||
-rw-r--r-- | po/gl.gmo | bin | 63233 -> 63233 bytes | |||
-rw-r--r-- | po/gl.po | 258 | ||||
-rw-r--r-- | po/hr.gmo | bin | 34075 -> 34075 bytes | |||
-rw-r--r-- | po/hr.po | 258 | ||||
-rw-r--r-- | po/hu.gmo | bin | 112658 -> 112658 bytes | |||
-rw-r--r-- | po/hu.po | 258 | ||||
-rw-r--r-- | po/id.gmo | bin | 110282 -> 110282 bytes | |||
-rw-r--r-- | po/id.po | 258 | ||||
-rw-r--r-- | po/it.gmo | bin | 124167 -> 124167 bytes | |||
-rw-r--r-- | po/it.po | 258 | ||||
-rw-r--r-- | po/ja.gmo | bin | 135623 -> 135623 bytes | |||
-rw-r--r-- | po/ja.po | 258 | ||||
-rw-r--r-- | po/lt.gmo | bin | 29354 -> 29354 bytes | |||
-rw-r--r-- | po/lt.po | 258 | ||||
-rw-r--r-- | po/nl.gmo | bin | 165324 -> 165324 bytes | |||
-rw-r--r-- | po/nl.po | 258 | ||||
-rw-r--r-- | po/pl.gmo | bin | 168196 -> 168196 bytes | |||
-rw-r--r-- | po/pl.po | 258 | ||||
-rw-r--r-- | po/pt_BR.gmo | bin | 9580 -> 9580 bytes | |||
-rw-r--r-- | po/pt_BR.po | 258 | ||||
-rw-r--r-- | po/ro.gmo | bin | 9358 -> 9358 bytes | |||
-rw-r--r-- | po/ro.po | 258 | ||||
-rw-r--r-- | po/ru.gmo | bin | 9155 -> 9155 bytes | |||
-rw-r--r-- | po/ru.po | 258 | ||||
-rw-r--r-- | po/sk.gmo | bin | 122728 -> 122728 bytes | |||
-rw-r--r-- | po/sk.po | 258 | ||||
-rw-r--r-- | po/sl.gmo | bin | 118855 -> 118855 bytes | |||
-rw-r--r-- | po/sl.po | 258 | ||||
-rw-r--r-- | po/sv.gmo | bin | 160743 -> 160743 bytes | |||
-rw-r--r-- | po/sv.po | 258 | ||||
-rw-r--r-- | po/tr.gmo | bin | 90159 -> 90159 bytes | |||
-rw-r--r-- | po/tr.po | 258 | ||||
-rw-r--r-- | po/uk.gmo | bin | 215538 -> 215538 bytes | |||
-rw-r--r-- | po/uk.po | 258 | ||||
-rw-r--r-- | po/vi.gmo | bin | 173049 -> 173049 bytes | |||
-rw-r--r-- | po/vi.po | 258 | ||||
-rw-r--r-- | po/zh_CN.gmo | bin | 103613 -> 103613 bytes | |||
-rw-r--r-- | po/zh_CN.po | 258 | ||||
-rw-r--r-- | po/zh_TW.gmo | bin | 5876 -> 5876 bytes | |||
-rw-r--r-- | po/zh_TW.po | 258 | ||||
-rw-r--r-- | shell.c | 2 | ||||
-rw-r--r-- | sig.c | 16 | ||||
-rw-r--r-- | subst.c | 57 | ||||
-rw-r--r-- | subst.h | 2 | ||||
-rw-r--r-- | support/._config.guess | bin | 0 -> 4096 bytes | |||
-rw-r--r--[-rwxr-xr-x] | support/config.guess | 194 | ||||
-rw-r--r--[-rwxr-xr-x] | support/config.sub | 104 | ||||
-rwxr-xr-x | support/shobj-conf | 46 | ||||
-rw-r--r-- | tests/builtins.right | 23 | ||||
-rw-r--r-- | tests/builtins.tests | 3 | ||||
-rw-r--r-- | tests/cond-regexp3.sub | 66 | ||||
-rw-r--r-- | tests/cond.right | 46 | ||||
-rwxr-xr-x | tests/cond.tests | 2 | ||||
-rwxr-xr-x | tests/dollar-at-star | 4 | ||||
-rw-r--r-- | tests/dollar-at6.sub | 30 | ||||
-rw-r--r-- | tests/dollar.right | 21 | ||||
-rw-r--r-- | tests/nameref.right | 17 | ||||
-rw-r--r-- | tests/nameref.tests | 2 | ||||
-rw-r--r-- | tests/nameref7.sub | 18 | ||||
-rw-r--r-- | tests/nameref8.sub | 57 | ||||
-rw-r--r-- | tests/source7.sub | 40 | ||||
-rw-r--r-- | trap.c | 71 | ||||
-rw-r--r-- | trap.h | 1 | ||||
-rw-r--r-- | variables.c | 50 | ||||
-rw-r--r-- | variables.h | 1 | ||||
-rw-r--r-- | y.tab.c | 68 |
144 files changed, 8669 insertions, 5710 deletions
@@ -1,3 +1,73 @@ +This document details the changes between this version, bash-4.3-rc2, and the +previous version, bash-4.3-rc1. + +1. Changes to Bash + +a. Fixed a bug that left variables set by printf -v marked as invisible. + +b. Fixed an off-by-one error in a job control warning message. + +c. Fixed a bug that caused the shell to crash after declaring a nameref variable + without a value. + +d. Fixed a bug that caused asynchronous commands to not set $? correctly. + +e. Fixed a bug that caused out-of-order execution when executing aliases with + embedded newlines containing `.' commands. + +f. Fixed a bug that caused error messages generated by expansion errors in + `for' commands to have the wrong line number. + +g. Fixed a bug that caused the `wait' builtin to not be interruptible in an + interactive shell with job control enabled. + +h. Fixed a bug that caused SIGINT and SIGQUIT to not be trappable in + asynchronous subshell commands. + +i. Bash now requires that the value assigned to a nameref variable be a valid + shell identifier (variable name or array reference). + +j. Converting an existing variable to a nameref variable now turns off the + -i/-l/-u/-c attributes. + +k. Displaying a nameref variable with `declare -p' now displays the nameref + variable and its value rather than following the nameref chain. + +l. Fixed a problem with interrupt handling that caused a second and subsequent + SIGINT to be ignored by interactive shells. + +m. Fixed a bug that caused certain positional parameter and array expansions + to mishandle (discard) null positional parameters and array elements. + +n. The shell no longer blocks receipt of signals while running trap handlers + for those signals, and allows most trap handlers to be run recursively + (running trap handlers while a trap handler is executing). + +o. The shell now handles backslashes in regular expression arguments to the + [[ command's =~ operator slightly differently, resulting in more + consistent behavior. + +2. Changes to Readline + +a. Fixed a bug that could cause readline to crash and seg fault attempting to + expand an empty history entry. + +b. Fixed a bug that caused a bad entry in the $LS_COLORS variable to abort all + color processing but leave color enabled. + +c. Fixed a bug that caused display problems with multi-line prompts containing + invisible characters on multiple lines. + +d. Fixed a bug that caused effects made by undoing changes to a history line to + be discarded. + +3. New Features in Bash + +4. New Features in Readline + +a. When creating shared libraries on Mac OS X, the pathname written into the + library (install_name) no longer includes the minor version number. +------------------------------------------------------------------------------ This document details the changes between this version, bash-4.3-rc1, and the previous version, bash-4.3-beta2. diff --git a/CWRU/changelog b/CWRU/changelog index eb574a62..cc582974 100644 --- a/CWRU/changelog +++ b/CWRU/changelog @@ -5379,3 +5379,340 @@ execute_cmd.c support/shobj-conf - add support for Darwin 13 (Mac OS X 10.9, Mavericks). Based on a report by Ludwig Schwardt <ludwig.schwardt@gmail.com> + + 11/20 + ----- +[bash-4.3-rc1 frozen] + + 11/24 + ----- +builtins/printf.def + - bind_printf_variable: make sure that the variable assigned to is + no longer marked as invisible. Fixes bug reported by NBaH + <nbah@sfr.fr> + + 11/28 + ----- +jobs.c + - delete_old_job: fix off-by-one error in job index in call to + internal_warning. Bug report from Peter Cordes <peter@cordes.ca> + + 11/30 + ----- +doc/bashref.texi + - add string to description of special parameters with name of + special parameter prefixed by a $, so you can search for $#, + for instance + + 12/2 + ---- +lib/readline/{histexpand.c + - get_history_event: account for current_history() possibly returning + NULL. Report and fix from Pankaj Sharma <pankaj.s01@samsung.com> + + + 12/11 + ----- + +lib/readline/parse-colors.c + - get_funky_string: don't call abort if we see something we can't + parse; just return an error + - _rl_parse_colors: if we encounter an error while parsing $LS_COLORS + we need to leave _rl_color_ext_list as NULL after freeing its + elements, then turn off _rl_colored_stats. Report and fix from Martin + Wesdorp <mwesdorp@casema.nl> + + 12/13 + ----- + +lib/readline/parse-colors.c + - _rl_parse_colors: if we encounter an unrecognized prefix, throw an + error but try to recover and go on to the next specification + +variables.c + - make_local_variable: for new variables this function creates, set + the att_invisible attribute. All callers from declare_internal. + Indirectly, this is a fix for bug with `declare -n var; var=foo;' + reported by Pierre Gaston <pierre.gaston@gmail.com> + - bind_variable: if assigning to nameref variable that doesn't have + a value yet (e.g., with `declare -n var; var=foo'), don't try to + use the unset name. Fixes a segfault reported by Pierre Gaston + <pierre.gaston@gmail.com> + +execute_cmd.c + - execute_command_internal: make sure last_command_exit_value is set + to 0 after any command executed in the background. Fixes bug + reported by Martin Kealey <martin@kurahaupo.gen.nz> + + 12/17 + ----- +support/config.{guess,sub} + - updated to latest versions from git + + 12/19 + ----- +parse.y + - struct STRING_SAVER: now has a new `flags' element, to identify the + caller: alias expansion, double-paren parsing, or parse_and_execute + - push_string: now sets flags to PSH_ALIAS if `ap' argument is non-NULL + - push_string: now doesn't attempt to call strlen on a NULL string to + set shell_input_line_size + - parser_expanding_alias, parser_save_alias, parser_restore_alias: new + functions to provide an external interface to push_string and + pop_string; parser_save_alias sets flags element to PSH_SOURCE (could + be renamed PSH_EXTERN someday) + - shell_getc: when yy_getc returns '\0', instead of just testing + whether the pushed_string_list is not-empty before popping it, don't + pop if if the saved string has flags PSH_SOURCE, indicating that + parse_and_execute set it before setting bash_input to the string. + We should continue reading to the end of that string before popping + back to a potential alias. Partial solution for the problem of aliases + with embedded newlines containing `.' commands being executed out of + order reported by Andrew Martin <andrew.martin@gmail.com> + - shell_getc: when yy_getc returns '\0' and there is a saved string of + type PSH_SOURCE, restart the read without popping the string stack + if we have not read to the end of bash_input.location.string. Rest + of fix for out-of-order execution problem + +externs.h + - parser_expanding_alias, parser_save_alias, parser_restore_alias: new + extern function declarations + +builtins/evalstring.c + - pe_prologue: if the parser is expanding an alias, make sure to add + an unwind-protect to restore the alias; undoes the work that will be + performed by parse_and_execute/parse_string + - parse_and_execute,parse_string: after calling push_stream to save + bash_input, check whether or not the parser is currently expanding + an alias (parser_expanding_alias() != 0). If it is, we want to save + that string in the pushed_string_list, which we do with + parser_save_alias. + + 12/23 + ----- +execute_cmd.c + - execute_for_command: make sure to set line_number before expanding + the word list, so expansion errors have the right line number. + From a report from Ben Okopnik <ben@okopnik.com> + +expr.c + - exp2: save token pointer before calling readtok(), arrange to use + saved token pointer when printing error token on a division by 0 + error + + 12/27 + ----- +lib/readline/display.c + - rl_redisplay: when calculating effects of invisible characters in a + prompt that is split across physical screen lines to set the indices + of linebreaks, don't bother testing local_prompt_prefix (line 751). + That prefix doesn't matter when calculating prompt visible and + invisible characters. Fixes problem reported by Jinesh Choksi + <jinesh@onelittlehope.com> + +Makefile.in + - install: make sure to use $(DESTDIR) when installing OTHER_DOCS. + Report and fix from Matthias Klose <doko@debian.org> + +doc/texinfo.tex + - updated to version of 2013-09-11 + + 12/28 + ----- +lib/readline/undo.c + - rl_do_undo: if we are undoing from a history entry (rl_undo_list == + current_history()->data), make sure the change to rl_line_buffer is + reflected in the history entry. We use the guts of + rl_maybe_replace_line to do the work. Fixes problem reported by + gregrwm <backuppc-users@whitleymott.net> + + 12/30 + ----- +sig.c + - sigint_sighandler: if we get a SIGINT (and this signal handler is + installed) while the wait builtin is running, note that we received + it in the same way as jobs.c:wait_sigint_handler and return. The + various wait_for functions will look for that with CHECK_WAIT_INTR. + This fixes the wait builtin not being interruptible in an interactive + job control shell + + 12/31 + ----- +trap.c + - set_signal_hard_ignored: rename set_signal_ignored to this, since it + both sets original_signals[sig] and sets the HARD_IGNORE flag + - set_signal_ignored: new function, now just sets original_signals[sig] + +trap.h + - set_signal_hard_ignored: new external declaration + +sig.c + - initialize_terminating_signals: call set_signal_hard_ignored instead + of set_signal_ignored for signals with disposition SIG_IGN when the + shell starts + +execute_cmd.c + - setup_async_signals: make sure we get the original dispositions for + SIGINT and SIGQUIT before starting the subshell, and don't call + set_signal_ignored because that sets original_signals[sig]. If we + don't, subsequent attempts to reset handling using trap will fail + because it thinks the original dispositions were SIG_IGN. Posix + interpretation 751 (http://austingroupbugs.net/view.php?id=751) + + 1/2/2014 + -------- +lib/sh/stringvec.c + - strvec_mcreate, strvec_mresize: versions of create and resize that + use malloc and realloc, respectively, instead of xmalloc/xrealloc + +braces.c + - expand_amble,mkseq: use strvec_mcreate/strvec_mresize so we can + catch and handle memory allocation failures instead of aborting + with the xmalloc/xrealloc interface + +lib/sh/strdup.c + - strdup replacement function for ancient systems that don't have it + +lib/sh/itos.c + - mitos: new function, itos that uses strdup instead of savestring + +externs.h + - strvec_mcreate/strvec_mresize: new extern declarations + - mitos: new extern declaration + +configure.ac + - bash version moved to 4.3-rc2 + + 1/6 + --- +doc/bash.1,lib/readline/doc/{rluser.texi,readline.3} + - separate the description of what happens when readline reads the + tty EOF character from the description of delete-char, leaving a + note in the delete-char description about common binding for ^D. + From suggestion by Parke <parke.nexus@gmail.com> + +lib/readline/doc/{version.texi,history.3,*.texi} + - updated email addresses and copyright dates + + 1/7 + --- +variables.c + - delete_var: new function, just removes a variable from a hash table + and frees it, without doing anything else + - make_variable_value: if we are trying to assign to a nameref variable, + return NULL if the value is null or the empty string or not a valid + identifier + +variables.h + - delete_var: new extern declaration + +subst.h + - ASS_NAMEREF: new define for assignments, means assigning to a nameref + variable + +builtins/declare.def + - declare_internal: if we are creating and assigning to a nameref + variable, make sure the value is a valid variable name (checks done + by make_variable_value via bind_variable_value) and display an + error message, deleting the variable we just created, if it is not. + Fixes bug reported by Peggy Russell <prusselltechgroup@gmail.com> + + 1/9 + --- +builtins/declare.def + - declare_internal: turning on nameref attribute for an existing + variable turns off -i/-l/-u/-c attributes (essentially the ones + that cause evaluation at assignment time) for ksh93 compat + +builtins/setattr.def + - show_name_attributes: if asked to display attributes and values for + a nameref variable, don't follow the nameref chain to the end. More + ksh93 compat + + 1/10 + ---- +trap.c + - _run_trap_internal: use {save,restore}_parser_state instead of + {save,restore}_token_state, like in run_pending_traps(); don't + need to save and restore last_command_exit_value as a result + - _run_trap_internal: call {save,restore}_pipeline like in + run_pending_traps() + - run_pending_traps: since we no longer run traps in a signal handler + context, do not block and unblock the trapped signal while the + trap is executing + - run_pending_traps: allow recursive invocations (basically, running + traps from a trap handler) with only a warning if the shell is + compiled in debug mode. If a caller doesn't want this to happen, + it should test running_trap > 0. signal_in_progress (sig) only works + for the signals the shell handles specially + +bashline.c + - bash_event_hook: make sure we clean up readline if interrupt_state + is set, not only when SIGINT is not trapped. check_signals_and_traps + will call check_signals, which calls QUIT, which will longjmp back + to top_level, running the interrupt trap along the way. Fixes the + problem of signal handlers being reset out from under readline, and + not being set properly the next time readline is called, because + signals_set_flag is still set to 1. XXX - might need to do this + for other signals too? + + 1/11 + ---- +subst.h + - SD_GLOB: new define for skip_to_delim; means we are scanning a + glob pattern. + +subst.c + - skip_to_delim: if flags include SD_GLOB, assume we are scanning a + glob pattern. Currently only used to skip bracket expressions + which may contain one of the delimiters + + 1/12 + ---- +subst.c + - parameter_brace_expand: when expanding $@ as part of substring + expansion, pattern substitution, or case modification, don't turn + on the QUOTED_NULL flag. The code that constructs the word to be + returned from expand_word_internal expects a different code path + when $@ is being expanded. Fixes bug reported by Theodoros + V. Kalamatianos <thkala@gmail.com> + + 1/19 + ---- +subst.c + - list_dequote_escapes: new function; analogue of list_quote_escapes + +pathexp.c + - quote_string_for_globbing: fix case where unescaped ^A is last char + in string; need to pass it through unaltered instead of turning it + into a bare backslash + - quote_string_for_globbing: when quoting for regexp matching in [[, + don't treat backslash as a quote character; quote the backslash as + any other character. Part of investigation into reports from + Eduardo A. Bustamante López <dualbus@gmail.com> + + 1/25 + ---- +builtins/gen-helpfiles.c + - write_helpfiles: add prototype + - make sure to #undef xmalloc/xfree/xrealloc/free if USING_BASH_MALLOC + is defined. the code does not use them, and we don't link against + xmalloc.o. Report from Linda Walsh <bash@tlinx.org> + +Makefile.in + - variables.o: add dependency on builtins/builtext.h; helps with + parallel builds. Report from Linda Walsh <bash@tlinx.org> + +support/shobj-conf + - darwin: combine the stanzas into one that will not require them to + be updated on each Mac OS X release. Report and fix from Max Horn + <max@quendi.de> + + 1/27 + ---- +support/shobj-conf + - darwin: changed the install_name embedded into the shared library + to contain only the major version number, not the minor one. The + idea is that the minor versions should all be API/ABI compatible, + and it is better to link automatically with the latest one. Idea + from Max Horn <max@quendi.de> @@ -428,6 +428,7 @@ lib/sh/spell.c f lib/sh/strcasecmp.c f lib/sh/strcasestr.c f lib/sh/strchrnul.c f +lib/sh/strdup.c f lib/sh/strerror.c f lib/sh/strftime.c f lib/sh/stringlist.c f @@ -829,6 +830,7 @@ tests/source3.sub f tests/source4.sub f tests/source5.sub f tests/source6.sub f +tests/source7.sub f tests/case.tests f tests/case.right f tests/case1.sub f @@ -854,6 +856,7 @@ tests/cond.tests f tests/cond.right f tests/cond-regexp1.sub f tests/cond-regexp2.sub f +tests/cond-regexp3.sub f tests/coproc.tests f tests/coproc.right f tests/cprint.tests f @@ -871,6 +874,7 @@ tests/dollar-at2.sub f tests/dollar-at3.sub f tests/dollar-at4.sub f tests/dollar-at5.sub f +tests/dollar-at6.sub f tests/dollar-star1.sub f tests/dollar-star2.sub f tests/dollar-star3.sub f @@ -989,6 +993,8 @@ tests/nameref3.sub f tests/nameref4.sub f tests/nameref5.sub f tests/nameref6.sub f +tests/nameref7.sub f +tests/nameref8.sub f tests/nameref.right f tests/new-exp.tests f tests/new-exp1.sub f diff --git a/Makefile.in b/Makefile.in index c3780f7b..cf772286 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile for bash-4.3, version 4.10 +# Makefile for bash-4.3, version 4.11 # # Copyright (C) 1996-2012 Free Software Foundation, Inc. @@ -190,7 +190,8 @@ SH_ABSSRC = ${topdir}/${SH_LIBSRC} SHLIB_SOURCE = ${SH_LIBSRC}/clktck.c ${SH_LIBSRC}/getcwd.c \ ${SH_LIBSRC}/getenv.c ${SH_LIBSRC}/oslib.c \ ${SH_LIBSRC}/setlinebuf.c ${SH_LIBSRC}/strchrnul.c \ - ${SH_LIBSRC}/strcasecmp.c ${SH_LIBSRC}/strerror.c \ + ${SH_LIBSRC}/strcasecmp.c ${SH_LIBSRC}/strdup.c \ + ${SH_LIBSRC}/strerror.c \ ${SH_LIBSRC}/strtod.c ${SH_LIBSRC}/strtol.c \ ${SH_LIBSRC}/strtoul.c ${SH_LIBSRC}/vprint.c \ ${SH_LIBSRC}/itos.c ${SH_LIBSRC}/rename.c \ @@ -766,7 +767,7 @@ installdirs: install: .made installdirs $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(DESTDIR)$(bindir)/$(Program) $(INSTALL_SCRIPT) $(INSTALLMODE2) bashbug $(DESTDIR)$(bindir)/bashbug - $(INSTALL_DATA) $(OTHER_DOCS) $(docdir) + $(INSTALL_DATA) $(OTHER_DOCS) $(DESTDIR)$(docdir) -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ man1dir=$(man1dir) man1ext=$(man1ext) \ man3dir=$(man3dir) man3ext=$(man3ext) \ @@ -1034,6 +1035,7 @@ sig.o: general.h xmalloc.h bashtypes.h variables.h arrayfunc.h conftypes.h array sig.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h sig.o: make_cmd.h subst.h sig.h pathnames.h externs.h sig.o: jobs.h siglist.h trap.h $(DEFSRC)/common.h bashline.h bashhist.h +sig.o: ${DEFDIR}/builtext.h siglist.o: config.h bashtypes.h siglist.h trap.h stringlib.o: bashtypes.h ${BASHINCDIR}/chartypes.h stringlib.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h @@ -1076,7 +1078,7 @@ variables.o: flags.h execute_cmd.h mailcheck.h input.h $(DEFSRC)/common.h variables.o: findcmd.h bashhist.h hashcmd.h pathexp.h variables.o: pcomplete.h ${BASHINCDIR}/chartypes.h variables.o: ${BASHINCDIR}/posixtime.h assoc.h -variables.o: version.h +variables.o: version.h $(DEFDIR)/builtext.h version.o: conftypes.h patchlevel.h version.h xmalloc.o: config.h bashtypes.h ${BASHINCDIR}/ansi_stdlib.h error.h @@ -4188,10 +4188,11 @@ bash_dequote_text (text) static int bash_event_hook () { - /* If we're going to longjmp to top_level, make sure we clean up readline */ - if (interrupt_state && signal_is_trapped (SIGINT) == 0) + /* If we're going to longjmp to top_level, make sure we clean up readline. + check_signals will call QUIT, which will eventually longjmp to top_level, + calling run_interrupt_trap along the way. */ + if (interrupt_state) rl_cleanup_after_signal (); - bashline_reset_event_hook (); check_signals_and_traps (); /* XXX */ return 0; @@ -34,6 +34,7 @@ #include <errno.h> #include "bashansi.h" +#include "bashintl.h" #if defined (SHELL) # include "shell.h" @@ -282,7 +283,7 @@ expand_amble (text, tlen, flags) size_t tlen; int flags; { - char **result, **partial; + char **result, **partial, **tresult; char *tem; int start, i, c; @@ -314,7 +315,16 @@ expand_amble (text, tlen, flags) lr = strvec_len (result); lp = strvec_len (partial); - result = strvec_resize (result, lp + lr + 1); + tresult = strvec_mresize (result, lp + lr + 1); + if (tresult == 0) + { + internal_error (_("brace expansion: cannot allocate memory for %s"), tem); + strvec_dispose (result); + result = (char **)NULL; + return result; + } + else + result = tresult; for (j = 0; j < lp; j++) result[lr + j] = partial[j]; @@ -359,7 +369,7 @@ mkseq (start, end, incr, type, width) int type, width; { intmax_t n, prevn; - int i, nelem; + int i, j, nelem; char **result, *t; if (incr == 0) @@ -397,7 +407,12 @@ mkseq (start, end, incr, type, width) nelem = (prevn / sh_imaxabs(incr)) + 1; if (nelem > INT_MAX - 2) /* Don't overflow int */ return ((char **)NULL); - result = strvec_create (nelem + 1); + result = strvec_mcreate (nelem + 1); + if (result == 0) + { + internal_error (_("brace expansion: failed to allocate memory for %d elements"), nelem); + return ((char **)NULL); + } /* Make sure we go through the loop at least once, so {3..3} prints `3' */ i = 0; @@ -408,7 +423,7 @@ mkseq (start, end, incr, type, width) QUIT; /* XXX - memory leak here */ #endif if (type == ST_INT) - result[i++] = itos (n); + result[i++] = t = itos (n); else if (type == ST_ZINT) { int len, arg; @@ -418,12 +433,27 @@ mkseq (start, end, incr, type, width) } else { - t = (char *)xmalloc (2); - t[0] = n; - t[1] = '\0'; + if (t = (char *)malloc (2)) + { + t[0] = n; + t[1] = '\0'; + } result[i++] = t; } + /* We failed to allocate memory for this number, so we bail. */ + if (t == 0) + { + char *p, lbuf[INT_STRLEN_BOUND(intmax_t) + 1]; + + /* Easier to do this than mess around with various intmax_t printf + formats (%ld? %lld? %jd?) and PRIdMAX. */ + p = inttostr (n, lbuf, sizeof (lbuf)); + internal_error (_("brace expansion: failed to allocate memory for `%s'"), p); + strvec_dispose (result); + return ((char **)NULL); + } + /* Handle overflow and underflow of n+incr */ if (ADDOVERFLOW (n, incr, INTMAX_MIN, INTMAX_MAX)) break; diff --git a/builtins/declare.def b/builtins/declare.def index 580e3fa8..a634e7ce 100644 --- a/builtins/declare.def +++ b/builtins/declare.def @@ -143,7 +143,7 @@ declare_internal (list, local_var) int flags_on, flags_off, *flags; int any_failed, assign_error, pflag, nodefs, opt, mkglobal, onref, offref; char *t, *subscript_start; - SHELL_VAR *var, *refvar; + SHELL_VAR *var, *refvar, *v; FUNCTION_DEF *shell_fn; flags_on = flags_off = any_failed = assign_error = pflag = nodefs = mkglobal = 0; @@ -375,31 +375,7 @@ declare_internal (list, local_var) var = make_local_array_variable (name, making_array_special); else #endif -#if 0 - /* XXX - this doesn't work right yet. */ - /* See below for rationale for doing this. */ - if (flags_on & att_nameref) - { - /* See if we are trying to modify an existing nameref variable */ - var = find_variable_last_nameref (name); - if (var && nameref_p (var) == 0) - var = make_local_variable (name); - } - else if (flags_off & att_nameref) - { - var = (SHELL_VAR *)NULL; - /* See if we are trying to modify an existing nameref variable */ - refvar = find_variable_last_nameref (name); - if (refvar && nameref_p (refvar) == 0) - refvar = 0; - if (refvar) - var = make_local_variable (nameref_cell (refvar)); - if (var == 0) - var = make_local_variable (name); - } - else -#endif - var = make_local_variable (name); + var = make_local_variable (name); /* sets att_invisible for new vars */ if (var == 0) { any_failed++; @@ -534,6 +510,11 @@ declare_internal (list, local_var) assign_error++; NEXT_VARIABLE (); } + else if (flags_on & att_nameref) + { + /* ksh93 compat: turning on nameref attribute turns off -ilu */ + VUNSETATTR (var, att_integer|att_uppercase|att_lowercase|att_capcase); + } /* Cannot use declare +r to turn off readonly attribute. */ if (readonly_p (var) && (flags_off & att_readonly)) @@ -651,7 +632,19 @@ declare_internal (list, local_var) /* bind_variable_value duplicates the essential internals of bind_variable() */ if (offset) - bind_variable_value (var, value, aflags); + { + if (onref) + aflags |= ASS_NAMEREF; + v = bind_variable_value (var, value, aflags); + if (v == 0 && onref) + { + sh_invalidid (value); + assign_error++; + /* XXX - unset this variable? or leave it as normal var? */ + delete_var (var->name, mkglobal ? global_variables : shell_variables); + NEXT_VARIABLE (); + } + } /* If we found this variable in the temporary environment, as with `var=value declare -x var', make sure it is treated identically diff --git a/builtins/evalfile.c b/builtins/evalfile.c index a59ce597..058d99da 100644 --- a/builtins/evalfile.c +++ b/builtins/evalfile.c @@ -109,7 +109,7 @@ _evalfile (filename, flags) GET_ARRAY_FROM_VAR ("BASH_ARGC", bash_argc_v, bash_argc_a); # endif #endif - + fd = open (filename, O_RDONLY); if (fd < 0 || (fstat (fd, &finfo) == -1)) diff --git a/builtins/evalstring.c b/builtins/evalstring.c index a78688cc..671ab5d7 100644 --- a/builtins/evalstring.c +++ b/builtins/evalstring.c @@ -159,6 +159,9 @@ parse_prologue (string, flags, tag) } add_unwind_protect (pop_stream, (char *)NULL); + if (parser_expanding_alias ()) + add_unwind_protect (parser_restore_alias, (char *)NULL); + if (orig_string && ((flags & SEVAL_NOFREE) == 0)) add_unwind_protect (xfree, orig_string); end_unwind_frame (); @@ -211,6 +214,10 @@ parse_and_execute (string, from_file, flags) before executing the next command (resetting the line number sets it to 0; the first line number is 1). */ push_stream (lreset); + if (parser_expanding_alias ()) + /* push current shell_input_line */ + parser_save_alias (); + if (lreset == 0) line_number--; @@ -432,7 +439,10 @@ parse_string (string, from_file, flags, endp) before executing the next command (resetting the line number sets it to 0; the first line number is 1). */ push_stream (0); - + if (parser_expanding_alias ()) + /* push current shell_input_line */ + parser_save_alias (); + code = should_jump_to_top_level = 0; oglobal = global_command; ostring = string; diff --git a/builtins/gen-helpfiles.c b/builtins/gen-helpfiles.c index b3144974..fac34edf 100644 --- a/builtins/gen-helpfiles.c +++ b/builtins/gen-helpfiles.c @@ -59,6 +59,14 @@ #include "../builtins.h" #include "tmpbuiltins.h" +#if defined (USING_BASH_MALLOC) +#undef xmalloc +#undef xrealloc +#undef xfree + +#undef free /* defined in xmalloc.h */ +#endif + #ifndef errno extern int errno; #endif @@ -90,7 +98,7 @@ char *helpfile_directory; /* Forward declarations. */ -int write_helpfiles (); +int write_helpfiles __P((struct builtin *)); /* For each file mentioned on the command line, process it and write the information to STRUCTFILE and EXTERNFILE, while diff --git a/builtins/jobs.def b/builtins/jobs.def index b14e91f2..47da58e4 100644 --- a/builtins/jobs.def +++ b/builtins/jobs.def @@ -31,7 +31,7 @@ Without options, the status of all active jobs is displayed. Options: -l lists process IDs in addition to the normal information - -n list only processes that have changed status since the last + -n lists only processes that have changed status since the last notification -p lists process IDs only -r restrict output to running jobs diff --git a/builtins/printf.def b/builtins/printf.def index cf33f6be..7f29126d 100644 --- a/builtins/printf.def +++ b/builtins/printf.def @@ -765,7 +765,7 @@ printstr (fmt, string, len, fieldwidth, precision) /* If we remove this, get rid of `s'. */ if (*fmt != 'b' && *fmt != 'q') { - internal_error ("format parsing problem: %s", s); + internal_error (_("format parsing problem: %s"), s); fw = pr = 0; } #endif @@ -1252,12 +1252,19 @@ bind_printf_variable (name, value, flags) char *value; int flags; { + SHELL_VAR *v; + #if defined (ARRAY_VARS) if (valid_array_reference (name) == 0) - return (bind_variable (name, value, flags)); + v = bind_variable (name, value, flags); else - return (assign_array_element (name, value, flags)); + v = assign_array_element (name, value, flags); #else /* !ARRAY_VARS */ - return bind_variable (name, value, flags); + v = bind_variable (name, value, flags); #endif /* !ARRAY_VARS */ + + if (v && readonly_p (v) == 0 && noassign_p (v) == 0) + VUNSETATTR (v, att_invisible); + + return v; } diff --git a/builtins/setattr.def b/builtins/setattr.def index 390b3eb1..3be31896 100644 --- a/builtins/setattr.def +++ b/builtins/setattr.def @@ -455,7 +455,11 @@ show_name_attributes (name, nodefs) { SHELL_VAR *var; +#if 0 var = find_variable_tempenv (name); +#else + var = find_variable_noref (name); +#endif if (var && invisible_p (var) == 0) { @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac for Bash 4.3, version 4.060. +# From configure.ac for Bash 4.3, version 4.062. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for bash 4.3-rc1. +# Generated by GNU Autoconf 2.69 for bash 4.3-rc2. # # Report bugs to <bug-bash@gnu.org>. # @@ -581,8 +581,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bash' PACKAGE_TARNAME='bash' -PACKAGE_VERSION='4.3-rc1' -PACKAGE_STRING='bash 4.3-rc1' +PACKAGE_VERSION='4.3-rc2' +PACKAGE_STRING='bash 4.3-rc2' PACKAGE_BUGREPORT='bug-bash@gnu.org' PACKAGE_URL='' @@ -1393,7 +1393,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bash 4.3-rc1 to adapt to many kinds of systems. +\`configure' configures bash 4.3-rc2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1458,7 +1458,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bash 4.3-rc1:";; + short | recursive ) echo "Configuration of bash 4.3-rc2:";; esac cat <<\_ACEOF @@ -1650,7 +1650,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bash configure 4.3-rc1 +bash configure 4.3-rc2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2359,7 +2359,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bash $as_me 4.3-rc1, which was +It was created by bash $as_me 4.3-rc2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2753,7 +2753,7 @@ ac_config_headers="$ac_config_headers config.h" BASHVERS=4.3 -RELSTATUS=rc1 +RELSTATUS=rc2 case "$RELSTATUS" in alp*|bet*|dev*|rc*|maint*) DEBUG='-DDEBUG' MALLOC_DEBUG='-DMALLOC_DEBUG' ;; @@ -2869,6 +2869,7 @@ sparc-linux*) opt_bash_malloc=no ;; # sparc running linux; requires ELF *-cygwin*) opt_bash_malloc=no ;; # Cygnus's CYGWIN environment *-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by Microsoft *-nsk*) opt_bash_malloc=no ;; # HP NonStop +*-haiku*) opt_bash_malloc=no ;; # Haiku OS esac # memory scrambling on free() @@ -10025,6 +10026,20 @@ esac fi +ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup" +if test "x$ac_cv_func_strdup" = xyes; then : + $as_echo "#define HAVE_STRDUP 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" strdup.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strdup.$ac_objext" + ;; +esac + +fi + + ac_fn_c_check_decl "$LINENO" "AUDIT_USER_TTY" "ac_cv_have_decl_AUDIT_USER_TTY" "#include <linux/audit.h> " @@ -10888,7 +10903,7 @@ fi rm -f conftest.mmap conftest.txt for ac_func in __argz_count __argz_next __argz_stringify dcgettext mempcpy \ - munmap stpcpy strcspn strdup + munmap stpcpy strcspn do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -16536,7 +16551,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bash $as_me 4.3-rc1, which was +This file was extended by bash $as_me 4.3-rc2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16602,7 +16617,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bash config.status 4.3-rc1 +bash config.status 4.3-rc2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index eb1ff32e..0058ee9a 100644 --- a/configure.ac +++ b/configure.ac @@ -21,10 +21,10 @@ dnl Process this file with autoconf to produce a configure script. # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -AC_REVISION([for Bash 4.3, version 4.060])dnl +AC_REVISION([for Bash 4.3, version 4.062])dnl define(bashvers, 4.3) -define(relstatus, rc1) +define(relstatus, rc2) AC_INIT([bash], bashvers-relstatus, [bug-bash@gnu.org]) @@ -91,6 +91,7 @@ sparc-linux*) opt_bash_malloc=no ;; # sparc running linux; requires ELF *-cygwin*) opt_bash_malloc=no ;; # Cygnus's CYGWIN environment *-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by Microsoft *-nsk*) opt_bash_malloc=no ;; # HP NonStop +*-haiku*) opt_bash_malloc=no ;; # Haiku OS esac # memory scrambling on free() @@ -784,6 +785,7 @@ AC_REPLACE_FUNCS(strcasecmp strcasestr strerror strftime strnlen strpbrk strstr) AC_REPLACE_FUNCS(strtod strtol strtoul strtoll strtoull strtoimax strtoumax) AC_REPLACE_FUNCS(dprintf) AC_REPLACE_FUNCS(strchrnul) +AC_REPLACE_FUNCS(strdup) AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include <linux/audit.h>]]) @@ -830,7 +832,7 @@ AC_CHECK_HEADERS([argz.h errno.h fcntl.h malloc.h stdio_ext.h]) dnl AC_FUNC_MALLOC AC_FUNC_MMAP AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify dcgettext mempcpy \ - munmap stpcpy strcspn strdup]) + munmap stpcpy strcspn]) INTL_DEP= INTL_INC= LIBINTL_H= if test "x$USE_INCLUDED_LIBINTL" = "xyes"; then diff --git a/doc/._texinfo.tex b/doc/._texinfo.tex Binary files differnew file mode 100644 index 00000000..5029935a --- /dev/null +++ b/doc/._texinfo.tex @@ -3,14 +3,14 @@ .\" .\" Chet Ramey .\" Case Western Reserve University -.\" chet@po.cwru.edu +.\" chet.ramey@case.edu .\" -.\" Last Change: Sun Oct 20 22:13:29 EDT 2013 +.\" Last Change: Mon Jan 6 16:40:31 EST 2014 .\" .\" bash_builtins, strip all but Built-Ins section .if \n(zZ=1 .ig zZ .if \n(zY=1 .ig zY -.TH BASH 1 "2013 October 20" "GNU Bash 4.3" +.TH BASH 1 "2014 January 6" "GNU Bash 4.3" .\" .\" There's some problem with having a `@' .\" in a tagged paragraph with the BSD man macros. @@ -881,7 +881,7 @@ The exit status is zero if no pattern matches. Otherwise, it is the exit status of the last command executed in \fIlist\fP. .TP -\fBif\fP \fIlist\fP; \fBthen\fP \fIlist;\fP \ +\fBif\fP \fIlist\fP; \fBthen\fP \fIlist\fP; \ [ \fBelif\fP \fIlist\fP; \fBthen\fP \fIlist\fP; ] ... \ [ \fBelse\fP \fIlist\fP; ] \fBfi\fP The @@ -5804,14 +5804,22 @@ and \fIemacs\fP as the editor, in that order. .PP .PD 0 .TP -.B delete\-char (C\-d) -Delete the character at point. If point is at the -beginning of the line, there are no characters in the line, and -the last character typed was not bound to \fBdelete\-char\fP, -then return +.B \fIend\-of\-file\fP (usually C\-d) +The character indicating end-of-file as set, for example, by +.if t \f(CWstty\fP. +.if n ``stty''. +If this character is read when there are no characters +on the line, and point is at the beginning of the line, Readline +interprets it as the end of input and returns .SM .BR EOF . .TP +.B delete\-char (C\-d) +Delete the character at point. +If this function is bound to the +same character as the tty \fBEOF\fP character, as \fBC\-d\fP +commonly is, see above for the effects. +.TP .B backward\-delete\-char (Rubout) Delete the character behind the cursor. When given a numeric argument, save the deleted text on the kill ring. @@ -6079,6 +6087,7 @@ and store the definition. .B call\-last\-kbd\-macro (C\-x e) Re-execute the last keyboard macro defined, by making the characters in the macro appear as if typed at the keyboard. +.TP .B print\-last\-kbd\-macro () Print the last keyboard macro defined in a format suitable for the \fIinputrc\fP file. diff --git a/doc/bashref.info b/doc/bashref.info index 7733bd36..1574c260 100644 --- a/doc/bashref.info +++ b/doc/bashref.info @@ -2,12 +2,12 @@ This is bashref.info, produced by makeinfo version 4.13 from /usr/homes/chet/src/bash/src/doc/bashref.texi. This text is a brief description of the features that are present in -the Bash shell (version 4.3, 20 October 2013). +the Bash shell (version 4.3, 6 January 2014). - This is Edition 4.3, last updated 20 October 2013, of `The GNU Bash + This is Edition 4.3, last updated 6 January 2014, of `The GNU Bash Reference Manual', for `Bash', Version 4.3. - Copyright (C) 1988-2013 Free Software Foundation, Inc. + Copyright (C) 1988-2014 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -28,10 +28,10 @@ Bash Features ************* This text is a brief description of the features that are present in -the Bash shell (version 4.3, 20 October 2013). The Bash home page is +the Bash shell (version 4.3, 6 January 2014). The Bash home page is `http://www.gnu.org/software/bash/'. - This is Edition 4.3, last updated 20 October 2013, of `The GNU Bash + This is Edition 4.3, last updated 6 January 2014, of `The GNU Bash Reference Manual', for `Bash', Version 4.3. Bash contains features that appear in other popular shells, and some @@ -1350,64 +1350,66 @@ The shell treats several parameters specially. These parameters may only be referenced; assignment to them is not allowed. `*' - Expands to the positional parameters, starting from one. When the - expansion occurs within double quotes, it expands to a single word - with the value of each parameter separated by the first character - of the `IFS' special variable. That is, `"$*"' is equivalent to - `"$1C$2C..."', where C is the first character of the value of the - `IFS' variable. If `IFS' is unset, the parameters are separated - by spaces. If `IFS' is null, the parameters are joined without - intervening separators. + ($*) Expands to the positional parameters, starting from one. + When the expansion occurs within double quotes, it expands to a + single word with the value of each parameter separated by the + first character of the `IFS' special variable. That is, `"$*"' is + equivalent to `"$1C$2C..."', where C is the first character of the + value of the `IFS' variable. If `IFS' is unset, the parameters + are separated by spaces. If `IFS' is null, the parameters are + joined without intervening separators. `@' - Expands to the positional parameters, starting from one. When the - expansion occurs within double quotes, each parameter expands to a - separate word. That is, `"$@"' is equivalent to `"$1" "$2" ...'. - If the double-quoted expansion occurs within a word, the expansion - of the first parameter is joined with the beginning part of the - original word, and the expansion of the last parameter is joined - with the last part of the original word. When there are no - positional parameters, `"$@"' and `$@' expand to nothing (i.e., - they are removed). + ($@) Expands to the positional parameters, starting from one. + When the expansion occurs within double quotes, each parameter + expands to a separate word. That is, `"$@"' is equivalent to + `"$1" "$2" ...'. If the double-quoted expansion occurs within a + word, the expansion of the first parameter is joined with the + beginning part of the original word, and the expansion of the last + parameter is joined with the last part of the original word. When + there are no positional parameters, `"$@"' and `$@' expand to + nothing (i.e., they are removed). `#' - Expands to the number of positional parameters in decimal. + ($#) Expands to the number of positional parameters in decimal. `?' - Expands to the exit status of the most recently executed foreground - pipeline. + ($?) Expands to the exit status of the most recently executed + foreground pipeline. `-' - (A hyphen.) Expands to the current option flags as specified upon - invocation, by the `set' builtin command, or those set by the + ($-, a hyphen.) Expands to the current option flags as specified + upon invocation, by the `set' builtin command, or those set by the shell itself (such as the `-i' option). `$' - Expands to the process ID of the shell. In a `()' subshell, it - expands to the process ID of the invoking shell, not the subshell. + ($$) Expands to the process ID of the shell. In a `()' subshell, + it expands to the process ID of the invoking shell, not the + subshell. `!' - Expands to the process ID of the job most recently placed into the - background, whether executed as an asynchronous command or using - the `bg' builtin (*note Job Control Builtins::). + ($!) Expands to the process ID of the job most recently placed + into the background, whether executed as an asynchronous command + or using the `bg' builtin (*note Job Control Builtins::). `0' - Expands to the name of the shell or shell script. This is set at - shell initialization. If Bash is invoked with a file of commands - (*note Shell Scripts::), `$0' is set to the name of that file. If - Bash is started with the `-c' option (*note Invoking Bash::), then - `$0' is set to the first argument after the string to be executed, - if one is present. Otherwise, it is set to the filename used to - invoke Bash, as given by argument zero. + ($0) Expands to the name of the shell or shell script. This is + set at shell initialization. If Bash is invoked with a file of + commands (*note Shell Scripts::), `$0' is set to the name of that + file. If Bash is started with the `-c' option (*note Invoking + Bash::), then `$0' is set to the first argument after the string + to be executed, if one is present. Otherwise, it is set to the + filename used to invoke Bash, as given by argument zero. `_' - (An underscore.) At shell startup, set to the absolute pathname - used to invoke the shell or shell script being executed as passed - in the environment or argument list. Subsequently, expands to the - last argument to the previous command, after expansion. Also set - to the full pathname used to invoke each command executed and - placed in the environment exported to that command. When checking - mail, this parameter holds the name of the mail file. + ($_, an underscore.) At shell startup, set to the absolute + pathname used to invoke the shell or shell script being executed + as passed in the environment or argument list. Subsequently, + expands to the last argument to the previous command, after + expansion. Also set to the full pathname used to invoke each + command executed and placed in the environment exported to that + command. When checking mail, this parameter holds the name of the + mail file. File: bashref.info, Node: Shell Expansions, Next: Redirections, Prev: Shell Parameters, Up: Basic Shell Features @@ -7822,10 +7824,16 @@ File: bashref.info, Node: Commands For Text, Next: Commands For Killing, Prev 8.4.3 Commands For Changing Text -------------------------------- +`end-of-file (usually C-d)' + The character indicating end-of-file as set, for example, by + `stty'. If this character is read when there are no characters on + the line, and point is at the beginning of the line, Readline + interprets it as the end of input and returns EOF. + `delete-char (C-d)' - Delete the character at point. If point is at the beginning of - the line, there are no characters in the line, and the last - character typed was not bound to `delete-char', then return EOF. + Delete the character at point. If this function is bound to the + same character as the tty EOF character, as `C-d' commonly is, see + above for the effects. `backward-delete-char (Rubout)' Delete the character behind the cursor. A numeric argument means @@ -10680,15 +10688,24 @@ D.3 Parameter and Variable Index * Menu: -* !: Special Parameters. (line 46) +* !: Special Parameters. (line 47) * #: Special Parameters. (line 30) * $: Special Parameters. (line 42) +* $!: Special Parameters. (line 48) +* $#: Special Parameters. (line 31) +* $$: Special Parameters. (line 43) +* $*: Special Parameters. (line 10) +* $-: Special Parameters. (line 38) +* $0: Special Parameters. (line 53) +* $?: Special Parameters. (line 34) +* $@: Special Parameters. (line 20) +* $_: Special Parameters. (line 62) * *: Special Parameters. (line 9) * -: Special Parameters. (line 37) -* 0: Special Parameters. (line 51) +* 0: Special Parameters. (line 52) * ?: Special Parameters. (line 33) * @: Special Parameters. (line 19) -* _: Special Parameters. (line 60) +* _: Special Parameters. (line 61) * auto_resume: Job Control Variables. (line 6) * BASH: Bash Variables. (line 13) @@ -10880,14 +10897,14 @@ D.4 Function Index (line 10) * accept-line (Newline or Return): Commands For History. (line 6) * backward-char (C-b): Commands For Moving. (line 15) -* backward-delete-char (Rubout): Commands For Text. (line 11) +* backward-delete-char (Rubout): Commands For Text. (line 17) * backward-kill-line (C-x Rubout): Commands For Killing. (line 9) * backward-kill-word (M-<DEL>): Commands For Killing. (line 24) * backward-word (M-b): Commands For Moving. (line 22) * beginning-of-history (M-<): Commands For History. (line 20) * beginning-of-line (C-a): Commands For Moving. (line 6) * call-last-kbd-macro (C-x e): Keyboard Macros. (line 13) -* capitalize-word (M-c): Commands For Text. (line 46) +* capitalize-word (M-c): Commands For Text. (line 52) * character-search (C-]): Miscellaneous Commands. (line 41) * character-search-backward (M-C-]): Miscellaneous Commands. @@ -10898,14 +10915,14 @@ D.4 Function Index * copy-backward-word (): Commands For Killing. (line 58) * copy-forward-word (): Commands For Killing. (line 63) * copy-region-as-kill (): Commands For Killing. (line 54) -* delete-char (C-d): Commands For Text. (line 6) +* delete-char (C-d): Commands For Text. (line 12) * delete-char-or-list (): Commands For Completion. (line 43) * delete-horizontal-space (): Commands For Killing. (line 46) * digit-argument (M-0, M-1, ... M--): Numeric Arguments. (line 6) * do-uppercase-version (M-a, M-b, M-X, ...): Miscellaneous Commands. (line 14) -* downcase-word (M-l): Commands For Text. (line 42) +* downcase-word (M-l): Commands For Text. (line 48) * dump-functions (): Miscellaneous Commands. (line 73) * dump-macros (): Miscellaneous Commands. @@ -10913,11 +10930,12 @@ D.4 Function Index * dump-variables (): Miscellaneous Commands. (line 79) * end-kbd-macro (C-x )): Keyboard Macros. (line 9) +* end-of-file (usually C-d): Commands For Text. (line 6) * end-of-history (M->): Commands For History. (line 23) * end-of-line (C-e): Commands For Moving. (line 9) * exchange-point-and-mark (C-x C-x): Miscellaneous Commands. (line 36) -* forward-backward-delete-char (): Commands For Text. (line 15) +* forward-backward-delete-char (): Commands For Text. (line 21) * forward-char (C-f): Commands For Moving. (line 12) * forward-search-history (C-s): Commands For History. (line 31) * forward-word (M-f): Commands For Moving. (line 18) @@ -10942,35 +10960,35 @@ D.4 Function Index (line 41) * non-incremental-reverse-search-history (M-p): Commands For History. (line 36) -* overwrite-mode (): Commands For Text. (line 50) +* overwrite-mode (): Commands For Text. (line 56) * possible-completions (M-?): Commands For Completion. (line 15) * prefix-meta (<ESC>): Miscellaneous Commands. (line 18) * previous-history (C-p): Commands For History. (line 13) * print-last-kbd-macro (): Keyboard Macros. (line 17) -* quoted-insert (C-q or C-v): Commands For Text. (line 20) +* quoted-insert (C-q or C-v): Commands For Text. (line 26) * re-read-init-file (C-x C-r): Miscellaneous Commands. (line 6) * redraw-current-line (): Commands For Moving. (line 38) * reverse-search-history (C-r): Commands For History. (line 27) * revert-line (M-r): Miscellaneous Commands. (line 25) -* self-insert (a, b, A, 1, !, ...): Commands For Text. (line 24) +* self-insert (a, b, A, 1, !, ...): Commands For Text. (line 30) * set-mark (C-@): Miscellaneous Commands. (line 32) * skip-csi-sequence (): Miscellaneous Commands. (line 51) * start-kbd-macro (C-x (): Keyboard Macros. (line 6) -* transpose-chars (C-t): Commands For Text. (line 27) -* transpose-words (M-t): Commands For Text. (line 33) +* transpose-chars (C-t): Commands For Text. (line 33) +* transpose-words (M-t): Commands For Text. (line 39) * undo (C-_ or C-x C-u): Miscellaneous Commands. (line 22) * universal-argument (): Numeric Arguments. (line 10) * unix-filename-rubout (): Commands For Killing. (line 41) * unix-line-discard (C-u): Commands For Killing. (line 12) * unix-word-rubout (C-w): Commands For Killing. (line 37) -* upcase-word (M-u): Commands For Text. (line 38) +* upcase-word (M-u): Commands For Text. (line 44) * yank (C-y): Commands For Killing. (line 68) * yank-last-arg (M-. or M-_): Commands For History. (line 79) * yank-nth-arg (M-C-y): Commands For History. (line 70) @@ -11138,134 +11156,134 @@ D.5 Concept Index Tag Table: -Node: Top930 -Node: Introduction2848 -Node: What is Bash?3076 -Node: What is a shell?4189 -Node: Definitions6728 -Node: Basic Shell Features9646 -Node: Shell Syntax10865 -Node: Shell Operation11895 -Node: Quoting13189 -Node: Escape Character14492 -Node: Single Quotes14977 -Node: Double Quotes15325 -Node: ANSI-C Quoting16450 -Node: Locale Translation17694 -Node: Comments18590 -Node: Shell Commands19208 -Node: Simple Commands20080 -Node: Pipelines20711 -Node: Lists23449 -Node: Compound Commands25178 -Node: Looping Constructs26184 -Node: Conditional Constructs28647 -Node: Command Grouping39577 -Node: Coprocesses41056 -Node: GNU Parallel42889 -Node: Shell Functions46875 -Node: Shell Parameters51959 -Node: Positional Parameters56088 -Node: Special Parameters56988 -Node: Shell Expansions60047 -Node: Brace Expansion61990 -Node: Tilde Expansion64771 -Node: Shell Parameter Expansion67120 -Node: Command Substitution79414 -Node: Arithmetic Expansion80747 -Node: Process Substitution81679 -Node: Word Splitting82729 -Node: Filename Expansion84377 -Node: Pattern Matching86542 -Node: Quote Removal90242 -Node: Redirections90537 -Node: Executing Commands99701 -Node: Simple Command Expansion100371 -Node: Command Search and Execution102301 -Node: Command Execution Environment104638 -Node: Environment107624 -Node: Exit Status109283 -Node: Signals110905 -Node: Shell Scripts112873 -Node: Shell Builtin Commands115391 -Node: Bourne Shell Builtins117419 -Node: Bash Builtins137326 -Node: Modifying Shell Behavior164779 -Node: The Set Builtin165124 -Node: The Shopt Builtin175450 -Node: Special Builtins189871 -Node: Shell Variables190850 -Node: Bourne Shell Variables191290 -Node: Bash Variables193321 -Node: Bash Features220196 -Node: Invoking Bash221095 -Node: Bash Startup Files226873 -Node: Interactive Shells231902 -Node: What is an Interactive Shell?232312 -Node: Is this Shell Interactive?232961 -Node: Interactive Shell Behavior233776 -Node: Bash Conditional Expressions237064 -Node: Shell Arithmetic241066 -Node: Aliases243842 -Node: Arrays246398 -Node: The Directory Stack251379 -Node: Directory Stack Builtins252098 -Node: Controlling the Prompt255054 -Node: The Restricted Shell257826 -Node: Bash POSIX Mode259663 -Node: Job Control269050 -Node: Job Control Basics269510 -Node: Job Control Builtins274229 -Node: Job Control Variables278700 -Node: Command Line Editing279858 -Node: Introduction and Notation281530 -Node: Readline Interaction283152 -Node: Readline Bare Essentials284343 -Node: Readline Movement Commands286132 -Node: Readline Killing Commands287097 -Node: Readline Arguments289017 -Node: Searching290061 -Node: Readline Init File292247 -Node: Readline Init File Syntax293394 -Node: Conditional Init Constructs310231 -Node: Sample Init File312764 -Node: Bindable Readline Commands315882 -Node: Commands For Moving317089 -Node: Commands For History318233 -Node: Commands For Text322418 -Node: Commands For Killing325091 -Node: Numeric Arguments327548 -Node: Commands For Completion328687 -Node: Keyboard Macros332879 -Node: Miscellaneous Commands333567 -Node: Readline vi Mode339373 -Node: Programmable Completion340280 -Node: Programmable Completion Builtins347556 -Node: A Programmable Completion Example357302 -Node: Using History Interactively362552 -Node: Bash History Facilities363236 -Node: Bash History Builtins366235 -Node: History Interaction370163 -Node: Event Designators372868 -Node: Word Designators374090 -Node: Modifiers375729 -Node: Installing Bash377133 -Node: Basic Installation378270 -Node: Compilers and Options380962 -Node: Compiling For Multiple Architectures381703 -Node: Installation Names383367 -Node: Specifying the System Type384185 -Node: Sharing Defaults384901 -Node: Operation Controls385574 -Node: Optional Features386532 -Node: Reporting Bugs396596 -Node: Major Differences From The Bourne Shell397794 -Node: GNU Free Documentation License414653 -Node: Indexes439849 -Node: Builtin Index440303 -Node: Reserved Word Index447130 -Node: Variable Index449578 -Node: Function Index463101 -Node: Concept Index470329 +Node: Top928 +Node: Introduction2844 +Node: What is Bash?3072 +Node: What is a shell?4185 +Node: Definitions6724 +Node: Basic Shell Features9642 +Node: Shell Syntax10861 +Node: Shell Operation11891 +Node: Quoting13185 +Node: Escape Character14488 +Node: Single Quotes14973 +Node: Double Quotes15321 +Node: ANSI-C Quoting16446 +Node: Locale Translation17690 +Node: Comments18586 +Node: Shell Commands19204 +Node: Simple Commands20076 +Node: Pipelines20707 +Node: Lists23445 +Node: Compound Commands25174 +Node: Looping Constructs26180 +Node: Conditional Constructs28643 +Node: Command Grouping39573 +Node: Coprocesses41052 +Node: GNU Parallel42885 +Node: Shell Functions46871 +Node: Shell Parameters51955 +Node: Positional Parameters56084 +Node: Special Parameters56984 +Node: Shell Expansions60095 +Node: Brace Expansion62038 +Node: Tilde Expansion64819 +Node: Shell Parameter Expansion67168 +Node: Command Substitution79462 +Node: Arithmetic Expansion80795 +Node: Process Substitution81727 +Node: Word Splitting82777 +Node: Filename Expansion84425 +Node: Pattern Matching86590 +Node: Quote Removal90290 +Node: Redirections90585 +Node: Executing Commands99749 +Node: Simple Command Expansion100419 +Node: Command Search and Execution102349 +Node: Command Execution Environment104686 +Node: Environment107672 +Node: Exit Status109331 +Node: Signals110953 +Node: Shell Scripts112921 +Node: Shell Builtin Commands115439 +Node: Bourne Shell Builtins117467 +Node: Bash Builtins137374 +Node: Modifying Shell Behavior164827 +Node: The Set Builtin165172 +Node: The Shopt Builtin175498 +Node: Special Builtins189919 +Node: Shell Variables190898 +Node: Bourne Shell Variables191338 +Node: Bash Variables193369 +Node: Bash Features220244 +Node: Invoking Bash221143 +Node: Bash Startup Files226921 +Node: Interactive Shells231950 +Node: What is an Interactive Shell?232360 +Node: Is this Shell Interactive?233009 +Node: Interactive Shell Behavior233824 +Node: Bash Conditional Expressions237112 +Node: Shell Arithmetic241114 +Node: Aliases243890 +Node: Arrays246446 +Node: The Directory Stack251427 +Node: Directory Stack Builtins252146 +Node: Controlling the Prompt255102 +Node: The Restricted Shell257874 +Node: Bash POSIX Mode259711 +Node: Job Control269098 +Node: Job Control Basics269558 +Node: Job Control Builtins274277 +Node: Job Control Variables278748 +Node: Command Line Editing279906 +Node: Introduction and Notation281578 +Node: Readline Interaction283200 +Node: Readline Bare Essentials284391 +Node: Readline Movement Commands286180 +Node: Readline Killing Commands287145 +Node: Readline Arguments289065 +Node: Searching290109 +Node: Readline Init File292295 +Node: Readline Init File Syntax293442 +Node: Conditional Init Constructs310279 +Node: Sample Init File312812 +Node: Bindable Readline Commands315930 +Node: Commands For Moving317137 +Node: Commands For History318281 +Node: Commands For Text322466 +Node: Commands For Killing325395 +Node: Numeric Arguments327852 +Node: Commands For Completion328991 +Node: Keyboard Macros333183 +Node: Miscellaneous Commands333871 +Node: Readline vi Mode339677 +Node: Programmable Completion340584 +Node: Programmable Completion Builtins347860 +Node: A Programmable Completion Example357606 +Node: Using History Interactively362856 +Node: Bash History Facilities363540 +Node: Bash History Builtins366539 +Node: History Interaction370467 +Node: Event Designators373172 +Node: Word Designators374394 +Node: Modifiers376033 +Node: Installing Bash377437 +Node: Basic Installation378574 +Node: Compilers and Options381266 +Node: Compiling For Multiple Architectures382007 +Node: Installation Names383671 +Node: Specifying the System Type384489 +Node: Sharing Defaults385205 +Node: Operation Controls385878 +Node: Optional Features386836 +Node: Reporting Bugs396900 +Node: Major Differences From The Bourne Shell398098 +Node: GNU Free Documentation License414957 +Node: Indexes440153 +Node: Builtin Index440607 +Node: Reserved Word Index447434 +Node: Variable Index449882 +Node: Function Index464062 +Node: Concept Index471363 End Tag Table diff --git a/doc/bashref.texi b/doc/bashref.texi index b11aae62..23e733a2 100644 --- a/doc/bashref.texi +++ b/doc/bashref.texi @@ -14,7 +14,7 @@ This is Edition @value{EDITION}, last updated @value{UPDATED}, of @cite{The GNU Bash Reference Manual}, for @code{Bash}, Version @value{VERSION}. -Copyright @copyright{} 1988--2013 Free Software Foundation, Inc. +Copyright @copyright{} 1988--2014 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -1565,7 +1565,8 @@ only be referenced; assignment to them is not allowed. @vtable @code @item * -Expands to the positional parameters, starting from one. When the +@vindex $* +($*) Expands to the positional parameters, starting from one. When the expansion occurs within double quotes, it expands to a single word with the value of each parameter separated by the first character of the @env{IFS} @@ -1579,7 +1580,8 @@ separators. @item @@ -Expands to the positional parameters, starting from one. When the +@vindex $@@ +($@@) Expands to the positional parameters, starting from one. When the expansion occurs within double quotes, each parameter expands to a separate word. That is, @code{"$@@"} is equivalent to @code{"$1" "$2" @dots{}}. @@ -1592,29 +1594,35 @@ When there are no positional parameters, @code{"$@@"} and expand to nothing (i.e., they are removed). @item # -Expands to the number of positional parameters in decimal. +@vindex $# +($#) Expands to the number of positional parameters in decimal. @item ? -Expands to the exit status of the most recently executed foreground +@vindex $? +($?) Expands to the exit status of the most recently executed foreground pipeline. @item - -(A hyphen.) Expands to the current option flags as specified upon +@vindex $- +($-, a hyphen.) Expands to the current option flags as specified upon invocation, by the @code{set} builtin command, or those set by the shell itself (such as the @option{-i} option). @item $ -Expands to the process @sc{id} of the shell. In a @code{()} subshell, it +@vindex $$ +($$) Expands to the process @sc{id} of the shell. In a @code{()} subshell, it expands to the process @sc{id} of the invoking shell, not the subshell. @item ! -Expands to the process @sc{id} of the job most recently placed into the +@vindex $! +($!) Expands to the process @sc{id} of the job most recently placed into the background, whether executed as an asynchronous command or using the @code{bg} builtin (@pxref{Job Control Builtins}). @item 0 -Expands to the name of the shell or shell script. This is set at +@vindex $0 +($0) Expands to the name of the shell or shell script. This is set at shell initialization. If Bash is invoked with a file of commands (@pxref{Shell Scripts}), @code{$0} is set to the name of that file. If Bash is started with the @option{-c} option (@pxref{Invoking Bash}), @@ -1623,7 +1631,8 @@ executed, if one is present. Otherwise, it is set to the filename used to invoke Bash, as given by argument zero. @item _ -(An underscore.) +@vindex $_ +($_, an underscore.) At shell startup, set to the absolute pathname used to invoke the shell or shell script being executed as passed in the environment or argument list. diff --git a/doc/texinfo.tex b/doc/texinfo.tex index 03c29989..bfd765dd 100644 --- a/doc/texinfo.tex +++ b/doc/texinfo.tex @@ -1,13 +1,13 @@ % texinfo.tex -- TeX macros to handle Texinfo files. -% +% % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2009-01-18.17} +\def\texinfoversion{2013-09-11.11} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009 Free Software Foundation, Inc. +% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -24,13 +24,14 @@ % % As a special exception, when this file is read by TeX when processing % a Texinfo source document, you may use the result without -% restriction. (This has been our intent since Texinfo was invented.) +% restriction. This Exception is an additional permission under section 7 +% of the GNU General Public License, version 3 ("GPLv3"). % % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: -% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or -% ftp://tug.org/tex/texinfo.tex -% (and all CTAN mirrors, see http://www.ctan.org). +% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or +% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or +% http://www.gnu.org/software/texinfo/ (the Texinfo home page) % The texinfo.tex in any given distribution could well be out % of date, so if that's what you're using, please check. % @@ -65,7 +66,6 @@ \everyjob{\message{[Texinfo version \texinfoversion]}% \catcode`+=\active \catcode`\_=\active} - \chardef\other=12 % We never want plain's \outer definition of \+ in Texinfo. @@ -93,14 +93,13 @@ \let\ptexnewwrite\newwrite \let\ptexnoindent=\noindent \let\ptexplus=+ +\let\ptexraggedright=\raggedright \let\ptexrbrace=\} \let\ptexslash=\/ \let\ptexstar=\* \let\ptext=\t \let\ptextop=\top -{\catcode`\'=\active -\global\let\ptexquoteright'}% Math-mode def from plain.tex. -\let\ptexraggedright=\raggedright +{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode % If this character appears in an error message or help string, it % starts a new line in the output. @@ -118,10 +117,11 @@ % Set up fixed words for English if not already set. \ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi \ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi +\ifx\putworderror\undefined \gdef\putworderror{error}\fi \ifx\putwordfile\undefined \gdef\putwordfile{file}\fi \ifx\putwordin\undefined \gdef\putwordin{in}\fi -\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi -\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi +\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi +\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi \ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi \ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi @@ -160,15 +160,18 @@ \def\spaceisspace{\catcode`\ =\spacecat} % sometimes characters are active, so we need control sequences. +\chardef\ampChar = `\& \chardef\colonChar = `\: \chardef\commaChar = `\, \chardef\dashChar = `\- \chardef\dotChar = `\. \chardef\exclamChar= `\! +\chardef\hashChar = `\# \chardef\lquoteChar= `\` \chardef\questChar = `\? \chardef\rquoteChar= `\' \chardef\semiChar = `\; +\chardef\slashChar = `\/ \chardef\underChar = `\_ % Ignore a token. @@ -199,36 +202,7 @@ % that mark overfull boxes (in case you have decided % that the text looks ok even though it passes the margin). % -\def\finalout{\overfullrule=0pt} - -% @| inserts a changebar to the left of the current line. It should -% surround any changed text. This approach does *not* work if the -% change spans more than two lines of output. To handle that, we would -% have adopt a much more difficult approach (putting marks into the main -% vertical list for the beginning and end of each change). -% -\def\|{% - % \vadjust can only be used in horizontal mode. - \leavevmode - % - % Append this vertical mode material after the current line in the output. - \vadjust{% - % We want to insert a rule with the height and depth of the current - % leading; that is exactly what \strutbox is supposed to record. - \vskip-\baselineskip - % - % \vadjust-items are inserted at the left edge of the type. So - % the \llap here moves out into the left-hand margin. - \llap{% - % - % For a thicker or thinner bar, change the `1pt'. - \vrule height\baselineskip width1pt - % - % This is the space between the bar and the text. - \hskip 12pt - }% - }% -} +\def\finalout{\overfullrule=0pt } % Sometimes it is convenient to have everything in the transcript file % and nothing on the terminal. We don't just call \tracingall here, @@ -246,7 +220,7 @@ \tracingmacros2 \tracingrestores1 \showboxbreadth\maxdimen \showboxdepth\maxdimen - \ifx\eTeXversion\undefined\else % etex gives us more logging + \ifx\eTeXversion\thisisundefined\else % etex gives us more logging \tracingscantokens1 \tracingifs1 \tracinggroups1 @@ -257,6 +231,13 @@ \errorcontextlines16 }% +% @errormsg{MSG}. Do the index-like expansions on MSG, but if things +% aren't perfect, it's not the end of the world, being an error message, +% after all. +% +\def\errormsg{\begingroup \indexnofonts \doerrormsg} +\def\doerrormsg#1{\errmessage{#1}} + % add check for \lastpenalty to plain's definitions. If the last thing % we did was a \nobreak, we don't want to insert more space. % @@ -267,7 +248,6 @@ \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount \removelastskip\penalty-200\bigskip\fi\fi} -% For @cropmarks command. % Do @cropmarks to get crop marks. % \newif\ifcropmarks @@ -301,9 +281,9 @@ \toks6=\expandafter{\prevsectiondefs}% \toks8=\expandafter{\lastcolordefs}% \mark{% - \the\toks0 \the\toks2 - \noexpand\or \the\toks4 \the\toks6 - \noexpand\else \the\toks8 + \the\toks0 \the\toks2 % 0: top marks (\last...) + \noexpand\or \the\toks4 \the\toks6 % 1: bottom marks (default, \prev...) + \noexpand\else \the\toks8 % 2: color marks }% } % \topmark doesn't work for the very first chapter (after the title @@ -342,10 +322,13 @@ % % Do this outside of the \shipout so @code etc. will be expanded in % the headline as they should be, not taken literally (outputting ''code). + \def\commmonheadfootline{\let\hsize=\pagewidth \texinfochars} + % \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi - \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}% + \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}% + % \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi - \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}% + \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}% % {% % Have to do this stuff outside the \shipout because we want it to @@ -358,7 +341,7 @@ % We don't want .vr (or whatever) entries like this: % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} % "\acronym" won't work when it's read back in; - % it needs to be + % it needs to be % {\code {{\tt \backslashcurfont }acronym} \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. @@ -577,7 +560,7 @@ } \def\inenvironment#1{% \ifx#1\empty - out of any environment% + outside of any environment% \else in environment \expandafter\string#1% \fi @@ -589,7 +572,7 @@ \parseargdef\end{% \if 1\csname iscond.#1\endcsname \else - % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03 + % The general wording of \badenverr may not be ideal. \expandafter\checkenv\csname#1\endcsname \csname E#1\endcsname \endgroup @@ -599,85 +582,6 @@ \newhelp\EMsimple{Press RETURN to continue.} -%% Simple single-character @ commands - -% @@ prints an @ -% Kludge this until the fonts are right (grr). -\def\@{{\tt\char64}} - -% This is turned off because it was never documented -% and you can use @w{...} around a quote to suppress ligatures. -%% Define @` and @' to be the same as ` and ' -%% but suppressing ligatures. -%\def\`{{`}} -%\def\'{{'}} - -% Used to generate quoted braces. -\def\mylbrace {{\tt\char123}} -\def\myrbrace {{\tt\char125}} -\let\{=\mylbrace -\let\}=\myrbrace -\begingroup - % Definitions to produce \{ and \} commands for indices, - % and @{ and @} for the aux/toc files. - \catcode`\{ = \other \catcode`\} = \other - \catcode`\[ = 1 \catcode`\] = 2 - \catcode`\! = 0 \catcode`\\ = \other - !gdef!lbracecmd[\{]% - !gdef!rbracecmd[\}]% - !gdef!lbraceatcmd[@{]% - !gdef!rbraceatcmd[@}]% -!endgroup - -% @comma{} to avoid , parsing problems. -\let\comma = , - -% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent -% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. -\let\, = \c -\let\dotaccent = \. -\def\ringaccent#1{{\accent23 #1}} -\let\tieaccent = \t -\let\ubaraccent = \b -\let\udotaccent = \d - -% Other special characters: @questiondown @exclamdown @ordf @ordm -% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. -\def\questiondown{?`} -\def\exclamdown{!`} -\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} -\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} - -% Dotless i and dotless j, used for accents. -\def\imacro{i} -\def\jmacro{j} -\def\dotless#1{% - \def\temp{#1}% - \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi - \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi - \else \errmessage{@dotless can be used only with i or j}% - \fi\fi -} - -% The \TeX{} logo, as in plain, but resetting the spacing so that a -% period following counts as ending a sentence. (Idea found in latex.) -% -\edef\TeX{\TeX \spacefactor=1000 } - -% @LaTeX{} logo. Not quite the same results as the definition in -% latex.ltx, since we use a different font for the raised A; it's most -% convenient for us to use an explicitly smaller font, rather than using -% the \scriptstyle font (since we don't reset \scriptstyle and -% \scriptscriptstyle). -% -\def\LaTeX{% - L\kern-.36em - {\setbox0=\hbox{T}% - \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}% - \kern-.15em - \TeX -} - % Be sure we're in horizontal mode when doing a tie, since we make space % equivalent to this in @example-like environments. Otherwise, a space % at the beginning of a line will start with \penalty -- and @@ -694,7 +598,7 @@ \def\:{\spacefactor=1000 } % @* forces a line break. -\def\*{\hfil\break\hbox{}\ignorespaces} +\def\*{\unskip\hfil\break\hbox{}\ignorespaces} % @/ allows a line break. \let\/=\allowbreak @@ -709,7 +613,7 @@ \def\?{?\spacefactor=\endofsentencespacefactor\space} % @frenchspacing on|off says whether to put extra space after punctuation. -% +% \def\onword{on} \def\offword{off} % @@ -719,7 +623,7 @@ \else\ifx\temp\offword \plainnonfrenchspacing \else \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on/off}% + \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% \fi\fi } @@ -801,15 +705,6 @@ where each line of input produces a line of output.} \newdimen\mil \mil=0.001in -% Old definition--didn't work. -%\parseargdef\need{\par % -%% This method tries to make TeX break the page naturally -%% if the depth of the box does not fit. -%{\baselineskip=0pt% -%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak -%\prevdepth=-1000pt -%}} - \parseargdef\need{% % Ensure vertical mode, so we don't make a big box in the middle of a % paragraph. @@ -873,7 +768,7 @@ where each line of input produces a line of output.} % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current % paragraph. For more general purposes, use the \margin insertion -% class. WHICH is `l' or `r'. +% class. WHICH is `l' or `r'. Not documented, written for gawk manual. % \newskip\inmarginspacing \inmarginspacing=1cm \def\strutdepth{\dp\strutbox} @@ -920,6 +815,36 @@ where each line of input produces a line of output.} \temp } +% @| inserts a changebar to the left of the current line. It should +% surround any changed text. This approach does *not* work if the +% change spans more than two lines of output. To handle that, we would +% have adopt a much more difficult approach (putting marks into the main +% vertical list for the beginning and end of each change). This command +% is not documented, not supported, and doesn't work. +% +\def\|{% + % \vadjust can only be used in horizontal mode. + \leavevmode + % + % Append this vertical mode material after the current line in the output. + \vadjust{% + % We want to insert a rule with the height and depth of the current + % leading; that is exactly what \strutbox is supposed to record. + \vskip-\baselineskip + % + % \vadjust-items are inserted at the left edge of the type. So + % the \llap here moves out into the left-hand margin. + \llap{% + % + % For a thicker or thinner bar, change the `1pt'. + \vrule height\baselineskip width1pt + % + % This is the space between the bar and the text. + \hskip 12pt + }% + }% +} + % @include FILE -- \input text of FILE. % \def\include{\parseargusing\filenamecatcodes\includezzz} @@ -930,6 +855,7 @@ where each line of input produces a line of output.} \makevalueexpandable % we want to expand any @value in FILE. \turnoffactive % and allow special characters in the expansion \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @include of #1^^J}% \edef\temp{\noexpand\input #1 }% % % This trickery is to read FILE outside of a group, in case it makes @@ -965,7 +891,7 @@ where each line of input produces a line of output.} \def\popthisfilestack{\errthisfilestackempty} \def\errthisfilestackempty{\errmessage{Internal error: the stack of filenames is empty.}} - +% \def\thisfile{} % @center line @@ -973,36 +899,46 @@ where each line of input produces a line of output.} % \parseargdef\center{% \ifhmode - \let\next\centerH + \let\centersub\centerH \else - \let\next\centerV + \let\centersub\centerV \fi - \next{\hfil \ignorespaces#1\unskip \hfil}% + \centersub{\hfil \ignorespaces#1\unskip \hfil}% + \let\centersub\relax % don't let the definition persist, just in case } -\def\centerH#1{% - {% - \hfil\break - \advance\hsize by -\leftskip - \advance\hsize by -\rightskip - \line{#1}% - \break - }% +\def\centerH#1{{% + \hfil\break + \advance\hsize by -\leftskip + \advance\hsize by -\rightskip + \line{#1}% + \break +}} +% +\newcount\centerpenalty +\def\centerV#1{% + % The idea here is the same as in \startdefun, \cartouche, etc.: if + % @center is the first thing after a section heading, we need to wipe + % out the negative parskip inserted by \sectionheading, but still + % prevent a page break here. + \centerpenalty = \lastpenalty + \ifnum\centerpenalty>10000 \vskip\parskip \fi + \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi + \line{\kern\leftskip #1\kern\rightskip}% } -\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}} % @sp n outputs n lines of vertical space - +% \parseargdef\sp{\vskip #1\baselineskip} % @comment ...line which is ignored... % @c is the same as @comment % @ignore ... @end ignore is another way to write a comment - +% \def\comment{\begingroup \catcode`\^^M=\other% \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% \commentxxx} {\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}} - +% \let\c=\comment % @paragraphindent NCHARS @@ -1095,109 +1031,6 @@ where each line of input produces a line of output.} } -% @asis just yields its argument. Used with @table, for example. -% -\def\asis#1{#1} - -% @math outputs its argument in math mode. -% -% One complication: _ usually means subscripts, but it could also mean -% an actual _ character, as in @math{@var{some_variable} + 1}. So make -% _ active, and distinguish by seeing if the current family is \slfam, -% which is what @var uses. -{ - \catcode`\_ = \active - \gdef\mathunderscore{% - \catcode`\_=\active - \def_{\ifnum\fam=\slfam \_\else\sb\fi}% - } -} -% Another complication: we want \\ (and @\) to output a \ character. -% FYI, plain.tex uses \\ as a temporary control sequence (why?), but -% this is not advertised and we don't care. Texinfo does not -% otherwise define @\. -% -% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. -\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} -% -\def\math{% - \tex - \mathunderscore - \let\\ = \mathbackslash - \mathactive - % make the texinfo accent commands work in math mode - \let\"=\ddot - \let\'=\acute - \let\==\bar - \let\^=\hat - \let\`=\grave - \let\u=\breve - \let\v=\check - \let\~=\tilde - \let\dotaccent=\dot - $\finishmath -} -\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. - -% Some active characters (such as <) are spaced differently in math. -% We have to reset their definitions in case the @math was an argument -% to a command which sets the catcodes (such as @item or @section). -% -{ - \catcode`^ = \active - \catcode`< = \active - \catcode`> = \active - \catcode`+ = \active - \catcode`' = \active - \gdef\mathactive{% - \let^ = \ptexhat - \let< = \ptexless - \let> = \ptexgtr - \let+ = \ptexplus - \let' = \ptexquoteright - } -} - -% Some math mode symbols. -\def\bullet{$\ptexbullet$} -\def\geq{\ifmmode \ge\else $\ge$\fi} -\def\leq{\ifmmode \le\else $\le$\fi} -\def\minus{\ifmmode -\else $-$\fi} - -% @dots{} outputs an ellipsis using the current font. -% We do .5em per period so that it has the same spacing in the cm -% typewriter fonts as three actual period characters; on the other hand, -% in other typewriter fonts three periods are wider than 1.5em. So do -% whichever is larger. -% -\def\dots{% - \leavevmode - \setbox0=\hbox{...}% get width of three periods - \ifdim\wd0 > 1.5em - \dimen0 = \wd0 - \else - \dimen0 = 1.5em - \fi - \hbox to \dimen0{% - \hskip 0pt plus.25fil - .\hskip 0pt plus1fil - .\hskip 0pt plus1fil - .\hskip 0pt plus.5fil - }% -} - -% @enddots{} is an end-of-sentence ellipsis. -% -\def\enddots{% - \dots - \spacefactor=\endofsentencespacefactor -} - -% @comma{} is so commas can be inserted into text without messing up -% Texinfo's parsing. -% -\let\comma = , - % @refill is a no-op. \let\refill=\relax @@ -1262,9 +1095,8 @@ where each line of input produces a line of output.} \newif\ifpdfmakepagedest % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 -% can be set). So we test for \relax and 0 as well as \undefined, -% borrowed from ifpdf.sty. -\ifx\pdfoutput\undefined +% can be set). So we test for \relax and 0 as well as being undefined. +\ifx\pdfoutput\thisisundefined \else \ifx\pdfoutput\relax \else @@ -1279,50 +1111,24 @@ where each line of input produces a line of output.} % for display in the outlines, and in other places. Thus, we have to % double any backslashes. Otherwise, a name like "\node" will be % interpreted as a newline (\n), followed by o, d, e. Not good. -% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html -% (and related messages, the final outcome is that it is up to the TeX -% user to double the backslashes and otherwise make the string valid, so -% that's what we do). - -% double active backslashes. -% -{\catcode`\@=0 \catcode`\\=\active - @gdef@activebackslashdouble{% - @catcode`@\=@active - @let\=@doublebackslash} -} - -% To handle parens, we must adopt a different approach, since parens are -% not active characters. hyperref.dtx (which has the same problem as -% us) handles it with this amazing macro to replace tokens, with minor -% changes for Texinfo. It is included here under the GPL by permission -% from the author, Heiko Oberdiek. -% -% #1 is the tokens to replace. -% #2 is the replacement. -% #3 is the control sequence with the string. % -\def\HyPsdSubst#1#2#3{% - \def\HyPsdReplace##1#1##2\END{% - ##1% - \ifx\\##2\\% - \else - #2% - \HyReturnAfterFi{% - \HyPsdReplace##2\END - }% - \fi - }% - \xdef#3{\expandafter\HyPsdReplace#3#1\END}% -} -\long\def\HyReturnAfterFi#1\fi{\fi#1} - -% #1 is a control sequence in which to do the replacements. -\def\backslashparens#1{% - \xdef#1{#1}% redefine it as its expansion; the definition is simply - % \lastnode when called from \setref -> \pdfmkdest. - \HyPsdSubst{(}{\realbackslash(}{#1}% - \HyPsdSubst{)}{\realbackslash)}{#1}% +% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and +% related messages. The final outcome is that it is up to the TeX user +% to double the backslashes and otherwise make the string valid, so +% that's what we do. pdftex 1.30.0 (ca.2005) introduced a primitive to +% do this reliably, so we use it. + +% #1 is a control sequence in which to do the replacements, +% which we \xdef. +\def\txiescapepdf#1{% + \ifx\pdfescapestring\thisisundefined + % No primitive available; should we give a warning or log? + % Many times it won't matter. + \else + % The expandable \pdfescapestring primitive escapes parentheses, + % backslashes, and other special chars. + \xdef#1{\pdfescapestring{#1}}% + \fi } \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images @@ -1332,13 +1138,16 @@ output) for that.)} \ifpdf % - % Color manipulation macros based on pdfcolor.tex. - \def\cmykDarkRed{0.28 1 1 0.35} - \def\cmykBlack{0 0 0 1} + % Color manipulation macros based on pdfcolor.tex, + % except using rgb instead of cmyk; the latter is said to render as a + % very dark gray on-screen and a very dark halftone in print, instead + % of actual black. + \def\rgbDarkRed{0.50 0.09 0.12} + \def\rgbBlack{0 0 0} % % k sets the color for filling (usual text, etc.); % K sets the color for stroking (thin rules, e.g., normal _'s). - \def\pdfsetcolor#1{\pdfliteral{#1 k #1 K}} + \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}} % % Set color, and create a mark which defines \thiscolor accordingly, % so that \makeheadline knows which color to restore. @@ -1348,7 +1157,7 @@ output) for that.)} \pdfsetcolor{#1}% } % - \def\maincolor{\cmykBlack} + \def\maincolor{\rgbBlack} \pdfsetcolor{\maincolor} \edef\thiscolor{\maincolor} \def\lastcolordefs{} @@ -1378,32 +1187,34 @@ output) for that.)} % % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). \def\dopdfimage#1#2#3{% - \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% - \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% + \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% + \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% % - % pdftex (and the PDF format) support .png, .jpg, .pdf (among - % others). Let's try in that order. + % pdftex (and the PDF format) support .pdf, .png, .jpg (among + % others). Let's try in that order, PDF first since if + % someone has a scalable image, presumably better to use that than a + % bitmap. \let\pdfimgext=\empty \begingroup - \openin 1 #1.png \ifeof 1 - \openin 1 #1.jpg \ifeof 1 - \openin 1 #1.jpeg \ifeof 1 - \openin 1 #1.JPG \ifeof 1 - \openin 1 #1.pdf \ifeof 1 - \openin 1 #1.PDF \ifeof 1 + \openin 1 #1.pdf \ifeof 1 + \openin 1 #1.PDF \ifeof 1 + \openin 1 #1.png \ifeof 1 + \openin 1 #1.jpg \ifeof 1 + \openin 1 #1.jpeg \ifeof 1 + \openin 1 #1.JPG \ifeof 1 \errhelp = \nopdfimagehelp \errmessage{Could not find image file #1 for pdf}% - \else \gdef\pdfimgext{PDF}% + \else \gdef\pdfimgext{JPG}% \fi - \else \gdef\pdfimgext{pdf}% + \else \gdef\pdfimgext{jpeg}% \fi - \else \gdef\pdfimgext{JPG}% + \else \gdef\pdfimgext{jpg}% \fi - \else \gdef\pdfimgext{jpeg}% + \else \gdef\pdfimgext{png}% \fi - \else \gdef\pdfimgext{jpg}% + \else \gdef\pdfimgext{PDF}% \fi - \else \gdef\pdfimgext{png}% + \else \gdef\pdfimgext{pdf}% \fi \closein 1 \endgroup @@ -1415,8 +1226,8 @@ output) for that.)} \else \immediate\pdfximage \fi - \ifdim \wd0 >0pt width \imagewidth \fi - \ifdim \wd2 >0pt height \imageheight \fi + \ifdim \wd0 >0pt width \pdfimagewidth \fi + \ifdim \wd2 >0pt height \pdfimageheight \fi \ifnum\pdftexversion<13 #1.\pdfimgext \else @@ -1431,10 +1242,9 @@ output) for that.)} % such as \, aren't expanded when present in a section title. \indexnofonts \turnoffactive - \activebackslashdouble \makevalueexpandable \def\pdfdestname{#1}% - \backslashparens\pdfdestname + \txiescapepdf\pdfdestname \safewhatsit{\pdfdest name{\pdfdestname} xyz}% }} % @@ -1443,8 +1253,8 @@ output) for that.)} % % by default, use a color that is dark enough to print on paper as % nearly black, but still distinguishable for online viewing. - \def\urlcolor{\cmykDarkRed} - \def\linkcolor{\cmykDarkRed} + \def\urlcolor{\rgbDarkRed} + \def\linkcolor{\rgbDarkRed} \def\endlink{\setcolor{\maincolor}\pdfendlink} % % Adding outlines to PDF; macros for calculating structure of outlines @@ -1466,29 +1276,24 @@ output) for that.)} % page number. We could generate a destination for the section % text in the case where a section has no node, but it doesn't % seem worth the trouble, since most documents are normally structured. - \def\pdfoutlinedest{#3}% + \edef\pdfoutlinedest{#3}% \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}% \else - % Doubled backslashes in the name. - {\activebackslashdouble \xdef\pdfoutlinedest{#3}% - \backslashparens\pdfoutlinedest}% + \txiescapepdf\pdfoutlinedest \fi % - % Also double the backslashes in the display string. - {\activebackslashdouble \xdef\pdfoutlinetext{#1}% - \backslashparens\pdfoutlinetext}% + % Also escape PDF chars in the display string. + \edef\pdfoutlinetext{#1}% + \txiescapepdf\pdfoutlinetext % \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% } % \def\pdfmakeoutlines{% \begingroup - % Thanh's hack / proper braces in bookmarks - \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace - \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace - % % Read toc silently, to get counts of subentries for \pdfoutline. + \def\partentry##1##2##3##4{}% ignore parts in the outlines \def\numchapentry##1##2##3##4{% \def\thischapnum{##2}% \def\thissecnum{0}% @@ -1542,25 +1347,41 @@ output) for that.)} % Latin 2 (0xea) gets translated to a | character. Info from % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. % - % xx to do this right, we have to translate 8-bit characters to - % their "best" equivalent, based on the @documentencoding. Right - % now, I guess we'll just let the pdf reader have its way. + % TODO this right, we have to translate 8-bit characters to + % their "best" equivalent, based on the @documentencoding. Too + % much work for too little return. Just use the ASCII equivalents + % we use for the index sort strings. + % \indexnofonts \setupdatafile + % We can have normal brace characters in the PDF outlines, unlike + % Texinfo index files. So set that up. + \def\{{\lbracecharliteral}% + \def\}{\rbracecharliteral}% \catcode`\\=\active \otherbackslash \input \tocreadfilename \endgroup } + {\catcode`[=1 \catcode`]=2 + \catcode`{=\other \catcode`}=\other + \gdef\lbracecharliteral[{]% + \gdef\rbracecharliteral[}]% + ] % \def\skipspaces#1{\def\PP{#1}\def\D{|}% \ifx\PP\D\let\nextsp\relax \else\let\nextsp\skipspaces - \ifx\p\space\else\addtokens{\filename}{\PP}% - \advance\filenamelength by 1 - \fi + \addtokens{\filename}{\PP}% + \advance\filenamelength by 1 \fi \nextsp} - \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax} + \def\getfilename#1{% + \filenamelength=0 + % If we don't expand the argument now, \skipspaces will get + % snagged on things like "@value{foo}". + \edef\temp{#1}% + \expandafter\skipspaces\temp|\relax + } \ifnum\pdftexversion < 14 \let \startlink \pdfannotlink \else @@ -1573,7 +1394,7 @@ output) for that.)} % tried to figure out what each command should do in the context % of @url. for now, just make @/ a no-op, that's the only one % people have actually reported a problem with. - % + % \normalturnoffactive \def\@{@}% \let\/=\empty @@ -1657,9 +1478,6 @@ output) for that.)} \def\ttsl{\setfontstyle{ttsl}} -% Default leading. -\newdimen\textleading \textleading = 13.2pt - % Set the baselineskip to #1, and the lineskip and strut size % correspondingly. There is no deep meaning behind these magic numbers % used as factors; they just match (closely enough) what Knuth defined. @@ -1671,6 +1489,7 @@ output) for that.)} % can get a sort of poor man's double spacing by redefining this. \def\baselinefactor{1} % +\newdimen\textleading \def\setleading#1{% \dimen0 = #1\relax \normalbaselineskip = \baselinefactor\dimen0 @@ -1692,7 +1511,7 @@ output) for that.)} % if we are producing pdf, and we have \pdffontattr, then define cmaps. % (\pdffontattr was introduced many years ago, but people still run % older pdftex's; it's easy to conditionalize, so we do.) -\ifpdf \ifx\pdffontattr\undefined \else +\ifpdf \ifx\pdffontattr\thisisundefined \else \begingroup \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap @@ -1943,28 +1762,34 @@ end \fi\fi -% Set the font macro #1 to the font named #2, adding on the -% specified font prefix (normally `cm'). +% Set the font macro #1 to the font named \fontprefix#2. % #3 is the font's design size, #4 is a scale factor, #5 is the CMap -% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass -% empty to omit). +% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit). +% Example: +% #1 = \textrm +% #2 = \rmshape +% #3 = 10 +% #4 = \mainmagstep +% #5 = OT1 +% \def\setfont#1#2#3#4#5{% \font#1=\fontprefix#2#3 scaled #4 \csname cmap#5\endcsname#1% } % This is what gets called when #5 of \setfont is empty. \let\cmap\gobble -% emacs-page end of cmaps +% +% (end of cmaps) % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix % before you read in texinfo.tex. -\ifx\fontprefix\undefined +\ifx\fontprefix\thisisundefined \def\fontprefix{cm} \fi % Support font families that don't use the same naming scheme as CM. \def\rmshape{r} -\def\rmbshape{bx} %where the normal face is bold +\def\rmbshape{bx} % where the normal face is bold \def\bfshape{b} \def\bxshape{bx} \def\ttshape{tt} @@ -1979,9 +1804,8 @@ end \def\scshape{csc} \def\scbshape{csc} -% Definitions for a main text size of 11pt. This is the default in -% Texinfo. -% +% Definitions for a main text size of 11pt. (The default in Texinfo.) +% \def\definetextfontsizexi{% % Text fonts (11.2pt, magstep1). \def\textnominalsize{11pt} @@ -2102,17 +1926,17 @@ end \font\reducedsy=cmsy10 \def\reducedecsize{1000} -% reset the current fonts -\textfonts +\textleading = 13.2pt % line spacing for 11pt CM +\textfonts % reset the current fonts \rm -} % end of 11pt text font size definitions +} % end of 11pt text font size definitions, \definetextfontsizexi % Definitions to make the main text be 10pt Computer Modern, with % section, chapter, etc., sizes following suit. This is for the GNU % Press printing of the Emacs 22 manual. Maybe other manuals in the % future. Used with @smallbook, which sets the leading to 12pt. -% +% \def\definetextfontsizex{% % Text fonts (10pt). \def\textnominalsize{10pt} @@ -2201,7 +2025,7 @@ end \setfont\secsf\sfbshape{12}{1000}{OT1} \let\secbf\secrm \setfont\secsc\scbshape{10}{\magstep1}{OT1} -\font\seci=cmmi12 +\font\seci=cmmi12 \font\secsy=cmsy10 scaled \magstep1 \def\sececsize{1200} @@ -2233,29 +2057,28 @@ end \font\reducedsy=cmsy9 \def\reducedecsize{0900} -% reduce space between paragraphs -\divide\parskip by 2 - -% reset the current fonts -\textfonts +\divide\parskip by 2 % reduce space between paragraphs +\textleading = 12pt % line spacing for 10pt CM +\textfonts % reset the current fonts \rm -} % end of 10pt text font size definitions +} % end of 10pt text font size definitions, \definetextfontsizex % We provide the user-level command % @fonttextsize 10 % (or 11) to redefine the text font size. pt is assumed. -% -\def\xword{10} +% \def\xiword{11} +\def\xword{10} +\def\xwordpt{10pt} % \parseargdef\fonttextsize{% \def\textsizearg{#1}% - \wlog{doing @fonttextsize \textsizearg}% + %\wlog{doing @fonttextsize \textsizearg}% % % Set \globaldefs so that documents can use this inside @tex, since % makeinfo 4.8 does not support it, but we need it nonetheless. - % + % \begingroup \globaldefs=1 \ifx\textsizearg\xword \definetextfontsizex \else \ifx\textsizearg\xiword \definetextfontsizexi @@ -2305,7 +2128,7 @@ end \let\tenttsl=\titlettsl \def\curfontsize{title}% \def\lsize{chap}\def\lllsize{subsec}% - \resetmathfonts \setleading{25pt}} + \resetmathfonts \setleading{27pt}} \def\titlefont#1{{\titlefonts\rmisbold #1}} \def\chapfonts{% \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl @@ -2433,12 +2256,14 @@ end % Markup style setup for left and right quotes. \defmarkupstylesetup\markupsetuplq{% - \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname + \expandafter\let\expandafter \temp + \csname markupsetuplq\currentmarkupstyle\endcsname \ifx\temp\relax \markupsetuplqdefault \else \temp \fi } \defmarkupstylesetup\markupsetuprq{% - \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname + \expandafter\let\expandafter \temp + \csname markupsetuprq\currentmarkupstyle\endcsname \ifx\temp\relax \markupsetuprqdefault \else \temp \fi } @@ -2451,29 +2276,32 @@ end \gdef\markupsetcodequoteleft{\let`\codequoteleft} \gdef\markupsetcodequoteright{\let'\codequoteright} - -\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft} } \let\markupsetuplqcode \markupsetcodequoteleft \let\markupsetuprqcode \markupsetcodequoteright +% \let\markupsetuplqexample \markupsetcodequoteleft \let\markupsetuprqexample \markupsetcodequoteright +% +\let\markupsetuplqkbd \markupsetcodequoteleft +\let\markupsetuprqkbd \markupsetcodequoteright +% +\let\markupsetuplqsamp \markupsetcodequoteleft +\let\markupsetuprqsamp \markupsetcodequoteright +% \let\markupsetuplqverb \markupsetcodequoteleft \let\markupsetuprqverb \markupsetcodequoteright +% \let\markupsetuplqverbatim \markupsetcodequoteleft \let\markupsetuprqverbatim \markupsetcodequoteright -\let\markupsetuplqsamp \markupsetnoligaturesquoteleft -\let\markupsetuplqkbd \markupsetnoligaturesquoteleft - -% Allow an option to not replace quotes with a regular directed right -% quote/apostrophe (char 0x27), but instead use the undirected quote -% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it -% the default, but it works for pasting with more pdf viewers (at least -% evince), the lilypond developers report. xpdf does work with the -% regular 0x27. -% +% Allow an option to not use regular directed right quote/apostrophe +% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). +% The undirected quote is ugly, so don't make it the default, but it +% works for pasting with more pdf viewers (at least evince), the +% lilypond developers report. xpdf does work with the regular 0x27. +% \def\codequoteright{% \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax @@ -2485,7 +2313,7 @@ end % and a similar option for the left quote char vs. a grave accent. % Modern fonts display ASCII 0x60 as a grave accent, so some people like % the code environments to do likewise. -% +% \def\codequoteleft{% \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax @@ -2496,33 +2324,85 @@ end \else \char'22 \fi } +% Commands to set the quote options. +% +\parseargdef\codequoteundirected{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% + \fi\fi +} +% +\parseargdef\codequotebacktick{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}% + \fi\fi +} + % [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. \def\noligaturesquoteleft{\relax\lq} % Count depth in font-changes, for error checks \newcount\fontdepth \fontdepth=0 -%% Add scribe-like font environments, plus @l for inline lisp (usually sans -%% serif) and @ii for TeX italic +% Font commands. -% \smartitalic{ARG} outputs arg in italics, followed by an italic correction -% unless the following character is such as not to need one. -\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else - \ptexslash\fi\fi\fi} -\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx} -\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx} +% #1 is the font command (\sl or \it), #2 is the text to slant. +% If we are in a monospaced environment, however, 1) always use \ttsl, +% and 2) do not add an italic correction. +\def\dosmartslant#1#2{% + \ifusingtt + {{\ttsl #2}\let\next=\relax}% + {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% + \next +} +\def\smartslanted{\dosmartslant\sl} +\def\smartitalic{\dosmartslant\it} -% like \smartslanted except unconditionally uses \ttsl. -% @var is set to this for defun arguments. -\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx} +% Output an italic correction unless \next (presumed to be the following +% character) is such as not to need one. +\def\smartitaliccorrection{% + \ifx\next,% + \else\ifx\next-% + \else\ifx\next.% + \else\ifx\next\.% + \else\ifx\next\comma% + \else\ptexslash + \fi\fi\fi\fi\fi + \aftersmartic +} + +% Unconditional use \ttsl, and no ic. @var is set to this for defuns. +\def\ttslanted#1{{\ttsl #1}} % @cite is like \smartslanted except unconditionally use \sl. We never want % ttsl for book titles, do we? -\def\cite#1{{\sl #1}\futurelet\next\smartitalicx} +\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection} + +\def\aftersmartic{} +\def\var#1{% + \let\saveaftersmartic = \aftersmartic + \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% + \smartslanted{#1}% +} \let\i=\smartitalic \let\slanted=\smartslanted -\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}} \let\dfn=\smartslanted \let\emph=\smartitalic @@ -2572,34 +2452,12 @@ end % @samp. \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} -% definition of @key that produces a lozenge. Doesn't adjust to text size. -%\setfont\keyrm\rmshape{8}{1000}{OT1} -%\font\keysy=cmsy9 -%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% -% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% -% \vbox{\hrule\kern-0.4pt -% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% -% \kern-0.4pt\hrule}% -% \kern-.06em\raise0.4pt\hbox{\angleright}}}} - -% definition of @key with no lozenge. If the current font is already -% monospace, don't change it; that way, we respect @kbdinputstyle. But -% if it isn't monospace, then use \tt. -% -\def\key#1{{\setupmarkupstyle{key}% - \nohyphenation - \ifmonospace\else\tt\fi - #1}\null} - -% ctrl is no longer a Texinfo command. -\def\ctrl #1{{\tt \rawbackslash \hat}#1} - -% @file, @option are the same as @samp. -\let\file=\samp -\let\option=\samp +% @indicateurl is \samp, that is, with quotes. +\let\indicateurl=\samp -% @code is a modification of @t, -% which makes spaces the same size as normal in the surrounding text. +% @code (and similar) prints in typewriter, but with spaces the same +% size as normal in the surrounding text, without hyphenation, etc. +% This is a subroutine for that. \def\tclose#1{% {% % Change normal interword space to be same as for the current font. @@ -2618,18 +2476,18 @@ end \plainfrenchspacing #1% }% - \null + \null % reset spacefactor to 1000 } % We *must* turn on hyphenation at `-' and `_' in @code. +% (But see \codedashfinish below.) % Otherwise, it is too hard to avoid overfull hboxes % in the Emacs manual, the Library manual, etc. - +% % Unfortunately, TeX uses one parameter (\hyphenchar) to control % both hyphenation at - and hyphenation within words. % We must therefore turn them both off (\tclose does that) -% and arrange explicitly to hyphenate at a dash. -% -- rms. +% and arrange explicitly to hyphenate at a dash. -- rms. { \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active \catcode`\`=\active @@ -2643,15 +2501,38 @@ end \let-\codedash \let_\codeunder \else - \let-\realdash + \let-\normaldash \let_\realunder \fi + % Given -foo (with a single dash), we do not want to allow a break + % after the hyphen. + \global\let\codedashprev=\codedash + % \codex } + % + \gdef\codedash{\futurelet\next\codedashfinish} + \gdef\codedashfinish{% + \normaldash % always output the dash character itself. + % + % Now, output a discretionary to allow a line break, unless + % (a) the next character is a -, or + % (b) the preceding character is a -. + % E.g., given --posix, we do not want to allow a break after either -. + % Given --foo-bar, we do want to allow a break between the - and the b. + \ifx\next\codedash \else + \ifx\codedashprev\codedash + \else \discretionary{}{}{}\fi + \fi + % we need the space after the = for the case when \next itself is a + % space token; it would get swallowed otherwise. As in @code{- a}. + \global\let\codedashprev= \next + } } +\def\normaldash{-} +% +\def\codex #1{\tclose{#1}\endgroup} -\def\realdash{-} -\def\codedash{-\discretionary{}{}{}} \def\codeunder{% % this is all so @math{@code{var_name}+1} can work. In math mode, _ % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) @@ -2663,13 +2544,12 @@ end \discretionary{}{}{}}% {\_}% } -\def\codex #1{\tclose{#1}\endgroup} % An additional complication: the above will allow breaks after, e.g., -% each of the four underscores in __typeof__. This is undesirable in -% some manuals, especially if they don't have long identifiers in -% general. @allowcodebreaks provides a way to control this. -% +% each of the four underscores in __typeof__. This is bad. +% @allowcodebreaks provides a document-level way to turn breaking at - +% and _ on and off. +% \newif\ifallowcodebreaks \allowcodebreakstrue \def\keywordtrue{true} @@ -2683,63 +2563,25 @@ end \allowcodebreaksfalse \else \errhelp = \EMsimple - \errmessage{Unknown @allowcodebreaks option `\txiarg'}% + \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}% \fi\fi } -% @kbd is like @code, except that if the argument is just one @key command, -% then @kbd has no effect. -\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} - -% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), -% `example' (@kbd uses ttsl only inside of @example and friends), -% or `code' (@kbd uses normal tty font always). -\parseargdef\kbdinputstyle{% - \def\txiarg{#1}% - \ifx\txiarg\worddistinct - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% - \else\ifx\txiarg\wordexample - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% - \else\ifx\txiarg\wordcode - \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% - \else - \errhelp = \EMsimple - \errmessage{Unknown @kbdinputstyle option `\txiarg'}% - \fi\fi\fi -} -\def\worddistinct{distinct} -\def\wordexample{example} -\def\wordcode{code} - -% Default is `distinct'. -\kbdinputstyle distinct - -\def\xkey{\key} -\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% -\ifx\one\xkey\ifx\threex\three \key{#2}% -\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi -\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} - -% For @indicateurl, @env, @command quotes seem unnecessary, so use \code. -\let\indicateurl=\code -\let\env=\code +% For @command, @env, @file, @option quotes seem unnecessary, +% so use \code rather than \samp. \let\command=\code - -% @clicksequence{File @click{} Open ...} -\def\clicksequence#1{\begingroup #1\endgroup} - -% @clickstyle @arrow (by default) -\parseargdef\clickstyle{\def\click{#1}} -\def\click{\arrow} +\let\env=\code +\let\file=\code +\let\option=\code % @uref (abbreviation for `urlref') takes an optional (comma-separated) % second argument specifying the text to display and an optional third % arg as text to display instead of (rather than in addition to) the url -% itself. First (mandatory) arg is the url. Perhaps eventually put in -% a hypertex \special here. -% -\def\uref#1{\douref #1,,,\finish} -\def\douref#1,#2,#3,#4\finish{\begingroup +% itself. First (mandatory) arg is the url. +% (This \urefnobreak definition isn't used now, leaving it for a while +% for comparison.) +\def\urefnobreak#1{\dourefnobreak #1,,,\finish} +\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup \unsepspaces \pdfurl{#1}% \setbox0 = \hbox{\ignorespaces #3}% @@ -2760,6 +2602,103 @@ end \endlink \endgroup} +% This \urefbreak definition is the active one. +\def\urefbreak{\begingroup \urefcatcodes \dourefbreak} +\let\uref=\urefbreak +\def\dourefbreak#1{\urefbreakfinish #1,,,\finish} +\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example + \unsepspaces + \pdfurl{#1}% + \setbox0 = \hbox{\ignorespaces #3}% + \ifdim\wd0 > 0pt + \unhbox0 % third arg given, show only that + \else + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \ifpdf + \unhbox0 % PDF: 2nd arg given, show only it + \else + \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url + \fi + \else + \urefcode{#1}% only url given, so show it + \fi + \fi + \endlink +\endgroup} + +% Allow line breaks around only a few characters (only). +\def\urefcatcodes{% + \catcode\ampChar=\active \catcode\dotChar=\active + \catcode\hashChar=\active \catcode\questChar=\active + \catcode\slashChar=\active +} +{ + \urefcatcodes + % + \global\def\urefcode{\begingroup + \setupmarkupstyle{code}% + \urefcatcodes + \let&\urefcodeamp + \let.\urefcodedot + \let#\urefcodehash + \let?\urefcodequest + \let/\urefcodeslash + \codex + } + % + % By default, they are just regular characters. + \global\def&{\normalamp} + \global\def.{\normaldot} + \global\def#{\normalhash} + \global\def?{\normalquest} + \global\def/{\normalslash} +} + +% we put a little stretch before and after the breakable chars, to help +% line breaking of long url's. The unequal skips make look better in +% cmtt at least, especially for dots. +\def\urefprestretch{\urefprebreak \hskip0pt plus.13em } +\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em } +% +\def\urefcodeamp{\urefprestretch \&\urefpoststretch} +\def\urefcodedot{\urefprestretch .\urefpoststretch} +\def\urefcodehash{\urefprestretch \#\urefpoststretch} +\def\urefcodequest{\urefprestretch ?\urefpoststretch} +\def\urefcodeslash{\futurelet\next\urefcodeslashfinish} +{ + \catcode`\/=\active + \global\def\urefcodeslashfinish{% + \urefprestretch \slashChar + % Allow line break only after the final / in a sequence of + % slashes, to avoid line break between the slashes in http://. + \ifx\next/\else \urefpoststretch \fi + } +} + +% One more complication: by default we'll break after the special +% characters, but some people like to break before the special chars, so +% allow that. Also allow no breaking at all, for manual control. +% +\parseargdef\urefbreakstyle{% + \def\txiarg{#1}% + \ifx\txiarg\wordnone + \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordbefore + \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordafter + \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} + \else + \errhelp = \EMsimple + \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% + \fi\fi\fi +} +\def\wordafter{after} +\def\wordbefore{before} +\def\wordnone{none} + +\urefbreakstyle after + % @url synonym for @uref, since that's how everyone uses it. % \let\url=\uref @@ -2781,6 +2720,67 @@ end \let\email=\uref \fi +% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), +% `example' (@kbd uses ttsl only inside of @example and friends), +% or `code' (@kbd uses normal tty font always). +\parseargdef\kbdinputstyle{% + \def\txiarg{#1}% + \ifx\txiarg\worddistinct + \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% + \else\ifx\txiarg\wordexample + \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% + \else\ifx\txiarg\wordcode + \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% + \else + \errhelp = \EMsimple + \errmessage{Unknown @kbdinputstyle setting `\txiarg'}% + \fi\fi\fi +} +\def\worddistinct{distinct} +\def\wordexample{example} +\def\wordcode{code} + +% Default is `distinct'. +\kbdinputstyle distinct + +% @kbd is like @code, except that if the argument is just one @key command, +% then @kbd has no effect. +\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} + +\def\xkey{\key} +\def\kbdsub#1#2#3\par{% + \def\one{#1}\def\three{#3}\def\threex{??}% + \ifx\one\xkey\ifx\threex\three \key{#2}% + \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi + \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +} + +% definition of @key that produces a lozenge. Doesn't adjust to text size. +%\setfont\keyrm\rmshape{8}{1000}{OT1} +%\font\keysy=cmsy9 +%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% +% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% +% \vbox{\hrule\kern-0.4pt +% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% +% \kern-0.4pt\hrule}% +% \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +% definition of @key with no lozenge. If the current font is already +% monospace, don't change it; that way, we respect @kbdinputstyle. But +% if it isn't monospace, then use \tt. +% +\def\key#1{{\setupmarkupstyle{key}% + \nohyphenation + \ifmonospace\else\tt\fi + #1}\null} + +% @clicksequence{File @click{} Open ...} +\def\clicksequence#1{\begingroup #1\endgroup} + +% @clickstyle @arrow (by default) +\parseargdef\clickstyle{\def\click{#1}} +\def\click{\arrow} + % Typeset a dimension, e.g., `in' or `pt'. The only reason for the % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. % @@ -2794,7 +2794,7 @@ end % @acronym for "FBI", "NATO", and the like. % We print this one point size smaller, since it's intended for % all-uppercase. -% +% \def\acronym#1{\doacronym #1,,\finish} \def\doacronym#1,#2,#3\finish{% {\selectfonts\lsize #1}% @@ -2802,11 +2802,12 @@ end \ifx\temp\empty \else \space ({\unsepspaces \ignorespaces \temp \unskip})% \fi + \null % reset \spacefactor=1000 } % @abbr for "Comput. J." and the like. % No font change, but don't do end-of-sentence spacing. -% +% \def\abbr#1{\doabbr #1,,\finish} \def\doabbr#1,#2,#3\finish{% {\plainfrenchspacing #1}% @@ -2814,10 +2815,248 @@ end \ifx\temp\empty \else \space ({\unsepspaces \ignorespaces \temp \unskip})% \fi + \null % reset \spacefactor=1000 +} + +% @asis just yields its argument. Used with @table, for example. +% +\def\asis#1{#1} + +% @math outputs its argument in math mode. +% +% One complication: _ usually means subscripts, but it could also mean +% an actual _ character, as in @math{@var{some_variable} + 1}. So make +% _ active, and distinguish by seeing if the current family is \slfam, +% which is what @var uses. +{ + \catcode`\_ = \active + \gdef\mathunderscore{% + \catcode`\_=\active + \def_{\ifnum\fam=\slfam \_\else\sb\fi}% + } +} +% Another complication: we want \\ (and @\) to output a math (or tt) \. +% FYI, plain.tex uses \\ as a temporary control sequence (for no +% particular reason), but this is not advertised and we don't care. +% +% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. +\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} +% +\def\math{% + \tex + \mathunderscore + \let\\ = \mathbackslash + \mathactive + % make the texinfo accent commands work in math mode + \let\"=\ddot + \let\'=\acute + \let\==\bar + \let\^=\hat + \let\`=\grave + \let\u=\breve + \let\v=\check + \let\~=\tilde + \let\dotaccent=\dot + $\finishmath +} +\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. + +% Some active characters (such as <) are spaced differently in math. +% We have to reset their definitions in case the @math was an argument +% to a command which sets the catcodes (such as @item or @section). +% +{ + \catcode`^ = \active + \catcode`< = \active + \catcode`> = \active + \catcode`+ = \active + \catcode`' = \active + \gdef\mathactive{% + \let^ = \ptexhat + \let< = \ptexless + \let> = \ptexgtr + \let+ = \ptexplus + \let' = \ptexquoteright + } +} + +% ctrl is no longer a Texinfo command, but leave this definition for fun. +\def\ctrl #1{{\tt \rawbackslash \hat}#1} + +% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. +% Ignore unless FMTNAME == tex; then it is like @iftex and @tex, +% except specified as a normal braced arg, so no newlines to worry about. +% +\def\outfmtnametex{tex} +% +\long\def\inlinefmt#1{\doinlinefmt #1,\finish} +\long\def\doinlinefmt#1,#2,\finish{% + \def\inlinefmtname{#1}% + \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi +} +% +% @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if +% FMTNAME is tex, else ELSE-TEXT. +\long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish} +\long\def\doinlinefmtifelse#1,#2,#3,#4,\finish{% + \def\inlinefmtname{#1}% + \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\else \ignorespaces #3\fi +} +% +% For raw, must switch into @tex before parsing the argument, to avoid +% setting catcodes prematurely. Doing it this way means that, for +% example, @inlineraw{html, foo{bar} gets a parse error instead of being +% ignored. But this isn't important because if people want a literal +% *right* brace they would have to use a command anyway, so they may as +% well use a command to get a left brace too. We could re-use the +% delimiter character idea from \verb, but it seems like overkill. +% +\long\def\inlineraw{\tex \doinlineraw} +\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} +\def\doinlinerawtwo#1,#2,\finish{% + \def\inlinerawname{#1}% + \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi + \endgroup % close group opened by \tex. +} + +% @inlineifset{VAR, TEXT} expands TEXT if VAR is @set. +% +\long\def\inlineifset#1{\doinlineifset #1,\finish} +\long\def\doinlineifset#1,#2,\finish{% + \def\inlinevarname{#1}% + \expandafter\ifx\csname SET\inlinevarname\endcsname\relax + \else\ignorespaces#2\fi +} + +% @inlineifclear{VAR, TEXT} expands TEXT if VAR is not @set. +% +\long\def\inlineifclear#1{\doinlineifclear #1,\finish} +\long\def\doinlineifclear#1,#2,\finish{% + \def\inlinevarname{#1}% + \expandafter\ifx\csname SET\inlinevarname\endcsname\relax \ignorespaces#2\fi } \message{glyphs,} +% and logos. + +% @@ prints an @, as does @atchar{}. +\def\@{\char64 } +\let\atchar=\@ + +% @{ @} @lbracechar{} @rbracechar{} all generate brace characters. +% Unless we're in typewriter, use \ecfont because the CM text fonts do +% not have braces, and we don't want to switch into math. +\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}} +\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}} +\let\{=\mylbrace \let\lbracechar=\{ +\let\}=\myrbrace \let\rbracechar=\} +\begingroup + % Definitions to produce \{ and \} commands for indices, + % and @{ and @} for the aux/toc files. + \catcode`\{ = \other \catcode`\} = \other + \catcode`\[ = 1 \catcode`\] = 2 + \catcode`\! = 0 \catcode`\\ = \other + !gdef!lbracecmd[\{]% + !gdef!rbracecmd[\}]% + !gdef!lbraceatcmd[@{]% + !gdef!rbraceatcmd[@}]% +!endgroup + +% @comma{} to avoid , parsing problems. +\let\comma = , + +% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent +% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. +\let\, = \ptexc +\let\dotaccent = \ptexdot +\def\ringaccent#1{{\accent23 #1}} +\let\tieaccent = \ptext +\let\ubaraccent = \ptexb +\let\udotaccent = \d + +% Other special characters: @questiondown @exclamdown @ordf @ordm +% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. +\def\questiondown{?`} +\def\exclamdown{!`} +\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} +\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} + +% Dotless i and dotless j, used for accents. +\def\imacro{i} +\def\jmacro{j} +\def\dotless#1{% + \def\temp{#1}% + \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi + \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi + \else \errmessage{@dotless can be used only with i or j}% + \fi\fi +} + +% The \TeX{} logo, as in plain, but resetting the spacing so that a +% period following counts as ending a sentence. (Idea found in latex.) +% +\edef\TeX{\TeX \spacefactor=1000 } + +% @LaTeX{} logo. Not quite the same results as the definition in +% latex.ltx, since we use a different font for the raised A; it's most +% convenient for us to use an explicitly smaller font, rather than using +% the \scriptstyle font (since we don't reset \scriptstyle and +% \scriptscriptstyle). +% +\def\LaTeX{% + L\kern-.36em + {\setbox0=\hbox{T}% + \vbox to \ht0{\hbox{% + \ifx\textnominalsize\xwordpt + % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX. + % Revert to plain's \scriptsize, which is 7pt. + \count255=\the\fam $\fam\count255 \scriptstyle A$% + \else + % For 11pt, we can use our lllsize. + \selectfonts\lllsize A% + \fi + }% + \vss + }}% + \kern-.15em + \TeX +} + +% Some math mode symbols. +\def\bullet{$\ptexbullet$} +\def\geq{\ifmmode \ge\else $\ge$\fi} +\def\leq{\ifmmode \le\else $\le$\fi} +\def\minus{\ifmmode -\else $-$\fi} + +% @dots{} outputs an ellipsis using the current font. +% We do .5em per period so that it has the same spacing in the cm +% typewriter fonts as three actual period characters; on the other hand, +% in other typewriter fonts three periods are wider than 1.5em. So do +% whichever is larger. +% +\def\dots{% + \leavevmode + \setbox0=\hbox{...}% get width of three periods + \ifdim\wd0 > 1.5em + \dimen0 = \wd0 + \else + \dimen0 = 1.5em + \fi + \hbox to \dimen0{% + \hskip 0pt plus.25fil + .\hskip 0pt plus1fil + .\hskip 0pt plus1fil + .\hskip 0pt plus.5fil + }% +} + +% @enddots{} is an end-of-sentence ellipsis. +% +\def\enddots{% + \dots + \spacefactor=\endofsentencespacefactor +} % @point{}, @result{}, @expansion{}, @print{}, @equiv{}. % @@ -2839,7 +3078,7 @@ end {\tentt \global\dimen0 = 3em}% Width of the box. \dimen2 = .55pt % Thickness of rules % The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} +\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} % \setbox\errorbox=\hbox to \dimen0{\hfil \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. @@ -2863,52 +3102,59 @@ end % Theiling, which support regular, slanted, bold and bold slanted (and % "outlined" (blackboard board, sort of) versions, which we don't need). % It is available from http://www.ctan.org/tex-archive/fonts/eurosym. -% +% % Although only regular is the truly official Euro symbol, we ignore % that. The Euro is designed to be slightly taller than the regular % font height. -% +% % feymr - regular % feymo - slanted % feybr - bold % feybo - bold slanted -% +% % There is no good (free) typewriter version, to my knowledge. % A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. % Hmm. -% +% % Also doesn't work in math. Do we need to do math with euro symbols? % Hope not. -% -% +% +% \def\euro{{\eurofont e}} \def\eurofont{% % We set the font at each command, rather than predefining it in % \textfonts and the other font-switching commands, so that % installations which never need the symbol don't have to have the % font installed. - % + % % There is only one designed size (nominal 10pt), so we always scale % that to the current nominal size. - % + % % By the way, simply using "at 1em" works for cmr10 and the like, but % does not work for cmbx10 and other extended/shrunken fonts. - % + % \def\eurosize{\csname\curfontsize nominalsize\endcsname}% % - \ifx\curfontstyle\bfstylename + \ifx\curfontstyle\bfstylename % bold: \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize - \else + \else % regular: \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize \fi \thiseurofont } -% Hacks for glyphs from the EC fonts similar to \euro. We don't -% use \let for the aliases, because sometimes we redefine the original -% macro, and the alias should reflect the redefinition. +% Glyphs from the EC fonts. We don't use \let for the aliases, because +% sometimes we redefine the original macro, and the alias should reflect +% the redefinition. +% +% Use LaTeX names for the Icelandic letters. +\def\DH{{\ecfont \char"D0}} % Eth +\def\dh{{\ecfont \char"F0}} % eth +\def\TH{{\ecfont \char"DE}} % Thorn +\def\th{{\ecfont \char"FE}} % thorn +% \def\guillemetleft{{\ecfont \char"13}} \def\guillemotleft{\guillemetleft} \def\guillemetright{{\ecfont \char"14}} @@ -2922,7 +3168,7 @@ end % we have the precomposed glyphs for the most common cases. We put the % tests to use those glyphs in the single \ogonek macro so we have fewer % dummy definitions to worry about for index entries, etc. -% +% % ogonek is also used with other letters in Lithuanian (IOU), but using % the precomposed glyphs for those is not so easy since they aren't in % the same EC font. @@ -2945,6 +3191,7 @@ end \def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} \def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} % +% Use the ec* fonts (cm-super in outline format) for non-CM glyphs. \def\ecfont{% % We can't distinguish serif/sans and italic/slanted, but this % is used for crude hacks anyway (like adding French and German @@ -2952,12 +3199,17 @@ end % hopefully nobody will notice/care. \edef\ecsize{\csname\curfontsize ecsize\endcsname}% \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% - \ifx\curfontstyle\bfstylename - % bold: - \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize + \ifmonospace + % typewriter: + \font\thisecfont = ectt\ecsize \space at \nominalsize \else - % regular: - \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \ifx\curfontstyle\bfstylename + % bold: + \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize + \else + % regular: + \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \fi \fi \thisecfont } @@ -2979,8 +3231,8 @@ end % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 % so we'll define it if necessary. -% -\ifx\Orb\undefined +% +\ifx\Orb\thisisundefined \def\Orb{\mathhexbox20D} \fi @@ -3008,8 +3260,9 @@ end \newif\ifsetshortcontentsaftertitlepage \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue -\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page} +\parseargdef\shorttitlepage{% + \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% + \endgroup\page\hbox{}\page} \envdef\titlepage{% % Open one extra group, as we want to close it in the middle of \Etitlepage. @@ -3069,14 +3322,28 @@ end \finishedtitlepagetrue } -%%% Macros to be used within @titlepage: +% Settings used for typesetting titles: no hyphenation, no indentation, +% don't worry much about spacing, ragged right. This should be used +% inside a \vbox, and fonts need to be set appropriately first. Because +% it is always used for titles, nothing else, we call \rmisbold. \par +% should be specified before the end of the \vbox, since a vbox is a group. +% +\def\raggedtitlesettings{% + \rmisbold + \hyphenpenalty=10000 + \parindent=0pt + \tolerance=5000 + \ptexraggedright +} + +% Macros to be used within @titlepage: \let\subtitlerm=\tenrm \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} \parseargdef\title{% \checkenv\titlepage - \leftline{\titlefonts\rmisbold #1} + \vbox{\titlefonts \raggedtitlesettings #1\par}% % print a rule at the page bottom also. \finishedtitlepagefalse \vskip4pt \hrule height 4pt width \hsize \vskip4pt @@ -3102,7 +3369,7 @@ end } -%%% Set up page headings and footings. +% Set up page headings and footings. \let\thispage=\folio @@ -3196,10 +3463,14 @@ end \def\headings #1 {\csname HEADINGS#1\endcsname} -\def\HEADINGSoff{% -\global\evenheadline={\hfil} \global\evenfootline={\hfil} -\global\oddheadline={\hfil} \global\oddfootline={\hfil}} -\HEADINGSoff +\def\headingsoff{% non-global headings elimination + \evenheadline={\hfil}\evenfootline={\hfil}% + \oddheadline={\hfil}\oddfootline={\hfil}% +} + +\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting +\HEADINGSoff % it's the default + % When we turn headings on, set the page number to 1. % For double-sided printing, put current file name in lower left corner, % chapter name on inside top of right hand pages, document @@ -3250,7 +3521,7 @@ end % This produces Day Month Year style of output. % Only define if not already defined, in case a txi-??.tex file has set % up a different format (e.g., txi-cs.tex does this). -\ifx\today\undefined +\ifx\today\thisisundefined \def\today{% \number\day\space \ifcase\month @@ -3311,7 +3582,7 @@ end \begingroup \advance\leftskip by-\tableindent \advance\hsize by\tableindent - \advance\rightskip by0pt plus1fil + \advance\rightskip by0pt plus1fil\relax \leavevmode\unhbox0\par \endgroup % @@ -3325,7 +3596,7 @@ end % cause the example and the item to crash together. So we use this % bizarre value of 10001 as a signal to \aboveenvbreak to insert % \parskip glue after all. Section titles are handled this way also. - % + % \penalty 10001 \endgroup \itemxneedsnegativevskipfalse @@ -3797,18 +4068,18 @@ end \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip \global\advance\multitablelinespace by-\ht0 \fi -%% Test to see if parskip is larger than space between lines of -%% table. If not, do nothing. -%% If so, set to same dimension as multitablelinespace. +% Test to see if parskip is larger than space between lines of +% table. If not, do nothing. +% If so, set to same dimension as multitablelinespace. \ifdim\multitableparskip>\multitablelinespace \global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller - %% than skip between lines in the table. +\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller + % than skip between lines in the table. \fi% \ifdim\multitableparskip=0pt \global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller - %% than skip between lines in the table. +\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller + % than skip between lines in the table. \fi} @@ -3960,7 +4231,7 @@ end \def\value{\begingroup\makevalueexpandable\valuexxx} \def\valuexxx#1{\expandablevalue{#1}\endgroup} { - \catcode`\- = \active \catcode`\_ = \active + \catcode`\-=\active \catcode`\_=\active % \gdef\makevalueexpandable{% \let\value = \expandablevalue @@ -3969,7 +4240,7 @@ end % ..., but we might end up with active ones in the argument if % we're called from @code, as @code{@value{foo-bar_}}, though. % So \let them to their normal equivalents. - \let-\realdash \let_\normalunderscore + \let-\normaldash \let_\normalunderscore } } @@ -3980,7 +4251,12 @@ end % variable's value contains other Texinfo commands, it's almost certain % it will fail (although perhaps we could fix that with sufficient work % to do a one-level expansion on the result, instead of complete). -% +% +% Unfortunately, this has the consequence that when _ is in the *value* +% of an @set, it does not print properly in the roman fonts (get the cmr +% dot accent at position 126 instead). No fix comes to mind, and it's +% been this way since 2003 or earlier, so just ignore it. +% \def\expandablevalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax {[No value for ``#1'']}% @@ -3992,8 +4268,9 @@ end % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. -% -% To get special treatment of `@end ifset,' call \makeond and the redefine. +% +% To get the special treatment we need for `@end ifset,' we call +% \makecond and then redefine. % \makecond{ifset} \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} @@ -4009,7 +4286,7 @@ end } \def\ifsetfail{\doignore{ifset}} -% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been +% @ifclear VAR ... @end executes the `...' iff VAR has never been % defined with @set, or has been undefined with @clear. % % The `\else' inside the `\doifset' parameter is a trick to reuse the @@ -4020,6 +4297,35 @@ end \def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} \def\ifclearfail{\doignore{ifclear}} +% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written +% without the @) is in fact defined. We can only feasibly check at the +% TeX level, so something like `mathcode' is going to considered +% defined even though it is not a Texinfo command. +% +\makecond{ifcommanddefined} +\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} +% +\def\doifcmddefined#1#2{{% + \makevalueexpandable + \let\next=\empty + \expandafter\ifx\csname #2\endcsname\relax + #1% If not defined, \let\next as above. + \fi + \expandafter + }\next +} +\def\ifcmddefinedfail{\doignore{ifcommanddefined}} + +% @ifcommandnotdefined CMD ... handled similar to @ifclear above. +\makecond{ifcommandnotdefined} +\def\ifcommandnotdefined{% + \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}} +\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}} + +% Set the `txicommandconditionals' variable, so documents have a way to +% test if the @ifcommand...defined conditionals are available. +\set txicommandconditionals + % @dircategory CATEGORY -- specify a category of the dir file % which this file should belong to. Ignore this in TeX. \let\dircategory=\comment @@ -4123,11 +4429,14 @@ end \def\@{@}% change to @@ when we switch to @ as escape char in index files. \def\ {\realbackslash\space }% % - % Need these in case \tex is in effect and \{ is a \delimiter again. - % But can't use \lbracecmd and \rbracecmd because texindex assumes - % braces and backslashes are used only as delimiters. - \let\{ = \mylbrace - \let\} = \myrbrace + % Need these unexpandable (because we define \tt as a dummy) + % definitions when @{ or @} appear in index entry text. Also, more + % complicated, when \tex is in effect and \{ is a \delimiter again. + % We can't use \lbracecmd and \rbracecmd because texindex assumes + % braces and backslashes are used only as delimiters. Perhaps we + % should define @lbrace and @rbrace commands a la @comma. + \def\{{{\tt\char123}}% + \def\}{{\tt\char125}}% % % I don't entirely understand this, but when an index entry is % generated from a macro call, the \endinput which \scanmacro inserts @@ -4138,7 +4447,7 @@ end % processing continues to some further point. On the other hand, it % seems \endinput does not hurt in the printed index arg, since that % is still getting written without apparent harm. - % + % % Sample source (mac-idx3.tex, reported by Graham Percival to % help-texinfo, 22may06): % @macro funindex {WORD} @@ -4146,12 +4455,12 @@ end % @end macro % ... % @funindex commtest - % + % % The above is not enough to reproduce the bug, but it gives the flavor. - % + % % Sample whatsit resulting: % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} - % + % % So: \let\endinput = \empty % @@ -4180,7 +4489,7 @@ end \def\commondummies{% % % \definedummyword defines \#1 as \string\#1\space, thus effectively - % preventing its expansion. This is used only for control% words, + % preventing its expansion. This is used only for control words, % not control letters, because the \space would be incorrect for % control characters, but is needed to separate the control word % from whatever follows. @@ -4199,23 +4508,28 @@ end \commondummiesnofonts % \definedummyletter\_% + \definedummyletter\-% % % Non-English letters. \definedummyword\AA \definedummyword\AE + \definedummyword\DH \definedummyword\L - \definedummyword\OE \definedummyword\O + \definedummyword\OE + \definedummyword\TH \definedummyword\aa \definedummyword\ae + \definedummyword\dh + \definedummyword\exclamdown \definedummyword\l - \definedummyword\oe \definedummyword\o - \definedummyword\ss - \definedummyword\exclamdown - \definedummyword\questiondown + \definedummyword\oe \definedummyword\ordf \definedummyword\ordm + \definedummyword\questiondown + \definedummyword\ss + \definedummyword\th % % Although these internal commands shouldn't show up, sometimes they do. \definedummyword\bf @@ -4231,20 +4545,25 @@ end \definedummyword\TeX % % Assorted special characters. + \definedummyword\arrow \definedummyword\bullet \definedummyword\comma \definedummyword\copyright \definedummyword\registeredsymbol \definedummyword\dots \definedummyword\enddots + \definedummyword\entrybreak \definedummyword\equiv \definedummyword\error \definedummyword\euro + \definedummyword\expansion + \definedummyword\geq \definedummyword\guillemetleft \definedummyword\guillemetright \definedummyword\guilsinglleft \definedummyword\guilsinglright - \definedummyword\expansion + \definedummyword\lbracechar + \definedummyword\leq \definedummyword\minus \definedummyword\ogonek \definedummyword\pounds @@ -4256,6 +4575,7 @@ end \definedummyword\quoteleft \definedummyword\quoteright \definedummyword\quotesinglbase + \definedummyword\rbracechar \definedummyword\result \definedummyword\textdegree % @@ -4301,18 +4621,27 @@ end \definedummyword\b \definedummyword\i \definedummyword\r + \definedummyword\sansserif \definedummyword\sc + \definedummyword\slanted \definedummyword\t % % Commands that take arguments. + \definedummyword\abbr \definedummyword\acronym + \definedummyword\anchor \definedummyword\cite \definedummyword\code \definedummyword\command \definedummyword\dfn + \definedummyword\dmn + \definedummyword\email \definedummyword\emph \definedummyword\env \definedummyword\file + \definedummyword\image + \definedummyword\indicateurl + \definedummyword\inforef \definedummyword\kbd \definedummyword\key \definedummyword\math @@ -4340,7 +4669,7 @@ end \def\definedummyaccent##1{\let##1\asis}% % We can just ignore other control letters. \def\definedummyletter##1{\let##1\empty}% - % Hopefully, all control words can become @asis. + % All control words become @asis by default; overrides below. \let\definedummyword\definedummyaccent % \commondummiesnofonts @@ -4352,48 +4681,63 @@ end % \def\ { }% \def\@{@}% - % how to handle braces? \def\_{\normalunderscore}% + \def\-{}% @- shouldn't affect sorting + % + % Unfortunately, texindex is not prepared to handle braces in the + % content at all. So for index sorting, we map @{ and @} to strings + % starting with |, since that ASCII character is between ASCII { and }. + \def\{{|a}% + \def\lbracechar{|a}% + % + \def\}{|b}% + \def\rbracechar{|b}% % % Non-English letters. \def\AA{AA}% \def\AE{AE}% + \def\DH{DZZ}% \def\L{L}% \def\OE{OE}% \def\O{O}% + \def\TH{ZZZ}% \def\aa{aa}% \def\ae{ae}% + \def\dh{dzz}% + \def\exclamdown{!}% \def\l{l}% \def\oe{oe}% - \def\o{o}% - \def\ss{ss}% - \def\exclamdown{!}% - \def\questiondown{?}% \def\ordf{a}% \def\ordm{o}% + \def\o{o}% + \def\questiondown{?}% + \def\ss{ss}% + \def\th{zzz}% % \def\LaTeX{LaTeX}% \def\TeX{TeX}% % % Assorted special characters. % (The following {} will end up in the sort string, but that's ok.) + \def\arrow{->}% \def\bullet{bullet}% \def\comma{,}% \def\copyright{copyright}% - \def\registeredsymbol{R}% \def\dots{...}% \def\enddots{...}% \def\equiv{==}% \def\error{error}% \def\euro{euro}% + \def\expansion{==>}% + \def\geq{>=}% \def\guillemetleft{<<}% \def\guillemetright{>>}% \def\guilsinglleft{<}% \def\guilsinglright{>}% - \def\expansion{==>}% + \def\leq{<=}% \def\minus{-}% - \def\pounds{pounds}% \def\point{.}% + \def\pounds{pounds}% \def\print{-|}% \def\quotedblbase{"}% \def\quotedblleft{"}% @@ -4401,22 +4745,31 @@ end \def\quoteleft{`}% \def\quoteright{'}% \def\quotesinglbase{,}% + \def\registeredsymbol{R}% \def\result{=>}% - \def\textdegree{degrees}% + \def\textdegree{o}% + % + \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax + \else \indexlquoteignore \fi % % We need to get rid of all macros, leaving only the arguments (if present). % Of course this is not nearly correct, but it is the best we can do for now. % makeinfo does not expand macros in the argument to @deffn, which ends up % writing an index entry, and texindex isn't prepared for an index sort entry % that starts with \. - % + % % Since macro invocations are followed by braces, we can just redefine them % to take a single TeX argument. The case of a macro invocation that % goes to end-of-line is not handled. - % + % \macrolist } +% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us +% ignore left quotes in the sort term. +{\catcode`\`=\active + \gdef\indexlquoteignore{\let`=\empty}} + \let\indexbackslash=0 %overridden during \printindex. \let\SETmarginindex=\relax % put index entries in margin (undocumented)? @@ -4514,10 +4867,9 @@ end % % ..., ready, GO: % -\def\safewhatsit#1{% -\ifhmode +\def\safewhatsit#1{\ifhmode #1% -\else + \else % \lastskip and \lastpenalty cannot both be nonzero simultaneously. \whatsitskip = \lastskip \edef\lastskipmacro{\the\lastskip}% @@ -4541,7 +4893,6 @@ end % to re-insert the same penalty (values >10000 are used for various % signals); since we just inserted a non-discardable item, any % following glue (such as a \parskip) would be a breakpoint. For example: - % % @deffn deffn-whatever % @vindex index-whatever % Description. @@ -4554,8 +4905,7 @@ end % (the whatsit from the \write), so we must insert a \nobreak. \nobreak\vskip\whatsitskip \fi -\fi -} +\fi} % The index entry written in the file actually looks like % \entry {sortstring}{page}{topic} @@ -4674,7 +5024,6 @@ end % But this freezes the catcodes in the argument, and can cause problems to % @code, which sets - active. This problem was fixed by a kludge--- % ``-'' was active throughout whole index, but this isn't really right. -% % The right solution is to prevent \entry from swallowing the whole text. % --kasal, 21nov03 \def\entry{% @@ -4711,10 +5060,17 @@ end % columns. \vskip 0pt plus1pt % + % When reading the text of entry, convert explicit line breaks + % from @* into spaces. The user might give these in long section + % titles, for instance. + \def\*{\unskip\space\ignorespaces}% + \def\entrybreak{\hfil\break}% + % % Swallow the left brace of the text (first parameter): \afterassignment\doentry \let\temp = } +\def\entrybreak{\unskip\space\ignorespaces}% \def\doentry{% \bgroup % Instead of the swallowed brace. \noindent @@ -4947,7 +5303,22 @@ end \message{sectioning,} % Chapters, sections, etc. -% \unnumberedno is an oxymoron, of course. But we count the unnumbered +% Let's start with @part. +\outer\parseargdef\part{\partzzz{#1}} +\def\partzzz#1{% + \chapoddpage + \null + \vskip.3\vsize % move it down on the page a bit + \begingroup + \noindent \titlefonts\rmisbold #1\par % the text + \let\lastnode=\empty % no node to associate with + \writetocentry{part}{#1}{}% but put it in the toc + \headingsoff % no headline or footline on the part page + \chapoddpage + \endgroup +} + +% \unnumberedno is an oxymoron. But we count the unnumbered % sections so that we can refer to them unambiguously in the pdf % outlines by their "section number". We avoid collisions with chapter % numbers by starting them at 10000. (If a document ever has 10000 @@ -5026,8 +5397,8 @@ end \chardef\maxseclevel = 3 % % A numbered section within an unnumbered changes to unnumbered too. -% To achive this, remember the "biggest" unnum. sec. we are currently in: -\chardef\unmlevel = \maxseclevel +% To achieve this, remember the "biggest" unnum. sec. we are currently in: +\chardef\unnlevel = \maxseclevel % % Trace whether the current chapter is an appendix or not: % \chapheadtype is "N" or "A", unnumbered chapters are ignored. @@ -5052,8 +5423,8 @@ end % The heading type: \def\headtype{#1}% \if \headtype U% - \ifnum \absseclevel < \unmlevel - \chardef\unmlevel = \absseclevel + \ifnum \absseclevel < \unnlevel + \chardef\unnlevel = \absseclevel \fi \else % Check for appendix sections: @@ -5065,10 +5436,10 @@ end \fi\fi \fi % Check for numbered within unnumbered: - \ifnum \absseclevel > \unmlevel + \ifnum \absseclevel > \unnlevel \def\headtype{U}% \else - \chardef\unmlevel = 3 + \chardef\unnlevel = 3 \fi \fi % Now print the heading: @@ -5122,7 +5493,9 @@ end \gdef\chaplevelprefix{\the\chapno.}% \resetallfloatnos % - \message{\putwordChapter\space \the\chapno}% + % \putwordChapter can contain complex things in translations. + \toks0=\expandafter{\putwordChapter}% + \message{\the\toks0 \space \the\chapno}% % % Write the actual heading. \chapmacro{#1}{Ynumbered}{\the\chapno}% @@ -5133,15 +5506,17 @@ end \global\let\subsubsection = \numberedsubsubsec } -\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz +\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz +% \def\appendixzzz#1{% \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 \global\advance\appendixno by 1 \gdef\chaplevelprefix{\appendixletter.}% \resetallfloatnos % - \def\appendixnum{\putwordAppendix\space \appendixletter}% - \message{\appendixnum}% + % \putwordAppendix can contain complex things in translations. + \toks0=\expandafter{\putwordAppendix}% + \message{\the\toks0 \space \appendixletter}% % \chapmacro{#1}{Yappendix}{\appendixletter}% % @@ -5150,7 +5525,8 @@ end \global\let\subsubsection = \appendixsubsubsec } -\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz +% normally unnmhead0 calls unnumberedzzz: +\outer\parseargdef\unnumbered{\unnmhead0{#1}} \def\unnumberedzzz#1{% \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 \global\advance\unnumberedno by 1 @@ -5194,40 +5570,47 @@ end \let\top\unnumbered % Sections. +% \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz \def\seczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% } -\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz +% normally calls appendixsectionzzz: +\outer\parseargdef\appendixsection{\apphead1{#1}} \def\appendixsectionzzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% } \let\appendixsec\appendixsection -\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz +% normally calls unnumberedseczzz: +\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} \def\unnumberedseczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% } % Subsections. -\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz +% +% normally calls numberedsubseczzz: +\outer\parseargdef\numberedsubsec{\numhead2{#1}} \def\numberedsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% } -\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz +% normally calls appendixsubseczzz: +\outer\parseargdef\appendixsubsec{\apphead2{#1}} \def\appendixsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 \sectionheading{#1}{subsec}{Yappendix}% {\appendixletter.\the\secno.\the\subsecno}% } -\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz +% normally calls unnumberedsubseczzz: +\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} \def\unnumberedsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 \sectionheading{#1}{subsec}{Ynothing}% @@ -5235,21 +5618,25 @@ end } % Subsubsections. -\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz +% +% normally numberedsubsubseczzz: +\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} \def\numberedsubsubseczzz#1{% \global\advance\subsubsecno by 1 \sectionheading{#1}{subsubsec}{Ynumbered}% {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% } -\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz +% normally appendixsubsubseczzz: +\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} \def\appendixsubsubseczzz#1{% \global\advance\subsubsecno by 1 \sectionheading{#1}{subsubsec}{Yappendix}% {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% } -\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz +% normally unnumberedsubsubseczzz: +\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} \def\unnumberedsubsubseczzz#1{% \global\advance\subsubsecno by 1 \sectionheading{#1}{subsubsec}{Ynothing}% @@ -5265,14 +5652,6 @@ end % Define @majorheading, @heading and @subheading -% NOTE on use of \vbox for chapter headings, section headings, and such: -% 1) We use \vbox rather than the earlier \line to permit -% overlong headings to fold. -% 2) \hyphenpenalty is set to 10000 because hyphenation in a -% heading is obnoxious; this forbids it. -% 3) Likewise, headings look best if no \parindent is used, and -% if justification is not attempted. Hence \raggedright. - \def\majorheading{% {\advance\chapheadingskip by 10pt \chapbreak }% \parsearg\chapheadingzzz @@ -5280,10 +5659,8 @@ end \def\chapheading{\chapbreak \parsearg\chapheadingzzz} \def\chapheadingzzz#1{% - {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\ptexraggedright - \rmisbold #1\hfill}}% - \bigskip \par\penalty 200\relax + \vbox{\chapfonts \raggedtitlesettings #1\par}% + \nobreak\bigskip \nobreak \suppressfirstparagraphindent } @@ -5299,14 +5676,13 @@ end % (including whitespace, linebreaking, etc. around it), % given all the information in convenient, parsed form. -%%% Args are the skip and penalty (usually negative) +% Args are the skip and penalty (usually negative) \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi} -%%% Define plain chapter starts, and page on/off switching for it % Parameter controlling skip before chapter headings (if needed) - \newskip\chapheadingskip +% Define plain chapter starts, and page on/off switching for it. \def\chapbreak{\dobreak \chapheadingskip {-4000}} \def\chappager{\par\vfill\supereject} % Because \domark is called before \chapoddpage, the filler page will @@ -5316,9 +5692,8 @@ end \chappager \ifodd\pageno \else \begingroup - \evenheadline={\hfil}\evenfootline={\hfil}% - \oddheadline={\hfil}\oddfootline={\hfil}% - \hbox to 0pt{}% + \headingsoff + \null \chappager \endgroup \fi @@ -5374,7 +5749,10 @@ end \xdef\lastchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\appendixletter}% - \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum: + % \noexpand\putwordAppendix avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} + \noexpand\thischapternum: \noexpand\thischaptername}% }% \else @@ -5382,7 +5760,10 @@ end \xdef\lastchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\the\chapno}% - \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum: + % \noexpand\putwordChapter avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thischapter{\noexpand\putwordChapter{} + \noexpand\thischapternum: \noexpand\thischaptername}% }% \fi\fi\fi @@ -5438,8 +5819,7 @@ end % % Typeset the actual heading. \nobreak % Avoid page breaks at the interline glue. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright - \hangindent=\wd0 \centerparametersmaybe + \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe \unhbox0 #1\par}% }% \nobreak\bigskip % no page break after a chapter title @@ -5461,18 +5841,18 @@ end \def\setchapterstyle #1 {\csname CHAPF#1\endcsname} % \def\unnchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\ptexraggedright - \rmisbold #1\hfill}}\bigskip \par\nobreak + \chapoddpage + \vbox{\chapfonts \raggedtitlesettings #1\par}% + \nobreak\bigskip\nobreak } \def\chfopen #1#2{\chapoddpage {\chapfonts \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% \par\penalty 5000 % } \def\centerchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt - \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak + \chapoddpage + \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% + \nobreak\bigskip \nobreak } \def\CHAPFopen{% \global\let\chapmacro=\chfopen @@ -5504,6 +5884,8 @@ end % \def\sectionheading#1#2#3#4{% {% + \checkenv{}% should not be in an environment. + % % Switch to the right set of fonts. \csname #2fonts\endcsname \rmisbold % @@ -5525,7 +5907,10 @@ end \xdef\lastsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% - \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum: + % \noexpand\putwordSection avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thissection{\noexpand\putwordSection{} + \noexpand\thissectionnum: \noexpand\thissectionname}% }% \fi @@ -5535,7 +5920,10 @@ end \xdef\lastsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% - \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum: + % \noexpand\putwordSection avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thissection{\noexpand\putwordSection{} + \noexpand\thissectionnum: \noexpand\thissectionname}% }% \fi @@ -5555,7 +5943,7 @@ end % % Now the second mark, after the heading break. No break points % between here and the heading. - \let\prevsectiondefs=\lastsectiondefs + \global\let\prevsectiondefs=\lastsectiondefs \domark % % Only insert the space after the number if we have a section number. @@ -5609,15 +5997,15 @@ end % % We'll almost certainly start a paragraph next, so don't let that % glue accumulate. (Not a breakpoint because it's preceded by a - % discardable item.) + % discardable item.) However, when a paragraph is not started next + % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out + % or the negative glue will cause weirdly wrong output, typically + % obscuring the section heading with something else. \vskip-\parskip - % - % This is purely so the last item on the list is a known \penalty > - % 10000. This is so \startdefun can avoid allowing breakpoints after - % section headings. Otherwise, it would insert a valid breakpoint between: - % - % @section sec-whatever - % @deffn def-whatever + % + % This is so the last item on the main vertical list is a known + % \penalty > 10000, so \startdefun, etc., can recognize the situation + % and do the needful. \penalty 10001 } @@ -5673,7 +6061,7 @@ end % These characters do not print properly in the Computer Modern roman % fonts, so we must take special care. This is more or less redundant % with the Texinfo input format setup at the end of this file. -% +% \def\activecatcodes{% \catcode`\"=\active \catcode`\$=\active @@ -5723,7 +6111,7 @@ end % redefined for the two-volume lispref. We always output on % \jobname.toc even if this is redefined. -% +% \def\tocreadfilename{\jobname.toc} % Normal (long) toc. @@ -5749,6 +6137,7 @@ end \def\summarycontents{% \startcontents{\putwordShortTOC}% % + \let\partentry = \shortpartentry \let\numchapentry = \shortchapentry \let\appentry = \shortchapentry \let\unnchapentry = \shortunnchapentry @@ -5804,6 +6193,19 @@ end % The last argument is the page number. % The arguments in between are the chapter number, section number, ... +% Parts, in the main contents. Replace the part number, which doesn't +% exist, with an empty box. Let's hope all the numbers have the same width. +% Also ignore the page number, which is conventionally not printed. +\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} +\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} +% +% Parts, in the short toc. +\def\shortpartentry#1#2#3#4{% + \penalty-300 + \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip + \shortchapentry{{\bf #1}}{\numeralbox}{}{}% +} + % Chapters, in the main contents. \def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} % @@ -5893,9 +6295,9 @@ end \message{environments,} % @foo ... @end foo. -% @tex ... @end tex escapes into raw Tex temporarily. +% @tex ... @end tex escapes into raw TeX temporarily. % One exception: @ is still an escape character, so that @end tex works. -% But \@ or @@ will get a plain tex @ character. +% But \@ or @@ will get a plain @ character. \envdef\tex{% \setupmarkupstyle{tex}% @@ -5908,10 +6310,14 @@ end \catcode `\|=\other \catcode `\<=\other \catcode `\>=\other - \catcode`\`=\other - \catcode`\'=\other + \catcode `\`=\other + \catcode `\'=\other \escapechar=`\\ % + % ' is active in math mode (mathcode"8000). So reset it, and all our + % other math active characters (just in case), to plain's definitions. + \mathactive + % \let\b=\ptexb \let\bullet=\ptexbullet \let\c=\ptexc @@ -5929,7 +6335,7 @@ end \let\/=\ptexslash \let\*=\ptexstar \let\t=\ptext - \expandafter \let\csname top\endcsname=\ptextop % outer + \expandafter \let\csname top\endcsname=\ptextop % we've made it outer \let\frenchspacing=\plainfrenchspacing % \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% @@ -6015,6 +6421,12 @@ end \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip % Flag to tell @lisp, etc., not to narrow margin. \let\nonarrowing = t% + % + % If this cartouche directly follows a sectioning command, we need the + % \parskip glue (backspaced over by default) or the cartouche can + % collide with the section heading. + \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi + % \vbox\bgroup \baselineskip=0pt\parskip=0pt\lineskip=0pt \carttop @@ -6028,7 +6440,7 @@ end \lineskip=\normlskip \parskip=\normpskip \vskip -\parskip - \comment % For explanation, see the end of \def\group. + \comment % For explanation, see the end of def\group. } \def\Ecartouche{% \ifhmode\par\fi @@ -6048,7 +6460,7 @@ end \newdimen\nonfillparindent \def\nonfillstart{% \aboveenvbreak - \hfuzz = 12pt % Don't be fussy + \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy \sepspaces % Make spaces be word-separators rather than space tokens. \let\par = \lisppar % don't ignore blank lines \obeylines % each line of input is a line of output @@ -6114,41 +6526,42 @@ end } % We often define two environments, @foo and @smallfoo. -% Let's do it by one command: -\def\makedispenv #1#2{ - \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2} - \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2} +% Let's do it in one command. #1 is the env name, #2 the definition. +\def\makedispenvdef#1#2{% + \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}% + \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}% \expandafter\let\csname E#1\endcsname \afterenvbreak \expandafter\let\csname Esmall#1\endcsname \afterenvbreak } -% Define two synonyms: -\def\maketwodispenvs #1#2#3{ - \makedispenv{#1}{#3} - \makedispenv{#2}{#3} +% Define two environment synonyms (#1 and #2) for an environment. +\def\maketwodispenvdef#1#2#3{% + \makedispenvdef{#1}{#3}% + \makedispenvdef{#2}{#3}% } - -% @lisp: indented, narrowed, typewriter font; @example: same as @lisp. +% +% @lisp: indented, narrowed, typewriter font; +% @example: same as @lisp. % % @smallexample and @smalllisp: use smaller fonts. % Originally contributed by Pavel@xerox. % -\maketwodispenvs {lisp}{example}{% +\maketwodispenvdef{lisp}{example}{% \nonfillstart \tt\setupmarkupstyle{example}% \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. - \gobble % eat return + \gobble % eat return } % @display/@smalldisplay: same as @lisp except keep current font. % -\makedispenv {display}{% +\makedispenvdef{display}{% \nonfillstart \gobble } % @format/@smallformat: same as @display except don't narrow margins. % -\makedispenv{format}{% +\makedispenvdef{format}{% \let\nonarrowing = t% \nonfillstart \gobble @@ -6167,7 +6580,7 @@ end \envdef\flushright{% \let\nonarrowing = t% \nonfillstart - \advance\leftskip by 0pt plus 1fill + \advance\leftskip by 0pt plus 1fill\relax \gobble } \let\Eflushright = \afterenvbreak @@ -6202,43 +6615,28 @@ end % we're doing normal filling. So, when using \aboveenvbreak and % \afterenvbreak, temporarily make \parskip 0. % +\makedispenvdef{quotation}{\quotationstart} +% \def\quotationstart{% - {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip - \parindent=0pt - % - % @cartouche defines \nonarrowing to inhibit narrowing at next level down. + \indentedblockstart % same as \indentedblock, but increase right margin too. \ifx\nonarrowing\relax - \advance\leftskip by \lispnarrowing \advance\rightskip by \lispnarrowing - \exdentamount = \lispnarrowing - \else - \let\nonarrowing = \relax \fi \parsearg\quotationlabel } -\envdef\quotation{% - \setnormaldispenv - \quotationstart -} - -\envdef\smallquotation{% - \setsmalldispenv - \quotationstart -} -\let\Esmallquotation = \Equotation - % We have retained a nonzero parskip for the environment, since we're % doing normal filling. % \def\Equotation{% \par - \ifx\quotationauthor\undefined\else + \ifx\quotationauthor\thisisundefined\else % indent a bit. \leftline{\kern 2\leftskip \sl ---\quotationauthor}% \fi {\parskip=0pt \afterenvbreak}% } +\def\Esmallquotation{\Equotation} % If we're given an argument, typeset it in bold with a colon after. \def\quotationlabel#1{% @@ -6248,6 +6646,32 @@ end \fi } +% @indentedblock is like @quotation, but indents only on the left and +% has no optional argument. +% +\makedispenvdef{indentedblock}{\indentedblockstart} +% +\def\indentedblockstart{% + {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip + \parindent=0pt + % + % @cartouche defines \nonarrowing to inhibit narrowing at next level down. + \ifx\nonarrowing\relax + \advance\leftskip by \lispnarrowing + \exdentamount = \lispnarrowing + \else + \let\nonarrowing = \relax + \fi +} + +% Keep a nonzero parskip for the environment, since we're doing normal filling. +% +\def\Eindentedblock{% + \par + {\parskip=0pt \afterenvbreak}% +} +\def\Esmallindentedblock{\Eindentedblock} + % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>} % If we want to allow any <char> as delimiter, @@ -6295,21 +6719,28 @@ end % Setup for the @verbatim environment % -% Real tab expansion +% Real tab expansion. \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % -\def\starttabbox{\setbox0=\hbox\bgroup} +% We typeset each line of the verbatim in an \hbox, so we can handle +% tabs. The \global is in case the verbatim line starts with an accent, +% or some other command that starts with a begin-group. Otherwise, the +% entire \verbbox would disappear at the corresponding end-group, before +% it is typeset. Meanwhile, we can't have nested verbatim commands +% (can we?), so the \global won't be overwriting itself. +\newbox\verbbox +\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} % \begingroup \catcode`\^^I=\active \gdef\tabexpand{% \catcode`\^^I=\active \def^^I{\leavevmode\egroup - \dimen0=\wd0 % the width so far, or since the previous tab - \divide\dimen0 by\tabw - \multiply\dimen0 by\tabw % compute previous multiple of \tabw - \advance\dimen0 by\tabw % advance to next multiple of \tabw - \wd0=\dimen0 \box0 \starttabbox + \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab + \divide\dimen\verbbox by\tabw + \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw + \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw + \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox }% } \endgroup @@ -6318,15 +6749,16 @@ end \def\setupverbatim{% \let\nonarrowing = t% \nonfillstart - % Easiest (and conventionally used) font for verbatim - \tt - \def\par{\leavevmode\egroup\box0\endgraf}% + \tt % easiest (and conventionally used) font for verbatim + % The \leavevmode here is for blank lines. Otherwise, we would + % never \starttabox and the \egroup would end verbatim mode. + \def\par{\leavevmode\egroup\box\verbbox\endgraf}% \tabexpand \setupmarkupstyle{verbatim}% % Respect line breaks, % print special symbols as themselves, and - % make each space count - % must do in this order: + % make each space count. + % Must do in this order: \obeylines \uncatcodespecials \sepspaces \everypar{\starttabbox}% } @@ -6383,6 +6815,7 @@ end \makevalueexpandable \setupverbatim \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% \input #1 \afterenvbreak }% @@ -6432,7 +6865,7 @@ end % commands also insert a nobreak penalty, and we don't want to allow % a break between a section heading and a defun. % - % As a minor refinement, we avoid "club" headers by signalling + % As a further refinement, we avoid "club" headers by signalling % with penalty of 10003 after the very first @deffn in the % sequence (see above), and penalty of 10002 after any following % @def command. @@ -6469,7 +6902,7 @@ end #1#2 \endheader % common ending: \interlinepenalty = 10000 - \advance\rightskip by 0pt plus 1fil + \advance\rightskip by 0pt plus 1fil\relax \endgraf \nobreak\vskip -\parskip \penalty\defunpenalty % signal to \startdefun and \dodefunx @@ -6499,13 +6932,36 @@ end \def\domakedefun#1#2#3{% \envdef#1{% \startdefun + \doingtypefnfalse % distinguish typed functions from all else \parseargusing\activeparens{\printdefunline#3}% }% \def#2{\dodefunx#1}% \def#3% } -%%% Untyped functions: +\newif\ifdoingtypefn % doing typed function? +\newif\ifrettypeownline % typeset return type on its own line? + +% @deftypefnnewline on|off says whether the return type of typed functions +% are printed on their own line. This affects @deftypefn, @deftypefun, +% @deftypeop, and @deftypemethod. +% +\parseargdef\deftypefnnewline{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxideftypefnnl\endcsname + = \empty + \else\ifx\temp\offword + \expandafter\let\csname SETtxideftypefnnl\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @txideftypefnnl value `\temp', + must be on|off}% + \fi\fi +} + +% Untyped functions: % @deffn category name args \makedefun{deffn}{\deffngeneral{}} @@ -6524,7 +6980,7 @@ end \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% } -%%% Typed functions: +% Typed functions: % @deftypefn category type name args \makedefun{deftypefn}{\deftypefngeneral{}} @@ -6539,10 +6995,11 @@ end % \def\deftypefngeneral#1#2 #3 #4 #5\endheader{% \dosubind{fn}{\code{#4}}{#1}% + \doingtypefntrue \defname{#2}{#3}{#4}\defunargs{#5\unskip}% } -%%% Typed variables: +% Typed variables: % @deftypevr category type var args \makedefun{deftypevr}{\deftypecvgeneral{}} @@ -6560,7 +7017,7 @@ end \defname{#2}{#3}{#4}\defunargs{#5\unskip}% } -%%% Untyped variables: +% Untyped variables: % @defvr category var args \makedefun{defvr}#1 {\deftypevrheader{#1} {} } @@ -6571,7 +7028,8 @@ end % \defcvof {category of}class var args \def\defcvof#1#2 {\deftypecvof{#1}#2 {} } -%%% Type: +% Types: + % @deftp category name args \makedefun{deftp}#1 #2 #3\endheader{% \doind{tp}{\code{#2}}% @@ -6599,25 +7057,49 @@ end % We are followed by (but not passed) the arguments, if any. % \def\defname#1#2#3{% + \par % Get the values of \leftskip and \rightskip as they were outside the @def... \advance\leftskip by -\defbodyindent % - % How we'll format the type name. Putting it in brackets helps + % Determine if we are typesetting the return type of a typed function + % on a line by itself. + \rettypeownlinefalse + \ifdoingtypefn % doing a typed function specifically? + % then check user option for putting return type on its own line: + \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else + \rettypeownlinetrue + \fi + \fi + % + % How we'll format the category name. Putting it in brackets helps % distinguish it from the body text that may end up on the next line % just below it. \def\temp{#1}% \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi} % - % Figure out line sizes for the paragraph shape. + % Figure out line sizes for the paragraph shape. We'll always have at + % least two. + \tempnum = 2 + % % The first line needs space for \box0; but if \rightskip is nonzero, % we need only space for the part of \box0 which exceeds it: \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip + % + % If doing a return type on its own line, we'll have another line. + \ifrettypeownline + \advance\tempnum by 1 + \def\maybeshapeline{0in \hsize}% + \else + \def\maybeshapeline{}% + \fi + % % The continuations: \dimen2=\hsize \advance\dimen2 by -\defargsindent - % (plain.tex says that \dimen1 should be used only as global.) - \parshape 2 0in \dimen0 \defargsindent \dimen2 % - % Put the type name to the right margin. + % The final paragraph shape: + \parshape \tempnum 0in \dimen0 \maybeshapeline \defargsindent \dimen2 + % + % Put the category name at the right margin. \noindent \hbox to 0pt{% \hfil\box0 \kern-\hsize @@ -6639,8 +7121,16 @@ end % . this still does not fix the ?` and !` ligatures, but so far no % one has made identifiers using them :). \df \tt - \def\temp{#2}% return value type - \ifx\temp\empty\else \tclose{\temp} \fi + \def\temp{#2}% text of the return type + \ifx\temp\empty\else + \tclose{\temp}% typeset the return type + \ifrettypeownline + % put return type on its own line; prohibit line break following: + \hfil\vadjust{\nobreak}\break + \else + \space % type on same line, so just followed by a space + \fi + \fi % no return type #3% output function name }% {\rm\enskip}% hskip 0.5 em of \tenrm @@ -6660,7 +7150,10 @@ end \df \sl \hyphenchar\font=0 % % On the other hand, if an argument has two dashes (for instance), we - % want a way to get ttsl. Let's try @var for that. + % want a way to get ttsl. We used to recommend @var for that, so + % leave the code in, but it's strange for @var to lead to typewriter. + % Nowadays we recommend @code, since the difference between a ttsl hyphen + % and a tt hyphen is pretty tiny. @code also disables ?` !`. \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% #1% \sl\hyphenchar\font=45 @@ -6758,7 +7251,7 @@ end % To do this right we need a feature of e-TeX, \scantokens, % which we arrange to emulate with a temporary file in ordinary TeX. -\ifx\eTeXversion\undefined +\ifx\eTeXversion\thisisundefined \newwrite\macscribble \def\scantokens#1{% \toks0={#1}% @@ -6769,25 +7262,30 @@ end } \fi -\def\scanmacro#1{% - \begingroup - \newlinechar`\^^M - \let\xeatspaces\eatspaces - % Undo catcode changes of \startcontents and \doprintindex - % When called from @insertcopying or (short)caption, we need active - % backslash to get it printed correctly. Previously, we had - % \catcode`\\=\other instead. We'll see whether a problem appears - % with macro expansion. --kasal, 19aug04 - \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ - % ... and \example - \spaceisspace - % - % Append \endinput to make sure that TeX does not see the ending newline. - % I've verified that it is necessary both for e-TeX and for ordinary TeX - % --kasal, 29nov03 - \scantokens{#1\endinput}% - \endgroup -} +\def\scanmacro#1{\begingroup + \newlinechar`\^^M + \let\xeatspaces\eatspaces + % + % Undo catcode changes of \startcontents and \doprintindex + % When called from @insertcopying or (short)caption, we need active + % backslash to get it printed correctly. Previously, we had + % \catcode`\\=\other instead. We'll see whether a problem appears + % with macro expansion. --kasal, 19aug04 + \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ + % + % ... and for \example: + \spaceisspace + % + % The \empty here causes a following catcode 5 newline to be eaten as + % part of reading whitespace after a control sequence. It does not + % eat a catcode 13 newline. There's no good way to handle the two + % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX + % would then have different behavior). See the Macro Details node in + % the manual for the workaround we recommend for macros and + % line-oriented commands. + % + \scantokens{#1\empty}% +\endgroup} \def\scanexp#1{% \edef\temp{\noexpand\scanmacro{#1}}% @@ -6815,7 +7313,7 @@ end % This does \let #1 = #2, with \csnames; that is, % \let \csname#1\endcsname = \csname#2\endcsname % (except of course we have to play expansion games). -% +% \def\cslet#1#2{% \expandafter\let \csname#1\expandafter\endcsname @@ -6841,17 +7339,18 @@ end % Macro bodies are absorbed as an argument in a context where % all characters are catcode 10, 11 or 12, except \ which is active -% (as in normal texinfo). It is necessary to change the definition of \. - +% (as in normal texinfo). It is necessary to change the definition of \ +% to recognize macro arguments; this is the job of \mbodybackslash. +% % Non-ASCII encodings make 8-bit characters active, so un-activate % them to avoid their expansion. Must do this non-globally, to % confine the change to the current group. - +% % It's necessary to have hard CRs when the macro is executed. This is -% done by making ^^M (\endlinechar) catcode 12 when reading the macro +% done by making ^^M (\endlinechar) catcode 12 when reading the macro % body, and then making it the \newlinechar in \scanmacro. - -\def\scanctxt{% +% +\def\scanctxt{% used as subroutine \catcode`\"=\other \catcode`\+=\other \catcode`\<=\other @@ -6864,13 +7363,13 @@ end \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi } -\def\scanargctxt{% +\def\scanargctxt{% used for copying and captions, not macros. \scanctxt \catcode`\\=\other \catcode`\^^M=\other } -\def\macrobodyctxt{% +\def\macrobodyctxt{% used for @macro definitions \scanctxt \catcode`\{=\other \catcode`\}=\other @@ -6878,32 +7377,56 @@ end \usembodybackslash } -\def\macroargctxt{% +\def\macroargctxt{% used when scanning invocations \scanctxt - \catcode`\\=\other + \catcode`\\=0 } +% why catcode 0 for \ in the above? To recognize \\ \{ \} as "escapes" +% for the single characters \ { }. Thus, we end up with the "commands" +% that would be written @\ @{ @} in a Texinfo document. +% +% We already have @{ and @}. For @\, we define it here, and only for +% this purpose, to produce a typewriter backslash (so, the @\ that we +% define for @math can't be used with @macro calls): +% +\def\\{\normalbackslash}% +% +% We would like to do this for \, too, since that is what makeinfo does. +% But it is not possible, because Texinfo already has a command @, for a +% cedilla accent. Documents must use @comma{} instead. +% +% \anythingelse will almost certainly be an error of some kind. + % \mbodybackslash is the definition of \ in @macro bodies. % It maps \foo\ => \csname macarg.foo\endcsname => #N % where N is the macro parameter number. % We define \csname macarg.\endcsname to be \realbackslash, so % \\ in macro replacement text gets you a backslash. - +% {\catcode`@=0 @catcode`@\=@active @gdef@usembodybackslash{@let\=@mbodybackslash} @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname} } \expandafter\def\csname macarg.\endcsname{\realbackslash} +\def\margbackslash#1{\char`\#1 } + \def\macro{\recursivefalse\parsearg\macroxxx} \def\rmacro{\recursivetrue\parsearg\macroxxx} \def\macroxxx#1{% - \getargs{#1}% now \macname is the macname and \argl the arglist + \getargs{#1}% now \macname is the macname and \argl the arglist \ifx\argl\empty % no arguments - \paramno=0% + \paramno=0\relax \else \expandafter\parsemargdef \argl;% + \if\paramno>256\relax + \ifx\eTeXversion\thisisundefined + \errhelp = \EMsimple + \errmessage{You need eTeX to compile a file with macros with more than 256 arguments} + \fi + \fi \fi \if1\csname ismacro.\the\macname\endcsname \message{Warning: redefining \the\macname}% @@ -6950,46 +7473,269 @@ end % an opening brace, and that opening brace is not consumed. \def\getargs#1{\getargsxxx#1{}} \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} -\def\getmacname #1 #2\relax{\macname={#1}} +\def\getmacname#1 #2\relax{\macname={#1}} \def\getmacargs#1{\def\argl{#1}} +% For macro processing make @ a letter so that we can make Texinfo private macro names. +\edef\texiatcatcode{\the\catcode`\@} +\catcode `@=11\relax + % Parse the optional {params} list. Set up \paramno and \paramlist -% so \defmacro knows what to do. Define \macarg.blah for each blah -% in the params list, to be ##N where N is the position in that list. +% so \defmacro knows what to do. Define \macarg.BLAH for each BLAH +% in the params list to some hook where the argument si to be expanded. If +% there are less than 10 arguments that hook is to be replaced by ##N where N +% is the position in that list, that is to say the macro arguments are to be +% defined `a la TeX in the macro body. +% % That gets used by \mbodybackslash (above). - +% % We need to get `macro parameter char #' into several definitions. -% The technique used is stolen from LaTeX: let \hash be something +% The technique used is stolen from LaTeX: let \hash be something % unexpandable, insert that wherever you need a #, and then redefine % it to # just before using the token list produced. % % The same technique is used to protect \eatspaces till just before % the macro is used. - -\def\parsemargdef#1;{\paramno=0\def\paramlist{}% - \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,} +% +% If there are 10 or more arguments, a different technique is used, where the +% hook remains in the body, and when macro is to be expanded the body is +% processed again to replace the arguments. +% +% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the +% argument N value and then \edef the body (nothing else will expand because of +% the catcode regime underwhich the body was input). +% +% If you compile with TeX (not eTeX), and you have macros with 10 or more +% arguments, you need that no macro has more than 256 arguments, otherwise an +% error is produced. +\def\parsemargdef#1;{% + \paramno=0\def\paramlist{}% + \let\hash\relax + \let\xeatspaces\relax + \parsemargdefxxx#1,;,% + % In case that there are 10 or more arguments we parse again the arguments + % list to set new definitions for the \macarg.BLAH macros corresponding to + % each BLAH argument. It was anyhow needed to parse already once this list + % in order to count the arguments, and as macros with at most 9 arguments + % are by far more frequent than macro with 10 or more arguments, defining + % twice the \macarg.BLAH macros does not cost too much processing power. + \ifnum\paramno<10\relax\else + \paramno0\relax + \parsemmanyargdef@@#1,;,% 10 or more arguments + \fi +} \def\parsemargdefxxx#1,{% \if#1;\let\next=\relax \else \let\next=\parsemargdefxxx - \advance\paramno by 1% + \advance\paramno by 1 \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname {\xeatspaces{\hash\the\paramno}}% \edef\paramlist{\paramlist\hash\the\paramno,}% \fi\next} +\def\parsemmanyargdef@@#1,{% + \if#1;\let\next=\relax + \else + \let\next=\parsemmanyargdef@@ + \edef\tempb{\eatspaces{#1}}% + \expandafter\def\expandafter\tempa + \expandafter{\csname macarg.\tempb\endcsname}% + % Note that we need some extra \noexpand\noexpand, this is because we + % don't want \the to be expanded in the \parsermacbody as it uses an + % \xdef . + \expandafter\edef\tempa + {\noexpand\noexpand\noexpand\the\toks\the\paramno}% + \advance\paramno by 1\relax + \fi\next} + % These two commands read recursive and nonrecursive macro bodies. % (They're different since rec and nonrec macros end differently.) +% +\catcode `\@\texiatcatcode \long\def\parsemacbody#1@end macro% {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% \long\def\parsermacbody#1@end rmacro% {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% +\catcode `\@=11\relax + +\let\endargs@\relax +\let\nil@\relax +\def\nilm@{\nil@}% +\long\def\nillm@{\nil@}% + +% This macro is expanded during the Texinfo macro expansion, not during its +% definition. It gets all the arguments values and assigns them to macros +% macarg.ARGNAME +% +% #1 is the macro name +% #2 is the list of argument names +% #3 is the list of argument values +\def\getargvals@#1#2#3{% + \def\macargdeflist@{}% + \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion. + \def\paramlist{#2,\nil@}% + \def\macroname{#1}% + \begingroup + \macroargctxt + \def\argvaluelist{#3,\nil@}% + \def\@tempa{#3}% + \ifx\@tempa\empty + \setemptyargvalues@ + \else + \getargvals@@ + \fi +} + +% +\def\getargvals@@{% + \ifx\paramlist\nilm@ + % Some sanity check needed here that \argvaluelist is also empty. + \ifx\argvaluelist\nillm@ + \else + \errhelp = \EMsimple + \errmessage{Too many arguments in macro `\macroname'!}% + \fi + \let\next\macargexpandinbody@ + \else + \ifx\argvaluelist\nillm@ + % No more arguments values passed to macro. Set remaining named-arg + % macros to empty. + \let\next\setemptyargvalues@ + \else + % pop current arg name into \@tempb + \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}% + \expandafter\@tempa\expandafter{\paramlist}% + % pop current argument value into \@tempc + \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}% + \expandafter\@tempa\expandafter{\argvaluelist}% + % Here \@tempb is the current arg name and \@tempc is the current arg value. + % First place the new argument macro definition into \@tempd + \expandafter\macname\expandafter{\@tempc}% + \expandafter\let\csname macarg.\@tempb\endcsname\relax + \expandafter\def\expandafter\@tempe\expandafter{% + \csname macarg.\@tempb\endcsname}% + \edef\@tempd{\long\def\@tempe{\the\macname}}% + \push@\@tempd\macargdeflist@ + \let\next\getargvals@@ + \fi + \fi + \next +} + +\def\push@#1#2{% + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter#2% + \expandafter\expandafter\expandafter{% + \expandafter#1#2}% +} + +% Replace arguments by their values in the macro body, and place the result +% in macro \@tempa +\def\macvalstoargs@{% + % To do this we use the property that token registers that are \the'ed + % within an \edef expand only once. So we are going to place all argument + % values into respective token registers. + % + % First we save the token context, and initialize argument numbering. + \begingroup + \paramno0\relax + % Then, for each argument number #N, we place the corresponding argument + % value into a new token list register \toks#N + \expandafter\putargsintokens@\saveparamlist@,;,% + % Then, we expand the body so that argument are replaced by their + % values. The trick for values not to be expanded themselves is that they + % are within tokens and that tokens expand only once in an \edef . + \edef\@tempc{\csname mac.\macroname .body\endcsname}% + % Now we restore the token stack pointer to free the token list registers + % which we have used, but we make sure that expanded body is saved after + % group. + \expandafter + \endgroup + \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% + } + +\def\macargexpandinbody@{% + %% Define the named-macro outside of this group and then close this group. + \expandafter + \endgroup + \macargdeflist@ + % First the replace in body the macro arguments by their values, the result + % is in \@tempa . + \macvalstoargs@ + % Then we point at the \norecurse or \gobble (for recursive) macro value + % with \@tempb . + \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname + % Depending on whether it is recursive or not, we need some tailing + % \egroup . + \ifx\@tempb\gobble + \let\@tempc\relax + \else + \let\@tempc\egroup + \fi + % And now we do the real job: + \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}% + \@tempd +} + +\def\putargsintokens@#1,{% + \if#1;\let\next\relax + \else + \let\next\putargsintokens@ + % First we allocate the new token list register, and give it a temporary + % alias \@tempb . + \toksdef\@tempb\the\paramno + % Then we place the argument value into that token list register. + \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname + \expandafter\@tempb\expandafter{\@tempa}% + \advance\paramno by 1\relax + \fi + \next +} + +% Save the token stack pointer into macro #1 +\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}} +% Restore the token stack pointer from number in macro #1 +\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax} +% newtoks that can be used non \outer . +\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi} + +% Tailing missing arguments are set to empty +\def\setemptyargvalues@{% + \ifx\paramlist\nilm@ + \let\next\macargexpandinbody@ + \else + \expandafter\setemptyargvaluesparser@\paramlist\endargs@ + \let\next\setemptyargvalues@ + \fi + \next +} -% This defines the macro itself. There are six cases: recursive and -% nonrecursive macros of zero, one, and many arguments. +\def\setemptyargvaluesparser@#1,#2\endargs@{% + \expandafter\def\expandafter\@tempa\expandafter{% + \expandafter\def\csname macarg.#1\endcsname{}}% + \push@\@tempa\macargdeflist@ + \def\paramlist{#2}% +} + +% #1 is the element target macro +% #2 is the list macro +% #3,#4\endargs@ is the list value +\def\pop@#1#2#3,#4\endargs@{% + \def#1{#3}% + \def#2{#4}% +} +\long\def\longpop@#1#2#3,#4\endargs@{% + \long\def#1{#3}% + \long\def#2{#4}% +} + +% This defines a Texinfo @macro. There are eight cases: recursive and +% nonrecursive macros of zero, one, up to nine, and many arguments. % Much magic with \expandafter here. % \xdef is used so that macro definitions will survive the file % they're defined in; @include reads the file inside a group. +% \def\defmacro{% \let\hash=##% convert placeholders to macro parameter chars \ifrecursive @@ -7004,17 +7750,25 @@ end \expandafter\noexpand\csname\the\macname xxx\endcsname}% \expandafter\xdef\csname\the\macname xxx\endcsname##1{% \egroup\noexpand\scanmacro{\temp}}% - \else % many - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\csname\the\macname xx\endcsname}% - \expandafter\xdef\csname\the\macname xx\endcsname##1{% - \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{\egroup\noexpand\scanmacro{\temp}}% + \else + \ifnum\paramno<10\relax % at most 9 + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup\noexpand\macroargctxt + \noexpand\csname\the\macname xx\endcsname}% + \expandafter\xdef\csname\the\macname xx\endcsname##1{% + \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% + \expandafter\expandafter + \expandafter\xdef + \expandafter\expandafter + \csname\the\macname xxx\endcsname + \paramlist{\egroup\noexpand\scanmacro{\temp}}% + \else % 10 or more + \expandafter\xdef\csname\the\macname\endcsname{% + \noexpand\getargvals@{\the\macname}{\argl}% + }% + \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp + \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble + \fi \fi \else \ifcase\paramno @@ -7031,29 +7785,40 @@ end \egroup \noexpand\norecurse{\the\macname}% \noexpand\scanmacro{\temp}\egroup}% - \else % many - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \expandafter\noexpand\csname\the\macname xx\endcsname}% - \expandafter\xdef\csname\the\macname xx\endcsname##1{% - \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{% - \egroup - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% + \else % at most 9 + \ifnum\paramno<10\relax + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup\noexpand\macroargctxt + \expandafter\noexpand\csname\the\macname xx\endcsname}% + \expandafter\xdef\csname\the\macname xx\endcsname##1{% + \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% + \expandafter\expandafter + \expandafter\xdef + \expandafter\expandafter + \csname\the\macname xxx\endcsname + \paramlist{% + \egroup + \noexpand\norecurse{\the\macname}% + \noexpand\scanmacro{\temp}\egroup}% + \else % 10 or more: + \expandafter\xdef\csname\the\macname\endcsname{% + \noexpand\getargvals@{\the\macname}{\argl}% + }% + \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp + \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse + \fi \fi \fi} +\catcode `\@\texiatcatcode\relax + \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} % \braceorline decides whether the next nonwhitespace character is a % {. If so it reads up to the closing }, if not, it reads the whole % line. Whatever was read is then fed to the next control sequence -% as an argument (by \parsebrace or \parsearg) +% as an argument (by \parsebrace or \parsearg). +% \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup\else @@ -7063,7 +7828,8 @@ end % @alias. % We need some trickery to remove the optional spaces around the equal -% sign. Just make them active and then expand them all to nothing. +% sign. Make them active and then expand them all to nothing. +% \def\alias{\parseargusing\obeyspaces\aliasxxx} \def\aliasxxx #1{\aliasyyy#1\relax} \def\aliasyyy #1=#2\relax{% @@ -7084,7 +7850,8 @@ end % @inforef is relatively simple. \def\inforef #1{\inforefzzz #1,,,,**} -\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, +\def\inforefzzz #1,#2,#3,#4**{% + \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, node \samp{\ignorespaces#1{}}} % @node's only job in TeX is to define \lastnode, which is used in @@ -7145,11 +7912,32 @@ end \toks0 = \expandafter{\lastsection}% \immediate \writexrdef{title}{\the\toks0 }% \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. - \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout + \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout }% \fi } +% @xrefautosectiontitle on|off says whether @section(ing) names are used +% automatically in xrefs, if the third arg is not explicitly specified. +% This was provided as a "secret" @set xref-automatic-section-title +% variable, now it's official. +% +\parseargdef\xrefautomaticsectiontitle{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \empty + \else\ifx\temp\offword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @xrefautomaticsectiontitle value `\temp', + must be on|off}% + \fi\fi +} + +% % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed % node name, #4 the name of the Info file, #5 the name of the printed @@ -7158,26 +7946,41 @@ end \def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]} \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} \def\ref#1{\xrefX[#1,,,,,,,]} +% +\newbox\toprefbox +\newbox\printedrefnamebox +\newbox\infofilenamebox +\newbox\printedmanualbox +% \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup \unsepspaces - \def\printedmanual{\ignorespaces #5}% + % + % Get args without leading/trailing spaces. \def\printedrefname{\ignorespaces #3}% - \setbox1=\hbox{\printedmanual\unskip}% - \setbox0=\hbox{\printedrefname\unskip}% - \ifdim \wd0 = 0pt + \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}% + % + \def\infofilename{\ignorespaces #4}% + \setbox\infofilenamebox = \hbox{\infofilename\unskip}% + % + \def\printedmanual{\ignorespaces #5}% + \setbox\printedmanualbox = \hbox{\printedmanual\unskip}% + % + % If the printed reference name (arg #3) was not explicitly given in + % the @xref, figure out what we want to use. + \ifdim \wd\printedrefnamebox = 0pt % No printed node name was explicitly given. - \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax - % Use the node name inside the square brackets. + \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax + % Not auto section-title: use node name inside the square brackets. \def\printedrefname{\ignorespaces #1}% \else - % Use the actual chapter/section title appear inside - % the square brackets. Use the real section title if we have it. - \ifdim \wd1 > 0pt - % It is in another manual, so we don't have it. + % Auto section-title: use chapter/section title inside + % the square brackets if we have it. + \ifdim \wd\printedmanualbox > 0pt + % It is in another manual, so we don't have it; use node name. \def\printedrefname{\ignorespaces #1}% \else \ifhavexrefs - % We know the real title if we have the xref values. + % We (should) know the real title if we have the xref values. \def\printedrefname{\refx{#1-title}{}}% \else % Otherwise just copy the Info node name. @@ -7191,13 +7994,20 @@ end \ifpdf {\indexnofonts \turnoffactive + \makevalueexpandable % This expands tokens, so do it after making catcode changes, so _ - % etc. don't get their TeX definitions. + % etc. don't get their TeX definitions. This ignores all spaces in + % #4, including (wrongly) those in the middle of the filename. \getfilename{#4}% % - % See comments at \activebackslashdouble. - {\activebackslashdouble \xdef\pdfxrefdest{#1}% - \backslashparens\pdfxrefdest}% + % This (wrongly) does not take account of leading or trailing + % spaces in #1, which should be ignored. + \edef\pdfxrefdest{#1}% + \ifx\pdfxrefdest\empty + \def\pdfxrefdest{Top}% no empty targets + \else + \txiescapepdf\pdfxrefdest % escape PDF special chars + \fi % \leavevmode \startlink attr{/Border [0 0 0]}% @@ -7224,29 +8034,42 @@ end \iffloat\Xthisreftitle % If the user specified the print name (third arg) to the ref, % print it instead of our usual "Figure 1.2". - \ifdim\wd0 = 0pt + \ifdim\wd\printedrefnamebox = 0pt \refx{#1-snt}{}% \else \printedrefname \fi % - % if the user also gave the printed manual name (fifth arg), append + % If the user also gave the printed manual name (fifth arg), append % "in MANUALNAME". - \ifdim \wd1 > 0pt + \ifdim \wd\printedmanualbox > 0pt \space \putwordin{} \cite{\printedmanual}% \fi \else % node/anchor (non-float) references. + % + % If we use \unhbox to print the node names, TeX does not insert + % empty discretionaries after hyphens, which means that it will not + % find a line break at a hyphen in a node names. Since some manuals + % are best written with fairly long node names, containing hyphens, + % this is a loss. Therefore, we give the text of the node name + % again, so it is as if TeX is seeing it for the first time. + % + \ifdim \wd\printedmanualbox > 0pt + % Cross-manual reference with a printed manual name. + % + \crossmanualxref{\cite{\printedmanual\unskip}}% + % + \else\ifdim \wd\infofilenamebox > 0pt + % Cross-manual reference with only an info filename (arg 4), no + % printed manual name (arg 5). This is essentially the same as + % the case above; we output the filename, since we have nothing else. + % + \crossmanualxref{\code{\infofilename\unskip}}% % - % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not - % insert empty discretionaries after hyphens, which means that it will - % not find a line break at a hyphen in a node names. Since some manuals - % are best written with fairly long node names, containing hyphens, this - % is a loss. Therefore, we give the text of the node name again, so it - % is as if TeX is seeing it for the first time. - \ifdim \wd1 > 0pt - \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}% \else + % Reference within this manual. + % % _ (for example) has to be the character _ for the purposes of the % control sequence corresponding to the node, but it has to expand % into the usual \leavevmode...\vrule stuff for purposes of @@ -7258,7 +8081,7 @@ end \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi }% - % output the `[mynode]' via a macro so it can be overridden. + % output the `[mynode]' via the macro below so it can be overridden. \xrefprintnodename\printedrefname % % But we always want a comma and a space: @@ -7266,11 +8089,37 @@ end % % output the `page 3'. \turnoffactive \putwordpage\tie\refx{#1-pg}{}% - \fi + \fi\fi \fi \endlink \endgroup} +% Output a cross-manual xref to #1. Used just above (twice). +% +% Only include the text "Section ``foo'' in" if the foo is neither +% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply +% "see The Foo Manual", the idea being to refer to the whole manual. +% +% But, this being TeX, we can't easily compare our node name against the +% string "Top" while ignoring the possible spaces before and after in +% the input. By adding the arbitrary 7sp below, we make it much less +% likely that a real node name would have the same width as "Top" (e.g., +% in a monospaced font). Hopefully it will never happen in practice. +% +% For the same basic reason, we retypeset the "Top" at every +% reference, since the current font is indeterminate. +% +\def\crossmanualxref#1{% + \setbox\toprefbox = \hbox{Top\kern7sp}% + \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% + \ifdim \wd2 > 7sp % nonempty? + \ifdim \wd2 = \wd\toprefbox \else % same as Top? + \putwordSection{} ``\printedrefname'' \putwordin{}\space + \fi + \fi + #1% +} + % This macro is called from \xrefX for the `[nodename]' part of xref % output. It's a separate macro only so it can be changed more easily, % since square brackets don't work well in some documents. Particularly @@ -7321,7 +8170,8 @@ end \angleleft un\-de\-fined\angleright \iflinks \ifhavexrefs - \message{\linenumber Undefined cross reference `#1'.}% + {\toks0 = {#1}% avoid expansion of possibly-complex value + \message{\linenumber Undefined cross reference `\the\toks0'.}}% \else \ifwarnedxrefs\else \global\warnedxrefstrue @@ -7485,7 +8335,7 @@ end % space to prevent strange expansion errors.) \def\supereject{\par\penalty -20000\footnoteno =0 } -% @footnotestyle is meaningful for info output only. +% @footnotestyle is meaningful for Info output only. \let\footnotestyle=\comment {\catcode `\@=11 @@ -7548,6 +8398,8 @@ end % expands into a box, it must come within the paragraph, lest it % provide a place where TeX can split the footnote. \footstrut + % + % Invoke rest of plain TeX footnote routine. \futurelet\next\fo@t } }%end \catcode `\@=11 @@ -7635,7 +8487,7 @@ end it from ftp://tug.org/tex/epsf.tex.} % \def\image#1{% - \ifx\epsfbox\undefined + \ifx\epsfbox\thisisundefined \ifwarnednoepsf \else \errhelp = \noepsfhelp \errmessage{epsf.tex not found, images will be ignored}% @@ -7651,7 +8503,7 @@ end % #2 is (optional) width, #3 is (optional) height. % #4 is (ignored optional) html alt text. % #5 is (ignored optional) extension. -% #6 is just the usual extra ignored arg for parsing this stuff. +% #6 is just the usual extra ignored arg for parsing stuff. \newif\ifimagevmode \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup \catcode`\^^M = 5 % in case we're inside an example @@ -7659,6 +8511,13 @@ end % If the image is by itself, center it. \ifvmode \imagevmodetrue + \else \ifx\centersub\centerV + % for @center @image, we need a vbox so we can have our vertical space + \imagevmodetrue + \vbox\bgroup % vbox has better behavior than vtop herev + \fi\fi + % + \ifimagevmode \nobreak\medskip % Usually we'll have text after the image which will insert % \parskip glue, so insert it here too to equalize the space @@ -7668,9 +8527,13 @@ end \fi % % Leave vertical mode so that indentation from an enclosing - % environment such as @quotation is respected. On the other hand, if - % it's at the top level, we don't want the normal paragraph indentation. - \noindent + % environment such as @quotation is respected. + % However, if we're at the top level, we don't want the + % normal paragraph indentation. + % On the other hand, if we are in the case of @center @image, we don't + % want to start a paragraph, which will create a hsize-width box and + % eradicate the centering. + \ifx\centersub\centerV\else \noindent \fi % % Output the image. \ifpdf @@ -7682,7 +8545,10 @@ end \epsfbox{#1.eps}% \fi % - \ifimagevmode \medskip \fi % space after the standalone image + \ifimagevmode + \medskip % space after a standalone image + \fi + \ifx\centersub\centerV \egroup \fi \endgroup} @@ -7975,21 +8841,22 @@ end \closein 1 \endgroup % end raw TeX \endgroup} -} % % If they passed de_DE, and txi-de_DE.tex doesn't exist, % try txi-de.tex. -% -\def\documentlanguagetrywithoutunderscore#1_#2\finish{% +% +\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{% \openin 1 txi-#1.tex \ifeof 1 \errhelp = \nolanghelp \errmessage{Cannot read language file txi-#1.tex}% \else + \globaldefs = 1 % everything in the txi-LL files needs to persist \input txi-#1.tex \fi \closein 1 } +}% end of special _ catcode % \newhelp\nolanghelp{The given language definition file cannot be found or is empty. Maybe you need to install it? Putting it in the current @@ -7998,16 +8865,16 @@ directory should work if nowhere else does.} % This macro is called from txi-??.tex files; the first argument is the % \language name to set (without the "\lang@" prefix), the second and % third args are \{left,right}hyphenmin. -% +% % The language names to pass are determined when the format is built. % See the etex.log file created at that time, e.g., % /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log. -% +% % With TeX Live 2008, etex now includes hyphenation patterns for all % available languages. This means we can support hyphenation in % Texinfo, at least to some extent. (This still doesn't solve the % accented characters problem.) -% +% \catcode`@=11 \def\txisetlanguage#1#2#3{% % do not set the language if the name is undefined in the current TeX. @@ -8062,7 +8929,7 @@ directory should work if nowhere else does.} \setnonasciicharscatcode\active \lattwochardefs % - \else \ifx \declaredencoding \latone + \else \ifx \declaredencoding \latone \setnonasciicharscatcode\active \latonechardefs % @@ -8074,7 +8941,7 @@ directory should work if nowhere else does.} \setnonasciicharscatcode\active \utfeightchardefs % - \else + \else \message{Unknown document encoding #1, ignoring.}% % \fi % utfeight @@ -8086,7 +8953,7 @@ directory should work if nowhere else does.} % A message to be logged when using a character that isn't available % the default font encoding (OT1). -% +% \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} % Take account of \c (plain) vs. \, (Texinfo) difference. @@ -8099,21 +8966,21 @@ directory should work if nowhere else does.} % % Latin1 (ISO-8859-1) character definitions. \def\latonechardefs{% - \gdef^^a0{~} + \gdef^^a0{\tie} \gdef^^a1{\exclamdown} - \gdef^^a2{\missingcharmsg{CENT SIGN}} + \gdef^^a2{\missingcharmsg{CENT SIGN}} \gdef^^a3{{\pounds}} \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} \gdef^^a5{\missingcharmsg{YEN SIGN}} - \gdef^^a6{\missingcharmsg{BROKEN BAR}} + \gdef^^a6{\missingcharmsg{BROKEN BAR}} \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\copyright} + \gdef^^a8{\"{}} + \gdef^^a9{\copyright} \gdef^^aa{\ordf} \gdef^^ab{\guillemetleft} \gdef^^ac{$\lnot$} - \gdef^^ad{\-} - \gdef^^ae{\registeredsymbol} + \gdef^^ad{\-} + \gdef^^ae{\registeredsymbol} \gdef^^af{\={}} % \gdef^^b0{\textdegree} @@ -8129,7 +8996,7 @@ directory should work if nowhere else does.} \gdef^^b9{$^1$} \gdef^^ba{\ordm} % - \gdef^^bb{\guilletright} + \gdef^^bb{\guillemetright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} \gdef^^be{$3\over4$} @@ -8140,7 +9007,7 @@ directory should work if nowhere else does.} \gdef^^c2{\^A} \gdef^^c3{\~A} \gdef^^c4{\"A} - \gdef^^c5{\ringaccent A} + \gdef^^c5{\ringaccent A} \gdef^^c6{\AE} \gdef^^c7{\cedilla C} \gdef^^c8{\`E} @@ -8152,7 +9019,7 @@ directory should work if nowhere else does.} \gdef^^ce{\^I} \gdef^^cf{\"I} % - \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}} + \gdef^^d0{\DH} \gdef^^d1{\~N} \gdef^^d2{\`O} \gdef^^d3{\'O} @@ -8166,7 +9033,7 @@ directory should work if nowhere else does.} \gdef^^db{\^U} \gdef^^dc{\"U} \gdef^^dd{\'Y} - \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}} + \gdef^^de{\TH} \gdef^^df{\ss} % \gdef^^e0{\`a} @@ -8186,7 +9053,7 @@ directory should work if nowhere else does.} \gdef^^ee{\^{\dotless i}} \gdef^^ef{\"{\dotless i}} % - \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}} + \gdef^^f0{\dh} \gdef^^f1{\~n} \gdef^^f2{\`o} \gdef^^f3{\'o} @@ -8200,7 +9067,7 @@ directory should work if nowhere else does.} \gdef^^fb{\^u} \gdef^^fc{\"u} \gdef^^fd{\'y} - \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}} + \gdef^^fe{\th} \gdef^^ff{\"y} } @@ -8221,7 +9088,7 @@ directory should work if nowhere else does.} % Latin2 (ISO-8859-2) character definitions. \def\lattwochardefs{% - \gdef^^a0{~} + \gdef^^a0{\tie} \gdef^^a1{\ogonek{A}} \gdef^^a2{\u{}} \gdef^^a3{\L} @@ -8272,7 +9139,7 @@ directory should work if nowhere else does.} \gdef^^ce{\^I} \gdef^^cf{\v D} % - \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}} + \gdef^^d0{\DH} \gdef^^d1{\'N} \gdef^^d2{\v N} \gdef^^d3{\'O} @@ -8281,7 +9148,7 @@ directory should work if nowhere else does.} \gdef^^d6{\"O} \gdef^^d7{$\times$} \gdef^^d8{\v R} - \gdef^^d9{\ringaccent U} + \gdef^^d9{\ringaccent U} \gdef^^da{\'U} \gdef^^db{\H U} \gdef^^dc{\"U} @@ -8302,11 +9169,11 @@ directory should work if nowhere else does.} \gdef^^ea{\ogonek{e}} \gdef^^eb{\"e} \gdef^^ec{\v e} - \gdef^^ed{\'\i} - \gdef^^ee{\^\i} + \gdef^^ed{\'{\dotless{i}}} + \gdef^^ee{\^{\dotless{i}}} \gdef^^ef{\v d} % - \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}} + \gdef^^f0{\dh} \gdef^^f1{\'n} \gdef^^f2{\v n} \gdef^^f3{\'o} @@ -8325,11 +9192,11 @@ directory should work if nowhere else does.} } % UTF-8 character definitions. -% +% % This code to support UTF-8 is based on LaTeX's utf8.def, with some % changes for Texinfo conventions. It is included here under the GPL by % permission from Frank Mittelbach and the LaTeX team. -% +% \newcount\countUTFx \newcount\countUTFy \newcount\countUTFz @@ -8394,7 +9261,7 @@ directory should work if nowhere else does.} \gdef\DeclareUnicodeCharacter#1#2{% \countUTFz = "#1\relax - \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% + %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% \begingroup \parseXMLCharref \def\UTFviiiTwoOctets##1##2{% @@ -8479,6 +9346,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00CE}{\^I} \DeclareUnicodeCharacter{00CF}{\"I} + \DeclareUnicodeCharacter{00D0}{\DH} \DeclareUnicodeCharacter{00D1}{\~N} \DeclareUnicodeCharacter{00D2}{\`O} \DeclareUnicodeCharacter{00D3}{\'O} @@ -8491,6 +9359,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00DB}{\^U} \DeclareUnicodeCharacter{00DC}{\"U} \DeclareUnicodeCharacter{00DD}{\'Y} + \DeclareUnicodeCharacter{00DE}{\TH} \DeclareUnicodeCharacter{00DF}{\ss} \DeclareUnicodeCharacter{00E0}{\`a} @@ -8510,6 +9379,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} + \DeclareUnicodeCharacter{00F0}{\dh} \DeclareUnicodeCharacter{00F1}{\~n} \DeclareUnicodeCharacter{00F2}{\`o} \DeclareUnicodeCharacter{00F3}{\'o} @@ -8522,6 +9392,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00FB}{\^u} \DeclareUnicodeCharacter{00FC}{\"u} \DeclareUnicodeCharacter{00FD}{\'y} + \DeclareUnicodeCharacter{00FE}{\th} \DeclareUnicodeCharacter{00FF}{\"y} \DeclareUnicodeCharacter{0100}{\=A} @@ -8858,8 +9729,8 @@ directory should work if nowhere else does.} % Prevent underfull vbox error messages. \vbadness = 10000 -% Don't be so finicky about underfull hboxes, either. -\hbadness = 2000 +% Don't be very finicky about underfull hboxes, either. +\hbadness = 6666 % Following George Bush, get rid of widows and orphans. \widowpenalty=10000 @@ -9066,28 +9937,21 @@ directory should work if nowhere else does.} \message{and turning on texinfo input format.} +\def^^L{\par} % remove \outer, so ^L can appear in an @comment + % DEL is a comment character, in case @c does not suffice. \catcode`\^^? = 14 % Define macros to output various characters with catcode for normal text. -\catcode`\"=\other -\catcode`\~=\other -\catcode`\^=\other -\catcode`\_=\other -\catcode`\|=\other -\catcode`\<=\other -\catcode`\>=\other -\catcode`\+=\other -\catcode`\$=\other -\def\normaldoublequote{"} -\def\normaltilde{~} -\def\normalcaret{^} -\def\normalunderscore{_} -\def\normalverticalbar{|} -\def\normalless{<} -\def\normalgreater{>} -\def\normalplus{+} -\def\normaldollar{$}%$ font-lock fix +\catcode`\"=\other \def\normaldoublequote{"} +\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix +\catcode`\+=\other \def\normalplus{+} +\catcode`\<=\other \def\normalless{<} +\catcode`\>=\other \def\normalgreater{>} +\catcode`\^=\other \def\normalcaret{^} +\catcode`\_=\other \def\normalunderscore{_} +\catcode`\|=\other \def\normalverticalbar{|} +\catcode`\~=\other \def\normaltilde{~} % This macro is used to make a character print one way in \tt % (where it can probably be output as-is), and another way in other fonts, @@ -9114,11 +9978,9 @@ directory should work if nowhere else does.} \catcode`\"=\active \def\activedoublequote{{\tt\char34}} \let"=\activedoublequote -\catcode`\~=\active -\def~{{\tt\char126}} +\catcode`\~=\active \def\activetilde{{\tt\char126}} \let~ = \activetilde \chardef\hat=`\^ -\catcode`\^=\active -\def^{{\tt \hat}} +\catcode`\^=\active \def\activehat{{\tt \hat}} \let^ = \activehat \catcode`\_=\active \def_{\ifusingtt\normalunderscore\_} @@ -9128,16 +9990,26 @@ directory should work if nowhere else does.} \catcode`\|=\active \def|{{\tt\char124}} + \chardef \less=`\< -\catcode`\<=\active -\def<{{\tt \less}} +\catcode`\<=\active \def\activeless{{\tt \less}}\let< = \activeless \chardef \gtr=`\> -\catcode`\>=\active -\def>{{\tt \gtr}} -\catcode`\+=\active -\def+{{\tt \char 43}} -\catcode`\$=\active -\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix +\catcode`\>=\active \def\activegtr{{\tt \gtr}}\let> = \activegtr +\catcode`\+=\active \def+{{\tt \char 43}} +\catcode`\$=\active \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix + +% used for headline/footline in the output routine, in case the page +% breaks in the middle of an @tex block. +\def\texinfochars{% + \let< = \activeless + \let> = \activegtr + \let~ = \activetilde + \let^ = \activehat + \markupsetuplqdefault \markupsetuprqdefault + \let\b = \strong + \let\i = \smartitalic + % in principle, all other definitions in \tex have to be undone too. +} % If a .fmt file is being used, characters that might appear in a file % name cannot be active until we have parsed the command line. @@ -9165,34 +10037,48 @@ directory should work if nowhere else does.} % In texinfo, backslash is an active character; it prints the backslash % in fixed width font. -\catcode`\\=\active -@def@normalbackslash{{@tt@backslashcurfont}} +\catcode`\\=\active % @ for escape char from now on. + +% The story here is that in math mode, the \char of \backslashcurfont +% ends up printing the roman \ from the math symbol font (because \char +% in math mode uses the \mathcode, and plain.tex sets +% \mathcode`\\="026E). It seems better for @backslashchar{} to always +% print a typewriter backslash, hence we use an explicit \mathchar, +% which is the decimal equivalent of "715c (class 7, e.g., use \fam; +% ignored family value; char position "5C). We can't use " for the +% usual hex value because it has already been made active. +@def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} +@let@backslashchar = @normalbackslash % @backslashchar{} is for user documents. + % On startup, @fixbackslash assigns: % @let \ = @normalbackslash - % \rawbackslash defines an active \ to do \backslashcurfont. % \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. +% catcode other. We switch back and forth between these. @gdef@rawbackslash{@let\=@backslashcurfont} @gdef@otherbackslash{@let\=@realbackslash} % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of -% the literal character `\'. -% -@def@normalturnoffactive{% - @let\=@normalbackslash - @let"=@normaldoublequote - @let~=@normaltilde - @let^=@normalcaret - @let_=@normalunderscore - @let|=@normalverticalbar - @let<=@normalless - @let>=@normalgreater - @let+=@normalplus - @let$=@normaldollar %$ font-lock fix - @markupsetuplqdefault - @markupsetuprqdefault - @unsepspaces +% the literal character `\'. Also revert - to its normal character, in +% case the active - from code has slipped in. +% +{@catcode`- = @active + @gdef@normalturnoffactive{% + @let-=@normaldash + @let"=@normaldoublequote + @let$=@normaldollar %$ font-lock fix + @let+=@normalplus + @let<=@normalless + @let>=@normalgreater + @let\=@normalbackslash + @let^=@normalcaret + @let_=@normalunderscore + @let|=@normalverticalbar + @let~=@normaltilde + @markupsetuplqdefault + @markupsetuprqdefault + @unsepspaces + } } % Make _ and + \other characters, temporarily. @@ -9221,10 +10107,19 @@ directory should work if nowhere else does.} % Say @foo, not \foo, in error messages. @escapechar = `@@ +% These (along with & and #) are made active for url-breaking, so need +% active definitions as the normal characters. +@def@normaldot{.} +@def@normalquest{?} +@def@normalslash{/} + % These look ok in all fonts, so just make them not special. -@catcode`@& = @other -@catcode`@# = @other -@catcode`@% = @other +% @hashchar{} gets its own user-level command, because of #line. +@catcode`@& = @other @def@normalamp{&} +@catcode`@# = @other @def@normalhash{#} +@catcode`@% = @other @def@normalpercent{%} + +@let @hashchar = @normalhash @c Finally, make ` and ' active, so that txicodequoteundirected and @c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we @@ -9234,7 +10129,7 @@ directory should work if nowhere else does.} @catcode`@`=@active @markupsetuplqdefault @markupsetuprqdefault - + @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp) @c page-delimiter: "^\\\\message" diff --git a/doc/version.texi b/doc/version.texi index 6ceed952..44ecb716 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,10 +1,10 @@ @ignore -Copyright (C) 1988-2013 Free Software Foundation, Inc. +Copyright (C) 1988-2014 Free Software Foundation, Inc. @end ignore -@set LASTCHANGE Sun Oct 20 22:15:33 EDT 2013 +@set LASTCHANGE Mon Jan 6 16:46:33 EST 2014 @set EDITION 4.3 @set VERSION 4.3 -@set UPDATED 20 October 2013 -@set UPDATED-MONTH October 2013 +@set UPDATED 6 January 2014 +@set UPDATED-MONTH January 2014 @@ -340,6 +340,36 @@ parser_error (lineno, format, va_alist) } #ifdef DEBUG +/* This assumes ASCII and is suitable only for debugging */ +char * +strescape (str) + const char *str; +{ + char *r, *result; + unsigned char *s; + + r = result = (char *)xmalloc (strlen (str) * 2 + 1); + + for (s = (unsigned char *)str; s && *s; s++) + { + if (*s < ' ') + { + *r++ = '^'; + *r++ = *s+64; + } + else if (*s == 127) + { + *r++ = '^'; + *r++ = '?'; + } + else + *r++ = *s; + } + + *r = '\0'; + return result; +} + void #if defined (PREFER_STDARG) itrace (const char *format, ...) @@ -51,6 +51,7 @@ extern void internal_error __P((const char *, ...)) __attribute__((__format__ ( extern void internal_warning __P((const char *, ...)) __attribute__((__format__ (printf, 1, 2))); /* Debugging functions, not enabled in released version. */ +extern char *strescape __P((const char *)); extern void itrace __P((const char *, ...)) __attribute__ ((__format__ (printf, 1, 2))); extern void trace __P((const char *, ...)) __attribute__ ((__format__ (printf, 1, 2))); diff --git a/execute_cmd.c b/execute_cmd.c index c08416d3..72da7a5b 100644 --- a/execute_cmd.c +++ b/execute_cmd.c @@ -675,6 +675,9 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out, run_pending_traps (); + /* Posix 2013 2.9.3.1: "the exit status of an asynchronous list + shall be zero." */ + last_command_exit_value = 0; return (EXECUTION_SUCCESS); } } @@ -2596,6 +2599,7 @@ execute_for_command (for_command) loop_level++; identifier = for_command->name->word; + line_number = for_command->line; /* for expansion error messages */ list = releaser = expand_words_no_vars (for_command->map_list); begin_unwind_frame ("for"); @@ -3500,6 +3504,9 @@ execute_cond_node (cond) { int result, invert, patmatch, rmatch, mflags, ignore; char *arg1, *arg2; +#if 0 + char *t1, *t2; +#endif invert = (cond->flags & CMD_INVERT_RETURN); ignore = (cond->flags & CMD_IGNORE_RETURN); @@ -3578,6 +3585,14 @@ execute_cond_node (cond) mflags |= SHMAT_SUBEXP; #endif +#if 0 + t1 = strescape(arg1); + t2 = strescape(arg2); + itrace("execute_cond_node: sh_regmatch on `%s' and `%s'", t1, t2); + free(t1); + free(t2); +#endif + result = sh_regmatch (arg1, arg2, mflags); } else @@ -4794,10 +4809,15 @@ setup_async_signals () if (job_control == 0) #endif { + /* Make sure we get the original signal dispositions now so we don't + confuse the trap builtin later if the subshell tries to use it to + reset SIGINT/SIGQUIT. Don't call set_signal_ignored; that sets + the value of original_signals to SIG_IGN. Posix interpretation 751. */ + get_original_signal (SIGINT); set_signal_handler (SIGINT, SIG_IGN); - set_signal_ignored (SIGINT); + + get_original_signal (SIGQUIT); set_signal_handler (SIGQUIT, SIG_IGN); - set_signal_ignored (SIGQUIT); } } @@ -839,7 +839,9 @@ exp2 () (curtok == MOD)) { int op = curtok; + char *stp, *sltp; + stp = tp; readtok (); val2 = exppower (); @@ -848,7 +850,14 @@ exp2 () if (((op == DIV) || (op == MOD)) && (val2 == 0)) { if (noeval == 0) - evalerror (_("division by 0")); + { + sltp = lasttp; + lasttp = stp; + while (lasttp && *lasttp && whitespace (*lasttp)) + lasttp++; + evalerror (_("division by 0")); + lasttp = sltp; + } else val2 = 1; } @@ -111,6 +111,10 @@ extern int parser_in_command_position __P((void)); extern void free_pushed_string_input __P((void)); +extern int parser_expanding_alias __P((void)); +extern void parser_save_alias __P((void)); +extern void parser_restore_alias __P((void)); + extern char *decode_prompt_string __P((char *)); extern int get_current_prompt_level __P((void)); @@ -230,6 +234,7 @@ extern int input_avail __P((int)); /* Declarations for functions defined in lib/sh/itos.c */ extern char *inttostr __P((intmax_t, char *, size_t)); extern char *itos __P((intmax_t)); +extern char *mitos __P((intmax_t)); extern char *uinttostr __P((uintmax_t, char *, size_t)); extern char *uitos __P((uintmax_t)); @@ -378,6 +383,8 @@ extern void strlist_sort __P((STRINGLIST *)); extern char **strvec_create __P((int)); extern char **strvec_resize __P((char **, int)); +extern char **strvec_mcreate __P((int)); +extern char **strvec_mresize __P((char **, int)); extern void strvec_flush __P((char **)); extern void strvec_dispose __P((char **)); extern int strvec_remove __P((char **, char *)); @@ -889,7 +889,9 @@ delete_old_job (pid) delete_job (job, DEL_NOBGPID); else { - internal_warning (_("forked pid %d appears in running job %d"), pid, job); +#ifdef DEBUG + internal_warning (_("forked pid %d appears in running job %d"), pid, job+1); +#endif if (p) p->pid = 0; } @@ -3352,7 +3354,7 @@ itrace("waitchld: waitpid returns %d block = %d", pid, block); else if (running_trap) queue_sigchld_trap (children_exited); else if (this_shell_builtin == wait_builtin) - run_sigchld_trap (children_exited); + run_sigchld_trap (children_exited); /* XXX */ else queue_sigchld_trap (children_exited); } diff --git a/lib/readline/display.c b/lib/readline/display.c index 8f04b3a2..913e0da0 100644 --- a/lib/readline/display.c +++ b/lib/readline/display.c @@ -748,10 +748,9 @@ rl_redisplay () /* Now account for invisible characters in the current line. */ /* XXX - this assumes that the invisible characters may be split, but only between the first and the last lines. */ - temp += ((local_prompt_prefix == 0) ? ((newlines == 0) ? prompt_invis_chars_first_line - : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line)) - : ((newlines == 0) ? wrap_offset : 0)); - + temp += (newlines == 0) ? prompt_invis_chars_first_line + : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line); + inv_lbreaks[++newlines] = temp; #if defined (HANDLE_MULTIBYTE) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0 && prompt_multibyte_chars > 0) diff --git a/lib/readline/doc/history.texi b/lib/readline/doc/history.texi index afbb6db6..a991fe5b 100644 --- a/lib/readline/doc/history.texi +++ b/lib/readline/doc/history.texi @@ -12,7 +12,7 @@ This document describes the GNU History library a programming tool that provides a consistent user interface for recalling lines of previously typed input. -Copyright @copyright{} 1988--2012 Free Software Foundation, Inc. +Copyright @copyright{} 1988--2014 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/lib/readline/doc/hstech.texi b/lib/readline/doc/hstech.texi index a87974bc..6487f20b 100644 --- a/lib/readline/doc/hstech.texi +++ b/lib/readline/doc/hstech.texi @@ -1,7 +1,7 @@ @ignore This file documents the user interface to the GNU History library. -Copyright (C) 1988-2012 Free Software Foundation, Inc. +Copyright (C) 1988-2014 Free Software Foundation, Inc. Authored by Brian Fox and Chet Ramey. Permission is granted to make and distribute verbatim copies of this manual diff --git a/lib/readline/doc/hsuser.texi b/lib/readline/doc/hsuser.texi index c398787b..69a50163 100644 --- a/lib/readline/doc/hsuser.texi +++ b/lib/readline/doc/hsuser.texi @@ -1,7 +1,7 @@ @ignore This file documents the user interface to the GNU History library. -Copyright (C) 1988--2012 Free Software Foundation, Inc. +Copyright (C) 1988--2014 Free Software Foundation, Inc. Authored by Brian Fox and Chet Ramey. Permission is granted to make and distribute verbatim copies of this manual diff --git a/lib/readline/doc/rlman.texi b/lib/readline/doc/rlman.texi index 7dc9611b..17a8292b 100644 --- a/lib/readline/doc/rlman.texi +++ b/lib/readline/doc/rlman.texi @@ -13,7 +13,7 @@ This manual describes the GNU Readline Library consistency of user interface across discrete programs which provide a command line interface. -Copyright @copyright{} 1988--2012 Free Software Foundation, Inc. +Copyright @copyright{} 1988--2014 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/lib/readline/doc/rltech.texi b/lib/readline/doc/rltech.texi index 5bfde171..178296be 100644 --- a/lib/readline/doc/rltech.texi +++ b/lib/readline/doc/rltech.texi @@ -7,7 +7,7 @@ This document describes the GNU Readline Library, a utility for aiding in the consistency of user interface across discrete programs that need to provide a command line interface. -Copyright (C) 1988--2012 Free Software Foundation, Inc. +Copyright (C) 1988--2014 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff --git a/lib/readline/doc/rluser.texi b/lib/readline/doc/rluser.texi index 1b5654f8..9c915242 100644 --- a/lib/readline/doc/rluser.texi +++ b/lib/readline/doc/rluser.texi @@ -9,7 +9,7 @@ use these features. There is a document entitled "readline.texinfo" which contains both end-user and programmer documentation for the GNU Readline Library. -Copyright (C) 1988--2012 Free Software Foundation, Inc. +Copyright (C) 1988--2014 Free Software Foundation, Inc. Authored by Brian Fox and Chet Ramey. @@ -1189,11 +1189,17 @@ as if the @samp{!$} history expansion had been specified. @subsection Commands For Changing Text @ftable @code + +@item @i{end-of-file} (usually C-d) +The character indicating end-of-file as set, for example, by +@code{stty}. If this character is read when there are no characters +on the line, and point is at the beginning of the line, Readline +interprets it as the end of input and returns @sc{eof}. + @item delete-char (C-d) -Delete the character at point. If point is at the -beginning of the line, there are no characters in the line, and -the last character typed was not bound to @code{delete-char}, then -return @sc{eof}. +Delete the character at point. If this function is bound to the +same character as the tty @sc{eof} character, as @kbd{C-d} +commonly is, see above for the effects. @item backward-delete-char (Rubout) Delete the character behind the cursor. A numeric argument means diff --git a/lib/readline/doc/rluserman.texi b/lib/readline/doc/rluserman.texi index 2281a1a9..ba6b0ad8 100644 --- a/lib/readline/doc/rluserman.texi +++ b/lib/readline/doc/rluserman.texi @@ -12,7 +12,7 @@ This manual describes the end user interface of the GNU Readline Library consistency of user interface across discrete programs which provide a command line interface. -Copyright @copyright{} 1988--2012 Free Software Foundation, Inc. +Copyright @copyright{} 1988--2014 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/lib/readline/doc/version.texi b/lib/readline/doc/version.texi index db450183..70b66582 100644 --- a/lib/readline/doc/version.texi +++ b/lib/readline/doc/version.texi @@ -1,10 +1,10 @@ @ignore -Copyright (C) 1988-2013 Free Software Foundation, Inc. +Copyright (C) 1988-2014 Free Software Foundation, Inc. @end ignore @set EDITION 6.3 @set VERSION 6.3 -@set UPDATED 26 May 2013 -@set UPDATED-MONTH May 2013 +@set UPDATED 6 January 2014 +@set UPDATED-MONTH January 2014 -@set LASTCHANGE Sat May 25 17:02:56 EDT 2013 +@set LASTCHANGE Mon Jan 6 16:26:51 EST 2014 diff --git a/lib/readline/histexpand.c b/lib/readline/histexpand.c index 6164e27c..4899b9d3 100644 --- a/lib/readline/histexpand.c +++ b/lib/readline/histexpand.c @@ -272,6 +272,8 @@ get_history_event (string, caller_index, delimiting_quote) if (local_index == 0 || substring_okay) { entry = current_history (); + if (entry == 0) + FAIL_SEARCH (); history_offset = history_length; /* If this was a substring search, then remember the diff --git a/lib/readline/parse-colors.c b/lib/readline/parse-colors.c index 06eb25ac..98b2e9d1 100644 --- a/lib/readline/parse-colors.c +++ b/lib/readline/parse-colors.c @@ -283,7 +283,9 @@ get_funky_string (char **dest, const char **src, bool equals_end, size_t *output default: /* should we ? */ - abort (); + /* abort (); no, we should not */ + state = ST_ERROR; + break; } } @@ -387,7 +389,16 @@ void _rl_parse_colors() } } if (state == -1) - _rl_errmsg ("LS_COLORS: unrecognized prefix: %s", label); + { + _rl_errmsg ("LS_COLORS: unrecognized prefix: %s", label); + /* recover from an unrecognized prefix */ + while (p && *p && *p != ':') + p++; + if (p && *p == ':') + state = 1; + else if (p && *p == 0) + state = 0; + } } break; @@ -400,6 +411,9 @@ void _rl_parse_colors() } else state = -1; + /* XXX - recover here as with an unrecognized prefix? */ + if (state == -1 && ext->ext.string) + _rl_errmsg ("LS_COLORS: syntax error: %s", ext->ext.string); break; } } @@ -417,6 +431,8 @@ void _rl_parse_colors() e = e->next; free (e2); } + _rl_color_ext_list = NULL; + _rl_colored_stats = 0; /* can't have colored stats without colors */ } #else /* !COLOR_SUPPORT */ ; diff --git a/lib/readline/search.c b/lib/readline/search.c index 99b9c8d3..028c2505 100644 --- a/lib/readline/search.c +++ b/lib/readline/search.c @@ -172,7 +172,8 @@ noninc_dosearch (string, dir) oldpos = where_history (); history_set_pos (noninc_history_pos); - entry = current_history (); + entry = current_history (); /* will never be NULL after successful search */ + #if defined (VI_MODE) if (rl_editing_mode != vi_mode) #endif @@ -477,7 +478,7 @@ rl_history_search_internal (count, dir) rl_history_search_pos = ret; oldpos = where_history (); history_set_pos (rl_history_search_pos); - temp = current_history (); + temp = current_history (); /* will never be NULL after successful search */ history_set_pos (oldpos); /* Don't find multiple instances of the same line. */ diff --git a/lib/readline/signals.c b/lib/readline/signals.c index d373ba14..61f02f9f 100644 --- a/lib/readline/signals.c +++ b/lib/readline/signals.c @@ -260,7 +260,7 @@ _rl_handle_signal (sig) # endif /* HAVE_BSD_SIGNALS */ #endif /* !HAVE_POSIX_SIGNALS */ - rl_reset_after_signal (); + rl_reset_after_signal (); } RL_UNSETSTATE(RL_STATE_SIGHANDLER); diff --git a/lib/readline/undo.c b/lib/readline/undo.c index 32873d27..a3d40447 100644 --- a/lib/readline/undo.c +++ b/lib/readline/undo.c @@ -178,6 +178,7 @@ rl_do_undo () { UNDO_LIST *release; int waiting_for_begin, start, end; + HIST_ENTRY *cur, *temp; #define TRANS(i) ((i) == -1 ? rl_point : ((i) == -2 ? rl_end : (i))) @@ -232,6 +233,18 @@ rl_do_undo () release = rl_undo_list; rl_undo_list = rl_undo_list->next; + + /* If we are editing a history entry, make sure the change is replicated + in the history entry's line */ + cur = current_history (); + if ((UNDO_LIST *)cur->data == release) + { + temp = replace_history_entry (where_history (), rl_line_buffer, (histdata_t)rl_undo_list); + xfree (temp->line); + FREE (temp->timestamp); + xfree (temp); + } + replace_history_data (-1, (histdata_t *)release, (histdata_t *)rl_undo_list); xfree (release); diff --git a/lib/sh/Makefile.in b/lib/sh/Makefile.in index 938c3721..36a83052 100644 --- a/lib/sh/Makefile.in +++ b/lib/sh/Makefile.in @@ -92,7 +92,7 @@ CSOURCES = clktck.c clock.c getcwd.c getenv.c oslib.c setlinebuf.c \ mktime.c strftime.c mbschr.c zcatfd.c zmapfd.c winsize.c eaccess.c \ wcsdup.c fpurge.c zgetline.c mbscmp.c uconvert.c ufuncs.c \ casemod.c dprintf.c input_avail.c mbscasecmp.c fnxform.c \ - strchrnul.c unicode.c wcswidth.c wcsnwidth.c shmbchar.c + strchrnul.c unicode.c wcswidth.c wcsnwidth.c shmbchar.c strdup.c # The header files for this library. HSOURCES = diff --git a/lib/sh/itos.c b/lib/sh/itos.c index 12e9398d..cd36ef33 100644 --- a/lib/sh/itos.c +++ b/lib/sh/itos.c @@ -50,6 +50,18 @@ itos (i) return (savestring (p)); } +/* Integer to string conversion. This conses the string using strdup; + caller should free it and be prepared to deal with NULL return. */ +char * +mitos (i) + intmax_t i; +{ + char *p, lbuf[INT_STRLEN_BOUND(intmax_t) + 1]; + + p = fmtumax (i, 10, lbuf, sizeof(lbuf), 0); + return (strdup (p)); +} + char * uinttostr (i, buf, len) uintmax_t i; diff --git a/lib/sh/strdup.c b/lib/sh/strdup.c new file mode 100644 index 00000000..90fa3532 --- /dev/null +++ b/lib/sh/strdup.c @@ -0,0 +1,42 @@ +/* strdup - return a copy of a string in newly-allocated memory. */ + +/* Copyright (C) 2013 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 <http://www.gnu.org/licenses/>. +*/ + + +#include <config.h> + +/* Get specification. */ +#include <string.h> +#include <stdlib.h> + +/* Duplicate S, returning an identical malloc'd string. */ +char * +strdup (s) + const char *s; +{ + size_t len; + void *new; + + len = strlen (s) + 1; + if ((new = malloc (len)) == NULL) + return NULL; + + memcpy (new, s, len); + return ((char *)new); +} diff --git a/lib/sh/stringvec.c b/lib/sh/stringvec.c index b0ed4164..3bb4ab70 100644 --- a/lib/sh/stringvec.c +++ b/lib/sh/stringvec.c @@ -40,6 +40,14 @@ strvec_create (n) return ((char **)xmalloc ((n) * sizeof (char *))); } +/* Allocate an array of strings with room for N members. */ +char ** +strvec_mcreate (n) + int n; +{ + return ((char **)malloc ((n) * sizeof (char *))); +} + char ** strvec_resize (array, nsize) char **array; @@ -48,6 +56,14 @@ strvec_resize (array, nsize) return ((char **)xrealloc (array, nsize * sizeof (char *))); } +char ** +strvec_mresize (array, nsize) + char **array; + int nsize; +{ + return ((char **)realloc (array, nsize * sizeof (char *))); +} + /* Return the length of ARRAY, a NULL terminated array of char *. */ int strvec_len (array) @@ -1792,6 +1792,10 @@ restore_token_state (ts) * implement alias expansion on a per-token basis. */ +#define PSH_ALIAS 0x01 +#define PSH_DPAREN 0x02 +#define PSH_SOURCE 0x04 + typedef struct string_saver { struct string_saver *next; int expand_alias; /* Value to set expand_alias to when string is popped. */ @@ -1801,6 +1805,7 @@ typedef struct string_saver { #endif size_t saved_line_size, saved_line_index; int saved_line_terminator; + int flags; } STRING_SAVER; STRING_SAVER *pushed_string_list = (STRING_SAVER *)NULL; @@ -1826,8 +1831,11 @@ push_string (s, expand, ap) temp->saved_line_size = shell_input_line_size; temp->saved_line_index = shell_input_line_index; temp->saved_line_terminator = shell_input_line_terminator; + temp->flags = 0; #if defined (ALIAS) temp->expander = ap; + if (ap) + temp->flags = PSH_ALIAS; #endif temp->next = pushed_string_list; pushed_string_list = temp; @@ -1838,7 +1846,7 @@ push_string (s, expand, ap) #endif shell_input_line = s; - shell_input_line_size = strlen (s); + shell_input_line_size = STRLEN (s); shell_input_line_index = 0; shell_input_line_terminator = '\0'; #if 0 @@ -1912,6 +1920,34 @@ free_pushed_string_input () #endif } +int +parser_expanding_alias () +{ + return (expanding_alias ()); +} + +void +parser_save_alias () +{ +#if defined (ALIAS) || defined (DPAREN_ARITHMETIC) + push_string ((char *)NULL, 0, (alias_t *)NULL); + pushed_string_list->flags = PSH_SOURCE; /* XXX - for now */ +#else + ; +#endif +} + +void +parser_restore_alias () +{ +#if defined (ALIAS) || defined (DPAREN_ARITHMETIC) + if (pushed_string_list) + pop_string (); +#else + ; +#endif +} + /* Return a line of text, taken from wherever yylex () reads input. If there is no more input, then we return NULL. If REMOVE_QUOTED_NEWLINE is non-zero, we remove unquoted \<newline> pairs. This is used by @@ -2406,8 +2442,13 @@ next_alias_char: because we have fully consumed the result of the last alias expansion. Do it transparently; just return the next character of the string popped to. */ + /* If pushed_string_list != 0 but pushed_string_list->expander == 0 (not + currently tested) and the flags value is not PSH_SOURCE, we are not + parsing an alias, we have just saved one (push_string, when called by + the parse_dparen code) In this case, just go on as well. The PSH_SOURCE + case is handled below. */ pop_alias: - if (uc == 0 && (pushed_string_list != (STRING_SAVER *)NULL)) + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) { pop_string (); uc = shell_input_line[shell_input_line_index]; @@ -2447,6 +2488,28 @@ pop_alias: if (uc == 0 && shell_input_line_terminator == EOF) return ((shell_input_line_index != 0) ? '\n' : EOF); +#if defined (ALIAS) || defined (DPAREN_ARITHMETIC) + /* We already know that we are not parsing an alias expansion because of the + check for expanding_alias() above. This knows how parse_and_execute + handles switching to st_string input while an alias is being expanded, + hence the check for pushed_string_list without pushed_string_list->expander + and the check for PSH_SOURCE as pushed_string_list->flags. + parse_and_execute and parse_string both change the input type to st_string + and place the string to be parsed and executed into location.string, so + we should not stop reading that until the pointer is '\0'. + The check for shell_input_line_terminator may be superfluous. + + This solves the problem of `.' inside a multi-line alias with embedded + newlines executing things out of order. */ + if (uc == 0 && bash_input.type == st_string && *bash_input.location.string && + pushed_string_list && pushed_string_list->flags == PSH_SOURCE && + shell_input_line_terminator == 0) + { + shell_input_line_index = 0; + goto restart_read; + } +#endif + return (uc); } @@ -4022,6 +4085,7 @@ parse_dparen (c) else if (cmdtyp == 0) /* nested subshell */ { push_string (wval, 0, (alias_t *)NULL); + pushed_string_list->flags = PSH_DPAREN; if ((parser_state & PST_CASEPAT) == 0) parser_state |= PST_SUBSHELL; return (c); @@ -1,6 +1,6 @@ /* pathexp.c -- The shell interface to the globbing library. */ -/* Copyright (C) 1995-2009 Free Software Foundation, Inc. +/* Copyright (C) 1995-2014 Free Software Foundation, Inc. This file is part of GNU Bash, the Bourne Again SHell. @@ -185,7 +185,7 @@ quote_string_for_globbing (pathname, qflags) register int i, j; int brack, cclass, collsym, equiv, c; - temp = (char *)xmalloc (strlen (pathname) + 1); + temp = (char *)xmalloc (2 * strlen (pathname) + 1); if ((qflags & QGLOB_CVTNULL) && QUOTED_NULL (pathname)) { @@ -196,7 +196,13 @@ quote_string_for_globbing (pathname, qflags) brack = cclass = collsym = equiv = 0; for (i = j = 0; pathname[i]; i++) { - if (pathname[i] == CTLESC) + /* Fix for CTLESC at the end of the string? */ + if (pathname[i] == CTLESC && pathname[i+1] == '\0') + { + temp[j++] = pathname[i++]; + break; + } + else if (pathname[i] == CTLESC) { if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') continue; @@ -274,10 +280,18 @@ quote_string_for_globbing (pathname, qflags) } else if (pathname[i] == '\\') { + /* If we want to pass through backslash unaltered, comment out these + lines. */ temp[j++] = '\\'; - i++; - if (pathname[i] == '\0') - break; + /* XXX - if not quoting regexp, use backslash as quote char. Should + we just pass it through without treating it as special? That is + what ksh93 seems to do. */ + if ((qflags & QGLOB_REGEXP) == 0) + { + i++; + if (pathname[i] == '\0') + break; + } } temp[j++] = pathname[i]; } Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2004-03-17 13:48+0200\n" "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n" "Language-Team: Afrikaans <i18n@af.org.za>\n" @@ -20,7 +20,7 @@ msgstr "" msgid "bad array subscript" msgstr "Os/2 Biskaart Skikking" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -64,6 +64,21 @@ msgstr "" msgid "%s: missing colon separator" msgstr "" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -187,7 +202,7 @@ msgstr "Die sein nommer wat was gevang het" msgid "invalid hex number" msgstr "Die sein nommer wat was gevang het" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 #, fuzzy msgid "invalid number" msgstr "Die sein nommer wat was gevang het" @@ -202,7 +217,7 @@ msgstr "" msgid "`%s': not a pid or valid job spec" msgstr "" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, fuzzy, c-format msgid "%s: readonly variable" msgstr "Veranderlike boom" @@ -306,7 +321,7 @@ msgstr "" msgid "can only be used in a function" msgstr "" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -316,21 +331,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: leesalleen-funksie" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, fuzzy, c-format msgid "%s: cannot destroy array variables in this way" msgstr "Kan nie soek 'n handtekening in hierdie boodskap!" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -359,7 +374,7 @@ msgstr "" msgid "%s: cannot delete: %s" msgstr "%s: kan nie %s skep nie" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -577,6 +592,11 @@ msgstr "" msgid "warning: %s: %s" msgstr "" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "" @@ -834,27 +854,27 @@ msgstr "Bevelreël" msgid "Aborting..." msgstr "" -#: error.c:410 +#: error.c:440 #, fuzzy msgid "unknown command error" msgstr "Onbekende fout %d" -#: error.c:411 +#: error.c:441 #, fuzzy msgid "bad command type" msgstr "bevelnaam" -#: error.c:412 +#: error.c:442 #, fuzzy msgid "bad connector" msgstr "foutiewe verbinder`%d'" -#: error.c:413 +#: error.c:443 #, fuzzy msgid "bad jump" msgstr "Spring na:" -#: error.c:451 +#: error.c:481 #, fuzzy, c-format msgid "%s: unbound variable" msgstr "Veranderlike boom" @@ -869,52 +889,52 @@ msgstr "" msgid "cannot redirect standard input from /dev/null: %s" msgstr "" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "pypfout: %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: bevel nie gevind nie" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, fuzzy, c-format msgid "%s: %s: bad interpreter" msgstr "%s: is 'n gids" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: kan nie 'n binêre lêer uitvoer nie" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, fuzzy, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "kan nie fd %d na fd 0 dupliseer nie: %s" @@ -937,7 +957,7 @@ msgstr "Sintaks fout in patroon" msgid "attempted assignment to non-variable" msgstr "" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 #, fuzzy msgid "division by 0" msgstr "devisie by nul." @@ -951,44 +971,44 @@ msgstr "" msgid "`:' expected for conditional expression" msgstr "Soek die lêer vir 'n uitdrukking" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 #, fuzzy msgid "missing `)'" msgstr "Ontbrekende '>'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 #, fuzzy msgid "syntax error: operand expected" msgstr "Onverwagte einde van lêer tydens inlees van hulpbron." -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "" -#: expr.c:1407 +#: expr.c:1416 #, fuzzy, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "" "Hierdie is die fout boodskap van %1:\n" "%2" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "waarde te groot vir basis" -#: expr.c:1534 +#: expr.c:1543 #, fuzzy, c-format msgid "%s: expression error\n" msgstr "%s: heelgetal-uitdrukking is verwag\n" @@ -998,7 +1018,7 @@ msgstr "%s: heelgetal-uitdrukking is verwag\n" msgid "getcwd: cannot access parent directories" msgstr "Kan nie die program uitvoer nie:" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, fuzzy, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "kan nie fd %d na fd 0 dupliseer nie: %s" @@ -1017,148 +1037,148 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, fuzzy, c-format msgid "describe_pid: %ld: no such pid" msgstr "E108: Geen veranderlike: \"%s\"" -#: jobs.c:1448 +#: jobs.c:1450 #, fuzzy, c-format msgid "Signal %d" msgstr "Sein kwaliteit:" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Klaar" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 #, fuzzy msgid "Stopped" msgstr "Op gehou" -#: jobs.c:1471 +#: jobs.c:1473 #, fuzzy, c-format msgid "Stopped(%s)" msgstr "Op gehou" -#: jobs.c:1475 +#: jobs.c:1477 #, fuzzy msgid "Running" msgstr "aktief" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Klaar(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Verlaat %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Onbekende status" -#: jobs.c:1581 +#: jobs.c:1583 #, fuzzy, c-format msgid "(core dumped) " msgstr "Kern Ontwikkelaar" -#: jobs.c:1600 +#: jobs.c:1602 #, fuzzy, c-format msgid " (wd: %s)" msgstr "Aktiveer nou dadelik" -#: jobs.c:1817 +#: jobs.c:1819 #, fuzzy, c-format msgid "child setpgid (%ld to %ld)" msgstr "Fout in die skryf van %s" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "" -#: jobs.c:2984 +#: jobs.c:2986 #, fuzzy, c-format msgid "%s: job has terminated" msgstr "Die bediener beëindig Die verbinding." -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, fuzzy, c-format msgid "%s: line %d: " msgstr "3d modus" -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, fuzzy, c-format msgid " (core dumped)" msgstr "Kern Ontwikkelaar" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, fuzzy, c-format msgid "(wd now: %s)\n" msgstr "Aktiveer nou dadelik" -#: jobs.c:3780 +#: jobs.c:3782 #, fuzzy msgid "initialize_job_control: getpgrp failed" msgstr "Inisialisering van OpenGL het misluk." -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 #, fuzzy msgid "initialize_job_control: setpgid" msgstr "Inisialisering van OpenGL het misluk." -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "geen taakbeheer in hierdie dop nie" @@ -1314,103 +1334,103 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "" -#: parse.y:4108 +#: parse.y:4172 #, fuzzy msgid "syntax error in conditional expression" msgstr "Sintaks fout in patroon" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "" -#: parse.y:4190 +#: parse.y:4254 #, fuzzy msgid "expected `)'" msgstr "')' is verwag\n" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, fuzzy, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "%s: binêre operator is verwag\n" -#: parse.y:4272 +#: parse.y:4336 #, fuzzy msgid "conditional binary operator expected" msgstr "%s: binêre operator is verwag\n" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, fuzzy, c-format msgid "unexpected token `%c' in conditional command" msgstr "Soek die lêer vir 'n uitdrukking" -#: parse.y:4312 +#: parse.y:4376 #, fuzzy, c-format msgid "unexpected token `%s' in conditional command" msgstr "Soek die lêer vir 'n uitdrukking" -#: parse.y:4316 +#: parse.y:4380 #, fuzzy, c-format msgid "unexpected token %d in conditional command" msgstr "Soek die lêer vir 'n uitdrukking" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "" -#: parse.y:5684 +#: parse.y:5748 #, fuzzy, c-format msgid "syntax error near `%s'" msgstr "Sintaks fout in patroon" -#: parse.y:5694 +#: parse.y:5758 #, fuzzy msgid "syntax error: unexpected end of file" msgstr "Onverwagte einde van lêer tydens inlees van hulpbron." -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "sintaksfout" -#: parse.y:5756 +#: parse.y:5820 #, fuzzy, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Gebruik Kaart na Los Tronk" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "" @@ -1551,7 +1571,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "" @@ -1757,92 +1777,92 @@ msgstr "Sein kwaliteit:" msgid "Unknown Signal #%d" msgstr "Sein kwaliteit:" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, fuzzy, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "--Geen reëls in buffer--" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 #, fuzzy msgid "cannot make pipe for process substitution" msgstr "Woord Substitusie" -#: subst.c:5074 +#: subst.c:5113 #, fuzzy msgid "cannot make child for process substitution" msgstr "Woord Substitusie" -#: subst.c:5119 +#: subst.c:5158 #, fuzzy, c-format msgid "cannot open named pipe %s for reading" msgstr "Kan nie oopmaak vir skrip-afvoer nie: \"" -#: subst.c:5121 +#: subst.c:5160 #, fuzzy, c-format msgid "cannot open named pipe %s for writing" msgstr "Kan nie oopmaak vir skrip-afvoer nie: \"" -#: subst.c:5139 +#: subst.c:5178 #, fuzzy, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "Kan nie oopmaak vir skrip-afvoer nie: \"" -#: subst.c:5337 +#: subst.c:5376 #, fuzzy msgid "cannot make pipe for command substitution" msgstr "Woord Substitusie" -#: subst.c:5375 +#: subst.c:5414 #, fuzzy msgid "cannot make child for command substitution" msgstr "Woord Substitusie" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, fuzzy, c-format msgid "%s: substring expression < 0" msgstr "ongeldige uitdrukking" -#: subst.c:7457 +#: subst.c:7506 #, fuzzy, c-format msgid "%s: bad substitution" msgstr "Woord Substitusie" -#: subst.c:7534 +#: subst.c:7583 #, fuzzy, c-format msgid "$%s: cannot assign in this way" msgstr "Kan nie soek 'n handtekening in hierdie boodskap!" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, fuzzy, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "--Geen reëls in buffer--" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "" @@ -1887,18 +1907,18 @@ msgstr "Ontbrekende '>'" msgid "invalid signal number" msgstr "Die sein nommer wat was gevang het" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "" @@ -1927,48 +1947,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "Kan nie soek 'n handtekening in hierdie boodskap!" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: kan nie %s skep nie" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "" diff --git a/po/bash.pot b/po/bash.pot index 05af64c9..0420adec 100644 --- a/po/bash.pot +++ b/po/bash.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -22,7 +22,7 @@ msgstr "" msgid "bad array subscript" msgstr "" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -66,6 +66,21 @@ msgstr "" msgid "%s: missing colon separator" msgstr "" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -185,7 +200,7 @@ msgstr "" msgid "invalid hex number" msgstr "" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "" @@ -199,7 +214,7 @@ msgstr "" msgid "`%s': not a pid or valid job spec" msgstr "" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "" @@ -298,7 +313,7 @@ msgstr "" msgid "can only be used in a function" msgstr "" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -308,21 +323,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -351,7 +366,7 @@ msgstr "" msgid "%s: cannot delete: %s" msgstr "" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -565,6 +580,11 @@ msgstr "" msgid "warning: %s: %s" msgstr "" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "" @@ -815,23 +835,23 @@ msgstr "" msgid "Aborting..." msgstr "" -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "" @@ -846,51 +866,51 @@ msgstr "" msgid "cannot redirect standard input from /dev/null: %s" msgstr "" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "" @@ -911,7 +931,7 @@ msgstr "" msgid "attempted assignment to non-variable" msgstr "" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "" @@ -923,40 +943,40 @@ msgstr "" msgid "`:' expected for conditional expression" msgstr "" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "" @@ -965,7 +985,7 @@ msgstr "" msgid "getcwd: cannot access parent directories" msgstr "" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "" @@ -984,144 +1004,144 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr "" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "" -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr "" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "" @@ -1272,99 +1292,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "" @@ -1500,7 +1520,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "" @@ -1674,88 +1694,88 @@ msgstr "" msgid "Unknown Signal #%d" msgstr "" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "" @@ -1796,18 +1816,18 @@ msgstr "" msgid "invalid signal number" msgstr "" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "" @@ -1836,48 +1856,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2007-07-26 07:18+0300\n" "Last-Translator: Alexander Shopov <ash@contact.bg>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "bad array subscript" msgstr "неправилен Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° маÑив" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -67,6 +67,21 @@ msgstr "в %2$s липÑва затварÑщ знак „%1$c“" msgid "%s: missing colon separator" msgstr "%s: разделителÑÑ‚ двоеточие липÑва" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "неправилен номер на Ñигнал" msgid "invalid hex number" msgstr "грешно чиÑло" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "грешно чиÑло" @@ -203,7 +218,7 @@ msgstr "%s: грешно указване на Ñигнал" msgid "`%s': not a pid or valid job spec" msgstr "„%s“: неправилен идентификатор на Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð¸Ð»Ð¸ задача" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: променлива Ñ Ð¿Ñ€Ð°Ð²Ð° Ñамо за четене" @@ -302,7 +317,7 @@ msgstr "" msgid "can only be used in a function" msgstr "може да Ñе използва Ñамо във функциÑ" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -312,21 +327,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "„-f“ не може да Ñе използва за Ñъздаването на функции" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ñ Ð¿Ñ€Ð°Ð²Ð° Ñамо за четене" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: променливите за маÑиви не могат да Ñе унищожават така" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -355,7 +370,7 @@ msgstr "%s: не е зареден динамично" msgid "%s: cannot delete: %s" msgstr "%s: не може да Ñе изтрие: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -581,6 +596,11 @@ msgstr "„%c“: грешен форматиращ знак" msgid "warning: %s: %s" msgstr "%s: предупреждение: " +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "липÑва шеÑтнадеÑетична цифра за \\x" @@ -896,23 +916,23 @@ msgstr "поÑледна команда: %s\n" msgid "Aborting..." msgstr "ПреуÑтановÑване…" -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "неизвеÑтна грешка в команда" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "неправилен вид команда" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "лоша връзка" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "неправилен преход" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: променлива без ÑтойноÑÑ‚" @@ -929,53 +949,53 @@ msgstr "" msgid "cannot redirect standard input from /dev/null: %s" msgstr "ÑтандартниÑÑ‚ вход от /dev/null не може да бъде пренаÑочен: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "в променливата $TIMEFORMAT: „%c“: грешен форматиращ знак" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "грешка при запиÑ: %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "" "%s: ограничение: в имената на командите не може да приÑÑŠÑтва знакът „/“" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: командата не е открита" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, fuzzy, c-format msgid "%s: %s" msgstr "%s е %s\n" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: лош интерпретатор" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: двоичниÑÑ‚ файл не може да бъде изпълнен" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s е вградена команда в обвивката\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "файловиÑÑ‚ деÑкриптор %d не може да Ñе дублира като деÑкриптор %d" @@ -996,7 +1016,7 @@ msgstr "Ñинтактична грешка в израз" msgid "attempted assignment to non-variable" msgstr "опит за приÑвоÑване на ÑтойноÑÑ‚ на нещо, което не е променлива" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "деление на 0" @@ -1008,41 +1028,41 @@ msgstr "програмна грешка: неправилна лекÑема зРmsgid "`:' expected for conditional expression" msgstr "за уÑловен израз Ñе изиÑква „:“" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "Ñтепента е по-малка от 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "очаква Ñе идентификатор Ñлед предварително увеличаване или намалÑване" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "липÑва „)“" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "Ñинтактична грешка: очаква Ñе оператор" -#: expr.c:1383 +#: expr.c:1392 #, fuzzy msgid "syntax error: invalid arithmetic operator" msgstr "Ñинтактична грешка: изиÑква Ñе аритметичен израз" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "грешна аритметична оÑнова на бройна ÑиÑтема" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "ÑтойноÑтта е прекалено голÑма за оÑновата" -#: expr.c:1534 +#: expr.c:1543 #, fuzzy, c-format msgid "%s: expression error\n" msgstr "%s: очаква Ñе целочиÑлен израз" @@ -1051,7 +1071,7 @@ msgstr "%s: очаква Ñе целочиÑлен израз" msgid "getcwd: cannot access parent directories" msgstr "getcwd: родителÑките директории не могат да бъдат доÑтъпени" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "не може да Ñе изчиÑти режимът без забавÑне на Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸Ñ Ð´ÐµÑкриптор %d" @@ -1073,145 +1093,145 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "изтриване на ÑпрÑната задача %d в групата процеÑи %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "" "опиÑателен идентификатор на процеÑ: %ld: нÑма такъв идентификатор на процеÑ" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr "" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "изчакване: процеÑÑŠÑ‚ Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ %ld не е дъщерен на тази обвивка" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "изчакване: липÑват данни за Ð¿Ñ€Ð¾Ñ†ÐµÑ Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "изчакване на задача: задачата %d е ÑпрÑна" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: задачата е приключила" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: задача %d вече е във фонов режим" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, fuzzy, c-format msgid "%s: line %d: " msgstr "%s: предупреждение: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr "" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "в тази обвивка нÑма управление на задачите" @@ -1374,100 +1394,100 @@ msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" "пренаÑочване: инÑтрукциÑта за пренаÑочване „%d“ е извън допуÑÑ‚Ð¸Ð¼Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "" "неочакван знак за край на файл „EOF“, а Ñе очакваше ÑъответÑтващ знак „%c“" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "неочакван знак за край на файл „EOF“, а Ñе очакваше „]]“" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "Ñинтактична грешка в уÑловен израз: неочаквана лекÑема „%s“" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "Ñинтактична грешка в уÑловен израз" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "неочаквана лекÑема „%s“, а Ñе очакваше знакът „)“" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "очакваше Ñе „)“" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "неочакван аргумент „%s“ за унарен уÑловен оператор" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "неочакван аргумент за унарен уÑловен оператор" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "неочаквана лекÑема „%s“, очакваше Ñе бинарен уÑловен оператор" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "очакваше Ñе бинарен уÑловен оператор" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "неочакван аргумент „%s“ за бинарен уÑловен оператор" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "неочакван аргумент за бинарен уÑловен оператор" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "неочаквана лекÑема „%c“ в уÑловна команда" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "неочаквана лекÑема „%s“ в уÑловна команда" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "неочаквана лекÑема %d в уÑловна команда" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "Ñинтактична грешка в близоÑÑ‚ до неочакваната лекÑема „%s“" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "Ñинтактична грешка в близоÑÑ‚ до „%s“" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "Ñинтактична грешка: неочакван край на файл" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "Ñинтактична грешка" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Използвайте „%s“, за да излезете от обвивката.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "неочакван знак за край на файл „EOF“, очакваше Ñе знакът „)“" @@ -1611,7 +1631,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "За да докладвате грешки използвайте командата „bashbug“.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "маÑка за обработката на Ñигнали: %d: невалидна операциÑ" @@ -1787,90 +1807,90 @@ msgstr "" msgid "Unknown Signal #%d" msgstr "" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "лошо замеÑтване: липÑва затварÑщ знак „%s“ в %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: на член от маÑив не може да Ñе приÑвои ÑпиÑък" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "не може да Ñе Ñъздаде програмен канал за замеÑтване на процеÑи" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "не може да Ñе Ñъздаде дъщерен Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð° замеÑтване на процеÑи" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "именуваниÑÑ‚ програмен канал %s не може да Ñе отвори за четене" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "именуваниÑÑ‚ програмен канал %s не може да Ñе отвори за запиÑ" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" "именуваниÑÑ‚ програмен канал %s не може да Ñе\n" "дублира като Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸Ñ Ð´ÐµÑкриптор %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "не може да Ñе Ñъздаде програмен канал за замеÑтване на команди" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "не може да Ñе Ñъздаде дъщерен Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð° замеÑтване на команди" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "замеÑтване на команди: каналът не може да Ñе дублира като fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%d: грешен файлов деÑкриптор: %s" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: аргументът е null или не е зададен" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: изразът от подниза е < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: лошо замеÑтване" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: не може да Ñе задава по този начин" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, fuzzy, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "лошо замеÑтване: липÑва затварÑщ знак „%s“ в %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "нÑма Ñъвпадение: %s" @@ -1911,13 +1931,13 @@ msgstr "липÑва „]“" msgid "invalid signal number" msgstr "неправилен номер на Ñигнал" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" "Ñтартиране на предÑтоÑщите капани: неправилна ÑтойноÑÑ‚ в trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1925,7 +1945,7 @@ msgstr "" "Ñтартиране на предÑтоÑщите капани: обработката на Ñигнали е SIG_DFL.\n" "%d (%s) е преизпратено на текущата обвивка" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "обработка на капани: неправилен Ñигнал %d" @@ -1957,58 +1977,58 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: на член от маÑив не може да Ñе приÑвои ÑпиÑък" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" "вÑички локални променливи: липÑва контекÑÑ‚ на Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð² текущата облаÑÑ‚ на\n" "видимоÑÑ‚" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: аргументът е null или не е зададен" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "неправилен знак на Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %d в низа за изнаÑÑне за %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "липÑва „=“ в низа за изнаÑÑне за %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "изваждане на контекÑÑ‚ на променливи: в началото на Ñтруктурата за променливи " "на\n" "обвивката (shell_variables) е нещо, което не е контекÑÑ‚ на функциÑ" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" "изваждане на контекÑÑ‚ на променливи: липÑва контекÑÑ‚ за глобални променливи\n" "(global_variables)" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "изваждане на облаÑÑ‚: поÑледниÑÑ‚ елемент Ñтруктурата за променливи на " "обвивката\n" "(shell_variables) не е временна облаÑÑ‚ в обкръжението" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: не може да Ñе отвори: %s" -#: variables.c:5216 +#: variables.c:5262 #, fuzzy, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%d: грешен файлов деÑкриптор: %s" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s е извън допуÑÑ‚Ð¸Ð¼Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2003-12-28 19:59+0100\n" "Last-Translator: Montxo Vicente i Sempere <montxo@alacant.com>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -20,7 +20,7 @@ msgstr "" msgid "bad array subscript" msgstr "la matriu est? mal composta" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -64,6 +64,21 @@ msgstr "" msgid "%s: missing colon separator" msgstr "" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -186,7 +201,7 @@ msgstr "n?mero inv?lid de senyal" msgid "invalid hex number" msgstr "n?mero inv?lid de senyal" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 #, fuzzy msgid "invalid number" msgstr "n?mero inv?lid de senyal" @@ -201,7 +216,7 @@ msgstr "" msgid "`%s': not a pid or valid job spec" msgstr "" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: ?s una variable nom?s de lectura" @@ -305,7 +320,7 @@ msgid "can only be used in a function" msgstr "" "servir LOCAL dins d'una funci?; a?? restringir? la magnitud visible de la" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -315,21 +330,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funci? nom?s de lectura" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, fuzzy, c-format msgid "%s: cannot destroy array variables in this way" msgstr "$%s: no es pot assignar d'aquesta manera" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -358,7 +373,7 @@ msgstr "" msgid "%s: cannot delete: %s" msgstr "%s: no es pot crear: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -575,6 +590,11 @@ msgstr "" msgid "warning: %s: %s" msgstr "" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "" @@ -834,27 +854,27 @@ msgstr "si s'escriu \"r\" s'executar? la darrera ordre." msgid "Aborting..." msgstr "" -#: error.c:410 +#: error.c:440 #, fuzzy msgid "unknown command error" msgstr "Error desconegut %d" -#: error.c:411 +#: error.c:441 #, fuzzy msgid "bad command type" msgstr "un nom d'una ordre." -#: error.c:412 +#: error.c:442 #, fuzzy msgid "bad connector" msgstr "connector inv?lid '%d'" -#: error.c:413 +#: error.c:443 #, fuzzy msgid "bad jump" msgstr "Salt incorrecte %d" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: variable sense vincle" @@ -870,52 +890,52 @@ msgstr "" msgid "cannot redirect standard input from /dev/null: %s" msgstr "" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "error del conducte: %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: restringit: no es pot especificar '/' en noms d'ordres" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: no s'ha trobat l'ordre" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, fuzzy, c-format msgid "%s: %s: bad interpreter" msgstr "%s: ?s un directori" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: no es pot executar el fitxer binari" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, fuzzy, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "" @@ -938,7 +958,7 @@ msgstr "error de sintaxi a l'expressi?" msgid "attempted assignment to non-variable" msgstr "s'ha intentat assignar una variable inexistent" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "divisi? per 0" @@ -951,41 +971,41 @@ msgstr "error de programaci?: pas incorrecte del senyal %d per a expassing()." msgid "`:' expected for conditional expression" msgstr "s'esperava ':' per a l'expressi? condicional" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "falta algun ')'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 #, fuzzy msgid "syntax error: operand expected" msgstr "error de sintaxi: s'ha arribat inesperadament a la fi del fitxer" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "" -#: expr.c:1407 +#: expr.c:1416 #, fuzzy, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s: %s: %s (la prova d'error ?s \"%s\")\n" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "valor massa gran per a la base de numeraci?" -#: expr.c:1534 +#: expr.c:1543 #, fuzzy, c-format msgid "%s: expression error\n" msgstr "%s: s'esperava una expressi? de nombre enter" @@ -995,7 +1015,7 @@ msgstr "%s: s'esperava una expressi? de nombre enter" msgid "getcwd: cannot access parent directories" msgstr "getwd: no s'ha pogut accedir als directoris pares" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, fuzzy, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "" @@ -1020,148 +1040,148 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, fuzzy, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: L'identificador de proc?s (pid) no existeix (%d)!\n" -#: jobs.c:1448 +#: jobs.c:1450 #, fuzzy, c-format msgid "Signal %d" msgstr "Senyal desconeguda #%d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Fet" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Aturat" -#: jobs.c:1471 +#: jobs.c:1473 #, fuzzy, c-format msgid "Stopped(%s)" msgstr "Aturat" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "S'est? executant" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Fet (%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Fi d'execuci? amb l'estat %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Estat desconegut" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(la imatge del nucli ha estat bolcada) " -#: jobs.c:1600 +#: jobs.c:1602 #, fuzzy, c-format msgid " (wd: %s)" msgstr "(wd ara: %s)\n" -#: jobs.c:1817 +#: jobs.c:1819 #, fuzzy, c-format msgid "child setpgid (%ld to %ld)" msgstr "error en l'execuci? de setpgid (%d a %d) en el proc?s fill %d: %s\n" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, fuzzy, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "" "wait: l'identificador del proc?s (pid) %d no ?s un fill d'aquest int?rpret" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: s'ha finalitzat la tasca" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, fuzzy, c-format msgid "%s: line %d: " msgstr "encaix %3d:" -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (bolcat de la imatge del nucli)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd ara: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 #, fuzzy msgid "initialize_job_control: getpgrp failed" msgstr "initialize_jobs: getpgrp ha fallat: %s" -#: jobs.c:3841 +#: jobs.c:3843 #, fuzzy msgid "initialize_job_control: line discipline" msgstr "initialize_jobs: disciplina de l?nia: %s" -#: jobs.c:3851 +#: jobs.c:3853 #, fuzzy msgid "initialize_job_control: setpgid" msgstr "initialize_jobs: getpgrp ha fallat: %s" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "no hi ha cap tasca de control dins d'aquest int?rpret" @@ -1315,107 +1335,107 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, fuzzy, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "" "s'ha arribat inesperadament a la fi del fitxer (EOF) mentre\n" "es buscava per '%c'" -#: parse.y:4099 +#: parse.y:4163 #, fuzzy msgid "unexpected EOF while looking for `]]'" msgstr "" "s'ha arribat inesperadament a la fi del fitxer (EOF) mentre\n" "es buscava per '%c'" -#: parse.y:4104 +#: parse.y:4168 #, fuzzy, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "hi ha un error inesperat de sintaxi prop del senyal '%s'" -#: parse.y:4108 +#: parse.y:4172 #, fuzzy msgid "syntax error in conditional expression" msgstr "error de sintaxi a l'expressi?" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "" -#: parse.y:4190 +#: parse.y:4254 #, fuzzy msgid "expected `)'" msgstr "s'esperava ')'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, fuzzy, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "%s: s'esperava un operador binari" -#: parse.y:4272 +#: parse.y:4336 #, fuzzy msgid "conditional binary operator expected" msgstr "%s: s'esperava un operador binari" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, fuzzy, c-format msgid "unexpected token `%c' in conditional command" msgstr "s'esperava ':' per a l'expressi? condicional" -#: parse.y:4312 +#: parse.y:4376 #, fuzzy, c-format msgid "unexpected token `%s' in conditional command" msgstr "s'esperava ':' per a l'expressi? condicional" -#: parse.y:4316 +#: parse.y:4380 #, fuzzy, c-format msgid "unexpected token %d in conditional command" msgstr "s'esperava ':' per a l'expressi? condicional" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "hi ha un error inesperat de sintaxi prop del senyal '%s'" -#: parse.y:5684 +#: parse.y:5748 #, fuzzy, c-format msgid "syntax error near `%s'" msgstr "hi ha un error inesperat de sintaxi prop del senyal '%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "error de sintaxi: s'ha arribat inesperadament a la fi del fitxer" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "error de sintaxi" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Utilitzeu ?%s? per a eixir de l'int?rpret d'ordres.\n" -#: parse.y:5918 +#: parse.y:5982 #, fuzzy msgid "unexpected EOF while looking for matching `)'" msgstr "" @@ -1563,7 +1583,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "" @@ -1743,97 +1763,97 @@ msgstr "Senyal desconeguda #" msgid "Unknown Signal #%d" msgstr "Senyal desconeguda #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, fuzzy, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "substituci? inv?lida: no existeix '%s' en %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: no es pot assignar la llista a un element de la matriu" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 #, fuzzy msgid "cannot make pipe for process substitution" msgstr "no es pot establir un conducte per a la substituci? del proc?s: %s" -#: subst.c:5074 +#: subst.c:5113 #, fuzzy msgid "cannot make child for process substitution" msgstr "no es pot establir un proc?s fill per a la substituci? del proc?s: %s" -#: subst.c:5119 +#: subst.c:5158 #, fuzzy, c-format msgid "cannot open named pipe %s for reading" msgstr "no es pot obrir el conducte anomenat %s per a %s: %s" -#: subst.c:5121 +#: subst.c:5160 #, fuzzy, c-format msgid "cannot open named pipe %s for writing" msgstr "no es pot obrir el conducte anomenat %s per a %s: %s" -#: subst.c:5139 +#: subst.c:5178 #, fuzzy, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" "no es pot duplicar el conducte anomenat %s\n" "com a descripci? de fitxer %d: %s" -#: subst.c:5337 +#: subst.c:5376 #, fuzzy msgid "cannot make pipe for command substitution" msgstr "no es poden establir conductes per a la substituci? de l'ordre: %s" -#: subst.c:5375 +#: subst.c:5414 #, fuzzy msgid "cannot make child for command substitution" msgstr "no es pot crear un proc?s fill per a la substituci? del proc?s: %s" -#: subst.c:5394 +#: subst.c:5433 #, fuzzy msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" "command_substitute(): el coducte no es pot duplicar\n" "com a descripci? de fitxer 1: %s" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: par?metre nul o no ajustat" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: la sub-cadena de l'expressi? ?s < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: substituci? inv?lida" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: no es pot assignar d'aquesta manera" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, fuzzy, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "substituci? inv?lida: no existeix '%s' en %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "" @@ -1875,18 +1895,18 @@ msgstr "s'ha perdut algun ']'" msgid "invalid signal number" msgstr "n?mero inv?lid de senyal" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" -#: trap.c:413 +#: trap.c:428 #, fuzzy, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: Senyal inv?lida %d" @@ -1915,48 +1935,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: no es pot assignar la llista a un element de la matriu" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: par?metre nul o no ajustat" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: no es pot crear: %s" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "" Binary files differ@@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-08-18 18:04+0200\n" "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" @@ -27,7 +27,7 @@ msgstr "" msgid "bad array subscript" msgstr "chybný podskript pole" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: ÄÃslované pole nezle pÅ™evést na pole asociativnÃ" @@ -71,6 +71,21 @@ msgstr "ne zavÃrajÃcà „%c“ v %s" msgid "%s: missing colon separator" msgstr "%s: chybà dvojteÄkový oddÄ›lovaÄ" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -193,7 +208,7 @@ msgstr "neplatné osmiÄkové ÄÃslo" msgid "invalid hex number" msgstr "chybné Å¡estnáctkové ÄÃslo" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "chybné ÄÃslo" @@ -207,7 +222,7 @@ msgstr "%s: chybné urÄenà signálu" msgid "`%s': not a pid or valid job spec" msgstr "„%s“: nenà PID ani platným oznaÄenÃm úlohy" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: promÄ›nná pouze pro ÄtenÃ" @@ -306,7 +321,7 @@ msgstr "doplňovacà funkce se právÄ› nevykonává" msgid "can only be used in a function" msgstr "může být použito jen ve funkci" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: promÄ›nná s odkazem nemůže být polem" @@ -316,21 +331,21 @@ msgstr "%s: promÄ›nná s odkazem nemůže být polem" msgid "%s: nameref variable self references not allowed" msgstr "%s: promÄ›nná s odkazem na název nemůže odkazovat sama na sebe" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "„-f“ nezle použÃt na výrobu funkce" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funkce jen pro ÄtenÃ" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: takto nelze likvidovat pole" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: asociativnà pole nelze pÅ™evést na ÄÃslované pole" @@ -359,7 +374,7 @@ msgstr "%s: nenà dynamicky nahráno" msgid "%s: cannot delete: %s" msgstr "%s: nelze smazat: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -586,6 +601,11 @@ msgstr "„%c“: neplatný formátovacà znak" msgid "warning: %s: %s" msgstr "varovánÃ: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "u \\x chybà šestnáctková ÄÃslovka" @@ -892,23 +912,23 @@ msgstr "poslednà pÅ™Ãkaz: %s\n" msgid "Aborting..." msgstr "UkonÄuji…" -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "chyba neznámého pÅ™Ãkazu" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "chybný druh pÅ™Ãkazu" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "chybný konektor" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "chybný skok" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: nevázaná promÄ›nná" @@ -923,51 +943,51 @@ msgstr "\aÄasový limit pro Äekánà na vstup vyprÅ¡el: automatické odhláše msgid "cannot redirect standard input from /dev/null: %s" msgstr "standardnà vstup nelze pÅ™esmÄ›rovat z /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: „%c“: chybný formátovacà znak" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "chyba v rouÅ™e" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: maximálnà úroveň zanoÅ™enà funkcà byla pÅ™ekroÄena (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: omezeno: v názvu pÅ™Ãkazu nesmà být „/“" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: pÅ™Ãkaz nenalezen" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: chybný interpretr" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: binárnà soubor nelze spustit: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "„%s“: je zvláštnà vestavÄ›ný pÅ™Ãkaz shellu" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "deskriptor souboru %d nelze duplikovat na deskriptor %d" @@ -988,7 +1008,7 @@ msgstr "syntaktická chyba ve výrazu" msgid "attempted assignment to non-variable" msgstr "pokus o pÅ™iÅ™azenà do ne-promÄ›nné" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "dÄ›lenà nulou" @@ -1000,40 +1020,40 @@ msgstr "chyba: chybný expassing token" msgid "`:' expected for conditional expression" msgstr "v podmÃnÄ›ném výrazu oÄekávána „:“" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "mocnitel menÅ¡Ã než 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "po pÅ™ednostnÃm zvýšenà nebo snÞenà oÄekáván identifikátor" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "postrádám „)“" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "syntaktická chyba: oÄekáván operand" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "syntaktická chyba: chybný aritmetický operátor" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (chybný token je „%s“)" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "chybný aritmetický základ" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "hodnot je pro základ pÅ™ÃliÅ¡ velká" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: chyba výrazu\n" @@ -1042,7 +1062,7 @@ msgstr "%s: chyba výrazu\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: rodiÄovské adresáře nejsou pÅ™Ãstupné" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "na deskriptoru %d nelze resetovat režim nodelay" @@ -1061,146 +1081,146 @@ msgstr "save_bash_input: buffer již pro nový deskriptor %d existuje" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp roury" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "forknutý PID %d se objevil v běžÃcà úloze %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "mažu pozastavenou úlohu %d se skupinou procesů %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: proces %5ld (%s) do the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: PID %5ld (%s) oznaÄen za stále živého" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: žádný takový PID" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signál %d" # XXX: (úloha) dokonÄna. PoužÃvat ženský rod i unásledujÃcÃch. Jedná se # o výpis úloh. -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "DokonÄena" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Pozastavena" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Pozastavena (%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "BěžÃ" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "DokonÄena (%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "UkonÄena %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Stav neznámý" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core dumped [obraz pamÄ›ti uložen]) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (cwd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid na potomku (z %ld na %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: PID %ld nenà potomkem tohoto shellu" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Žádný záznam o procesu %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: úloha %d je pozastavena" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: úloha skonÄila" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: úloha %d je již na pozadÃ" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: zapÃná se WNOHANG, aby se zabránilo neurÄitému zablokovánÃ" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: řádek %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core dumped [obraz pamÄ›ti uložen])" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(cwd nynÃ: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp selhalo" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: disciplÃna linky" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "nelze nastavit skupinu procesů terminálu (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "žádná správa úloh v tomto shellu" @@ -1353,102 +1373,102 @@ msgstr "„here“ dokument na řádku %d ukonÄen koncem souboru (požadováno msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: instrukce pÅ™esmÄ›rovánà „%d“ mimo rozsah" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "neoÄekávaný konec souboru pÅ™i hledánà znaku odpovÃdajÃcÃmu „%c“" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "neoÄekávaný konec souboru pÅ™i hledánà „]]“" # XXX: Condional means condition (adj.) probably. Can English distinguish # between the condition (podmÃnkový) and the code branch (podmÃnÄ›ný)? Check # for all "conditional" string occurences. -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "chyba syntaxe ve výrazu podmÃnky: neoÄekávaný token „%s“" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "chyba syntaxe ve výrazu podmÃnky" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "neoÄekávaný token „%s“, oÄekávána „)“" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "oÄekávána „)“" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "neoÄekávaný argument „%s“ u podmÃnkového unárnÃho operátoru" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "neoÄekávaný argument u podmÃnkového unárnÃho operátoru" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "neoÄekávaný token „%s“, oÄekáván podmÃnkový binárnà operátor" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "oÄekáván podmÃnkový binárnà operátor" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "neoÄekávaný argument „%s„ u podmÃnkového binárnÃho operátoru" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "neoÄekávaný argument u podmÃnkového binárnÃho operátoru" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "neoÄekávaný token „%c“ v podmÃnkovém pÅ™Ãkazu" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "neoÄekávaný token „%s“ v podmÃnkovém pÅ™Ãkazu" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "neoÄekávaný token %d v podmÃnkovém pÅ™Ãkazu" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "chyba syntaxe poblÞ neoÄekávaného tokenu „%s“" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "chyba syntaxe poblÞ „%s“" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "chyba syntaxe: nenadálý konec souboru" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "chyba syntaxe" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Shell lze ukonÄit pÅ™Ãkazem „%s“.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "nenadálý konec souboru pÅ™i hledánà odpovÃdajÃcà „)“" @@ -1591,7 +1611,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Chyby nahlásÃte pÅ™Ãkazem „bashbug“.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: neplatná operace" @@ -1769,77 +1789,77 @@ msgstr "Neznámé ÄÃslo signálu" msgid "Unknown Signal #%d" msgstr "Neznámý signál Ä. %d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "chybná substituce: v %2$s chybà uzavÃracà „%1$s“" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: seznam nelze pÅ™iÅ™adit do prvku pole" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "nelze vyrobit rouru za úÄelem substituce procesu" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "nelze vytvoÅ™it potomka za úÄelem substituce procesu" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "pojmenovanou rouru %s nelze otevÅ™Ãt pro ÄtenÃ" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "pojmenovanou rouru %s nelze otevÅ™Ãt pro zápis" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "pojmenovanou rouru %s nelze zdvojit jako deskriptor %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "nelze vytvoÅ™it rouru pro substituci pÅ™Ãkazu" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "nelze vytvoÅ™it potomka pro substituci pÅ™Ãkazu" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: rouru nelze zdvojit jako deskriptor 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: neplatný název promÄ›nné pro odkaz na název" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametr null nebo nenastaven" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: výraz podÅ™etÄ›zce < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: chybná substituce" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: takto nelze pÅ™iÅ™azovat" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1847,12 +1867,12 @@ msgstr "" "budoucá verze tohoto shellu budou vynucovat vyhodnocenà jako aritmetickou " "substituci" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "chybná substituce: v %s chybà uzavÃracà „`“" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "žádná shoda: %s" @@ -1893,18 +1913,18 @@ msgstr "postrádám „]“" msgid "invalid signal number" msgstr "neplatné ÄÃslo signálu" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: chybná hodnota v trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "run_pending_traps: obsluha signálu je SIG_DFL, pÅ™eposÃlám %d (%s) sobÄ›" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: chybný signál %d" @@ -1933,48 +1953,48 @@ msgstr "make_local_variable: žádný kontext funkce v aktuálnÃm rozsahu" msgid "%s: variable may not be assigned value" msgstr "%s: hodnotu nelze do promÄ›nné pÅ™iÅ™adit" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: žádný kontext funkce v aktuálnÃm rozsahu" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s: má nullový exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "neplatný znak %d v exportstr pro %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "v exportstr pro %s chybà „=“" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: hlava shell_variables nenà kontextem funkce" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: chybà kontext global_variables" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: hlava shell_variables nenà doÄasným rozsahem prostÅ™edÃ" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: nelze otevÅ™Ãt jako SOUBOR" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: neplatná hodnota pro deskriptor trasovacÃho souboru" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: hodnota kompatibility je mimo rozsah" Binary files differ@@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2011-03-18 01:36+0100\n" "Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -28,7 +28,7 @@ msgstr "" msgid "bad array subscript" msgstr "ugyldigt arrayindeks" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: kan ikke konvertere indekseret til associativt array" @@ -74,6 +74,21 @@ msgstr "ingen afsluttende \"%c\" i %s" msgid "%s: missing colon separator" msgstr "%s: manglende kolonseparator" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -196,7 +211,7 @@ msgstr "ugyldigt oktaltal" msgid "invalid hex number" msgstr "ugyldigt heksadecimalt tal" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "ugyldigt tal" @@ -210,7 +225,7 @@ msgstr "%s: ugyldig signalspecifikation" msgid "`%s': not a pid or valid job spec" msgstr "\"%s\": ikke en pid eller gyldig job-spec" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: skrivebeskyttet variabel" @@ -309,7 +324,7 @@ msgstr "ikke i gang med at eksekvere fuldførelsesfunktion" msgid "can only be used in a function" msgstr "kan kun bruges i en funktion" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -319,21 +334,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "kan ikke bruge \"-f\" til at lave funktioner" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: skrivebeskyttet funktion" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: kan ikke destruere arrayvariabel pÃ¥ denne mÃ¥de" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: kan ikke konvertere associativt til indekseret array" @@ -362,7 +377,7 @@ msgstr "%s: ikke dynamisk indlæst" msgid "%s: cannot delete: %s" msgstr "%s: kan ikke slette: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -591,6 +606,11 @@ msgstr "\"%c\": ugyldigt formattegn" msgid "warning: %s: %s" msgstr "advarsel: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "manglende heksciffer for \\x" @@ -899,23 +919,23 @@ msgstr "sidste kommando: %s\n" msgid "Aborting..." msgstr "Afbryder..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "ukendt kommandofejl" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "ugyldig kommandotype" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "dÃ¥rligt mellemled" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "dÃ¥rligt hop" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: ubundet variabel" @@ -930,46 +950,46 @@ msgstr "\atidsudløb mens der ventedes pÃ¥ input: auto-logud\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "kan ikke videresende standardinput fra /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: \"%c\": ugyldigt formateringstegn" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "datakanalfejl (pipe error)" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: begrænset: kan ikke specificere \"/\" i kommandonavne" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: kommando ikke fundet" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: dÃ¥rlig fortolker" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: kan ikke eksekvere binær fil" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s er indbygget i skallen\n" @@ -983,7 +1003,7 @@ msgstr "%s er indbygget i skallen\n" # expansion. If the >(list) form is used, writing to the file will pro†# vide input for list. If the <(list) form is used, the file passed as # an argument should be read to obtain the output of list. -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "kan ikke duplikere fd %d til fd %d" @@ -1004,7 +1024,7 @@ msgstr "syntaksfejl i udtryk" msgid "attempted assignment to non-variable" msgstr "forsøgte tildeling til ikke-variabel" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "division med 0" @@ -1017,40 +1037,40 @@ msgstr "bug: dÃ¥rligt expassign-udtryk" msgid "`:' expected for conditional expression" msgstr "\":\" forventet for betingede udtryk" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "eksponent mindre end 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "identifikator forventet efter præforøgelse eller -formindskelse" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "manglende \")\"" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "syntaksfejl: operand forventet" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "syntaksfejl: ugyldig aritmetisk operator" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (fejlelement er \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "ugyldig aritmetisk grundtal" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "værdi for stor til grundtal" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: fejl i udtryk\n" @@ -1060,7 +1080,7 @@ msgid "getcwd: cannot access parent directories" msgstr "getcwd: kan ikke tilgÃ¥ overliggende mapper" # Har ladet nodelay stÃ¥, idet jeg gætter pÃ¥ at det er et navn -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "kan ikke nulstille \"nodelay\"-tilstand for fd %d" @@ -1080,145 +1100,145 @@ msgstr "save_bash_input: buffer eksisterer allerede til ny fd %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp-datakanal (pipe)" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "forgrenet pid %d figurerer i kørende job %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "sletter stoppet job %d med procesgruppe %ld" # ?? -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: proces %5ld (%s) i the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) markeret som stadig i live" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: ingen process med det pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Færdig" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Stoppet" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Stoppet(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Kører" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Færdig(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Afslut %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Ukendt status" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(smed kerne) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "underproces setpgid (%ld til %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld er ikke en underproces af denne skal" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Ingen optegnelse af proces %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: job %d er stoppet" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: job er afbrudt" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: job %d er allerede i baggrunden" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: linje %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (smed kerne)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd nu: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp fejlede" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: linjedisciplin" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "kan ikke indstille terminal-procesgruppe (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "ingen jobkontrol i denne skal" @@ -1372,104 +1392,104 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_direction: videresendelsesinstruktion \"%d\" uden for interval" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "uventet EOF mens der ledtes efter samhørende \"%c\"" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "uventet EOF mens der ledtes efter \"]]\"" # word A sequence of characters considered as a single unit by the # shell. Also known as a token. # Jeg har valgt udtryk -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "syntaksfejl i betingelsesudtryk: uventet element \"%s\"" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "syntaksfejl i betingelsesudtryk" # word A sequence of characters considered as a single unit by the # shell. Also known as a token. -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "uventet element \"%s\", forventede \")\"" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "forventede \")\"" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "uventet argument \"%s\" til unær betingelsesoperator" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "uventet argument til unær betingelsesoperator" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "uventet udtryk \"%s\", ventede binær betingelsesoperator" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "ventedet binær betingelsesoperator" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "uventet argument \"%s\" til binær betingelsesoperator" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "uventet argument til binær betingelsesoperator" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "uventet udtryk \"%c\" i betingelseskommando" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "uventet udtryk \"%s\" i betingelseskommando" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "uventet udtryk \"%d\" i betingelseskommando" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "syntaksfejl nær uventet udtryk \"%s\"" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "syntaksfejl nær \"%s\"" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "syntaksfejl: uventet slutning pÃ¥ fil" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "syntaksfejl" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Brug \"%s\" for at forlade skallen.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "uventet EOF mens der ledtes efter samhørende \")\"" @@ -1611,7 +1631,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Brug kommandoen \"bashbug\" til at rapportere fejl.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: ugyldig handling" @@ -1787,88 +1807,88 @@ msgstr "Ukendt signal #" msgid "Unknown Signal #%d" msgstr "Ukendt signal #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "dÃ¥rlig udskiftning: ingen lukkende \"%s\" i %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: kan ikke tildele liste til arrayelementer" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "kan ikke lave datakanal (pipe) til procesudskiftning" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "kan ikke danne underproces til procesudskiftning" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "kan ikke Ã¥bne navngiven datakanal (pipe) %s til læsning" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "kan ikke Ã¥bne navngiven datakanal (pipe) %s til skrivning" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "kan ikke duplikere navngiven datakanal (pipe) %s som %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "kan ikke danne datakanal (pipe) til kommandoudskiftning" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "kan ikke danne underproces til kommandoudskiftning" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: kan ikke duplikere datakanal (pipe) som fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%d: ugyldig filbeskrivelse: %s" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parameter null eller ikke indstillet" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: understreng-udtryk < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: dÃ¥rlig udskiftning" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: kan ikke tildele pÃ¥ denne mÃ¥de" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "dÃ¥rlig udskiftning: ingen lukkende \"`\" i %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "intet match: %s" @@ -1909,12 +1929,12 @@ msgstr "manglende \"]\"" msgid "invalid signal number" msgstr "ugyldigt signalnummer" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: dÃ¥rlig værdi i trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1922,7 +1942,7 @@ msgstr "" "run_pending_traps: signalhÃ¥ndtering er SIG_DFL, gensender %d (%s) til mig " "selv" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: ugyldigt signal %d" @@ -1951,49 +1971,49 @@ msgstr "make_local_variable: ingen funktionskontekst ved nuværende navneomrÃ¥de msgid "%s: variable may not be assigned value" msgstr "%s: kan ikke tildele liste til arrayelementer" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: ingen funktionskontekst ved nuværende navneomrÃ¥de" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: parameter null eller ikke indstillet" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "ugyldigt tegn %d i exportstr for %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "intet \"=\" i exportstr for %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: hoved af shell_variables er ikke en funktionskontekst" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: ingen global_variables-kontekst" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: hoved af shell_variables er ikke et midlertidigt miljønavnerum" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: kan ikke Ã¥bne: %s" -#: variables.c:5216 +#: variables.c:5262 #, fuzzy, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%d: ugyldig filbeskrivelse: %s" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s udenfor rækkevidde" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-08-26 21:04+0200\n" "Last-Translator: Nils Naumann <nau@gmx.net>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" @@ -20,7 +20,7 @@ msgstr "" msgid "bad array subscript" msgstr "Falscher Feldbezeichner." -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: Kann nicht das indizierte in ein assoziatives Array umwandeln." @@ -68,6 +68,21 @@ msgstr "fehlende schließende `%c' in %s." msgid "%s: missing colon separator" msgstr "%s: Fehlender Doppelpunkt." +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "Ungültige Oktalzahl." msgid "invalid hex number" msgstr "Ungültige hexadezimale Zahl." -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "Ungültige Zahl." @@ -203,7 +218,7 @@ msgstr "%s: Ungültige Signalbezeichnung." msgid "`%s': not a pid or valid job spec" msgstr "`%s': Ist keine gültige Prozess- oder Jobbezeichnung." -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: Schreibgeschützte Variable." @@ -302,7 +317,7 @@ msgstr "Gegenwärtig wird keine Komplettierungsfunktion ausgeführt." msgid "can only be used in a function" msgstr "kann nur innerhalb einer Funktion benutzt werden." -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -312,21 +327,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "Mit `-f' können keine Funktionen erzeugt werden." -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: Schreibgeschützte Funktion." -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: Kann Feldvariablen nicht auf diese Art löschen." -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -356,7 +371,7 @@ msgstr "%s: Ist nicht dynamisch geladen." msgid "%s: cannot delete: %s" msgstr "%s: Kann nicht löschen: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -580,6 +595,11 @@ msgstr "`%c': Ungültiges Formatierungszeichen." msgid "warning: %s: %s" msgstr "Warnung: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "Fehlende hexadezimale Ziffer nach \\x." @@ -893,24 +913,24 @@ msgstr "Letztes Kommando: %s\n" msgid "Aborting..." msgstr "Abbruch..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "Unbekanntes Kommando" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "" # Programmierfehler -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "Falscher Sprung" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s ist nicht gesetzt." @@ -925,51 +945,51 @@ msgstr "\aZu lange keine Eingabe: Automatisch ausgeloggt.\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "Kann nicht die Standardeingabe von /dev/null umleiten: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': Ungültiges Formatzeichen." -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "Pipe-Fehler" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: Verboten: `/' ist in Kommandonamen unzulässig." -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: Kommando nicht gefunden." -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: Defekter Interpreter" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: Kann die Binärdatei nicht ausführen: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "`%s' ist eine spezielle eingebaute Funktion." -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "Kann fd %d nicht auf fd %d verdoppeln." @@ -990,7 +1010,7 @@ msgstr "Syntaxfehler im Ausdruck." msgid "attempted assignment to non-variable" msgstr "Versuchte Zuweisung zu keiner Variablen." -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "Division durch 0." @@ -1002,41 +1022,41 @@ msgstr "Fehler: Falscher Zuweisungsoperator." msgid "`:' expected for conditional expression" msgstr "`:' für ein bedingten Ausdruck erwaret." -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "Der Exponent ist kleiner als 0." -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" "Nach einem Präinkrement oder Prädekrement wird ein Bezeichner erwartet." -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "Fehlende `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "Syntax Fehler: Operator erwartet." -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "Syntaxfehler: Ungültiger arithmetischer Operator." -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (Fehlerverursachendes Zeichen ist \\\"%s\\\")." -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "Ungültige Basis." -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "Der Wert ist für die aktuelle Basis zu groß." -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: Fehler im Ausdruck.\n" @@ -1045,7 +1065,7 @@ msgstr "%s: Fehler im Ausdruck.\n" msgid "getcwd: cannot access parent directories" msgstr "getwd: Kann auf das übergeordnete Verzeichnis nicht zugreifen." -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "Konnte den No-Delay Modus für fd %d nicht wieder herstellen." @@ -1065,150 +1085,150 @@ msgstr "save_bash_input: Es existiert bereits ein Puffer für den neuen fd %d." msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "Die geforkte PID %d erscheint im laufenden Prozess %d." -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "Lösche den gestoppten Prozess %d der Prozessgruppe %ld." -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" # Programmierfehler -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: Prozeßnummer existiert nicht." -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Fertig" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Angehalten" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Angehalten(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Läuft" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Fertig(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Exit %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Unbekannter Status" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(Speicherabzug geschrieben) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" # interner Fehler -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: Prozeß %ld wurde nicht von dieser Shell gestartet." -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: Programm ist beendet." -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" # Debug Ausgabe -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: Zeile %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (Speicherabzug geschrieben)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(gegenwärtiges Arbeitsverzeichnis ist: %s)\n" # interner Fehler -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_jobs: getpgrp war nicht erfolgreich." # interner Fehler -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: line discipline" # interner Fehler -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "Kann die Prozessgruppe des Terminals nicht setzen (%d)." -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "Keine Job Steuerung in dieser Shell." @@ -1372,100 +1392,100 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "Dateiende beim Suchen nach `%c' erreicht." -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "Dateiende beim Suchen nach `]]' erreicht." -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "Syntaxfehler im bedingten Ausdruck: Unerwartetes Zeichen `%s'." -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "Syntaxfehler im bedingen Ausdruck." -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "Unerwartetes Zeichen: `%s' anstatt von `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "`)' erwartet." -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "Syntaxfehler beim unerwarteten Wort `%s'" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "Syntaxfehler beim unerwarteten Wort `%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "Syntax Fehler: Unerwartetes Dateiende." -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "Syntax Fehler" # Du oder Sie? -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Benutze \"%s\" um die Shell zu verlassen.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "Dateiende beim Suchen nach passender `)' erreicht." @@ -1604,7 +1624,7 @@ msgstr "`%s -c help' für mehr Information über Shell-Kommandos.\n" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Mit dem `bashbug' Kommando können Fehler gemeldet werden.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: Ungültige Operation" @@ -1778,79 +1798,79 @@ msgstr "Unbekannte Signalnummer." msgid "Unknown Signal #%d" msgstr "Unbekanntes Signal Nr.: %d." -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "Falsche Ersetzung: Keine schließende `%s' in `%s' enthalten." -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: Kann einem Feldelement keine Liste zuweisen." -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "Kann keine Pipe für die Prozeßersetzung erzeugen." -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "Kann den Kindsprozess für die Prozeßersetzung nicht erzeugen." -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "Kann nicht die benannte Pipe %s zum lesen öffnen." -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "Kann nicht die benannte Pipe %s zum schreiben öffnen." -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "Kann die benannte Pipe %s nicht auf fd %d." -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "Kann keine Pipes für Kommandoersetzung erzeugen." -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "Kann keinen Unterprozess für die Kommandoersetzung erzeugen." # interner Fehler -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "Kommandoersetzung: Kann Pipe nicht als fd 1 duplizieren." -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: Parameter ist Null oder nicht gesetzt." # interner Fehler -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: Teilstring-Ausdruck < 0." -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: Falsche Variablenersetzung." -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: Kann so nicht zuweisen." -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1858,12 +1878,12 @@ msgstr "" "Zukünftige Versionen dieser Shell werden das Auswerten arithmetischer " "Ersetzungen erzwingen." -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "Falsche Ersetzung: Keine schließende \"`\" in %s." -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "Keine Entsprechung: %s" @@ -1904,19 +1924,19 @@ msgstr "Fehlende `]'" msgid "invalid signal number" msgstr "Ungültige Signalnummer." -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" # Programmierfehler -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: Falsches Signal %d." @@ -1945,48 +1965,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: Der Variable könnte kein Wert zugewiesen sein." -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: Kann nicht als Datei geöffnet werden." -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: Kompatibilitätswert außerhalb des Gültigkeitsbereiches." Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-11-15 10:37+0200\n" "Last-Translator: Lefteris Dimitroulakis <ledimitro@gmail.com>\n" "Language-Team: Greek <team@lists.gnome.gr>\n" @@ -22,7 +22,7 @@ msgstr "" msgid "bad array subscript" msgstr "" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -66,6 +66,21 @@ msgstr "" msgid "%s: missing colon separator" msgstr "" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -185,7 +200,7 @@ msgstr "μη ÎγκυÏος οκταδικός αÏιθμός" msgid "invalid hex number" msgstr "μη ÎγκυÏος εξαδικός αÏιθμός" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "μη ÎγκυÏος αÏιθμός" @@ -199,7 +214,7 @@ msgstr "%s: μη ÎγκυÏη Ï€ÏοδιαγÏαφή σήματος" msgid "`%s': not a pid or valid job spec" msgstr "«%s»: όχι pid ή ÎγκυÏο job spec" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: μεταβλητή μόνο για ανάγνωση" @@ -298,7 +313,7 @@ msgstr "" msgid "can only be used in a function" msgstr "μποÏεί να χÏησιμοποιηθεί μόνο μÎσα σε συνάÏτηση" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -308,22 +323,22 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "" "η επιλογή «-f» δεν μποÏεί να χÏησιμοποιηθεί για τη δημιουÏγία συναÏτήσεων" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: συνάÏτηση μόνο για ανάγνωση" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -352,7 +367,7 @@ msgstr "%s: δεν φοÏτώθηκε δυναμικά" msgid "%s: cannot delete: %s" msgstr "%s: αδυναμία διαγÏαφής: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -568,6 +583,11 @@ msgstr "«%c»: μη ÎγκυÏος χαÏακτήÏας φοÏμαÏίσματΠmsgid "warning: %s: %s" msgstr "Ï€Ïοειδοποίηση: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "απουσία hex ψηφίου για \\x" @@ -820,23 +840,23 @@ msgstr "τελευταία εντολή: %s\n" msgid "Aborting..." msgstr "" -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "άγνωστο σφάλμα εντολής" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "" @@ -851,51 +871,51 @@ msgstr "\aη αναμονή για δεδομÎνα Îληξε: αυτόματη msgid "cannot redirect standard input from /dev/null: %s" msgstr "αδυναμία ανακατεÏθυνσης τυπικής εισόδου από /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: «%c»: μη ÎγκυÏος χαÏακτήÏας μοÏφοποίησης" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "pipe error" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: πεÏιοÏισμός: δεν μποÏεί να πεÏιÎχεται «/» σε όνομα εντολής" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: εντολή δεν βÏÎθηκε" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: αδυναμία εκτÎλεσης Î´Ï…Î±Î´Î¹ÎºÎ¿Ï Î±Ïχείου: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "«%s»: είναι ειδικό builtin" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "αδυναμία αντιγÏαφής του fd %d στον fd %d" @@ -916,7 +936,7 @@ msgstr "συντακτικό σφάλμα στην ÎκφÏαση" msgid "attempted assignment to non-variable" msgstr "απόπειÏα ανάθεσης σε μη-μεταβλητή" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "διαίÏεση διά 0" @@ -928,40 +948,40 @@ msgstr "" msgid "`:' expected for conditional expression" msgstr "" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "εκθÎτης μικÏότεÏος του 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "λείπει «)»" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "syntax error: αναμενόταν τελεστÎος" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "syntax error: μη ÎγκυÏος αÏιθμητικός τελεστής" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (το λανθασμÎνο σÏμβολο είναι \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "μη ÎγκυÏη αÏιθμητική βάση" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "τιμή Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· για βάση" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: σφάλμα ÎκφÏασης\n" @@ -970,7 +990,7 @@ msgstr "%s: σφάλμα ÎκφÏασης\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: αδυναμία Ï€Ïόσβασης στο γονικό κατάλογο" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "αδυναμία επανάταξης nodelay mode για fd %d" @@ -990,144 +1010,144 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: δεν υπάÏχει Ï„Îτοιο pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Σήμα %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Done" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "σταματημÎνο" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "σταματημÎνο(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Done(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Έξοδος %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Άγνωστη κατάσταση" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core dumped) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "child setpgid (%ld to %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: διεÏγασία %ld δεν αποτελεί θυγατÏική Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… κελÏφους" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Δεν υπάÏχουν στοιχεία για διεÏγασία %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: η εÏγασία %d είναι σταματημÎνη" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: η εÏγασία τεÏματίστηκε" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: εÏγασία %d ήδη στο παÏασκήνιο" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: γÏαμμή %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core dumped)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(Ï„ÏŽÏα wd: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: αποτυχία getpgrp" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "δεν υπάÏχει job control σ'αυτό το κÎλυφος" @@ -1278,99 +1298,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: η οδηγία της ανακατεÏθυνσης «%d» εκτός οÏίων" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "μη αναμενόμενο EOF κατά την αναζήτηση «%c»" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "μη αναμενόμενο EOF ενώ Îψαχνα για «]]»" -#: parse.y:4104 +#: parse.y:4168 #, fuzzy, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "syntax error in conditional expression: μη αναμενόμενο σÏμβολο «%s»" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "μη αναμενόμενο σÏμβολο «%s», αναμενόταν «)»" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "αναμενόταν «)»" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "συντακτικό σφάλμα κοντά στο μη αναμενόμενο σÏμβολο «%s»" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "συντακτικό σφάλμα κοντά σε «%s»" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "syntax error: μη αναμενόμενο Ï„Îλος αÏχείου" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "συντακτικό σφάλμα" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "ΧÏήση «%s» για Îξοδο από το κÎλυφος.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "μη αναμενόμενο EOF ενώ Îψαχνα «)»" @@ -1512,7 +1532,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "ΧÏησιμοποίησε την εντολή «bashbug» για αναφοÏά σφαλμάτων.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: μη ÎγκυÏη λειτουÏγία" @@ -1686,88 +1706,88 @@ msgstr "Άγνωστο σήμα #" msgid "Unknown Signal #%d" msgstr "Άγνωστο σήμα #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "αδυναμία ανοίγματοε επώνυμης σωλήνας %s Ï€Ïος ανάγνωση" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "αδυναμία ανοίγματος επώνυμης σωλήνας %s Ï€Ïος εγγÏαφή" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: παÏάμετÏος κενή ή δεν Îχει οÏιστεί" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: ÎκφÏαση αÏνητική < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: κακή αντικατάσταση" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: αδÏνατη ανάθεση κατ' αυτόν τον Ï„Ïόπο" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "κακή αντικατάσταση: δεν υπάÏχει «`» που κλείνει στο %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "" @@ -1808,18 +1828,18 @@ msgstr "αποÏσα «]»" msgid "invalid signal number" msgstr "μη ÎγκυÏος αÏιθμός σήματος" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: κακό σήμα %d" @@ -1848,48 +1868,48 @@ msgstr "make_local_variable: no function context at current scope" msgid "%s: variable may not be assigned value" msgstr "" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: no function context at current scope" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s Îχει κενό exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "ο χαÏακτήÏας %d δεν Îίναι ÎγκυÏος στην exportstr για %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "απουσία «=» στην exportstr για %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: head of shell_variables not a function context" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: no global_variables context" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: head of shell_variables not a temporary environment scope" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: αδυναμία ανοίγματος ως ΑΡΧΕΙΟ" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "" diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo Binary files differindex 38e30841..31f9f8c3 100644 --- a/po/en@boldquot.gmo +++ b/po/en@boldquot.gmo diff --git a/po/en@boldquot.po b/po/en@boldquot.po index a680ac60..561d2e48 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -1,7 +1,7 @@ # English translations for GNU bash package. -# Copyright (C) 2013 Free Software Foundation, Inc. +# Copyright (C) 2014 Free Software Foundation, Inc. # This file is distributed under the same license as the GNU bash package. -# Automatically generated, 2013. +# Automatically generated, 2014. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU bash 4.3-rc1\n" +"Project-Id-Version: GNU bash 4.3-rc2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" -"PO-Revision-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" +"PO-Revision-Date: 2014-01-23 16:04-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en\n" @@ -46,7 +46,7 @@ msgstr "" msgid "bad array subscript" msgstr "bad array subscript" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: cannot convert indexed to associative array" @@ -90,6 +90,21 @@ msgstr "no closing ‘[1m%c[0m’ in %s" msgid "%s: missing colon separator" msgstr "%s: missing colon separator" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "brace expansion: cannot allocate memory for %s" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "brace expansion: failed to allocate memory for %d elements" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "brace expansion: failed to allocate memory for ‘[1m%s[0m’" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -212,7 +227,7 @@ msgstr "invalid octal number" msgid "invalid hex number" msgstr "invalid hex number" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "invalid number" @@ -226,7 +241,7 @@ msgstr "%s: invalid signal specification" msgid "`%s': not a pid or valid job spec" msgstr "‘[1m%s[0m’: not a pid or valid job spec" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: readonly variable" @@ -325,7 +340,7 @@ msgstr "not currently executing completion function" msgid "can only be used in a function" msgstr "can only be used in a function" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: reference variable cannot be an array" @@ -335,21 +350,21 @@ msgstr "%s: reference variable cannot be an array" msgid "%s: nameref variable self references not allowed" msgstr "%s: nameref variable self references not allowed" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "cannot use ‘[1m-f[0m’ to make functions" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: readonly function" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: cannot destroy array variables in this way" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: cannot convert associative to indexed array" @@ -378,7 +393,7 @@ msgstr "%s: not dynamically loaded" msgid "%s: cannot delete: %s" msgstr "%s: cannot delete: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -603,6 +618,11 @@ msgstr "‘[1m%c[0m’: invalid format character" msgid "warning: %s: %s" msgstr "warning: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "format parsing problem: %s" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "missing hex digit for \\x" @@ -914,23 +934,23 @@ msgstr "last command: %s\n" msgid "Aborting..." msgstr "Aborting..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "unknown command error" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "bad command type" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "bad connector" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "bad jump" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: unbound variable" @@ -945,51 +965,51 @@ msgstr "\atimed out waiting for input: auto-logout\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "cannot redirect standard input from /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: ‘[1m%c[0m’: invalid format character" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "pipe error" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: maximum function nesting level exceeded (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: restricted: cannot specify ‘[1m/[0m’ in command names" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: command not found" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: bad interpreter" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: cannot execute binary file: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "‘[1m%s[0m’: is a special builtin" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "cannot duplicate fd %d to fd %d" @@ -1010,7 +1030,7 @@ msgstr "syntax error in expression" msgid "attempted assignment to non-variable" msgstr "attempted assignment to non-variable" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "division by 0" @@ -1022,40 +1042,40 @@ msgstr "bug: bad expassign token" msgid "`:' expected for conditional expression" msgstr "‘[1m:[0m’ expected for conditional expression" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "exponent less than 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "identifier expected after pre-increment or pre-decrement" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "missing ‘[1m)[0m’" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "syntax error: operand expected" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "syntax error: invalid arithmetic operator" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (error token is “[1m%s[0mâ€)" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "invalid arithmetic base" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "value too great for base" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: expression error\n" @@ -1064,7 +1084,7 @@ msgstr "%s: expression error\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: cannot access parent directories" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "cannot reset nodelay mode for fd %d" @@ -1083,144 +1103,144 @@ msgstr "save_bash_input: buffer already exists for new fd %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "forked pid %d appears in running job %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "deleting stopped job %d with process group %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: process %5ld (%s) in the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) marked as still alive" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: no such pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Done" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Stopped" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Stopped(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Running" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Done(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Exit %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Unknown status" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core dumped) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "child setpgid (%ld to %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld is not a child of this shell" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: No record of process %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: job %d is stopped" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: job has terminated" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: job %d already in background" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: turning on WNOHANG to avoid indefinite block" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: line %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core dumped)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd now: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp failed" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: line discipline" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "cannot set terminal process group (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "no job control in this shell" @@ -1373,99 +1393,99 @@ msgstr "here-document at line %d delimited by end-of-file (wanted ‘[1m%s[0mâ msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: redirection instruction ‘[1m%d[0m’ out of range" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "unexpected EOF while looking for matching ‘[1m%c[0m’" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "unexpected EOF while looking for ‘[1m]][0m’" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "syntax error in conditional expression: unexpected token ‘[1m%s[0m’" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "syntax error in conditional expression" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "unexpected token ‘[1m%s[0m’, expected ‘[1m)[0m’" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "expected ‘[1m)[0m’" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "unexpected argument ‘[1m%s[0m’ to conditional unary operator" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "unexpected argument to conditional unary operator" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "unexpected token ‘[1m%s[0m’, conditional binary operator expected" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "conditional binary operator expected" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "unexpected argument ‘[1m%s[0m’ to conditional binary operator" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "unexpected argument to conditional binary operator" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "unexpected token ‘[1m%c[0m’ in conditional command" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "unexpected token ‘[1m%s[0m’ in conditional command" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "unexpected token %d in conditional command" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "syntax error near unexpected token ‘[1m%s[0m’" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "syntax error near ‘[1m%s[0m’" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "syntax error: unexpected end of file" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "syntax error" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Use “[1m%s[0m†to leave the shell.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "unexpected EOF while looking for matching ‘[1m)[0m’" @@ -1606,7 +1626,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Use the ‘[1mbashbug[0m’ command to report bugs.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: invalid operation" @@ -1780,77 +1800,77 @@ msgstr "Unknown Signal #" msgid "Unknown Signal #%d" msgstr "Unknown Signal #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "bad substitution: no closing ‘[1m%s[0m’ in %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: cannot assign list to array member" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "cannot make pipe for process substitution" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "cannot make child for process substitution" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "cannot open named pipe %s for reading" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "cannot open named pipe %s for writing" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "cannot duplicate named pipe %s as fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "cannot make pipe for command substitution" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "cannot make child for command substitution" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: cannot duplicate pipe as fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: invalid variable name for name reference" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parameter null or not set" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: substring expression < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: bad substitution" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: cannot assign in this way" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1858,12 +1878,12 @@ msgstr "" "future versions of the shell will force evaluation as an arithmetic " "substitution" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "bad substitution: no closing “[1m`[0m†in %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "no match: %s" @@ -1904,19 +1924,19 @@ msgstr "missing ‘[1m][0m’" msgid "invalid signal number" msgstr "invalid signal number" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: bad value in trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: bad signal %d" @@ -1945,48 +1965,48 @@ msgstr "make_local_variable: no function context at current scope" msgid "%s: variable may not be assigned value" msgstr "%s: variable may not be assigned value" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: no function context at current scope" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s has null exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "invalid character %d in exportstr for %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "no ‘[1m=[0m’ in exportstr for %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: head of shell_variables not a function context" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: no global_variables context" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: head of shell_variables not a temporary environment scope" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: cannot open as FILE" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: invalid value for trace file descriptor" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: compatibility value out of range" diff --git a/po/en@quot.gmo b/po/en@quot.gmo Binary files differindex ed99c16d..e7e7a48e 100644 --- a/po/en@quot.gmo +++ b/po/en@quot.gmo diff --git a/po/en@quot.po b/po/en@quot.po index 7d5a821b..30b42e81 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -1,7 +1,7 @@ # English translations for GNU bash package. -# Copyright (C) 2013 Free Software Foundation, Inc. +# Copyright (C) 2014 Free Software Foundation, Inc. # This file is distributed under the same license as the GNU bash package. -# Automatically generated, 2013. +# Automatically generated, 2014. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU bash 4.3-rc1\n" +"Project-Id-Version: GNU bash 4.3-rc2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" -"PO-Revision-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" +"PO-Revision-Date: 2014-01-23 16:04-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en\n" @@ -43,7 +43,7 @@ msgstr "" msgid "bad array subscript" msgstr "bad array subscript" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: cannot convert indexed to associative array" @@ -87,6 +87,21 @@ msgstr "no closing ‘%c’ in %s" msgid "%s: missing colon separator" msgstr "%s: missing colon separator" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "brace expansion: cannot allocate memory for %s" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "brace expansion: failed to allocate memory for %d elements" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "brace expansion: failed to allocate memory for ‘%s’" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -209,7 +224,7 @@ msgstr "invalid octal number" msgid "invalid hex number" msgstr "invalid hex number" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "invalid number" @@ -223,7 +238,7 @@ msgstr "%s: invalid signal specification" msgid "`%s': not a pid or valid job spec" msgstr "‘%s’: not a pid or valid job spec" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: readonly variable" @@ -322,7 +337,7 @@ msgstr "not currently executing completion function" msgid "can only be used in a function" msgstr "can only be used in a function" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: reference variable cannot be an array" @@ -332,21 +347,21 @@ msgstr "%s: reference variable cannot be an array" msgid "%s: nameref variable self references not allowed" msgstr "%s: nameref variable self references not allowed" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "cannot use ‘-f’ to make functions" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: readonly function" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: cannot destroy array variables in this way" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: cannot convert associative to indexed array" @@ -375,7 +390,7 @@ msgstr "%s: not dynamically loaded" msgid "%s: cannot delete: %s" msgstr "%s: cannot delete: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -597,6 +612,11 @@ msgstr "‘%c’: invalid format character" msgid "warning: %s: %s" msgstr "warning: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "format parsing problem: %s" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "missing hex digit for \\x" @@ -905,23 +925,23 @@ msgstr "last command: %s\n" msgid "Aborting..." msgstr "Aborting..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "unknown command error" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "bad command type" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "bad connector" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "bad jump" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: unbound variable" @@ -936,51 +956,51 @@ msgstr "\atimed out waiting for input: auto-logout\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "cannot redirect standard input from /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: ‘%c’: invalid format character" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "pipe error" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: maximum function nesting level exceeded (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: restricted: cannot specify ‘/’ in command names" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: command not found" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: bad interpreter" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: cannot execute binary file: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "‘%s’: is a special builtin" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "cannot duplicate fd %d to fd %d" @@ -1001,7 +1021,7 @@ msgstr "syntax error in expression" msgid "attempted assignment to non-variable" msgstr "attempted assignment to non-variable" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "division by 0" @@ -1013,40 +1033,40 @@ msgstr "bug: bad expassign token" msgid "`:' expected for conditional expression" msgstr "‘:’ expected for conditional expression" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "exponent less than 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "identifier expected after pre-increment or pre-decrement" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "missing ‘)’" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "syntax error: operand expected" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "syntax error: invalid arithmetic operator" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (error token is “%sâ€)" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "invalid arithmetic base" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "value too great for base" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: expression error\n" @@ -1055,7 +1075,7 @@ msgstr "%s: expression error\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: cannot access parent directories" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "cannot reset nodelay mode for fd %d" @@ -1074,144 +1094,144 @@ msgstr "save_bash_input: buffer already exists for new fd %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "forked pid %d appears in running job %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "deleting stopped job %d with process group %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: process %5ld (%s) in the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) marked as still alive" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: no such pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Done" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Stopped" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Stopped(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Running" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Done(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Exit %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Unknown status" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core dumped) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "child setpgid (%ld to %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld is not a child of this shell" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: No record of process %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: job %d is stopped" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: job has terminated" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: job %d already in background" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: turning on WNOHANG to avoid indefinite block" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: line %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core dumped)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd now: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp failed" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: line discipline" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "cannot set terminal process group (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "no job control in this shell" @@ -1364,99 +1384,99 @@ msgstr "here-document at line %d delimited by end-of-file (wanted ‘%s’)" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: redirection instruction ‘%d’ out of range" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "unexpected EOF while looking for matching ‘%c’" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "unexpected EOF while looking for ‘]]’" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "syntax error in conditional expression: unexpected token ‘%s’" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "syntax error in conditional expression" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "unexpected token ‘%s’, expected ‘)’" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "expected ‘)’" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "unexpected argument ‘%s’ to conditional unary operator" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "unexpected argument to conditional unary operator" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "unexpected token ‘%s’, conditional binary operator expected" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "conditional binary operator expected" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "unexpected argument ‘%s’ to conditional binary operator" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "unexpected argument to conditional binary operator" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "unexpected token ‘%c’ in conditional command" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "unexpected token ‘%s’ in conditional command" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "unexpected token %d in conditional command" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "syntax error near unexpected token ‘%s’" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "syntax error near ‘%s’" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "syntax error: unexpected end of file" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "syntax error" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Use “%s†to leave the shell.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "unexpected EOF while looking for matching ‘)’" @@ -1594,7 +1614,7 @@ msgstr "Type ‘%s -c help’ for more information about shell builtin commands. msgid "Use the `bashbug' command to report bugs.\n" msgstr "Use the ‘bashbug’ command to report bugs.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: invalid operation" @@ -1768,77 +1788,77 @@ msgstr "Unknown Signal #" msgid "Unknown Signal #%d" msgstr "Unknown Signal #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "bad substitution: no closing ‘%s’ in %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: cannot assign list to array member" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "cannot make pipe for process substitution" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "cannot make child for process substitution" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "cannot open named pipe %s for reading" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "cannot open named pipe %s for writing" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "cannot duplicate named pipe %s as fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "cannot make pipe for command substitution" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "cannot make child for command substitution" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: cannot duplicate pipe as fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: invalid variable name for name reference" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parameter null or not set" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: substring expression < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: bad substitution" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: cannot assign in this way" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1846,12 +1866,12 @@ msgstr "" "future versions of the shell will force evaluation as an arithmetic " "substitution" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "bad substitution: no closing “`†in %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "no match: %s" @@ -1892,19 +1912,19 @@ msgstr "missing ‘]’" msgid "invalid signal number" msgstr "invalid signal number" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: bad value in trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: bad signal %d" @@ -1933,48 +1953,48 @@ msgstr "make_local_variable: no function context at current scope" msgid "%s: variable may not be assigned value" msgstr "%s: variable may not be assigned value" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: no function context at current scope" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s has null exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "invalid character %d in exportstr for %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "no ‘=’ in exportstr for %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: head of shell_variables not a function context" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: no global_variables context" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: head of shell_variables not a temporary environment scope" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: cannot open as FILE" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: invalid value for trace file descriptor" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: compatibility value out of range" Binary files differ@@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bash 4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-08-24 14:35+0700\n" "Last-Translator: Sergio Pokrovskij <sergio.pokrovskij@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -42,7 +42,7 @@ msgstr "" msgid "bad array subscript" msgstr "Misa tabel-indico" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: Maleblas konverti entjerindican tabelon en asocitabelon" @@ -87,6 +87,21 @@ msgstr "Mankas ferma „%c‟ en %s" msgid "%s: missing colon separator" msgstr "%s: Mankas disiga dupunkto" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -209,7 +224,7 @@ msgstr "Misa okuma nombro" msgid "invalid hex number" msgstr "Misa 16uma nombro" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "Misa nombro" @@ -223,7 +238,7 @@ msgstr "%s: Misa signalindiko" msgid "`%s': not a pid or valid job spec" msgstr "„%s‟: Nek proceznumero, nek taÅga laborindiko" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: Nurlega variablo" @@ -322,7 +337,7 @@ msgstr "Ni ne estas en plenumado de kompletiga funkcio" msgid "can only be used in a function" msgstr "Uzeblas nur ene de funkcio" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: Referenca variablo ne povas esti tabelo" @@ -332,21 +347,21 @@ msgstr "%s: Referenca variablo ne povas esti tabelo" msgid "%s: nameref variable self references not allowed" msgstr "%s: Nomreferenca variablo ne referencu sin mem" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "„-f‟ ne estas uzebla por fari funkciojn" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: Nurlega funkcio" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: Ĉi tiel ne eblas neniigi tabelvariablojn" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: Ne eblas konverti asocitabelon en entjerindican tabelon" @@ -375,7 +390,7 @@ msgstr "%s: Ne Åargita dinamike" msgid "%s: cannot delete: %s" msgstr "%s: Ne eblas forigi: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -600,6 +615,11 @@ msgstr "„%c‟: Misa signo formata" msgid "warning: %s: %s" msgstr "Averto: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "Mankas 16uma cifero por \\x" @@ -912,23 +932,23 @@ msgstr "La ĵusa komando: %s\n" msgid "Aborting..." msgstr "Ĉesigado ..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "Nekonata komand-eraro" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "Misa komandotipo" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "Misa stir-operacio" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "Misa salto" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: Neligita variablo" @@ -945,52 +965,52 @@ msgid "cannot redirect standard input from /dev/null: %s" msgstr "Fiaskis provo nomumi la disponaĵon «/dev/null» ĉefenigujo: %s" # XXX: internal error: -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: „%c‟: Misa formatsigno" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "Eraro en dukto" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: La ingado de funkcioj superis sian maksimumon (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: Malpermesitas uzi „/‟ en komandonomoj" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: Komando ne trovita" # XXX: internal error: -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: Misa interpretilo" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: Neplenumebla duuma dosiero: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "„%s‟ estas primitiva komando speciala" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "Ne eblas kunnomumi al dosiernumero %d la dosiernumeron %d" @@ -1011,7 +1031,7 @@ msgstr "Sintaksa eraro en esprimo" msgid "attempted assignment to non-variable" msgstr "Provo valorizi ne-variablon" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "Divido per 0" @@ -1023,40 +1043,40 @@ msgstr "CIMO: Misa operacisigno en kombinita valorizsimbolo" msgid "`:' expected for conditional expression" msgstr "„:‟ mankas kondiĉa esprimo" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "Negativa eksponento" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "Post antaÅkremento aperu nomo de variablo" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "Mankas „)‟" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "Sintaksa eraro: Mankas operando" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "Sintaksa eraro: Misa operacisimbolo aritmetika" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (misa simbolo estas „%s‟)" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "MaltaÅga bazo nombrosistema" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "Tro granda valoro por bazo de nombrosistemo" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: Misa esprimo\n" @@ -1065,7 +1085,7 @@ msgstr "%s: Misa esprimo\n" msgid "getcwd: cannot access parent directories" msgstr "getwd: Ne eblas atingi patrajn dosierujojn" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "Ne eblas reÅalti senprokrastan reÄimon por dosiernumero %d" @@ -1085,147 +1105,147 @@ msgstr "save_bash_input: La nova dosiernumero (fd %d) jam havas bufron" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: procezgrupo dukto" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "Forke farita proceznumero %d aperas en rulata laboro %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "Haltigita laboro %d kun procezgrupo %ld estas forigata" # ifdef DEBUG ... internal_warning(): -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: process %5ld (%s) in the_pipeline" # ifdef DEBUG ... internal_warning(): -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) marked as still alive" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: Ne estas tia proceznumero (%ld)!" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signalo %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Farite" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Haltigita" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Haltigita(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Rulata" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Farite(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Eliro %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Nekonata stato" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(nekropsio elÅutita)" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (labordosierujo: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "provo atribui (setpgid) procezgrupon %2$ld de la procezido %1$ld" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: La procezo %ld ne estas ido de ĉi tiu Åelo" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Malestas informoj pri procezo %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: La laboro %d estas haltigita" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: La laboro finiÄis" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: La laboro %d jam estas fona" # XXX: internal warning: -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: WNOHANG iÄas Åaltita por eviti nedifintan pendiÄon" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: linio %dª: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr "(nekropsio elÅutita)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(nun labordosierujo estas: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp fiaskis" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: liniaranÄo" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid()" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "ne prosperis atribui grupon (%d) de terminala procezo" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "Ĉi tiu Åelo ne disponigas laborregadon" @@ -1401,99 +1421,99 @@ msgstr "Tuj-dokumenton de linio %d limigas dosierfino (mankas „%s‟)" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: Alidirektada komando „%d‟ ekster sia variejo" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "Neatendita dosierfino dum serĉo de responda „%c‟" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "Neatendita dosierfino dum serĉo de „]]‟" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "Sintaksa eraro en kondiĉa esprimo: Neatendita simbolo „%s‟" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "Sintaksa eraro en kondiĉa esprimo" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "Nekonvena simbolo „%s‟ anstataŠ„)‟" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "Mankas „)‟" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "La argumento „%s‟ ne konvenas por unuloka kondiĉa operacisimbolo" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "MaltaÅga argumento por unuloka kondiĉa operacisimbolo" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "Misa simbolo „%s‟ anstataÅ duloka kondiĉa operacisigno" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "ĉi tie devas esti duloka kondiĉa operacisigno" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "La argumento „%s‟ ne konvenas por duloka kondiĉa operacisimbolo" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "<maltaÅga argumento por duloka kondiĉa operacisimbolo" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "Misa simbolo „%c‟ en kondiĉa komando" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "Misa simbolo „%s‟ en kondiĉa komando" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "Misa simbolo „%d‟ en kondiĉa komando" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "Sintaksa eraro apud neatendita simbolo „%s‟" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "Sintaksa eraro apud „%s‟" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "Sintaksa eraro: Neatendita dosierfino" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "Sintaksa eraro" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Uzu «%s» por eliri el la Åelo.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "Neatendita dosierfino dum serĉo de responda „)‟" @@ -1643,7 +1663,7 @@ msgid "Use the `bashbug' command to report bugs.\n" msgstr "Por raporti pri eraroj uzu la komandon „bashbug‟\n" # XXX: internal_error -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: Misa operacio" @@ -1856,90 +1876,90 @@ msgstr "Nekonata signalnumero" msgid "Unknown Signal #%d" msgstr "Nekonata signalo n-ro %d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "Misa anstataÅigo: Mankas ferma „%s‟ en %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: Maleblas valorizi tabelanon per listo" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "Ne prosperis fari dukton por proceza anstataÅigo" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "Ne prosperis krei idon por proceza anstataÅigo" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "Ne prosperis malfermi nomitan dukton %s porlegan" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "Ne prosperis malfermi nomitan dukton %s por skribado" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "Ne prosperis kunnomumi nomhavan dukton %s kiel dosiernumeron %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "Ne prosperis fari dukton por komanda anstataÅigo" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "Ne prosperis krei procezidon por komanda anstataÅigo" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: Ne prosperis kunnomumi la dosiernumeron 1 al dukto" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: Misa variablonomo por nomreferenco" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: Parametro estas NUL aÅ malaktiva" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: subĉeno-esprimo < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: Misa anstataÅigo" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: ĉi tiel ne valorizebla" # XXX: internal warning: -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" "Ontaj versioj de la Åelo plenumos komputon kiel aritmetikan anstataÅigon" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "Misa anstataÅigo: Mankas ferma „`‟ en %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "Nenio kongrua: %s" @@ -1981,19 +2001,19 @@ msgid "invalid signal number" msgstr "Misa signalnumero" # XXX: internal_warning -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: Misa valoro en trap_list[%d]: %p" # XXX: internal_warning -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "run_pending_traps: Signaltraktilo SIG_DFL resendas %d (%s) al mi mem" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: Misa signalnumero %d" @@ -2025,58 +2045,58 @@ msgid "%s: variable may not be assigned value" msgstr "%s: Variablo ne valorizebla" # XXX: internal_error -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: Malestas funkcia kunteksto en ĉi-regiono" # XXX: internal_error -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "«exportstr» de %s estas NUL" # XXX: internal_error -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "Misa signo %d en eksporta signoĉeno por „%s‟" # XXX: internal_error -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "Mankas „=‟ en eksporta signoĉeno por „%s‟" # XXX: internal_error -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context: La kapo de „shell_variables‟ ne estas funkcia kunteksto" # XXX: internal_error -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: Mankas kunteksto de „global_variables‟" # XXX: internal_error -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: La kapo de „shell_variables‟ ne estas provizora regiono" # XXX: internal_error -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: Ne malfermeblas kiel DOSIERO" # XXX: internal_error -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: Misa valoro por spurada dosiernumero (trace file descriptor)" # # XXX: internal_error -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s kongruo-nivelo estas ekster sia variejo" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bash 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2011-08-14 11:55-0500\n" "Last-Translator: Cristian Othón MartÃnez Vera <cfuga@cfuga.mx>\n" "Language-Team: Spanish <es@li.org>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "bad array subscript" msgstr "subÃndice de matriz incorrecto" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: no se puede convertir la matriz de indizada a asociativa" @@ -67,6 +67,21 @@ msgstr "no hay un `%c' que cierre en %s" msgid "%s: missing colon separator" msgstr "%s: falta un `:' separador" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "número octal inválido" msgid "invalid hex number" msgstr "número hexadecimal inválido" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "número inválido" @@ -203,7 +218,7 @@ msgstr "%s: especificación de señal inválida" msgid "`%s': not a pid or valid job spec" msgstr "`%s': no es un pid o una especificación válida de trabajo" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: variable de sólo lectura" @@ -304,7 +319,7 @@ msgstr "no se está ejecutando la función de completado" msgid "can only be used in a function" msgstr "sólo se puede usar dentro de una función" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -314,21 +329,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "no se puede usar `-f' para hacer funciones" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: función de sólo lectura" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: no se pueden destruir variables de matriz de esta forma" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: no se puede convertir una matriz asociativa a indizada" @@ -357,7 +372,7 @@ msgstr "%s: no se cargó dinámicamente" msgid "%s: cannot delete: %s" msgstr "%s: no se puede borrar: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -585,6 +600,11 @@ msgstr "`%c': carácter de formato inválido" msgid "warning: %s: %s" msgstr "aviso: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "falta el dÃgito hexadecimal para \\x" @@ -892,23 +912,23 @@ msgstr "última orden: %s\n" msgid "Aborting..." msgstr "Abortando..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "error de orden desconocido" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "tipo de orden erróneo" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "conector erróneo" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "salto erróneo" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: variable sin asignar" @@ -923,53 +943,53 @@ msgstr "\aha expirado mientras esperaba alguna entrada: auto-logout\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "no se puede redirigir la salida estándar desde /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': carácter de formato inválido" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "error de tuberÃa" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: restringido: no se puede especificar `/' en nombres de órdenes" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: no se encontró la orden" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: intérprete erróneo" # file=fichero. archive=archivo. Si no, es imposible traducir tar. sv # De acuerdo. Corregido en todo el fichero. cfuga -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: no se puede ejecutar el fichero binario" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s es una orden interna del shell\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "no se puede duplicar el df %d al df %d" @@ -990,7 +1010,7 @@ msgstr "error sintáctico en la expresión" msgid "attempted assignment to non-variable" msgstr "se intentó asignar a algo que no es una variable" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "división por 0" @@ -1004,11 +1024,11 @@ msgstr "bicho: elemento de asignación de expresión erróneo" msgid "`:' expected for conditional expression" msgstr "se esperaba `:' para la expresión condicional" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "exponente menor que 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" "se esperaba un identificador después del pre-incremento o pre-decremento" @@ -1016,32 +1036,32 @@ msgstr "" # falta , singular em+ # mmmh, puede faltar más de un paréntesis cfuga # tiene razón Enrique, es singular. cfuga -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "falta un `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "error sintáctico: se esperaba un operando" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "error sintáctico: operador aritmético inválido" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (el elemento de error es \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "base aritmética inválida" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "valor demasiado grande para la base" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: error de expresión\n" @@ -1050,7 +1070,7 @@ msgstr "%s: error de expresión\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: no se puede acceder a los directorios padre" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "no se puede reestablecer el modo nodelay para el df %d" @@ -1075,145 +1095,145 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: tuberÃa de pgrp" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "el pid `forked' %d aparece en el trabajo en ejecución %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "borrando el trabajo detenido %d con grupo de proceso %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: el proceso %5ld (%s) en the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) se marca como vivo aún" # CambiarÃa 'hay' por 'existe' em+ -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: no existe tal pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Señal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Hecho" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Detenido" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Detenido(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Ejecutando" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Hecho(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Salida %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Estado desconocido" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(`core' generado) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (dir ahora: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid hijo (%ld a %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld no es un proceso hijo de este shell" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: No hay un registro del proceso %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: el trabajo %d está detenido" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: el trabajo ha terminado" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: el trabajo %d ya está en segundo plano" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: se activa WNOHANG para evitar el bloque indefinido" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: lÃnea %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (`core' generado)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(dir ahora: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_jobs_control: falló getpgrp" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_jobs_control: disciplina de lÃnea" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_jobs_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "no se puede establecer el grupo de proceso de terminal (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "no hay control de trabajos en este shell" @@ -1371,71 +1391,71 @@ msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" "make_redirection: la instrucción de redirección `%d' está fuera de rango" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "EOF inesperado mientras se buscaba un `%c' coincidente" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "EOF inesperado mientras se buscaba `]]'" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "error sintáctico en la expresión condicional: elemento inesperado `%s'" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "error sintáctico en la expresión condicional" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "elemento inesperado `%s', se esperaba `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "se esperaba `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "argumento inesperado `%s' para el operador unario condicional" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "argumento inesperado para el operador unario condicional" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "elemento inesperado `%s', se esperaba un operador binario condicional" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "se esperaba un operador binario condicional" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "argumento inesperado `%s' para el operador binario condicional" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "argumento inesperado para el operador binario condicional" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "elemento inesperado `%c' en la orden condicional" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "elemento inesperado `%s' en la orden condicional" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "elemento inesperado %d en la orden condicional" @@ -1446,12 +1466,12 @@ msgstr "elemento inesperado %d en la orden condicional" # provocado por el sÃmbolo. Simplemente estar cerca del mismo. cfuga # Por consistencia con el siguiente, yo borrarÃa la coma. sv # Cierto. Coma borrada. cfuga -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "error sintáctico cerca del elemento inesperado `%s'" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "error sintáctico cerca de `%s'" @@ -1460,20 +1480,20 @@ msgstr "error sintáctico cerca de `%s'" # no se esperaba el final de la lÃnea em+ # Ojo, que end of file es fin de fichero, no de lÃnea. sv # Se hicieron ambos cambios. cfuga -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "error sintáctico: no se esperaba el final del fichero" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "error sintáctico" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Use \"%s\" para dejar el shell.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "EOF inesperado mientras se buscaba un `)' coincidente" @@ -1624,7 +1644,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Use la orden `bashbug' para reportar bichos.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: operación inválida" @@ -1809,77 +1829,77 @@ msgstr "Señal Desconocida #" msgid "Unknown Signal #%d" msgstr "Señal Desconocida #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "sustitución errónea: no hay un `%s' que cierre en %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: no se puede asignar una lista a un miembro de la matriz" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "no se puede crear la tuberÃa para la sustitución del proceso" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "no se puede crear un proceso hijo para la sustitución del proceso" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "no se puede abrir la tuberÃa llamada %s para lectura" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "no se puede abrir la tuberÃa llamada %s para escritura" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "no se puede duplicar la tuberÃa llamada %s como df %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "no se pueden crear la tuberÃa para la sustitución de la orden" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "no se puede crear un proceso hijo para la sustitución de la orden" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: no se puede duplicar la tuberÃa como df 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: valor inválido para el descriptor de fichero de rastreo" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parámetro nulo o no establecido" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: expresión de subcadena < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: sustitución errónea" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: no se puede asignar de esta forma" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1887,12 +1907,12 @@ msgstr "" "versiones futuras del intérprete obligarán la evaluación como una " "sustitución aritmética" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "sustitución errónea: no hay una \"`\" que cierre en %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "no hay coincidencia: %s" @@ -1940,12 +1960,12 @@ msgstr "falta un `]'" msgid "invalid signal number" msgstr "número de señal inválido" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: valor erróneo en trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1953,7 +1973,7 @@ msgstr "" "run_pending_traps: el manejador de señal es SIG_DFL, reenviando %d (%s) a mà " "mismo" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: señal errónea %d" @@ -1982,50 +2002,50 @@ msgstr "make_local_variable: no hay contexto de función en el ámbito actual" msgid "%s: variable may not be assigned value" msgstr "%s: no se puede asignar el fd a la variable" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: no hay contexto de función en el ámbito actual" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s tiene exportstr nulo" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "carácter inválido %d en exportstr para %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "no hay `=' en exportstr para %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context: la cabeza de shell_variables no es un contexto de función" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: no es un contexto global_variables" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: la cabeza de shell_variables no es un ámbito de ambiente temporal" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: no se puede abrir como FICHERO" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: valor inválido para el descriptor de fichero de rastreo" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s fuera de rango" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2006-11-11 16:38+0200\n" "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n" "Language-Team: Estonian <et@li.org>\n" @@ -19,7 +19,7 @@ msgstr "" msgid "bad array subscript" msgstr "vigane massiivi indeks" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -63,6 +63,21 @@ msgstr "sulgev `%c' puudub %s sees" msgid "%s: missing colon separator" msgstr "%s: puudub eraldav koolon" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -185,7 +200,7 @@ msgstr "vigane signaali number" msgid "invalid hex number" msgstr "vigane number" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "vigane number" @@ -199,7 +214,7 @@ msgstr "%s: vigane signaali spetsifikatsioon" msgid "`%s': not a pid or valid job spec" msgstr "`%s': ei ole pid ega korrektne töö spetsifikatsioon" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: mittemuudetav muutuja" @@ -298,7 +313,7 @@ msgstr "" msgid "can only be used in a function" msgstr "saab kasutada ainult funktsioonis" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -308,21 +323,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "võtit `-f' ei saa funktsiooni loomiseks kasutada" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funktsioon ei ole muudetav" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: masiivi muutujaid ei saa nii kustutada" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -351,7 +366,7 @@ msgstr "%s: pole dünaamiliselt laetud" msgid "%s: cannot delete: %s" msgstr "%s: ei saa kustutada: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -566,6 +581,11 @@ msgstr "" msgid "warning: %s: %s" msgstr "%s: hoiatus: " +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "" @@ -816,23 +836,23 @@ msgstr "viimane käsklus: %s\n" msgid "Aborting..." msgstr "Katkestan..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "tundmatu viga käsus" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: sidumata muutuja" @@ -847,52 +867,52 @@ msgstr "" msgid "cannot redirect standard input from /dev/null: %s" msgstr "" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "kirjutamise viga: %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: piiratud: käskudes ei saa kasutada sümboleid `/'" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: käsku ei ole" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, fuzzy, c-format msgid "%s: %s" msgstr "%s on %s\n" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: halb interpretaator" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: kahendfaili ei õnnestu käivitada" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s on shelli sisekäsk\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "" @@ -913,7 +933,7 @@ msgstr "süntaksi viga avaldises" msgid "attempted assignment to non-variable" msgstr "üritati omistada mitte-muutujale" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "nulliga jagamine" @@ -925,40 +945,40 @@ msgstr "" msgid "`:' expected for conditional expression" msgstr "" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "eksponent on väiksem kui 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "puudub `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "süntaksi viga: oodati operandi" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "süntaksi viga: vigane aritmeetiline operaator" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "vigane aritmeetiline baas" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "väärtus on baasiks liiga suur" -#: expr.c:1534 +#: expr.c:1543 #, fuzzy, c-format msgid "%s: expression error\n" msgstr "%s: oodati täisarvude avaldist" @@ -967,7 +987,7 @@ msgstr "%s: oodati täisarvude avaldist" msgid "getcwd: cannot access parent directories" msgstr "getcwd: vanemkataloogidele ei ole juurdepääsu" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "" @@ -986,144 +1006,144 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: pid puudub" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr "" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: töö %d on peatatud" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: töö on lõpetatud" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: töö %d on juba taustal" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, fuzzy, c-format msgid "%s: line %d: " msgstr "%s: hoiatus: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr "" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "" @@ -1275,99 +1295,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "süntaksi viga tingimuslikus avaldises" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "ootamatu märk `%s', oodati `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "oodati `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "süntaksi viga kohal `%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "süntaksi viga: ootamatu faililõpp" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "süntaksi viga" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Käsuinterpretaatorist väljumiseks kasutage \"%s\".\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "" @@ -1506,7 +1526,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Vigadest teatamiseks kasutage käsku `bashbug'.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: vigane operatsioon" @@ -1682,88 +1702,88 @@ msgstr "" msgid "Unknown Signal #%d" msgstr "" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parameeter on null või pole seatud" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: halb asendus" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: sedasi ei saa omistada" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, fuzzy, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "sulgev `%c' puudub %s sees" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "ei leitud: %s" @@ -1804,19 +1824,19 @@ msgstr "puudub `]'" msgid "invalid signal number" msgstr "vigane signaali number" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: halb väärtus muutujas trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" "run_pending_traps: signaali käsitleja on SIG_DFL, saadan %d (%s) iseendale" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: vigane signaal %d" @@ -1845,48 +1865,48 @@ msgstr "make_local_variable: praegune skoop pole funktsiooni kontekst" msgid "%s: variable may not be assigned value" msgstr "$%s: sedasi ei saa omistada" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: praegune skoop pole funktsiooni kontekst" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: parameeter on null või pole seatud" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: pole global_variables kontekst" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: ei saa avada: %s" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s on piiridest väljas" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2009-05-09 15:13+0300\n" "Last-Translator: Pekka Niemi <pekka.niemi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -24,7 +24,7 @@ msgstr "" msgid "bad array subscript" msgstr "virheellinen taulukkoindeksi" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: indeksoitua taulukkoa ei voi muuttaa assosiatiiviseksi" @@ -70,6 +70,21 @@ msgstr "ei loppumerkkiä â€%c†rivissä %s" msgid "%s: missing colon separator" msgstr "%s: puuttuva kaksoispiste-erotin" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -192,7 +207,7 @@ msgstr "virheellinen oktaaliluku" msgid "invalid hex number" msgstr "virheellinen heksadesimaaliluku" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "virheellinen luku" @@ -206,7 +221,7 @@ msgstr "%s: virheellinen signaalimääritys" msgid "`%s': not a pid or valid job spec" msgstr "â€%sâ€: ei ole prosessitunnus eikä kelvollinen työtunniste" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: kirjoitussuojattu muuttuja" @@ -305,7 +320,7 @@ msgstr "tällä hetkellä komennon lavennusfunktiota ei suoriteta" msgid "can only be used in a function" msgstr "voidaan käyttää ainoastaan funktiossa" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -315,21 +330,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "â€-fâ€:ää ei voida käyttää funktioiden luomiseen" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: kirjoitussuojattu funktio" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: taulukkomuuttujia ei voi tuhota näin" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: assosiatiivista taulukkoa ei voi muuttaa indeksoiduksi" @@ -358,7 +373,7 @@ msgstr "%s: ei dynaamisesti ladattu" msgid "%s: cannot delete: %s" msgstr "%s: ei voida poistaa: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -583,6 +598,11 @@ msgstr "â€%câ€: virheellinen muotoilumerkki" msgid "warning: %s: %s" msgstr "varoitus: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "\\x:stä puuttuu heksadesimaalinumero" @@ -887,23 +907,23 @@ msgstr "viimeinen komento: %s\n" msgid "Aborting..." msgstr "Keskeytetään..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "tuntematon komentovirhe" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "virheellinen komentotyyppi" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "virheellinen liittäjä" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "virheellinen hyppy" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: sitomaton muuttuja" @@ -918,51 +938,51 @@ msgstr "\aaikakatkaisu: automaattinen uloskirjautuminen\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "syötettä ei voida lukea tiedostosta /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "AJAN MUOTOMÄÄRITYS: â€%câ€: virheellinen muotoilumerkki" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "putkitusvirhe" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: rajoitettu: komentojen nimissä ei voi käyttää â€/â€-merkkiä" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: komentoa ei löydy" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, fuzzy, c-format msgid "%s: %s" msgstr "%s on %s\n" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: virheellinen tulkki" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: binääritiedostoa ei voida suorittaa" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s on komentotulkin sisäänrakennettu komento\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "tiedostokahvaa %d ei voida kopioida kahvaksi %d" @@ -983,7 +1003,7 @@ msgstr "lauseoppivirhe lausekkeessa" msgid "attempted assignment to non-variable" msgstr "yritettiin sijoittaa objektiin, joka ei ole muuttuja" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "jako nollalla" @@ -995,40 +1015,40 @@ msgstr "bugi: virheellinen sijoitusavainsana" msgid "`:' expected for conditional expression" msgstr "â€:â€:ttä odotettiin ehdolliseen lausekkeeseen" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "eksponentti on pienempi kuin 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "odotettiin muuttujaa ++:n tai --:n jälkeen" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "puuttuva â€)â€" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "lauseoppivirhe: odotettiin operandia" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "lauseoppivirhe: virheellinen aritmetiikkaoperaattori" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (virheellinen avainsana on â€%sâ€)" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "virheellinen lukujärjestelmä" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "liian iso luku lukujärjestelmälle" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: virhe lausekkeessa\n" @@ -1037,7 +1057,7 @@ msgstr "%s: virhe lausekkeessa\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: ylempiin hakemistoihin ei päästä" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "nodelay-tilaa ei voida asettaa tiedostokahvalle %d" @@ -1056,144 +1076,144 @@ msgstr "save_bash_input: uudella tiedostokahvalla %d on jo puskuri" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp-putki" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "haarautettu prosessi-id %d on ajossa olevalla työllä %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "poistetaan pysäytetty työ %d prosessiryhmästä %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: prosessi %5ld (%s) putkijonossa" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: prosessi %5ld (%s) on merkattu vielä toimivaksi" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: prosessitunnusta ei löydy." -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signaali %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Valmis" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Pysäytetty" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Pysäytetty(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Ajossa" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Valmis(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Poistui %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Tuntematon tila" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(luotiin core-tiedosto)" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (työhakemisto: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "lapsiprosessin setpgid (%ld => %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: prosessi %ld ei ole tämän komentotulkin lapsiprosessi" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Prosessista %ld ei ole tietoja" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: työ %d on pysäytetty" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: työ on lopetettu" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: työ %d on jo taustalla" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: rivi %d:" -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (luotiin core-tiedosto)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(työhakemisto nyt: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp epäonnistui" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: vuonhallinta" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "päätteen prosessiryhmää ei voitu asettaa (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "tällä komentotulkilla ei ole työnohjausta" @@ -1347,100 +1367,100 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: uudelleenohjaus â€%d†rajojen ulkopuolella" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "odottamaton EOF (tiedostonloppu) odotettaessa sulkevaa â€%câ€" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "odottamaton EOF odotettaessa â€]]â€" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "lauseoppivirhe ehdollisessa lausekkeessa: odottamaton avainsana â€%sâ€" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "lauseoppivirhe ehdollisessa lausekkeessa" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "odottamaton avainsana â€%sâ€, odotettiin â€)â€" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "odototettiin â€)â€" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "odottamaton argumentti â€%s†ehdolliselle unaariselle operaattorille" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "odottamaton argumentti ehdolliselle unaariselle operaattorille" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" "odottamaton avainsana â€%sâ€, odotettiin ehdollista binääristä operaattoria" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "odotettiin ehdollista binääristä operaattoria" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "odottamaton argumentti â€%s†ehdolliselle binääriselle operaattorille" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "odottamaton argumentti ehdolliselle binääriselle operaattorille" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "odottamaton avainsana â€%c†ehdollisessa komennossa" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "odottamaton avainsana â€%s†ehdollisessa komennossa" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "odottamaton avainsana %d ehdollisessa komennossa" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "lauseoppivirhe lähellä odottamatonta avainsanaa â€%sâ€" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "lauseoppivirhe lähellä â€%sâ€" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "lauseoppivirhe: odottamaton tiedostonloppu" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "lauseoppivirhe" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Kirjoita â€%s†poistuaksesi komentotulkista.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "Odottamaton EOF odotettaessa vastaavaa â€)â€" @@ -1584,7 +1604,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Raportoi virheet komennolla â€bashbugâ€.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: virheellinen operaatio" @@ -1758,88 +1778,88 @@ msgstr "Tuntematon signaali #" msgid "Unknown Signal #%d" msgstr "Tuntematon signaali #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "virheellinen korvaus: ei sulkevaa â€%s†jonossa %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: listaa ei voida sijoittaa taulukon alkioon" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "putkea ei voida luoda prosessin korvaamista varten" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "lapsiprosessia ei voida luoda prosessin korvaamista varten" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "nimettyä putkea %s ei voida avata lukemista varten" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "nimettyä putkea %s ei voida avata kirjoitusta varten" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "nimettyä putkea %s ei voida kopioida tiedostokahvaksi %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "putkea ei voida luoda komennon korvaamista varten" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "ei voida luoda lapsiprosessia komennon korvaamista varten" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: putkea ei voida kopioida tiedostokahvaksi 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%d: virheellinen tiedostokahva: %s" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametria ei ole tai sitä ei ole asetettu" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: alimerkkijonolauseke < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: virheellinen korvaus" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: ei voida asettaa näin" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "virheellinen korvaus: ei sulkevaa â€`†jonossa %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "ei osumia: %s" @@ -1880,12 +1900,12 @@ msgstr "puuttuva â€]â€" msgid "invalid signal number" msgstr "virheellinen signaalinumero" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: virheellinen arvo trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1893,7 +1913,7 @@ msgstr "" "run_pending_traps: signaalikäsittelijä on SIG_DFL, lähetän %d (%s) uudelleen " "itselleni" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: virheellinen signaali %d" @@ -1922,50 +1942,50 @@ msgstr "make_local_variable: ei funktiokontekstia nykytilassa" msgid "%s: variable may not be assigned value" msgstr "%s: listaa ei voida sijoittaa taulukon alkioon" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: ei funktiokontekstia nykytilassa" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: parametria ei ole tai sitä ei ole asetettu" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "virheellinen merkki %d %s:n exportstr:ssä" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "ei =:ä kohteen %s exportstr:ssä" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: shell_variablesin alku ei ole funktiokonteksti" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: ei global_variables-kontekstia" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: shell_variablesin alku ei väliaikaisten ympäristömuuttujien " "ympäristössä" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: ei voida avata: %s" -#: variables.c:5216 +#: variables.c:5262 #, fuzzy, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%d: virheellinen tiedostokahva: %s" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s rajojen ulkopuolella" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2012-07-07 21:52+0100\n" "Last-Translator: Christophe Combelles <ccomb@free.fr>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -22,7 +22,7 @@ msgstr "" msgid "bad array subscript" msgstr "mauvais indice de tableau" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s : impossible de convertir un tableau indexé en associatif" @@ -69,6 +69,21 @@ msgstr "pas de « %c » de fermeture dans %s" msgid "%s: missing colon separator" msgstr "%s : virgule de séparation manquante" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -191,7 +206,7 @@ msgstr "nombre octal non valable" msgid "invalid hex number" msgstr "nombre hexadécimal non valable" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "nombre non valable" @@ -207,7 +222,7 @@ msgstr "" "« %s » : ce n'est pas un n° de processus ou une spécification de tâche " "valable" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s : variable en lecture seule" @@ -310,7 +325,7 @@ msgstr "fonction de completion actuellement non en cours d'exécution" msgid "can only be used in a function" msgstr "utilisable seulement dans une fonction" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -320,21 +335,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "« -f » ne peut pas être utilisé pour fabriquer des fonctions" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s : fonction en lecture seule" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s : impossible de détruire des variables tableaux de cette façon" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s : impossible de convertir un tableau indexé en tableau associatif" @@ -363,7 +378,7 @@ msgstr "%s : non chargé dynamiquement" msgid "%s: cannot delete: %s" msgstr "%s : impossible d'effacer : %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -590,6 +605,11 @@ msgstr "« %c » : caractère de format non permis" msgid "warning: %s: %s" msgstr "avertissement : %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "chiffre hexadécimal manquant pour \\x" @@ -908,23 +928,23 @@ msgstr "dernière commande : %s\n" msgid "Aborting..." msgstr "Annulation..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "erreur de commande inconnue" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "mauvais type de commande" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "mauvais connecteur" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "mauvais saut" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s : variable sans liaison" @@ -939,52 +959,52 @@ msgstr "\aattente de données expirée : déconnexion automatique\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "l'entrée standard ne peut pas être redirigée depuis /dev/null : %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT : « %c » : caractère de format non valable" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "erreur de tube" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "" "%s : restriction : « / » ne peut pas être spécifié dans un nom de commande" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s : commande introuvable" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s : %s : mauvais interpréteur" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s : fichier binaire impossible à lancer" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s est une primitive du shell\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "impossible de dupliquer le fd %d vers le fd %d" @@ -1005,7 +1025,7 @@ msgstr "erreur de syntaxe dans l'expression" msgid "attempted assignment to non-variable" msgstr "tentative d'affectation à une non-variable" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "division par 0" @@ -1017,40 +1037,40 @@ msgstr "bogue : mauvais symbole pour expassign" msgid "`:' expected for conditional expression" msgstr "« : » attendu pour une expression conditionnelle." -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "exposant négatif" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "identifiant attendu après un pré-incrément ou un pré-décrément" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "« ) » manquante" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "erreur de syntaxe : opérande attendue" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "erreur de syntaxe : opérateur arithmétique non valable" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s : %s (le symbole erroné est \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "base arithmétique non valable" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "valeur trop grande pour la base" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s : erreur d'expression\n" @@ -1059,7 +1079,7 @@ msgstr "%s : erreur d'expression\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd : ne peut accéder aux répertoires parents" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "Impossible de réinitialiser le mode « nodelay » pour le fd %d" @@ -1080,144 +1100,144 @@ msgstr "save_bash_input : le tampon existe déjà pour le nouveau fd %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline : pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "le processus cloné n°%d apparaît dans la tâche en fonctionnement %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "suppression de la tâche stoppée %d avec le groupe de processus %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process : processus %5ld (%s) dans le_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process : pid %5ld (%s) signalé toujours en vie" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid : %ld : n° de processus inexistant" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Fini" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Stoppé" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Stoppé(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "En cours d'exécution" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Fini(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Termine %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "État inconnu" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core dumped)" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd : %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "fils setpgid (%ld à %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait : le processus n°%ld n'est pas un fils de ce shell." -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for : aucun enregistrement du processus n°%ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job : la tâche %d est stoppée" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s : la tâche s'est terminée" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s : la tâche %d est déjà en arrière plan" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld : activation de WNOHANG pour éviter un blocage définitif" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s : ligne %d : " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core dumped)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(maintenant, wd : %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control : getpgrp a échoué" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control : discipline de ligne" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control : setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "impossible de régler le groupe de processus du terminlal (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "pas de contrôle de tâche dans ce shell" @@ -1375,104 +1395,104 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection : l'instruction de redirection « %d » est hors plage" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "" "caractère de fin de fichier (EOF) prématuré lors de la recherche du « %c » " "correspondant" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "" "caractère de fin de fichier (EOF) prématuré lors de la recherche de « ]] »" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "" "erreur de syntaxe dans une expression conditionnelle : symbole « %s » " "inattendu" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "erreur de syntaxe dans une expression conditionnelle" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "symbole inattendu « %s » au lieu de « ) »" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "« ) » attendu" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "argument inattendu « %s » pour l'opérateur conditionnel à un argument" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "argument inattendu pour l'opérateur conditionnel à un argument" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "symbole « %s » trouvé à la place d'un opérateur binaire conditionnel" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "opérateur binaire conditionnel attendu" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "argument « %s » inattendu pour l'opérateur binaire conditionnel" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "argument inattendu pour l'opérateur binaire conditionnel" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "symbole « %c » inattendu dans la commande conditionnelle" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "symbole « %s » inattendu dans la commande conditionnelle" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "symbole « %d » inattendu dans la commande conditionnelle" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "erreur de syntaxe près du symbole inattendu « %s »" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "erreur de syntaxe près de « %s »" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "erreur de syntaxe : fin de fichier prématurée" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "erreur de syntaxe" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Utilisez « %s » pour quitter le shell.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "" "caractère de fin de fichier (EOF) prématuré lors de la recherche d'un « ) » " @@ -1618,7 +1638,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Utilisez la commande « bashbug » pour faire un rapport de bogue.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask : %d : operation non valable" @@ -1792,78 +1812,78 @@ msgstr "N° de signal inconnu" msgid "Unknown Signal #%d" msgstr "Signal n°%d inconnu" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "Mauvaise substitution : pas de « %s » de fermeture dans %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s : impossible d'affecter une liste à un élément de tableau" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "impossible de fabriquer un tube pour une substitution de processus" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "impossible de fabriquer un fils pour une substitution de processus" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "impossible d'ouvrir le tube nommé « %s » en lecture" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "impossible d'ouvrir le tube nommé « %s » en écriture" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "impossible de dupliquer le tube nommé « %s » vers le fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "impossible de fabriquer un tube pour une substitution de commande" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "" "impossible de fabriquer un processus fils pour une substitution de commande" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute : impossible de dupliquer le tube vers le fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s : %s : valeur non valable pour un descripteur de fichier de trace" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s : paramètre vide ou non défini" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s : expression de sous-chaîne négative" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s : mauvaise substitution" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s : affectation impossible de cette façon" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1871,12 +1891,12 @@ msgstr "" "Les versions futures du shell forceront l'évaluation comme une substitution " "arithmétique" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "Mauvais remplacement : pas de « ` » de fermeture dans %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "pas de correspondance : %s" @@ -1917,12 +1937,12 @@ msgstr "« ] » manquant" msgid "invalid signal number" msgstr "numéro de signal non valable" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps : mauvaise valeur dans trap_list[%d] : %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1930,7 +1950,7 @@ msgstr "" "run_pending_traps : le gestionnaire de signal est SIG_DFL, %d (%s) renvoyé à " "moi-même" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler : mauvais signal %d" @@ -1961,54 +1981,54 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s : impossible d'affecter le descripteur de fichier à la variable" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" "all_local_variables : aucun contexte de fonction dans le champ d'application " "actuel" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s a un « exportstr » vide" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "caractère %d non valable dans « exportstr » pour %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "Pas de « = » dans « exportstr » pour %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context : le début de « shell_variables » n'est pas un contexte de " "fonction" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context : aucun contexte à « global_variables »" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope : le début de « shell_variables » n'est pas un champ d'application " "temporaire d'environnement" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s : %s : impossible d'ouvrir comme FILE" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s : %s : valeur non valable pour un descripteur de fichier de trace" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s : %s hors plage" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2009-09-24 23:08+0100\n" "Last-Translator: Séamus Ó Ciardhuáin <seoc@iolfree.ie>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" @@ -22,7 +22,7 @@ msgstr "" msgid "bad array subscript" msgstr "droch-fhoscript eagair" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -69,6 +69,21 @@ msgstr "NÃl \"%c\" dúnta i %s" msgid "%s: missing colon separator" msgstr "%s: deighilteoir idirstaid ar iarraidh" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -191,7 +206,7 @@ msgstr "uimhir ochtnártha neamhbhailÃ" msgid "invalid hex number" msgstr "uimhir heicsidheachúlach neamhbhailÃ" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "uimhir neamhbhailÃ" @@ -205,7 +220,7 @@ msgstr "%s: sonrú neamhbhailà comhartha" msgid "`%s': not a pid or valid job spec" msgstr "\"%s\": nà aitheantas próisis nó sonrú jab bailà é" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: athróg inléite amháin" @@ -306,7 +321,7 @@ msgstr "nÃl an fheidhm chomhlánaithe á rith faoi láthair" msgid "can only be used in a function" msgstr "Inúsáidte i bhfeidhmeanna amháin. " -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -316,21 +331,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "Nà féidir \"-f\" a úsáid chun feidhmeanna a dhéanamh" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: feidhm inléite amháin" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: nà féidir athróga eagair a scrios mar seo." -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -360,7 +375,7 @@ msgstr "%s: nÃl sé luchtaithe go dinimiciúil" msgid "%s: cannot delete: %s" msgstr "%s: nà féidir scrios: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -585,6 +600,11 @@ msgstr "\"%c\": carachtar formáide neamhbhailÃ." msgid "warning: %s: %s" msgstr "rabhadh: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "digit heicsidheachúlach ar iarraidh le haghaidh \\x" @@ -836,23 +856,23 @@ msgstr "Ordú deireanach: %s\n" msgid "Aborting..." msgstr "Ag tobscor..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "earráid ordaithe neamhaithnid" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "droch-chineál ordaithe" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "drochnascóir" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "drochléim" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: athróg neamhcheangailte" @@ -867,51 +887,51 @@ msgstr "\aimithe thar am ag feitheamh le hionchur: logáil amach uathoibrÃoch\n msgid "cannot redirect standard input from /dev/null: %s" msgstr "Nà féidir an ionchur caighdeánach a atreorú ó /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "FORMÃID_AMA: \"%c\": carachtar formáide neamhbhaiÃ." -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "earráid phÃopa" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: srianta: nà féidir \"/\" a shonrú in ainmneacha ordaithe" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: nÃor aimsÃodh an t-ordú" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, fuzzy, c-format msgid "%s: %s" msgstr "Tá %s %s\n" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: drochléirmhÃnitheoir" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: nà féidir comhad dénártha a rith" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "Is ordú ionsuite blaoisce é %s\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "" @@ -933,7 +953,7 @@ msgstr "Earráid chomhréire sa slonn." msgid "attempted assignment to non-variable" msgstr "Deineadh iarracht sannadh go rud nach athróg é." -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "roinnt ar 0" @@ -945,40 +965,40 @@ msgstr "fabht: droch-chomhartha expassign" msgid "`:' expected for conditional expression" msgstr "BhÃothas ag súil le \":\" le haghaidh sloinn choinnÃollaigh." -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "Easpónant nÃos lú ná 0." -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "ag súil le aitheantóir tar éis réamhincriminte nó réamhdeicriminte" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "\")\" ar iarraidh" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "Earráid chomhréire: bhÃothas ag súil le hoibreann." -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "earráid chomhréire: oibreoir neamhbhailà uimhrÃochta" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (comhartha earráide \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "Bonnuimhir uimhrÃochtúil neamhbhailÃ." -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "Tá an luach rómhór don bhonnuimhir." -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: earráid sloinn\n" @@ -987,7 +1007,7 @@ msgstr "%s: earráid sloinn\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: nà féidir na máthairchomhadlanna a rochtain." -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "" @@ -1012,144 +1032,144 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pÃopa" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "tá an aitheantas an phróisis ghabhlaithe %d sa jab %d atá ag rith" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "Tá an jab stoptha %d leis an ngrúpa próisis %ld á scrios." -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: próiseas %5ld (%s) sa phÃblÃne" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: próiseas %5ld (%s) marcáilte mar fós beo" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: nÃl an aitheantóir próisis sin ann." -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Comhartha %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Déanta" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Stoptha" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Stoptha(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Ag Rith" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Déanta(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Scoir %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Stádas neamhaithnid" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(cuimhne dumpáilte)" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (comhadlann oibre: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid macphróisis (%ld go %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: nÃl an próiseas %ld ina mhacphróiseas den bhlaosc seo." -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: nÃl taifead den phróiseas %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: tá an jab %d stoptha." -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: tá an jab crÃochnaithe." -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: tá an jab %d sa chúlra cheana." -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: lÃne %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (cuimhne dumpáilte)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(comhadlann oibre anois: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: theip ar getpgrp" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: araÃonacht lÃne" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "nà féidir grúpa próisis teirminéil a shocrú (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "NÃl rialú jabanna sa bhlaosc seo." @@ -1305,103 +1325,103 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: ordú atreoraithe \"%d\" as raon." -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "Deireadh comhaid gan súil leis agus \"%c\" a mheaitseálann á lorg." -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "Deireadh comhaid gan súil leis agus \"]]\" á lorg." -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "" "Earráid chomhréire i slonn coinnÃollach: comhartha \"%s\" gan suil leis." -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "Earráid chomhréire i slonn coinnÃollach." -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "Comhartha \"%s\" gan súil leis; ag súil le \")\"." -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "Ag súil le \")\"" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "Argóint \"%s\" gan súil lei go hoibreoir aonártha coinnÃollach." -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "Argóint gan súil lei go hoibreoir coinnÃollach aonártha ." -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" "Comhartha \"%s\" gan súil leis. BhÃothas ag súil le hoibreoir coinnÃollach " "dénártha." -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "BhÃothas ag súil le hoibreoir coinnÃollach dénártha." -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "Argóint \"%s\" gan súil lei go hoibreoir dénártha coinnÃollach." -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "Argóint gan súil lei go hoibreoir dénártha coinnÃollach." -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "Comhartha \"%c\" gan súil leis in ordú coinnÃollach." -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "Comhartha \"%s\" gan súil leis in ordú coinnÃollach." -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "Comhartha %d gan súil leis in ordú coinnÃollach." -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "" "Earráid chomhréire in aice comhartha \"%s\" nach rabhthas ag súil leis." -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "Earráid chomhréire in aice \"%s\"" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "Earráid chomhréire: deireadh comhaid gan súil leis." -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "Earráid chomhréire" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Úsáid \"%s\" le scoir den mblaosc.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "Deireadh comhaid gan súil leis agus \")\" á lorg le meaitseáil." @@ -1544,7 +1564,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Úsáid an t-ordú \"bashbug\" le tuarascáil a sheoladh faoi fhabht.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: oibrÃocht neamhbhailÃ" @@ -1718,91 +1738,91 @@ msgstr "Comhartha neamhaithnid #" msgid "Unknown Signal #%d" msgstr "Comhartha neamhaithnid #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "Drochionadú: nÃl \"%s\" dúnta i %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: nà féidir liosta a shannadh go ball eagair." -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "Nà féidir pÃopa a dhéanamh le haghaidh ionadaÃocht próisis." -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "Nà féidir macphróiseas a dhéanamh le haghaidh ionadaÃocht próisis." -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "Nà féidir pÃopa ainmnithe %s a oscailt le haghaidh léamh." -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "Nà féidir pÃopa ainmnithe %s a oscailt le haghaidh scrÃofa." -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" "Nà féidir an pÃopa ainmnithe %s a dhúbailt mar thuairisceoir comhaid %d." -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "Nà féidir pÃopa a dhéanamh le haghaidh ionadú ordaithe." -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "Nà féidir macphróiseas a dhéanamh le haghaidh ionadú ordaithe." -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" "command_substitute: nà feidir an pÃopa a dhúbailt mar thuairisceoir comhaid " "1." -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%d: tuairisceoir comhaid neamhbhailÃ: %s" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: paraiméadar neamhnitheach nó gan socrú." -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: slonn fotheaghráin < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: drochionadú" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: nà féidir sannadh mar seo." -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "drochionadú: nÃl \"`\" dúnta i %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "gan meaitseáil: %s" @@ -1843,12 +1863,12 @@ msgstr "\"]\" ar iarraidh" msgid "invalid signal number" msgstr "Uimhir chomhartha neamhbhailÃ" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: drochluach sa liosta_gaistÃ[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1856,7 +1876,7 @@ msgstr "" "run_pending_traps: is SIG_DFL an láimhseálaà comharthaÃ; %d (%s) á " "athsheoladh chugam féin." -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: droch-chomhartha %d" @@ -1885,48 +1905,48 @@ msgstr "make_local_variable: nÃl comhthéacs feidhme sa scóip reatha." msgid "%s: variable may not be assigned value" msgstr "%s: nà féidir liosta a shannadh go ball eagair." -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: nÃl comhthéacs feidhme sa scóip reatha" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: paraiméadar neamhnitheach nó gan socrú." -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "Carachtar neamhbhailà %d sa teaghrán easpórtála le haghaidh %s." -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "NÃl \"=\" sa teaghrán easpórtála le haghaidh %s." -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: nà comhthéacs feidhme é ceann shell_variables" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: nÃl comhthéacs global_variables ann" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: nà scóip shealadach thimpeallachta é ceann shell_variables" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: nà féidir oscailt: %s" -#: variables.c:5216 +#: variables.c:5262 #, fuzzy, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%d: tuairisceoir comhaid neamhbhailÃ: %s" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s as raon" Binary files differ@@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2012-02-23 14:38+0100\n" "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -27,7 +27,7 @@ msgstr "" msgid "bad array subscript" msgstr "subÃndice de matriz incorrecto" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: non é posÃbel converter a matriz de indizada a asociativa" @@ -73,6 +73,21 @@ msgstr "no hai un `%c' que peche en %s" msgid "%s: missing colon separator" msgstr "%s: falta un `:' separador" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -195,7 +210,7 @@ msgstr "número octal non válido" msgid "invalid hex number" msgstr "número hexadecimal non válido" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "número non válido" @@ -209,7 +224,7 @@ msgstr "%s: especificación de sinal non válida" msgid "`%s': not a pid or valid job spec" msgstr "`%s': no é un pid ou unha especificación válida de traballo" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: variábel de só lectura" @@ -308,7 +323,7 @@ msgstr "non se está executando a función de completado" msgid "can only be used in a function" msgstr "só se pode usar dentro dunha función" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -318,21 +333,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "non se pode use `-f' para facer funcións" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: función de só lectura" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: non é posÃbel destruÃr variábeis de matriz desta forma" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: non é posÃbel converter unha matriz asociativa a indizada" @@ -361,7 +376,7 @@ msgstr "%s: non foi cargado dinamicamente" msgid "%s: cannot delete: %s" msgstr "%s: non foi posÃbel eliminar: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -586,6 +601,11 @@ msgstr "`%c': carácter de formato non válido" msgid "warning: %s: %s" msgstr "aviso: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "falta o dÃxito hexadecimal para \\x" @@ -892,23 +912,23 @@ msgstr "última orde: %s\n" msgid "Aborting..." msgstr "Abortando…" -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "erro de orde descoñecido" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "tipo de orde erróneo" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "conector erróneo" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "salto erróneo" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: variable sen asignar" @@ -923,51 +943,51 @@ msgstr "\aexpirou mentres agardaba algunha entrada: auto-logout\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "non é posÃbel redirixir a saÃda estándar desde /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': carácter de formato non válido" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "erro de canalización" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: restrinxido: non se pode especificar `/' en nomes de ordes" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: non se atopou a orde" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: intérprete erróneo" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: non é posÃbel executar o ficheiro binario" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s é unha orde interna do shell\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "no se pode duplicar o df %d ao df %d" @@ -988,7 +1008,7 @@ msgstr "erro de sintaxe na expresión" msgid "attempted assignment to non-variable" msgstr "tentouse asignar a algo que non é unha variábel" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "división entre 0" @@ -1000,41 +1020,41 @@ msgstr "erro: elemento de asignación de expresión erróneo" msgid "`:' expected for conditional expression" msgstr "agardábase `:' para a expresión condicional" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "expoñente menor que 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" "agardábase un identificador despois do pre-incremento ou pre-decremento" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "falta un `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "erro de sintaxe: agardábase un operando" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "erro de sintaxe: operador aritmético non válido" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (o elemento de erro é \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "base aritmética non válida" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "valor demasiado grande para a base" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: erro de expresión\n" @@ -1043,7 +1063,7 @@ msgstr "%s: erro de expresión\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: non é posÃbel acceder aos directorios pai" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "non é posÃbel restabelecer o modo nodelay para o df %d" @@ -1065,144 +1085,144 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: tuberÃa de pgrp" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "o pid `forked' %d aparece no traballo en execución %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "borrando o trabajo detido %d con grupo de proceso %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: o proceso %5ld (%s) en the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) márcase como vivo aÃnda" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: non existe tal pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Sinal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Feito" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Detido" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Detido(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "En execución" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Feito(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "SaÃda %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Estado descoñecido" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(«core» xerado) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (dir agora: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid fillo (%ld a %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld non é un proceso fillo desta shell" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Non hai un rexistro do proceso %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: o traballo %d está detido" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: o traballo rematou" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: o trabajo %d xa está en segundo plano" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: actÃvase WNOHANG para evitar o bloque indefinido" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: liña %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " («core» generado)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(dir agora: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_jobs_control: fallou getpgrp" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_jobs_control: disciplina de liña" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_jobs_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "non é posÃbel estabelecer o grupo de procesos de terminal (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "non hai control de trabalos nesta shell" @@ -1359,99 +1379,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: a instrucción de redirección `%d' está fóra de rango" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "EOF inesperado mentres se buscaba un `%c' coincidente" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "EOF inesperado mentres se buscaba `]]'" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "error de sintaxe na expresión condicional: elemento inesperado `%s'" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "error sintáctico na expresión condicional" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "elemento inesperado `%s', agardábase `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "agardábase `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "argumento inesperado `%s' para o operador unario condicional" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "argumento inesperado para o operador unario condicional" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "elemento inesperado `%s', agardábase un operador binario condicional" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "agardábase un operador binario condicional" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "argumento inesperado `%s' para o operador binario condicional" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "argumento inesperado para o operador binario condicional" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "elemento inesperado `%c' na orde condicional" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "elemento inesperado `%s' na orde condicional" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "elemento inesperado %d na orde condicional" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "error de sintaxe perto do elemento inesperado `%s'" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "erro de sintaxe cerca de «%s»" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "error de sintaxe: non se agardaba o final do fichero" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "erro de sintaxe" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Use «%s» para deixar o shell.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "EOF non agardado mentres se buscaba un «)» coincidente" @@ -1594,7 +1614,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Use a orden `bashbug' para reportar erros.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: operación non válida" @@ -1768,77 +1788,77 @@ msgstr "Sinal descoñecido #" msgid "Unknown Signal #%d" msgstr "Sinal descoñecido #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "susbtitución errónea: non hai un `%s' que peche en %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: no é posÃbel asignar unha lista a un membro da matriz" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "non é posÃbel crear a tuberÃa para a sustitución do proceso" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "non é posÃbel crear un proceso fillo para a substitución do proceso" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "non é posÃbel abrir a tuberÃa chamada %s para lectura" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "non é posÃbel abrir a tuberÃa chamada %s para escritura" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "non é posÃbel duplicar a tuberÃa chamada %s como df %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "non é posÃble crear a tuberÃa para a substitución da orde" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "non é posÃbel crear un proceso fillo para a substitución da orde" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: non é posÃbel duplicar a tuberÃa como fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: valor non válido para o descitor de ficheiro de rastreo" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parámetro nulo ou non estabelecido" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: expresión de subcadea < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: substitución errónea" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: non é posÃbel asignar de esta forma" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1846,12 +1866,12 @@ msgstr "" "versiones futuras do intérprete obligarán a evaluación como unha " "substitución aritmética" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "substitución errónea: non hai unha \"`\" que peche en %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "non hai concidencia: %s" @@ -1892,12 +1912,12 @@ msgstr "falta un «]»" msgid "invalid signal number" msgstr "número de sinal non válido" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: valor erróneo en trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1905,7 +1925,7 @@ msgstr "" "run_pending_traps: o manexador de sinal é SIG_DFL, reenviando %d (%s) a sà " "mesmo" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: sinal errónea %d" @@ -1934,50 +1954,50 @@ msgstr "make_local_variable: non hai contexto de función no ámbito actual" msgid "%s: variable may not be assigned value" msgstr "%s: non é posÃbel asignar o gd á variábel" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: non hai contexto de función no ámbito actual" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s ten exportstr nulo" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "carácter non válido %d en exportsrt para %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "non hai «=» en exportstr para %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context: a cabezak de shell_variables non é un contexto de función" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: non é un contexto global_variables " -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: a cabeza de shell_variables non é un ámbito de ambiente temporal" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: non é posÃbel abrir como FICHEIRO" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: valor non válido para o descitor de ficheiro de rastreo" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s fóra de rango" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-04-18 01:00+0200\n" "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n" @@ -23,7 +23,7 @@ msgstr "" msgid "bad array subscript" msgstr "neispravan indeks polja" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: ne mogu pretvoriti indeksirano u asocijativno polje" @@ -67,6 +67,21 @@ msgstr "nema zatvorene „%c†u %s" msgid "%s: missing colon separator" msgstr "%s: nedostaje dvotoÄje za razdvajanje" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "neispravan oktalni broj" msgid "invalid hex number" msgstr "neispravan heksadekadski broj" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "neispravan broj" @@ -203,7 +218,7 @@ msgstr "%s: neispravno naveden signal" msgid "`%s': not a pid or valid job spec" msgstr "„%sâ€: nije pid ili ispravno naveden zadatak" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: varijabla samo za Äitanje" @@ -302,7 +317,7 @@ msgstr "trenutno ne izvrÅ¡avam funkciju nadopunjavanja" msgid "can only be used in a function" msgstr "može se koristiti samo u funkciji" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -312,21 +327,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "ne mogu koristiti „-f†za izradu funkcija" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funkcija samo za Äitanje" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: ne mogu uniÅ¡titi varijable polja na ovaj naÄin" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: ne mogu pretvoriti asocijativno u indeksirano polje" @@ -355,7 +370,7 @@ msgstr "%s: nije dinamiÄki uÄitan" msgid "%s: cannot delete: %s" msgstr "%s: ne mogu ukloniti: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -580,6 +595,11 @@ msgstr "„%câ€: neispravan znak oblika" msgid "warning: %s: %s" msgstr "upozorenje: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "nedostaje heksadekadska znamenka za \\x" @@ -850,23 +870,23 @@ msgstr "posljednja naredba: %s\n" msgid "Aborting..." msgstr "Prekidam..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "nepoznata greÅ¡ka naredbe" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "neispravna vrsta naredbe" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "neispravno spajanje" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "neispravan skok" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: nepovezana varijabla" @@ -881,51 +901,51 @@ msgstr "\avrijeme Äekanja ulaza je isteklo: automatska-odjava\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "ne mogu preusmjeriti standardni ulaz iz /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: „%câ€: neispravan znak oblika" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "greÅ¡ka cjevovoda" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: ograniÄeno: ne možete navesti „/†u imenu naredbe" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: naredba nije pronaÄ‘ena" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: neispravan tumaÄ" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: ne mogu izvrÅ¡iti binarnu datoteku" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s je ugraÄ‘en u ljusku\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "ne mogu udvostruÄiti opisnik datoteke %d u opisnik datoteke %d" @@ -946,7 +966,7 @@ msgstr "sintaksna greÅ¡ka u izrazu" msgid "attempted assignment to non-variable" msgstr "pokuÅ¡aj pridruživanja ne-varijabli" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "dijeljenje s 0" @@ -958,40 +978,40 @@ msgstr "greÅ¡ka: neispravan simbol expassign" msgid "`:' expected for conditional expression" msgstr "oÄekujem „:†za uvjetni izraz" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "eksponent je manji od 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "oÄekujem identifikator nakon pred-povećanja ili pred-smanjenja" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "nedostaje „)â€" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "sintaksna greÅ¡ka: oÄekujem operand" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "sintaksna greÅ¡ka: neispravan aritmetiÄki operator" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (simbol greÅ¡ke je „%sâ€)" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "neispravna aritmetiÄka baza" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "vrijednost baze je prevelika" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: greÅ¡ka izraza\n" @@ -1000,7 +1020,7 @@ msgstr "%s: greÅ¡ka izraza\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: ne mogu pristupiti nadreÄ‘enim direktorijima" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "" @@ -1019,144 +1039,144 @@ msgstr "save_bash_input: meÄ‘uspremnik već postoji za novi fd %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "razdvojen pid %d se javlja u pokrenutom zadatku %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "uklanjam zaustavljeni zadatak %d s grupom procesa %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: proces %5ld (%s) u the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) oznaÄen kao joÅ¡ živ" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: ne postoji takav pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Gotovo" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Zaustavljen" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Zaustavljen(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Pokrenut" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Gotovo(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Izlaz %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Nepoznato stanje" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(jezgra izbaÄena) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld nije dijete ove ljuske" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Ne postoji zapis o procesu %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: zadatak %d je zaustavljen" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: zadatak je dovrÅ¡en" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: zadatak %d je već u pozadini" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: redak %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (jezgra izbaÄena)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(sadaÅ¡nji wd: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp nije uspio" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "ne mogu postaviti grupu procesa terminala (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "nema kontrole zadataka u ovoj ljusci" @@ -1307,99 +1327,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "neoÄekivani EOF pri traženju odgovarajućeg „%câ€" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "neoÄekivani EOF pri traženju „]]â€" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "sintaksna greÅ¡ka u uvjetnom izrazu: neoÄekivani simbol „%sâ€" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "sintaksna greÅ¡ka u uvjetnom izrazu" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "neoÄekivani simbol „%sâ€, oÄekujem „)â€" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "oÄekujem „)â€" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "neoÄekivani argument „%s†uvjetnom unarnom operatoru" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "neoÄekivani argument uvjetnom unarnom operatoru" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "neoÄekivani simbol „%sâ€, oÄekujem uvjetni binarni operator" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "oÄekujem uvjetni binarni operator" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "neoÄekivani argument „%s†uvjetnom binarnom operatoru" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "neoÄekivani argument uvjetnom binarnom operatoru" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "neoÄekivani simbol „%c†u uvjetnoj naredbi" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "neoÄekivani simbol „%s†u uvjetnoj naredbi" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "neoÄekivani simbol %d u uvjetnoj naredbi" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "sintaksna greÅ¡ka kod neoÄekivanog simbola „%sâ€" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "sintaksna greÅ¡ka kod „%sâ€" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "sintaksna greÅ¡ka: neoÄekivani kraj datoteke" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "sintaksna greÅ¡ka" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Koristite „%s†za napuÅ¡tanje ljuske.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "neoÄekivani EOF pri traženju odgovarajuće „)â€" @@ -1537,7 +1557,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Koristite naredbu „bashbug†za prijavljivanje greÅ¡aka.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "" @@ -1711,89 +1731,89 @@ msgstr "Nepoznat signal #" msgid "Unknown Signal #%d" msgstr "Nepoznat signal #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "neispravna zamjena: nema zatvorene „%s†u %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: ne mogu pridružiti popis elementu polja" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "ne mogu napraviti cjevovod za zamjenu procesa" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "ne mogu napraviti dijete za zamjenu procesa" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "ne mogu otvoriti imenovani cjevovod %s za Äitanje" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "ne mogu otvoriti imenovani cjevovod %s za pisanje" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "ne mogu udvostruÄiti imenovani cjevovod %s kao opisnik datoteke %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "ne mogu napraviti cjevovod za zamjenu naredbi" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "ne mogu napraviti dijete za zamjenu naredbi" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" "command_substitute: ne mogu udvostruÄiti cjevovod kao opisnik datoteke 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametar prazan ili nije postavljen" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: izraz podniza < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: neispravna zamjena" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: ne mogu pridružiti na ovaj naÄin" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "buduće inaÄice ljuske će prisiliti procjenu kao aritmetiÄku zamjenu" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "neispravna zamjena: nema zatvorenog „`†u %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "nema podudaranja: %s" @@ -1834,18 +1854,18 @@ msgstr "nedostaje „]â€" msgid "invalid signal number" msgstr "neispravan broj signala" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: neispravan signal %d" @@ -1874,48 +1894,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: ne mogu pridružiti opisnik datoteke varijabli" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s ima prazan exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: ne mogu otvoriti kao DATOTEKU" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s je izvan granica" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2010-08-06 17:44+0200\n" "Last-Translator: Mate Ory <orymate@ubuntu.com>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "bad array subscript" msgstr "Hibás tömbindex" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: nem lehetséges az indexelt tömb asszociatÃvvá alakÃtása" @@ -66,6 +66,21 @@ msgstr "nincs záró „%c†a következÅ‘ben: %s" msgid "%s: missing colon separator" msgstr "%s: hiányzó kettÅ‘spont-elválasztó" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "érvénytelen oktális szám" msgid "invalid hex number" msgstr "érvénytelen hexadecimális szám" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "érvénytelen szám" @@ -203,7 +218,7 @@ msgstr "%s: érvénytelen szignálmegadás" msgid "`%s': not a pid or valid job spec" msgstr "„%sâ€: nem pid vagy munkaazonosÃtó" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: csak olvasható változó" @@ -302,7 +317,7 @@ msgstr "jelenleg nincs kiegészÃtési függvény végrehajtás alatt" msgid "can only be used in a function" msgstr "csak függvényben használható" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -312,21 +327,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "nem használható a „-f†függvény létrehozására" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: csak olvasható függvény" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: ilyen módon nem lehet tömböt megszüntetni" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: nem lehetséges az asszociatÃv tömb indexeltté alakÃtása" @@ -355,7 +370,7 @@ msgstr "%s: nem dinamikusan van betöltve" msgid "%s: cannot delete: %s" msgstr "%s: nem törölhetÅ‘: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -579,6 +594,11 @@ msgstr "„%câ€: érvénytelen formátumkarakter" msgid "warning: %s: %s" msgstr "figyelmeztetés: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "hiányzó hexadecimális számjegy a következÅ‘höz: \\x" @@ -883,23 +903,23 @@ msgstr "utolsó parancs: %s\n" msgid "Aborting..." msgstr "MegszakÃtás..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "hiba: érvénytelen parancs" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "hibás parancstÃpus" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "hibás csatlakozó" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "hibás ugrás" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: kötetlen változó" @@ -914,51 +934,51 @@ msgstr "\aidÅ‘túllépés bemenetre várva: automatikus kijelentkezés\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "szabványos bemenet /dev/null-ra állÃtása sikertelen: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "IDÅFORMÃTUM: „%câ€: érvénytelen formátumkarakter" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "hibás csÅ‘vezeték" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: korlátozott: nem adható meg „/†a parancsok nevében" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: parancs nem található" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, fuzzy, c-format msgid "%s: %s" msgstr "%s egy %s\n" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: rossz parancsértelmezÅ‘" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: bináris nem hajtható végre" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s egy beépÃtett parancs\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "nem lehet duplikálni a(z) %d. fájlleÃrót a(z) %d. helyre" @@ -979,7 +999,7 @@ msgstr "szintaktikai hiba a kifejezésben" msgid "attempted assignment to non-variable" msgstr "nem változóhoz próbált értéket rendelni" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "0-val osztás" @@ -991,40 +1011,40 @@ msgstr "bug: rossz expassign token" msgid "`:' expected for conditional expression" msgstr "„:†egy feltételkifejezés szükséges" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "0-nál kisebb kitevÅ‘" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "prefix növelés vagy csökkentés után azonosÃtó kell következzen" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "hiányzó „)â€" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "szintaktikai hiba: operandus kell következzen" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "szintaktikai hiba: érvénytelen aritmetikai operátor" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (hibás token: „%sâ€)" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "érvénytelen számrendszer" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "túl nagy érték a számrendszerhez" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: hibás kifejezés\n" @@ -1033,7 +1053,7 @@ msgstr "%s: hibás kifejezés\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: nem érhetÅ‘ek el a szülÅ‘könyvtárak" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "nem lehet újraindÃtani a nodelay módot a(z) %d. fájlleÃróhoz" @@ -1053,144 +1073,144 @@ msgstr "save_bash_input: már van puffer a(z) %d. fájlleÃróhoz" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp csÅ‘vezeték" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "a(z) %d számú forkolt pid a(z) %d számú munkában jelent meg" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "%d. számú megállÃtott munka törlése a %ld számú folyamatcsoporttal" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: %5ld. folyamat (%s) a the_pipeline-ban" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: %5ld. folyamat (%s) még élÅ‘ként van jelölve" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: nincs ilyen pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "%d. szignál" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Kész" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "MegállÃtva" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "MegállÃtva(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Fut" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Kész(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Kilépett(%d)" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Ismeretlen állapot" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core készült) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (mk: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "gyermek setpgid (innen: %ld ide: %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: %ld. számú folyamat nem gyermeke ennek a parancsértelmezÅ‘nek" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Nincs bejegyzés %ld. számú folyamatról" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: %d. számú munka le lett állÃtva" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: a munka be lett fejezve" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: %d. számú munka már a háttérben van" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: WNOHANG bekapcsolása a korlátlan blokk elkerülésére" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: %d. sor: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core készült)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(mk most: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp sikertelen" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: line discipline" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "nem állÃtható be a terminál folyamatcsoportja (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "nincsen munkakezelés ebben a parancsértelmezÅ‘ben" @@ -1343,99 +1363,99 @@ msgstr "a(z) %d. sorban kezdett heredocot EOF zárja („%s†helyett)" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: %d. átirányÃtó utasÃtás kÃvül esik a tartományon" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "váratlan EOF „%c†helyett" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "váratlan EOF „]]†helyett" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "szintaktikai hiba a feltételben: váratlan token: „%sâ€" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "szintaktikai hiba a feltételben" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "váratlan token (%s) „)†helyett" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "„)†szükséges" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "váratlan argumentum (%s) feltételes egyoperandusú operátorhoz" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "váratlan argumentum feltételes egyoperandusú operátorhoz" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "váratlan token (%s), feltételes kétoperandusú operátor szükséges" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "feltételes kétoperandusú operátor szükséges" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "váratlan argumentum (%s) feltételes kétoperandusú operátorhoz" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "váratlan argumentum feltételes kétoperandusú operátorhoz" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "váratlan token (%c) feltételes parancsban" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "váratlan token (%s) feltételes parancsban" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "váratlan token (%d) feltételes parancsban" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "szintaktikai hiba „%s†váratlan token közelében" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "szintaktikai hiba „%s†közelében" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "szintaktikai hiba: váratlan fájlvége" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "szintaktikai hiba" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "„%s†használatával lehet elhagyni a parancsértelmezÅ‘t.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "váratlan EOF „)†helyett" @@ -1576,7 +1596,7 @@ msgstr "A „%s -c help†további információt ad a beépÃtett parancsokról msgid "Use the `bashbug' command to report bugs.\n" msgstr "A „bashbug†paranccsal jelenthet hibákat.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: érvénytelen művelet" @@ -1750,77 +1770,77 @@ msgstr "Ismeretlen szignál #" msgid "Unknown Signal #%d" msgstr "%d. számú ismeretlen szignál" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "hibás helyettesÃtés: nincs záró „%s†a következÅ‘ben: %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: lista nem adható tömbelemnek értékül" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "nem hozható létre a csÅ‘vezeték a folyamatbehelyettesÃtéshez" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "nem hozható létre a gyermek a folyamatbehelyettesÃtéshez" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "nem nyitható meg olvasásra a(z) %s csÅ‘vezeték" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "nem nyitható meg Ãrásra a(z) %s csÅ‘vezeték" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "nem duplikálható a(z) %s csÅ‘vezeték %d. fájlleÃróként" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "nem hozható létre csÅ‘vezeték a parancsbehelyettesÃtéshez" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "nem hozható létre gyermek a parancsbehelyettesÃtéshez" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: nem duplikálható a csÅ‘vezeték 1. fájlleÃróként" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: érvénytelen érték a trace fájlleÃróhoz" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: a paraméter null vagy nincs beállÃtva" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: részkarakterlánc-kifejezés < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: rossz helyettesÃtés" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: nem lehet Ãgy értéket adni" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1828,12 +1848,12 @@ msgstr "" "a parancsértelmezÅ‘ késÅ‘bbi verziói kötelezÅ‘vé teszik majd az aritmetikai " "kiértékelést" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "hibás helyettesÃtés: nincs záró „`†a következÅ‘ben: %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "nincs találat: %s" @@ -1874,19 +1894,19 @@ msgstr "hiányzó „]â€" msgid "invalid signal number" msgstr "érvénytelen szignálszám" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: rossz érték a trap_list[%d]-ban: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" "run_pending_traps: szignálkezelÅ‘ a SIG_DFL, %d (%s) újraküldése önmagunknak" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: rossz szignál: %d" @@ -1915,48 +1935,48 @@ msgstr "make_local_variable: nincs függvénykörnyezet az aktuális látókörb msgid "%s: variable may not be assigned value" msgstr "%s: nem lehet változóhoz fájlleÃrót rendelni" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: nincs függvénykörnyezet az aktuális látókörben" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s exportstr-je null" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "érvénytelen karakter (%d) %s exportstr-jében" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "nincs „=†%s exportstr-jében" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: shell_variables feje nem egy függvénykörnyezet" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: nincs global_variables környezet" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: shell_variables feje nem egy átmeneti környezeti látókör" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: nem nyitható meg FILE-ként" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: érvénytelen érték a trace fájlleÃróhoz" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s kÃvül esik a tartományon" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2010-01-16 12:45+0700\n" "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "bad array subscript" msgstr "array subscript buruk" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: tidak dapat mengubah index ke array yang berassosiasi" @@ -65,6 +65,21 @@ msgstr "tidak menutup '%c' dalam %s" msgid "%s: missing colon separator" msgstr "%s: hilang pemisah colon" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -187,7 +202,7 @@ msgstr "nomor oktal tidak valid" msgid "invalid hex number" msgstr "nomor hexa tidak valid" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "nomor tidak valid" @@ -201,7 +216,7 @@ msgstr "%s: spesifikasi sinyal tidak valid" msgid "`%s': not a pid or valid job spec" msgstr "`%s': bukan sebuah pid atau spesifikasi pekerjaan yang valid" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: variabel baca-saja" @@ -302,7 +317,7 @@ msgstr "saat ini sedang tidak menjalankan fungsi completion" msgid "can only be used in a function" msgstr "hanya dapat digunakan dalam sebuah fungsi" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -312,21 +327,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "tidak dapat menggunakan `-f' untuk membuat fungsi" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: fungsi baca-saja" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: tidak dapat menghapus variabel array secara ini" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: tidak dapat mengubah assosiasi ke array index" @@ -355,7 +370,7 @@ msgstr "%s: bukan dinamically loaded" msgid "%s: cannot delete: %s" msgstr "%s: tidak dapat menghapus: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -582,6 +597,11 @@ msgstr "`%c': karakter format tidak valid" msgid "warning: %s: %s" msgstr "peringatan: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "hilang digit hexa untuk \\x" @@ -890,23 +910,23 @@ msgstr "perintah terakhir: %s\n" msgid "Aborting..." msgstr "membatalkan..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "perintah error tidak diketahui" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "tipe perintah buruk" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "konektor buruk" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "lompat buruk" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: variabel tidak terikat" @@ -921,52 +941,52 @@ msgstr "kehabisan waktu menunggu masukan: otomatis-keluar\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "tidak dapat menyalurkan masukan standar dari /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': karakter format tidak valid" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "pipe error" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "" "%s: dibatasi: tidak dapat menspesifikasikan '/' dalam nama nama perintah" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: perintah tidak ditemukan" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, fuzzy, c-format msgid "%s: %s" msgstr "%s adalah %s\n" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: interpreter buruk" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: tidak dapat menjalankan berkas binary" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s adalah sebuah shell builtin\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "tidak dapat menduplikasikan fd %d ke fd %d" @@ -987,7 +1007,7 @@ msgstr "syntax error dalam expresi" msgid "attempted assignment to non-variable" msgstr "mencoba menempatkan ke bukan sebuah variabel" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "dibagi oleh 0" @@ -999,40 +1019,40 @@ msgstr "bug: tanda expassign buruk" msgid "`:' expected for conditional expression" msgstr "`:' diharapkan untuk sebuah pernyataan kondisional" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "eksponen kurang dari 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "idenfier diharapkan setelah pre-increment atau pre-decrement" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "hilang `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "syntax error: operand diharapkan" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "syntax error: operator arithmetic tidak valid" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (error token adalah \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "basis arithmetic tidak valid" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "nilai terlalu besar untuk basis" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: expresi error\n" @@ -1041,7 +1061,7 @@ msgstr "%s: expresi error\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: tidak dapat mengakses direktori orang tua" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "tidak dapat mereset mode nodelay untuk fd %d" @@ -1062,144 +1082,144 @@ msgstr "simpan bash_input: buffer telah ada untuk fd %d baru" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "forked pid %d terlihat dalam pekerjaan yang sedang berjalan %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "menghapus pekerjaan yang terhenti %d dengan proses grup %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: process %5ld (%s) dalam the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) ditandai dengan tetap hidup" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: tidak ada pid seperti itu" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "sinyal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Selesai" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Terhenti" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Terhenti(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Berjalan" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Selesai(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Keluar %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Status tidak diketahui" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core didump) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "anak setpgid (%ld ke %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld bukan sebuah anak dari shell ini" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Tidak ada catatan untuk proses %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: pekerjaan %d terhenti" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: pekerjaan telah selesai" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: pekerjaan %d sudah berjalan di belakang (background)" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: mengaktifkan WNOHANG untuk menghindari blok tak terhingga" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: baris %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core didump)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd sekarang: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp gagal" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: baris disiplin" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "tidak dapat menset terminal proses grup (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "tidak ada pengontrol pekerjaan dalam shell ini" @@ -1354,99 +1374,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: instruksi redireksi `%d' diluar dari jangkauan" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "EOF tidak terduga ketika mencari untuk pencocokan `%c'" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "EOF tidak terduga ketika mencari untuk `]]'" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "syntax error dalam ekspresi kondisional: tanda `%s' tidak terduga" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "syntax error dalam ekspresi kondisional" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "tanda `%s' tidak terduga, diduga `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "diduga `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "argumen tidak terduga `%s' ke operator kondisional unary" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "argumen tidak terduga untuk operasi unary kondisional" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "tanda `%s' tidak terduga, operator binary kondisional diduga" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "operator binary kondisional diduga" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "argumen `%s' tidak terduga ke operator binary kondisional" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "argumen tidak terduga ke operasi binary kondisional" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "tanda `%c' tidak terduga dalam perintah kondisional" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "tanda `%s' tidak terduga dalam perintah kondisional" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "tanda %d tidak terduga dalam perintah kondisional" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "syntax error didekat tanda `%s' yang tidak terduga" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "syntax error didekat `%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "syntax error: tidak terduga diakhir dari berkas" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "syntax error" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Gunakan \"%s\" untuk meninggalkan shell.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "EOF tidak terduga ketika mencari untuk pencocokan ')'" @@ -1589,7 +1609,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Gunakan perintah 'bashbug' untuk melaporkan bugs.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: operasi tidak valid" @@ -1763,77 +1783,77 @@ msgstr "Sinyal tidak diketahui #" msgid "Unknown Signal #%d" msgstr "Sinyal tidak diketahui #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "substitusi buruk: tidak ada penutupan `%s' dalam %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: tidak dapat meng-assign daftar kedalam anggoya array" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "tidak dapat membuat pipe untuk proses substitusi" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "tidak dapat membuat anak untuk proses substitusi" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "tidak dapat membuka named pipe %s untuk membaca" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "tidak dapat membukan named pipe %s untuk menulis" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "tidak dapat menduplikasi nama pipe %s sebagai fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "tidak dapat membuat pipe untuk perintah substitusi" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "tidak dapat membuat anak untuk perintah substitusi" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: tidak dapat menduplikasikan pipe sebagi fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: nilai dari berkas pendeskripsi penelusur tidak valid" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parameter kosong atau tidak diset" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: substring expresi < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: substitusi buruk" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: tidak dapat meng-assign dengan cara ini" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1841,12 +1861,12 @@ msgstr "" "versi selanjutnya dari shell akan memaksa evaluasi dari sebuah penggantian " "aritmetika" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "substitusi buruk: tidak ada penutupan \"\" dalam %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "tidak cocok: %s" @@ -1887,12 +1907,12 @@ msgstr "hilang `]'" msgid "invalid signal number" msgstr "nomor sinyal tidak valid" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: nilai buruk dalam trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1900,7 +1920,7 @@ msgstr "" "run_pending_traps: sinyal handler adalah SIG_DFL, mengirimkan kembali %d " "(%s) kediri sendiri" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: sinyal buruk %d" @@ -1929,51 +1949,51 @@ msgstr "make_local_variable: tidak ada context fungsi di scope ini" msgid "%s: variable may not be assigned value" msgstr "%s: tidak dapat meng-'assign' fd ke variabel" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: tidak ada context fungsi dalam scope ini" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s memiliki exportstr kosong" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "karakter %d tidak valid dalam exporstr untuk %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "bukan `=' dalam exportstr untuk %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context: kepala dari shell_variables bukan sebuah fungsi cbntext" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: bukan global_variable context" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: kepala dari shell_variables bukan sebuah scope lingkungan " "sementara" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: tidak dapat membuka sebagai BERKAS" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: nilai dari berkas pendeskripsi penelusur tidak valid" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s diluar jangkauan" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2011-10-17 09:14+0200\n" "Last-Translator: Sergio Zanchetta <primes2h@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "bad array subscript" msgstr "indice dell'array errato" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: impossibile convertire un array indicizzato in uno associativo" @@ -67,6 +67,21 @@ msgstr "carattere di chiusura \"%c\" non presente in %s" msgid "%s: missing colon separator" msgstr "%s: separatore di tipo due punti mancante" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "numero ottale non valido" msgid "invalid hex number" msgstr "numero esadecimale non valido" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "numero non valido" @@ -203,7 +218,7 @@ msgstr "%s: specifica di segnale non valida" msgid "`%s': not a pid or valid job spec" msgstr "\"%s\": non eÌ€ un pid o un numero di job valido" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: variabile in sola lettura" @@ -302,7 +317,7 @@ msgstr "funzione di completamento attualmente non in esecuzione" msgid "can only be used in a function" msgstr "puoÌ€ essere usato solo in una funzione" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -312,21 +327,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "impossibile usare \"-f\" per creare funzioni" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funzione in sola lettura" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: impossibile eliminare variabili array in questo modo" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: impossibile convertire un array associativo in uno indicizzato" @@ -355,7 +370,7 @@ msgstr "%s: non caricato dinamicamente" msgid "%s: cannot delete: %s" msgstr "%s: impossibile eliminare: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -580,6 +595,11 @@ msgstr "\"%c\": carattere di formato non valido" msgid "warning: %s: %s" msgstr "attenzione: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "cifra esadecimale mancante in \\x" @@ -888,23 +908,23 @@ msgstr "ultimo comando: %s\n" msgid "Aborting..." msgstr "Interruzione..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "errore di comando sconosciuto" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "tipo di comando errato" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "connettore errato" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "salto errato" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: variabile non assegnata" @@ -919,51 +939,51 @@ msgstr "\atempo di attesa scaduto per l'input: auto-logout\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "impossibile redirigere lo standard input da /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: \"%c\": carattere di formato non valido" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "errore della pipe" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: limitato: impossibile specificare \"/\" nei nomi dei comandi" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: comando non trovato" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: interprete errato" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: impossibile eseguire il file binario" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s è un comando interno di shell\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "impossibile duplicare fd %d su fd %d" @@ -984,7 +1004,7 @@ msgstr "errore di sintassi nell'espressione" msgid "attempted assignment to non-variable" msgstr "tentata un'assegnazione a una non variabile" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "divisione per 0" @@ -996,40 +1016,40 @@ msgstr "bug: token di expassign errato" msgid "`:' expected for conditional expression" msgstr "atteso \":\" per l'espressione condizionale" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "esponente minore di 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "atteso identificatore dopo un pre-incremento o un pre-decremento" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "\")\" mancante" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "errore di sintassi: atteso un operando" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "errore di sintassi: operatore aritmetico non valido" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (il token dell'errore è \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "base aritmetica non valida" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "valore troppo grande per la base" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: errore di espressione\n" @@ -1038,7 +1058,7 @@ msgstr "%s: errore di espressione\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: impossibile accedere alle directory padre" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "impossibile reimpostare il modo nodelay per fd %d" @@ -1059,144 +1079,144 @@ msgstr "save_bash_input: buffer giaÌ€ esistente per il nuovo fd %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pipe pgrp" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "il pid %d del fork appare nel job in esecuzione %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "eliminazione del job %d interrotto con il gruppo di processi %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: processo %5ld (%s) in the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) segnato come ancora in vita" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: pid inesistente" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Segnale %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Completato" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Fermato" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Fermato(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "In esecuzione" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Eseguito(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Uscita %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Stato sconosciuto" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core dump creato) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (dir: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid del figlio (%ld a %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: il pid %ld non eÌ€ un figlio di questa shell" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: nessun record del processo %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: il job %d eÌ€ fermo" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: il job eÌ€ terminato" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: il job %d è giaÌ€ in background" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: attivato WNOHANG per evitare blocchi indefiniti" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: riga %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core dump creato)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(dir ora: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp non riuscita" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: disciplina di linea" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "impossibile impostare il gruppo di processi del terminale (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "nessun controllo dei job in questa shell" @@ -1352,100 +1372,100 @@ msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" "make_redirection: istruzione di reindirizzamento \"%d\" fuori dell'intervallo" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "EOF non atteso durante la ricerca di \"%c\"" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "EOF non atteso durante la ricerca di \"]]\"" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "" "errore di sintassi nell'espressione condizionale: token non atteso \"%s\"" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "errore di sintassi nell'espressione condizionale" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "token non atteso \"%s\", era atteso \")\"" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "atteso \")\"" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "argomento non atteso \"%s\" per l'operatore unario condizionale" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "argomento non atteso per l'operatore unario condizionale" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "token non atteso \"%s\", era atteso un operatore binario condizionale" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "atteso operatore binario condizionale" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "argomento non atteso \"%s\" per l'operatore binario condizionale" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "argomento non atteso per l'operatore binario condizionale" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "token non atteso \"%c\" nel comando condizionale" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "token non atteso \"%s\" nel comando condizionale" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "token non atteso %d nel comando condizionale" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "errore di sintassi vicino al token non atteso \"%s\"" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "errore di sintassi vicino a \"%s\"" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "errore di sintassi: EOF non atteso" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "errore di sintassi" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Usare \"%s\" per uscire dalla shell.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "EOF non atteso durante la ricerca di \")\"" @@ -1588,7 +1608,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Usare il comando \"bashbug\" per segnalare i bug.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: operazione non valida" @@ -1762,77 +1782,77 @@ msgstr "Numero di segnale sconosciuto" msgid "Unknown Signal #%d" msgstr "Segnale sconosciuto n° %d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "sostituzione errata: nessuna chiusura di \"%s\" in %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: impossibile assegnare una lista a un membro di un array" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "impossibile creare una pipe per la sostituzione del processo" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "impossibile creare un figlio per la sostituzione del processo" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "impossibile aprire la pipe con nome %s in lettura" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "impossibile aprire la pipe con nome %s in scrittura" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "impossibile duplicare una pipe con nome %s come fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "impossibile creare una pipe per la sostituzione del comando" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "impossibile creare un figlio per la sostituzione del comando" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: impossibile duplicare la pipe come fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: valore non valido per il descrittore del file di traccia" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametro nullo o non impostato" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: expressione di sottostringa < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: sostituzione errata" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: impossibile assegnare in questo modo" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1840,12 +1860,12 @@ msgstr "" "le versioni future della shell forzeranno la valutazione come fosse una " "sostituzione aritmetica" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "sostituzione errata: manca «\"» di chiusura in %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "nessuna corrispondenza: %s" @@ -1886,12 +1906,12 @@ msgstr "\"]\" mancante" msgid "invalid signal number" msgstr "numero di segnale non valido" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: valore errato in trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1899,7 +1919,7 @@ msgstr "" "run_pending_traps: il gestore dei segnali eÌ€ SIG_DFL, viene inviato " "nuovamente %d (%s)" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: segnale errato %d" @@ -1928,52 +1948,52 @@ msgstr "make_local_variable: nessun contesto di funzione nell'ambito corrente" msgid "%s: variable may not be assigned value" msgstr "%s: impossibile assegnare fd a una variabile" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: nessun contesto di funzione nell'ambito corrente" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s ha exportstr null" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "carattere non valido %d in exportstr per %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "nessun \"=\" in exportstr per %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context: la prima parte di shell_variables non è un contesto di " "funzione" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: nessun contesto global_variables" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: la prima parte di shell_variables non è un ambito temporaneo " "d'ambiente" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: impossibile aprire come FILE" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: valore non valido per il descrittore del file di traccia" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s fuori dall'intervallo" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bash 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-03-12 19:44+0900\n" "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -23,7 +23,7 @@ msgstr "" msgid "bad array subscript" msgstr "誤ã£ãŸé…列ã®æ·»å—" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: インデックスé…列ã‹ã‚‰é€£æƒ³é…列ã«å¤‰æ›ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" @@ -67,6 +67,21 @@ msgstr "é–‰ã˜ã‚‹ `%c' ㌠%s ã«ã‚ã‚Šã¾ã›ã‚“" msgid "%s: missing colon separator" msgstr "%s: 区切り文å—コãƒãƒ³(:)ãŒã‚ã‚Šã¾ã›ã‚“" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "無効ãªå…«é€²æ•°ã§ã™" msgid "invalid hex number" msgstr "無効ãªåå…進数ã§ã™" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "無効ãªæ•°å—ã§ã™" @@ -203,7 +218,7 @@ msgstr "%s: 無効ãªã‚·ã‚°ãƒŠãƒ«æŒ‡å®šã§ã™" msgid "`%s': not a pid or valid job spec" msgstr "`%s': pid ã¾ãŸã¯æœ‰åŠ¹ãªã‚¸ãƒ§ãƒ–指定ã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: èªã¿å–り専用ã®å¤‰æ•°ã§ã™" @@ -302,7 +317,7 @@ msgstr "補完機能ã¯ç¾åœ¨å®Ÿè¡Œã•ã‚Œã¦ã„ã¾ã›ã‚“" msgid "can only be used in a function" msgstr "関数ã®ä¸ã§ã®ã¿ä½¿ç”¨ã§ãã¾ã™" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -312,21 +327,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "関数作æˆæ™‚ã« `-f' を使用ã§ãã¾ã›ã‚“" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: èªã¿å–り専用関数ã§ã™" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: ã“ã®æ–¹æ³•ã§é…列変数を消去ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: 連想é…列ã‹ã‚‰ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹é…列ã«å¤‰æ›ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" @@ -355,7 +370,7 @@ msgstr "%s: å‹•çš„ã«ãƒãƒ¼ãƒ‰ã•ã‚Œã¦ã„ã¾ã›ã‚“" msgid "%s: cannot delete: %s" msgstr "%s: 削除ã§ãã¾ã›ã‚“: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -580,6 +595,11 @@ msgstr "`%c': 無効ãªæ›¸å¼æŒ‡å®šæ–‡å—ã§ã™" msgid "warning: %s: %s" msgstr "è¦å‘Š: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "\\x 用ã®åå…進数å—ãŒã‚ã‚Šã¾ã›ã‚“" @@ -884,23 +904,23 @@ msgstr "最後ã®ã‚³ãƒžãƒ³ãƒ‰: %s\n" msgid "Aborting..." msgstr "ä¸æ¢ã—ã¦ã„ã¾ã™..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰ã‚¨ãƒ©ãƒ¼ã§ã™" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "誤ã£ãŸã‚³ãƒžãƒ³ãƒ‰ã‚¿ã‚¤ãƒ—ã§ã™" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "誤ã£ãŸæŽ¥ç¶šã§ã™" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "誤ã£ãŸã‚¸ãƒ£ãƒ³ãƒ—ã§ã™" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: 未割り当ã¦ã®å¤‰æ•°ã§ã™" @@ -915,51 +935,51 @@ msgstr "\a入力待ã¡ãŒã‚¿ã‚¤ãƒ アウトã—ã¾ã—ãŸ: 自動ãƒã‚°ã‚¢ã‚¦ãƒˆ\n msgid "cannot redirect standard input from /dev/null: %s" msgstr "/dev/null ã‹ã‚‰æ¨™æº–入力ã«å¯¾ã—ã¦ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã§ãã¾ã›ã‚“: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': 無効ãªæ›¸å¼æ–‡å—ã§ã™" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "パイプエラー" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: 制é™ã•ã‚Œã¦ã„ã¾ã™: `/' をコマンドåã®ä¸ã«æŒ‡å®šã§ãã¾ã›ã‚“" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: コマンドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: 誤ã£ãŸã‚¤ãƒ³ã‚¿ãƒ—リタã§ã™" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã‚’実行ã§ãã¾ã›ã‚“" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s ã¯ã‚·ã‚§ãƒ«çµ„ã¿è¾¼ã¿é–¢æ•°ã§ã™\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "fd %d ã‚’ fd %d ã«è¤‡è£½ã§ãã¾ã›ã‚“" @@ -980,7 +1000,7 @@ msgstr "å¼ã«æ§‹æ–‡ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™" msgid "attempted assignment to non-variable" msgstr "éžå¤‰æ•°ã«å‰²ã‚Šå½“ã¦ã‚’è¡ŒãŠã†ã¨ã—ã¦ã¾ã™" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "0 ã«ã‚ˆã‚‹é™¤ç®—ã§ã™" @@ -992,40 +1012,40 @@ msgstr "ãƒã‚°: 誤ã£ãŸå¼ã®ãƒˆãƒ¼ã‚¯ãƒ³ã§ã™" msgid "`:' expected for conditional expression" msgstr "æ¡ä»¶å¼ã«ã¯ `:' ãŒäºˆæœŸã•ã‚Œã¾ã™" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "0よりå°ã•ã„指数部ã§ã™" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "è˜åˆ¥åã¯å‰ç½®ã‚¤ãƒ³ã‚¯ãƒªãƒ¡ãƒ³ãƒˆã¾ãŸã¯å‰ç½®ãƒ‡ã‚¯ãƒªãƒ¡ãƒ³ãƒˆãŒäºˆæœŸã•ã‚Œã¾ã™" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "`)' ãŒã‚ã‚Šã¾ã›ã‚“" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "構文エラー: オペランドãŒäºˆæœŸã•ã‚Œã¾ã™" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "構文エラー: 無効ãªè¨ˆç®—演算åã§ã™" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (エラーã®ã‚るトークン㯠\"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "無効ãªåŸºåº•ã®æ•°å€¤ã§ã™" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "基底ã®å€¤ãŒå¤§ãã™ãŽã¾ã™" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: å¼ã®ã‚¨ãƒ©ãƒ¼\n" @@ -1034,7 +1054,7 @@ msgstr "%s: å¼ã®ã‚¨ãƒ©ãƒ¼\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: 親ディレクトリã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "ファイル記述å(fd) %d ã‚’ç„¡é…延モードã«å†è¨å®šã§ãã¾ã›ã‚“" @@ -1053,144 +1073,144 @@ msgstr "save_bash_input: æ–°è¦ fd %d ã®ãƒãƒƒãƒ•ã‚¡ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "実行ä¸ã®ã‚¸ãƒ§ãƒ– %2$d 㧠fork ã—㟠pid %1$d ãŒå‡ºç¾ã—ã¾ã—ãŸ" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "プãƒã‚»ã‚¹ã‚°ãƒ«ãƒ¼ãƒ— %2$ld ã®ã‚¸ãƒ§ãƒ– %1$d を削除ã—ã¦ã„ã¾ã™" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: プãƒã‚»ã‚¹ %5ld (%s) ㌠the_pipeline ã«ã‚ã‚Šã¾ã™" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) ã¯ã¾ã å˜åœ¨ã—ã¦ã„ã‚‹ã¨ãƒžãƒ¼ã‚¯ã•ã‚Œã¦ã„ã¾ã™" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: ãã®ã‚ˆã†ãª pid ã¯å˜åœ¨ã—ã¾ã›ã‚“" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "シグナル %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "終了" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "åœæ¢" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "åœæ¢ (%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "実行ä¸" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "終了(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "終了 %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "ä¸æ˜Žãªã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(コアダンプ) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "åプãƒã‚»ã‚¹ setpgid (%ld ã‹ã‚‰ %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld ã¯ã“ã®ã‚·ã‚§ãƒ«ã®åプãƒã‚»ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: プãƒã‚»ã‚¹ %ld ã®è¨˜éŒ²ãŒã‚ã‚Šã¾ã›ã‚“" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: ジョブ %d ã¯åœæ¢ã—ã¦ã„ã¾ã™" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: ジョブã¯çµ‚了ã—ã¾ã—ãŸ" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: ジョブ %d ã¯ã™ã§ã«ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§å‹•ä½œã—ã¦ã„ã¾ã™" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: ä¸å®šã®ãƒ–ãƒãƒƒã‚¯ã‚’é¿ã‘ã‚‹ãŸã‚ã« WNOHANG をオンã«ã—ã¾ã—ãŸã€‚" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: %d è¡Œ: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (コアダンプ)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd now: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp ãŒå¤±æ•—ã—ã¾ã—ãŸ" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: line discipline" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "端末プãƒã‚»ã‚¹ã‚°ãƒ«ãƒ¼ãƒ—ã‚’è¨å®šã§ãã¾ã›ã‚“ (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "ã“ã®ã‚·ã‚§ãƒ«ã§ã¯ã‚¸ãƒ§ãƒ–制御ãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™" @@ -1344,99 +1364,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: リダイレクト指定 `%d' ã¯ç¯„囲外ã§ã™" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "対応ã™ã‚‹ `%c' を探索ä¸ã«äºˆæœŸã—ãªã„ファイル終了 (EOF) ã§ã™" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "`]]' を探索ä¸ã«äºˆæœŸã—ãªã„ファイル終了 (EOF) ã§ã™" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "æ¡ä»¶å¼ã«æ§‹æ–‡ã‚¨ãƒ©ãƒ¼: 予期ã—ãªã„トークン `%s' ã§ã™" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "æ¡ä»¶å¼ã«æ§‹æ–‡ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "予期ã—ãªã„トークン `%s' ã§ã™ã€‚`)' ãŒäºˆæœŸã•ã‚Œã¾ã™" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "`)' ãŒäºˆæœŸã•ã‚Œã¾ã™" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "æ¡ä»¶å˜é …演算åã«äºˆæœŸã—ãªã„引数 `%s' ã§ã™" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "æ¡ä»¶å˜é …演算åã«äºˆæœŸã—ãªã„引数ã§ã™" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "`%s` ã¯äºˆæœŸã—ãªã„トークンã§ã™ã€‚æ¡ä»¶äºŒé …演算åãŒäºˆæœŸã•ã‚Œã¾ã™" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "æ¡ä»¶äºŒé …演算åãŒäºˆæœŸã•ã‚Œã¾ã™" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "æ¡ä»¶äºŒé …演算åã«äºˆæœŸã—ãªã„引数 `%s' ã§ã™" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "æ¡ä»¶äºŒé …演算åã«äºˆæœŸã—ãªã„引数ã§ã™" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "æ¡ä»¶ã‚³ãƒžãƒ³ãƒ‰ã«äºˆæœŸã—ãªã„トークン `%c' ãŒã‚ã‚Šã¾ã™" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "æ¡ä»¶ã‚³ãƒžãƒ³ãƒ‰ã«äºˆæœŸã—ãªã„トークン `%s' ãŒã‚ã‚Šã¾ã™" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "æ¡ä»¶ã‚³ãƒžãƒ³ãƒ‰ã«äºˆæœŸã—ãªã„トークン %d ãŒã‚ã‚Šã¾ã™" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "予期ã—ãªã„トークン `%s' 周辺ã«æ§‹æ–‡ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "`%s' 周辺ã«æ§‹æ–‡ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "構文エラー: 予期ã—ãªã„ファイル終了 (EOF) ã§ã™" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "構文エラー" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "シェルã‹ã‚‰è„±å‡ºã™ã‚‹ã«ã¯ \"%s\" を使用ã—ã¦ãã ã•ã„。\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "対応ã™ã‚‹ `)' を探索ä¸ã«äºˆæœŸã—ãªã„ファイル終了(EOF)ã§ã™" @@ -1576,7 +1596,7 @@ msgstr "シェル組ã¿è¾¼ã¿ã‚³ãƒžãƒ³ãƒ‰ã«ã¤ã„ã¦ã¯ `%s -c help' ã¨å…¥åŠ›ã msgid "Use the `bashbug' command to report bugs.\n" msgstr "ãƒã‚°å ±å‘Šã‚’ã™ã‚‹å ´åˆã¯ `bashbug' コマンドを使用ã—ã¦ãã ã•ã„。\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: 無効ãªæ“作ã§ã™" @@ -1750,88 +1770,88 @@ msgstr "ä¸æ˜Žãªã‚·ã‚°ãƒŠãƒ«ç•ªå·" msgid "Unknown Signal #%d" msgstr "ä¸æ˜Žãªã‚·ã‚°ãƒŠãƒ«ç•ªå· %d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "誤ã£ãŸä»£å…¥: é–‰ã˜ã‚‹ `%s' ㌠%s ã«å˜åœ¨ã—ã¾ã›ã‚“" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: リストをé…列è¦ç´ ã«å‰²ã‚Šå½“ã¦ã§ãã¾ã›ã‚“" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "プãƒã‚»ã‚¹ä»£å…¥ã§ã¯ãƒ‘イプを作æˆã§ãã¾ã›ã‚“" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "プãƒã‚»ã‚¹ä»£å…¥ã§ã¯åプãƒã‚»ã‚¹ã‚’作æˆã§ãã¾ã›ã‚“" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "åå‰ä»˜ãパイプ %s ã‚’èªã¿è¾¼ã¿ç”¨ã«é–‹ã‘ã¾ã›ã‚“" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "åå‰ä»˜ãパイプ %s を書ãè¾¼ã¿ç”¨ã«é–‹ã‘ã¾ã›ã‚“" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "åå‰ä»˜ãパイプ %s をファイル記述å(fd) %d ã¨ã—ã¦è¤‡è£½ã§ãã¾ã›ã‚“" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "コマンド代入ã§ã¯ãƒ‘イプを作æˆã§ãã¾ã›ã‚“" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "コマンド代入ã§ã¯åプãƒã‚»ã‚¹ã‚’作æˆã§ãã¾ã›ã‚“" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: パイプを fd 1 ã¨ã—ã¦è¤‡è£½ã§ãã¾ã›ã‚“" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: トレースファイル記述åã¨ã—ã¦ç„¡åŠ¹ãªå€¤ã§ã™" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: パラメータ㌠null ã¾ãŸã¯è¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: substring expression < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: 誤ã£ãŸä»£å…¥ã§ã™" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: ã“ã®æ–¹æ³•ã§å‰²å½“ã¯ã§ãã¾ã›ã‚“" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "å°†æ¥ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚·ã‚§ãƒ«ã§ã¯å¼·åˆ¶çš„ã«æ•°å€¤ä»£å…¥ã¨ã—ã¦è©•ä¾¡ã•ã‚Œã¾ã™" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "誤ã£ãŸä»£å…¥: %s ã«é–‰ã˜ã‚‹ \"`\" ãŒã‚ã‚Šã¾ã›ã‚“" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "一致ã—ã¾ã›ã‚“: %s" @@ -1872,12 +1892,12 @@ msgstr "`]'ãŒã‚ã‚Šã¾ã›ã‚“" msgid "invalid signal number" msgstr "無効ãªã‚·ã‚°ãƒŠãƒ«ç•ªå·" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: trap_list[%d] ã«èª¤ã£ãŸå€¤ãŒã‚ã‚Šã¾ã™: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1885,7 +1905,7 @@ msgstr "" "run_pending_traps: シグナルãƒãƒ³ãƒ‰ãƒ©ãƒ¼ã¯ SIG_DFLã§ã™ã€‚, %d (%s) を自身ã«å†é€ã—" "ã¾ã™ã€‚" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: 誤ã£ãŸã‚·ã‚°ãƒŠãƒ« %d" @@ -1914,49 +1934,49 @@ msgstr "make_local_variable: ç¾åœ¨ã®ã‚¹ã‚³ãƒ¼ãƒ—ã¯é–¢æ•°ã‚³ãƒ³ãƒ†ã‚スト㧠msgid "%s: variable may not be assigned value" msgstr "%s: ファイル記述å (fd) を変数ã«è¨å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: ç¾åœ¨ã®ã‚¹ã‚³ãƒ¼ãƒ—ã¯é–¢æ•°ã‚³ãƒ³ãƒ†ã‚ストã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s 㯠null ã® exportstr ã‚’æŒã£ã¦ã„ã¾ã™" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "%2$s ã«å¯¾ã™ã‚‹ exportstr 㧠%1$d ã¯ç„¡åŠ¹ãªæ–‡å—ã§ã™" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "%s ã«å¯¾ã™ã‚‹ exportstr ã« `=' ãŒã‚ã‚Šã¾ã›ã‚“" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context: shell_variables ã®å…ˆé ã§ã™ã€‚関数コンテã‚ストã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: global_variables コンテã‚ストã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: shell_variables ã®å…ˆé ã§ã™ã€‚一時環境スコープã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: ファイルã¨ã—ã¦é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: トレースファイル記述åã¨ã—ã¦ç„¡åŠ¹ãªå€¤ã§ã™" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s ãŒç¯„囲外ã§ã™" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2009-03-25 16:49+0200\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -23,7 +23,7 @@ msgstr "" msgid "bad array subscript" msgstr "blogas masyvo indeksas" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -67,6 +67,21 @@ msgstr "nÄ—ra uždaranÄiojo „%c“ %s" msgid "%s: missing colon separator" msgstr "%s: trÅ«ksta dvitaÅ¡kio skirtuko" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -187,7 +202,7 @@ msgstr "netaisyklingas aÅ¡tuonetainis skaiÄius" msgid "invalid hex number" msgstr "netaisyklingas Å¡eÅ¡ioliktainis skaiÄius" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "netaisyklingas skaiÄius" @@ -201,7 +216,7 @@ msgstr "%s: netaisyklinga signalo specifikacija" msgid "`%s': not a pid or valid job spec" msgstr "„%s“: ne pid'as ar taisyklinga darbo specifikacija" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: kintamasis tik skaitymui" @@ -300,7 +315,7 @@ msgstr "" msgid "can only be used in a function" msgstr "galima naudoti tik funkcijoje" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -310,21 +325,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "negalima naudoti „-f“ funkcijoms kurti" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funkcija tik skaitymui" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: negalima tokiu bÅ«du sunaikinti masyvų kintamųjų" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -353,7 +368,7 @@ msgstr "%s: nedinamiÅ¡kai įkrauta" msgid "%s: cannot delete: %s" msgstr "%s: nepavyko iÅ¡trinti: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -580,6 +595,11 @@ msgstr "„%c“: netaisyklingas formato simbolis" msgid "warning: %s: %s" msgstr "įspÄ—jimas: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "trÅ«ksta Å¡eÅ¡ioliktainio skaitmens iÅ¡raiÅ¡koje \\x" @@ -831,23 +851,23 @@ msgstr "paskutinÄ— komanda: %s\n" msgid "Aborting..." msgstr "Nutraukiama..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "nežinoma komandos klaida" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "blogas komandos tipas" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "blogas jungtukas" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "blogas Å¡uolis" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: nepriskirtas kintamasis" @@ -862,52 +882,52 @@ msgstr "\alaukiant įvedimo baigÄ—si laikas: automatiÅ¡kai atsijungta\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "nepavyko peradresuoti standartinio įvedimo iÅ¡ /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: „%c“: netaisyklingas formato simbolis" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "raÅ¡ymo klaida: %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: apribota: negalima naudoti „/“ komandų pavadinimuose" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: komanda nerasta" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, fuzzy, c-format msgid "%s: %s" msgstr "%s yra %s\n" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: blogas interpretatorius" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: negalima vykdyti dvejetainių failų" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s yra aplinkos vidinÄ— komanda\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "nepavyko dublikuoti fd %d į fd %d" @@ -928,7 +948,7 @@ msgstr "sintaksÄ—s klaida iÅ¡raiÅ¡koje" msgid "attempted assignment to non-variable" msgstr "bandymas priskirti ne kintamajam" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "dalyba iÅ¡ 0" @@ -940,41 +960,41 @@ msgstr "klaida: bloga expassign leksema" msgid "`:' expected for conditional expression" msgstr "sÄ…lygos iÅ¡raiÅ¡koje tikÄ—tasi „:“" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "eksponentÄ— mažesnis už 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" "po prieÅ¡-didinimo ar prieÅ¡-mažinimo operatoriaus tikÄ—tasi identifikatoriaus" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "TrÅ«ksta „)“" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "sintaksÄ—s klaida: tikÄ—tasi operando" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "sintaksÄ—s klaida: netaisyklingas aritmetinis operatorius" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "netaisyklingas aritmetinis pagrindas" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "per didelÄ— pagrindo reikÅ¡mÄ—" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: iÅ¡raiÅ¡kos klaida\n" @@ -983,7 +1003,7 @@ msgstr "%s: iÅ¡raiÅ¡kos klaida\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: nepavyko pasiekti aukÅ¡tesnių aplankų" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, fuzzy, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "nepavyko dublikuoti fd %d į fd %d" @@ -1002,144 +1022,144 @@ msgstr "save_bash_input: naujam fd %d buferis jau egzistuoja" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "trinamas sustabdytas darbas %d procesų grupÄ—je %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: tokio pid nÄ—ra" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signalas %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Atlikta" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Atlikta(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Nežinoma bÅ«sena" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr "" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld nÄ—ra Å¡ios aplinkos dukterinis procesas" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: nÄ—ra proceso %ld įraÅ¡o" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: darbas %d yra sustabdytas" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: darbas užsibaigÄ—" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: darbas %d jau fone" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: %d eilutÄ—: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr "" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "Å¡ioje aplinkoje nÄ—ra darbų valdymo" @@ -1292,99 +1312,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: nukreipimo instrukcija „%d“ už ribų" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "netikÄ—ta failo pabaiga ieÅ¡kant atitinkamo „%c“" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "netikÄ—ta failo pabaiga ieÅ¡kant „]]“" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "sintaksÄ—s klaida sÄ…lygos iÅ¡raiÅ¡koje: netikÄ—ta leksema „%s“" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "sintaksÄ—s klaida sÄ…lygos iÅ¡raiÅ¡koje" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "netikÄ—ta leksema „%s“, tikÄ—tasi „)“" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "tikÄ—tasi „)“" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "netikÄ—tas argumentas „%s“ sÄ…lygos unariniam operatoriui" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "netikÄ—tas argumentas sÄ…lygos unariniam operatoriui" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "netikÄ—ta leksema „%s“, tikÄ—tasi sÄ…lyginio binarinio operatoriaus" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "tikÄ—tasi sÄ…lygos binarinio operatoriaus" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "netikÄ—tas argumentas „%s“ sÄ…lygos binariniam operatoriui" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "netikÄ—tas argumentas sÄ…lygos binariniam operatoriui" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "netikÄ—ta leksema „%c“ sÄ…lygos komandoje" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "netikÄ—ta leksema „%s“ sÄ…lygos komandoje" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "netikÄ—ta leksema %d sÄ…lygos komandoje" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "sintaksÄ—s klaida prie netikÄ—tos leksemos: „%s“" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "sintaksÄ—s klaida prie „%s“" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "sintaksÄ—s klaida: netikÄ—ta failo pabaiga" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "sintaksÄ—s klaida" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Naudokite „%s“, jei norite iÅ¡eiti iÅ¡ ap.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "netikÄ—ta failo pabaiga ieÅ¡kant atitinkamo „)“" @@ -1526,7 +1546,7 @@ msgstr "Bandykite „ldd --help“, jei norite daugiau informacijos." msgid "Use the `bashbug' command to report bugs.\n" msgstr "Naudokite komandÄ… „bashbug“ klaidoms praneÅ¡ti.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: netaisyklinga operacija" @@ -1701,88 +1721,88 @@ msgstr "Nežinomas signalas #" msgid "Unknown Signal #%d" msgstr "Nežinomas signalas #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "blogas keitinys: trÅ«ksta „%s“ %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: negalima priskirti sÄ…raÅ¡o masyvo elementui" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%d: netaisyklingas failo deskriptorius: %s" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametras tuÅ¡Äias arba nenustatytas" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: posekio iÅ¡raiÅ¡ka < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: blogas keitinys" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: negalima tokiu bÅ«du priskirti" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, fuzzy, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "blogas keitinys: trÅ«ksta „%s“ %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "nÄ—ra atitikmenų: %s" @@ -1823,18 +1843,18 @@ msgstr "trÅ«ksta „]“" msgid "invalid signal number" msgstr "netaisyklingas signalo numeris" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: bloga trap_list[%d] reikÅ¡mÄ—: %p" -#: trap.c:359 +#: trap.c:375 #, c-format 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:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: blogas signalas %d" @@ -1863,48 +1883,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: negalima priskirti sÄ…raÅ¡o masyvo elementui" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: parametras tuÅ¡Äias arba nenustatytas" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "netaisyklingas simbolis %d %s exportstr'e" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "%s exportstr'e trÅ«ksta „=“" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: nÄ—ra global_variables konteksto" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: nepavyko atverti: %s" -#: variables.c:5216 +#: variables.c:5262 #, fuzzy, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%d: netaisyklingas failo deskriptorius: %s" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s iÅ¡Ä—jo už ribų" Binary files differ@@ -25,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-08-15 22:31+0200\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -40,7 +40,7 @@ msgstr "" msgid "bad array subscript" msgstr "ongeldige array-index" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: kan geïndexeerd array niet omzetten naar associatief array" @@ -85,6 +85,21 @@ msgstr "geen sluit-'%c' in %s" msgid "%s: missing colon separator" msgstr "%s: ontbrekend scheidingsteken (dubbele punt)" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -207,7 +222,7 @@ msgstr "ongeldig octaal getal" msgid "invalid hex number" msgstr "ongeldig hexadecimaal getal" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "ongeldig getal" @@ -221,7 +236,7 @@ msgstr "%s: ongeldige signaalaanduiding" msgid "`%s': not a pid or valid job spec" msgstr "'%s': is geen PID en geen geldige taakaanduiding" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: is een alleen-lezen variabele" @@ -320,7 +335,7 @@ msgstr "er wordt momenteel geen completeringsfunctie uitgevoerd" msgid "can only be used in a function" msgstr "kan alleen worden gebruikt binnen een functie" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: verwijzingsvariabele mag geen array zijn" @@ -330,21 +345,21 @@ msgstr "%s: verwijzingsvariabele mag geen array zijn" msgid "%s: nameref variable self references not allowed" msgstr "%s: zelfverwijzing door naamsverwijzingsvariabele is niet toegestaan" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "'-f' kan niet gebruikt worden om een functie te definiëren" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: is een alleen-lezen functie" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: kan array-variabelen niet op deze manier verwijderen" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: kan associatief array niet omzetten naar geïndexeerd array" @@ -373,7 +388,7 @@ msgstr "%s: is niet dynamisch geladen" msgid "%s: cannot delete: %s" msgstr "Kan %s niet verwijderen: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -601,6 +616,11 @@ msgstr "'%c': ongeldig opmaakteken" msgid "warning: %s: %s" msgstr "waarschuwing: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "ontbrekend hexadecimaal cijfer bij \\x" @@ -903,23 +923,23 @@ msgstr "laatste opdracht: %s\n" msgid "Aborting..." msgstr "Afbreken..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "onbekende opdrachtfout" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "ongeldig opdrachttype" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "ongeldige verbinder" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "ongeldige sprong" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: ongebonden variabele" @@ -934,51 +954,51 @@ msgstr "\awachten op invoer duurde te lang -- automatisch afgemeld\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "kan standaardinvoer niet omleiden vanaf /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: '%c': ongeldig opmaakteken" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "pijpfout" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: maximum functie-nestingsniveau is overschreden (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: beperkte modus: '/' in opdrachtnamen is niet toegestaan" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: opdracht niet gevonden" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: ongeldige interpreter" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: kan binair bestand %s niet uitvoeren" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "'%s' is een speciale ingebouwde shell-functie" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "kan bestandsdescriptor %d niet dupliceren naar bestandsdescriptor %d" @@ -999,7 +1019,7 @@ msgstr "syntaxfout in expressie" msgid "attempted assignment to non-variable" msgstr "poging tot toewijzing aan een niet-variabele" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "deling door nul" @@ -1011,40 +1031,40 @@ msgstr "**interne fout**: onjuist symbool in toewijzingsexpressie" msgid "`:' expected for conditional expression" msgstr "':' werd verwacht voor een voorwaardelijke expressie" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "exponent is kleiner dan 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "naam verwacht na pre-increment of pre-decrement" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "ontbrekend ')'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "syntaxfout: operator verwacht" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "syntaxfout: ongeldige rekenkundige operator" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (het onjuiste symbool is \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "ongeldige rekenkundige basis" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "waarde is te groot voor basis" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: expressiefout\n" @@ -1053,7 +1073,7 @@ msgstr "%s: expressiefout\n" msgid "getcwd: cannot access parent directories" msgstr "getwd(): kan geen geen toegang verkrijgen tot bovenliggende mappen" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "kan 'nodelay'-modus niet uitschakelen voor bestandsdescriptor %d" @@ -1075,146 +1095,146 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline(): procesgroep van pijp" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "afgesplitst PID %d hoort bij draaiende taak %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "verwijderen van gepauzeerde taak %d met procesgroep %ld..." -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process(): proces %5ld (%s) in de pijplijn" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process(): PID %5ld (%s) staat gemarkeerd als nog actief" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid(): PID %ld bestaat niet" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signaal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Klaar" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Gepauzeerd" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Gepauzeerd(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Wordt uitgevoerd" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Klaar(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Exit %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Onbekende afsluitwaarde" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(geheugendump gemaakt) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (werkmap: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "instellen van procesgroep %2$ld van dochter %1$ld" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait(): PID %ld is geen dochterproces van deze shell" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for(): proces %ld is nergens geregistreerd" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job(): taak %d is gepauzeerd" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: taak is afgesloten" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: taak %d draait al op de achtergrond" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" "waitchld(): WNOHANG wordt ingeschakeld om een onbegrensde blokkering te " "vermijden" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: regel %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (geheugendump gemaakt)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(werkmap is nu: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp() is mislukt" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: lijnprotocol" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid()" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "kan procesgroep (%d) van terminal niet instellen" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "er is geen taakbesturing in deze shell" @@ -1369,100 +1389,100 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection(): omleidingsinstructie '%d' valt buiten bereik" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "onverwacht bestandseinde tijdens zoeken naar bijpassende '%c'" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "onverwacht bestandseinde tijdens zoeken naar ']]'" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "syntaxfout in conditionele expressie: onverwacht symbool '%s'" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "syntaxfout in conditionele expressie" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "onverwacht symbool '%s'; ')' werd verwacht" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "')' werd verwacht" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "onverwacht argument '%s' bij eenzijdige conditionele operator" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "onverwacht argument bij eenzijdige conditionele operator" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" "onverwacht symbool '%s'; tweezijdige conditionele operator werd verwacht" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "tweezijdige conditionele operator werd verwacht" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "onverwacht argument '%s' bij tweezijdige conditionele operator" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "onverwacht argument bij tweezijdige conditionele operator" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "onverwacht symbool '%c' in conditionele opdracht" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "onverwacht symbool '%s' in conditionele opdracht" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "onverwacht symbool %d in conditionele opdracht" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "syntaxfout nabij onverwacht symbool '%s'" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "syntaxfout nabij '%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "syntaxfout: onverwacht bestandseinde" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "syntaxfout" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Gebruik \"%s\" om de shell te verlaten.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "onverwacht bestandseinde tijdens zoeken naar bijpassende ')'" @@ -1603,7 +1623,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Gebruik de opdracht 'bashbug' om fouten in bash te rapporteren.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask(): %d: ongeldige operatie" @@ -1780,78 +1800,78 @@ msgstr "Onbekend signaalnummer" msgid "Unknown Signal #%d" msgstr "Onbekend signaal #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "ongeldige vervanging: geen sluit-'%s' in %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: kan geen lijst toewijzen aan een array-element" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "kan geen pijp maken voor procesvervanging" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "kan geen dochterproces maken voor procesvervanging" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "kan pijp genaamd %s niet openen om te lezen" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "kan pijp genaamd %s niet openen om te schrijven" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "kan pijp genaamd %s niet dupliceren als bestandsdescriptor %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "kan geen pijp maken voor opdrachtvervanging" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "kan geen dochterproces maken voor opdrachtvervanging" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" "command_substitute(): kan pijp niet dupliceren als bestandsdescriptor 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: ongeldige variabelenaam voor naamsverwijzing" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: lege parameter, of niet ingesteld" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: resultaat van deeltekenreeks is kleiner dan nul" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: ongeldige vervanging" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: kan niet op deze manier toewijzen" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1859,12 +1879,12 @@ msgstr "" "toekomstige versies van de shell zullen dit als een rekenkundige vervanging " "evalueren" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "ongeldige vervanging: geen afsluitende '`' in %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "geen overeenkomst: %s" @@ -1905,12 +1925,12 @@ msgstr "ontbrekende ']'" msgid "invalid signal number" msgstr "ongeldig signaalnummer" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps(): ongeldige waarde in trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1918,7 +1938,7 @@ msgstr "" "run_pending_traps: signaalverwerker is SIG_DFL, herzenden van %d (%s) aan " "mezelf..." -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler(): ongeldig signaal %d" @@ -1948,50 +1968,50 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: aan variabele mag geen waarde toegewezen worden" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" "all_local_variables(): er is geen functiecontext in huidige geldigheidsbereik" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "*** %s heeft lege export-tekenreeks" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "*** ongeldig teken '%d' in export-tekenreeks voor %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "*** geen '=' in export-tekenreeks voor %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context(): top van 'shell_variables' is geen functiecontext" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context(): er is geen 'global_variables'-context" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope(): top van 'shell_variables' is geen tijdelijk geldigheidsbereik" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: Kan %s niet openen als BESTAND" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: ongeldige waarde %s voor 'trace'-bestandsdescriptor" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: compatibiliteitswaarde valt buiten bereik" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-08-18 11:22+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -23,7 +23,7 @@ msgstr "" msgid "bad array subscript" msgstr "nieprawidÅ‚owy indeks tablicy" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: nie można przeksztaÅ‚cić tablicy indeksowanej na asocjacyjnÄ…" @@ -69,6 +69,21 @@ msgstr "brak zamykajÄ…cego `%c' w %s" msgid "%s: missing colon separator" msgstr "%s: brak separujÄ…cego dwukropka" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -193,7 +208,7 @@ msgstr "bÅ‚Ä™dna liczba ósemkowa" msgid "invalid hex number" msgstr "bÅ‚Ä™dna liczba szesnastkowa" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "nieprawidÅ‚owa liczba" @@ -207,7 +222,7 @@ msgstr "%s: nieprawidÅ‚owo okreÅ›lony sygnaÅ‚" msgid "`%s': not a pid or valid job spec" msgstr "`%s': nie jest to nr PID ani prawidÅ‚owe okreÅ›lenie zadania" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: zmienna tylko do odczytu" @@ -306,7 +321,7 @@ msgstr "aktualnie nie jest wykonywana funkcja dopeÅ‚niania" msgid "can only be used in a function" msgstr "można używać tylko w funkcji" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: zmienna referencyjna nie może być tablicÄ…" @@ -316,21 +331,21 @@ msgstr "%s: zmienna referencyjna nie może być tablicÄ…" msgid "%s: nameref variable self references not allowed" msgstr "%s: zmienna referencyjna nie może wskazywać na siebie" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "nie można używać `-f' do tworzenia funkcji" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funkcja tylko do odczytu" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: nie można w ten sposób unicestwić zmiennej tablicowej" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: nie można przeksztaÅ‚cić tablicy asocjacyjnej na indeksowanÄ…" @@ -359,7 +374,7 @@ msgstr "%s: nie jest Å‚adowany dynamicznie" msgid "%s: cannot delete: %s" msgstr "%s: nie można usunąć: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -586,6 +601,11 @@ msgstr "`%c': nieprawidÅ‚owy znak formatujÄ…cy" msgid "warning: %s: %s" msgstr "uwaga: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "brak cyfry szesnastkowej dla \\x" @@ -892,23 +912,23 @@ msgstr "ostatnie polecenie: %s\n" msgid "Aborting..." msgstr "Przerywanie..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "nieznany bÅ‚Ä…d polecenia" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "zÅ‚y rodzaj polecenia" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "zÅ‚y Å‚Ä…cznik" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "zÅ‚y skok" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: nieustawiona zmienna" @@ -923,51 +943,51 @@ msgstr "\aprzekroczony czas oczekiwania na dane wejÅ›ciowe: auto-wylogowanie\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "nie można przekierować standardowego wejÅ›cia z /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': nieprawidÅ‚owy znak formatujÄ…cy" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "bÅ‚Ä…d potoku" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: przekroczono maksymalny poziom zagnieżdżenia funkcji (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: ograniczony: nie można podawać `/' w nazwach poleceÅ„" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: nie znaleziono polecenia" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: zÅ‚y interpreter" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: nie można uruchomić pliku binarnego: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "`%s' jest specjalnym poleceniem wewnÄ™trznym" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "nie można skopiować deskryptora pliku %d do %d" @@ -988,7 +1008,7 @@ msgstr "bÅ‚Ä…d skÅ‚adniowy w wyrażeniu" msgid "attempted assignment to non-variable" msgstr "próba przypisania do nie-zmiennej" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "dzielenie przez 0" @@ -1001,41 +1021,41 @@ msgstr "bÅ‚Ä…d: zÅ‚y prefiks operatora przypisujÄ…cego" msgid "`:' expected for conditional expression" msgstr "spodziewano siÄ™ `:' w wyrażeniu warunkowym" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "wykÅ‚adnik mniejszy niż 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" "spodziewany identyfikator po operatorze preinkrementacji lub predekrementacji" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "brakujÄ…cy `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "bÅ‚Ä…d skÅ‚adni: spodziewany argument" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "bÅ‚Ä…d skÅ‚adni: nieprawidÅ‚owy operator arytmetyczny" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (bÅ‚Ä™dny znacznik to \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "nieprawidÅ‚owa podstawa arytmetyczna" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "wartość za duża na podstawÄ™" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: bÅ‚Ä…d w wyrażeniu\n" @@ -1044,7 +1064,7 @@ msgstr "%s: bÅ‚Ä…d w wyrażeniu\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: niemożliwy dostÄ™p do katalogów nadrzÄ™dnych" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "nie można wyÅ‚Ä…czyć trybu nieblokujÄ…cego dla deskryptora %d" @@ -1064,145 +1084,145 @@ msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" # ??? -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "proces o PID %d wystÄ™puje w dziaÅ‚ajÄ…cym zadaniu %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "usuwanie zatrzymanego zadania %d z grupÄ… procesów %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: proces %5ld (%s) w potoku" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) oznaczony jako nadal żywy" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: brak takiego PID-u" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "SygnaÅ‚ %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "ZakoÅ„czono" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Zatrzymano" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Zatrzymano(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "DziaÅ‚a" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "ZakoÅ„czono(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Kod wyjÅ›cia %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Stan nieznany" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(zrzut pamiÄ™ci) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (katalog: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid potomka (%ld na %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: PID %ld nie jest potomkiem tej powÅ‚oki" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Brak rekordu dla procesu %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: zadanie %d jest zatrzymane" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: zadanie zostaÅ‚o przerwane" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: zadanie %d już pracuje w tle" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" "waitchld: wyÅ‚Ä…czanie WNOHANG w celu unikniÄ™cia nieskoÅ„czonego oczekiwania" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: linia %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (zrzut pamiÄ™ci)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(katalog: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp nie powiodÅ‚o siÄ™" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: dyscyplina linii" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "nie można ustawić grupy procesów terminala (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "w tej powÅ‚oce nie ma kontroli zadaÅ„" @@ -1357,99 +1377,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: instrukcja przekierowania `%d' poza zakresem" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "nieoczekiwany EOF podczas poszukiwania pasujÄ…cego `%c'" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "nieoczekiwany EOF podczas poszukiwania `]]'" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "bÅ‚Ä…d skÅ‚adni w wyrażeniu warunkowym: nieoczekiwany znacznik `%s'" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "bÅ‚Ä…d skÅ‚adni w wyrażeniu warunkowym" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "nieoczekiwany znacznik `%s', oczekiwano `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "oczekiwano `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "nieoczekiwany argument `%s' jednoargumentowego operatora warunkowego" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "nieoczekiwany argument jednoargumentowego operatora warunkowego" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "nieoczekiwany argument `%s', oczekiwano dwuarg. operatora warunkowego" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "oczekiwano dwuargumentowego operatora warunkowego" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "nieoczekiwany argument `%s' dwuargumentowego operatora warunkowego" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "nieoczekiwany argument dwuargumentowego operatora warunkowego" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "nieoczekiwany znacznik `%c' w poleceniu warunkowym" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "nieoczekiwany znacznik `%s' w poleceniu warunkowym" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "nieoczekiwany znacznik %d w poleceniu warunkowym" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "bÅ‚Ä…d skÅ‚adni przy nieoczekiwanym znaczniku `%s'" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "bÅ‚Ä…d skÅ‚adni przy `%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "bÅ‚Ä…d skÅ‚adni: nieoczekiwany koniec pliku" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "bÅ‚Ä…d skÅ‚adni" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Użyj \"%s\", aby opuÅ›cić tÄ™ powÅ‚okÄ™.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "nieoczekiwany EOF podczas poszukiwania pasujÄ…cego `)'" @@ -1591,7 +1611,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Do zgÅ‚aszania bÅ‚Ä™dów należy używać polecenia `bashbug'.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: nieprawidÅ‚owa operacja" @@ -1765,77 +1785,77 @@ msgstr "Nieznany sygnaÅ‚ #" msgid "Unknown Signal #%d" msgstr "Nieznany sygnaÅ‚ #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "zÅ‚e podstawienie: brak zamykajÄ…cego `%s' w %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: nie można przypisać listy do elementu tablicy" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "nie można utworzyć potoku dla podstawienia procesu" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "nie można utworzyć procesu potomnego dla podstawienia procesu" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "nie można otworzyć nazwanego potoku %s do odczytu" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "nie można otworzyć nazwanego potoku %s do zapisu" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "nie można powielić nazwanego potoku %s jako deskryptor %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "nie można utworzyć potoku dla podstawienia polecenia" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "nie można utworzyć procesu potomnego dla podstawienia polecenia" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: nie można powielić potoku jako deskryptora 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: nieprawidÅ‚owa nazwa zmiennej przy odwoÅ‚aniu do nazwy" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametr pusty lub nieustawiony" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: wyrażenie dla podÅ‚aÅ„cucha < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: zÅ‚e podstawienie" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: nie można przypisywać w ten sposób" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1843,12 +1863,12 @@ msgstr "" "przyszÅ‚e wersje powÅ‚oki bÄ™dÄ… wymuszać obliczenie jako podstawienie " "arytmetyczne" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "zÅ‚e podstawienie: brak zamykajÄ…cego \"`\" w %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "brak pasujÄ…cego: %s" @@ -1889,12 +1909,12 @@ msgstr "brakujÄ…cy `]'" msgid "invalid signal number" msgstr "nieprawidÅ‚owy numer sygnaÅ‚u" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: zÅ‚a wartość trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1902,7 +1922,7 @@ msgstr "" "run_pending_traps: obsÅ‚uga sygnaÅ‚u jest ustawiona na SIG_DFL, wysyÅ‚ajÄ…c %d " "(%s) do siebie" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: zÅ‚y sygnaÅ‚ %d" @@ -1931,49 +1951,49 @@ msgstr "make_local_variable: brak kontekstu funkcji w bieżącym zakresie" msgid "%s: variable may not be assigned value" msgstr "%s: nie można przypisać wartoÅ›ci do zmiennej" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: brak kontekstu funkcji w bieżącym zakresie" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s ma pusty exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "nieprawidÅ‚owy znak %d w exportstr dla %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "brak `=' w exportstr dla %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: nagłówek shell_variables poza kontekstem funkcji" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: brak kontekstu global_variables" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: nagłówek shell_variables poza zakresem tymczasowego Å›rodowiska" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: nie można otworzyć jako PLIK" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: nieprawidÅ‚owa wartość dla deskryptora pliku do Å›ledzenia" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: wartość kompatybilna poza zakresem" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex 4902f772..95dd48da 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 700f7416..d77c5d4c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2002-05-08 13:50GMT -3\n" "Last-Translator: Halley Pacheco de Oliveira <halleypo@ig.com.br>\n" "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n" @@ -20,7 +20,7 @@ msgstr "" msgid "bad array subscript" msgstr "índice da matriz (array) incorreto" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -64,6 +64,21 @@ msgstr "" msgid "%s: missing colon separator" msgstr "" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -186,7 +201,7 @@ msgstr "número do sinal incorreto" msgid "invalid hex number" msgstr "número do sinal incorreto" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 #, fuzzy msgid "invalid number" msgstr "número do sinal incorreto" @@ -201,7 +216,7 @@ msgstr "" msgid "`%s': not a pid or valid job spec" msgstr "" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: a variável permite somente leitura" @@ -304,7 +319,7 @@ msgstr "" msgid "can only be used in a function" msgstr "somente pode ser usado dentro de funções; faz com que o escopo visível" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -314,21 +329,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: função somente para leitura" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, fuzzy, c-format msgid "%s: cannot destroy array variables in this way" msgstr "$%s: impossível atribuir desta maneira" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -357,7 +372,7 @@ msgstr "" msgid "%s: cannot delete: %s" msgstr "%s: impossível criar: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -574,6 +589,11 @@ msgstr "" msgid "warning: %s: %s" msgstr "" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "" @@ -832,27 +852,27 @@ msgstr "`r', o último comando seja executado novamente." msgid "Aborting..." msgstr "" -#: error.c:410 +#: error.c:440 #, fuzzy msgid "unknown command error" msgstr "Erro desconhecido %d" -#: error.c:411 +#: error.c:441 #, fuzzy msgid "bad command type" msgstr "usado como nome de um comando." -#: error.c:412 +#: error.c:442 #, fuzzy msgid "bad connector" msgstr "conector incorreto `%d'" -#: error.c:413 +#: error.c:443 #, fuzzy msgid "bad jump" msgstr "Desvio incorreto %d" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: variável não vinculada" @@ -869,52 +889,52 @@ msgstr "" msgid "cannot redirect standard input from /dev/null: %s" msgstr "" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "erro de `pipe': %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: restrição: não é permitido especificar `/' em nomes de comandos" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: comando não encontrado" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, fuzzy, c-format msgid "%s: %s: bad interpreter" msgstr "%s: é um diretório" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: impossível executar o arquivo binário" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, fuzzy, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "impossível duplicar fd (descritor de arquivo) %d para fd 0: %s" @@ -936,7 +956,7 @@ msgstr "erro de sintaxe na expressão" msgid "attempted assignment to non-variable" msgstr "tentativa de atribuição para algo que não é uma variável" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "divisão por 0" @@ -949,41 +969,41 @@ msgstr "Erro de programação: `token' inválido `%d' passado para expassign()" msgid "`:' expected for conditional expression" msgstr "`:' esperado para expressão condicional" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "faltando `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 #, fuzzy msgid "syntax error: operand expected" msgstr "erro de sintaxe: fim prematuro do arquivo" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "" -#: expr.c:1407 +#: expr.c:1416 #, fuzzy, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s: %s: %s (erro: o `token' é \"%s\")\n" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "valor muito grande para esta base de numeração" -#: expr.c:1534 +#: expr.c:1543 #, fuzzy, c-format msgid "%s: expression error\n" msgstr "%s: esperado expressão de número inteiro" @@ -993,7 +1013,7 @@ msgstr "%s: esperado expressão de número inteiro" msgid "getcwd: cannot access parent directories" msgstr "getwd: impossível acessar os diretórios pais (anteriores)" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, fuzzy, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "impossível duplicar fd (descritor de arquivo) %d para fd 0: %s" @@ -1016,147 +1036,147 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, fuzzy, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: o identificador do processo (pid) não existe (%d)!\n" -#: jobs.c:1448 +#: jobs.c:1450 #, fuzzy, c-format msgid "Signal %d" msgstr "Sinal desconhecido #%d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Concluído" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Parado" -#: jobs.c:1471 +#: jobs.c:1473 #, fuzzy, c-format msgid "Stopped(%s)" msgstr "Parado" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Executando" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Concluído(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Fim da execução com status %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Status desconhecido" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(imagem do núcleo gravada)" -#: jobs.c:1600 +#: jobs.c:1602 #, fuzzy, c-format msgid " (wd: %s)" msgstr "(wd agora: %s)\n" -#: jobs.c:1817 +#: jobs.c:1819 #, fuzzy, c-format msgid "child setpgid (%ld to %ld)" msgstr "`setpgid' filho (%d para %d) erro %d: %s\n" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, fuzzy, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: o pid %d não é um filho deste `shell'" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: o trabalho terminou" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, fuzzy, c-format msgid "%s: line %d: " msgstr "encaixe (slot) %3d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (imagem do núcleo gravada)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd agora: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 #, fuzzy msgid "initialize_job_control: getpgrp failed" msgstr "initialize_jobs: getpgrp falhou: %s" -#: jobs.c:3841 +#: jobs.c:3843 #, fuzzy msgid "initialize_job_control: line discipline" msgstr "initialize_jobs: disciplina da linha: %s" -#: jobs.c:3851 +#: jobs.c:3853 #, fuzzy msgid "initialize_job_control: setpgid" msgstr "initialize_jobs: getpgrp falhou: %s" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "nenhum controle de trabalho nesta `shell'" @@ -1310,103 +1330,103 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, fuzzy, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "encontrado EOF não esperado enquanto procurava por `%c'" -#: parse.y:4099 +#: parse.y:4163 #, fuzzy msgid "unexpected EOF while looking for `]]'" msgstr "encontrado EOF não esperado enquanto procurava por `%c'" -#: parse.y:4104 +#: parse.y:4168 #, fuzzy, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "erro de sintaxe próximo do `token' não esperado `%s'" -#: parse.y:4108 +#: parse.y:4172 #, fuzzy msgid "syntax error in conditional expression" msgstr "erro de sintaxe na expressão" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "" -#: parse.y:4190 +#: parse.y:4254 #, fuzzy msgid "expected `)'" msgstr "esperado `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, fuzzy, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "%s: esperado operador binário" -#: parse.y:4272 +#: parse.y:4336 #, fuzzy msgid "conditional binary operator expected" msgstr "%s: esperado operador binário" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, fuzzy, c-format msgid "unexpected token `%c' in conditional command" msgstr "`:' esperado para expressão condicional" -#: parse.y:4312 +#: parse.y:4376 #, fuzzy, c-format msgid "unexpected token `%s' in conditional command" msgstr "`:' esperado para expressão condicional" -#: parse.y:4316 +#: parse.y:4380 #, fuzzy, c-format msgid "unexpected token %d in conditional command" msgstr "`:' esperado para expressão condicional" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "erro de sintaxe próximo do `token' não esperado `%s'" -#: parse.y:5684 +#: parse.y:5748 #, fuzzy, c-format msgid "syntax error near `%s'" msgstr "erro de sintaxe próximo do `token' não esperado `%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "erro de sintaxe: fim prematuro do arquivo" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "erro de sintaxe" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Use \"%s\" para sair da `shell'.\n" -#: parse.y:5918 +#: parse.y:5982 #, fuzzy msgid "unexpected EOF while looking for matching `)'" msgstr "encontrado EOF não esperado enquanto procurava por `%c'" @@ -1551,7 +1571,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "" @@ -1726,97 +1746,97 @@ msgstr "Sinal desconhecido #" msgid "Unknown Signal #%d" msgstr "Sinal desconhecido #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, fuzzy, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "substituição incorreta: nenhum `%s' em %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: impossível atribuir uma lista a um membro de uma matriz (array)" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 #, fuzzy msgid "cannot make pipe for process substitution" msgstr "impossível criar `pipe' para a substituição do processo: %s" -#: subst.c:5074 +#: subst.c:5113 #, fuzzy msgid "cannot make child for process substitution" msgstr "impossível criar um processo filho para a substituição do processo: %s" -#: subst.c:5119 +#: subst.c:5158 #, fuzzy, c-format msgid "cannot open named pipe %s for reading" msgstr "impossível abrir o `named pipe' %s para %s: %s" -#: subst.c:5121 +#: subst.c:5160 #, fuzzy, c-format msgid "cannot open named pipe %s for writing" msgstr "impossível abrir o `named pipe' %s para %s: %s" -#: subst.c:5139 +#: subst.c:5178 #, fuzzy, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" "impossível duplicar o `named pipe' %s\n" "como descritor de arquivo (fd) %d: %s" -#: subst.c:5337 +#: subst.c:5376 #, fuzzy msgid "cannot make pipe for command substitution" msgstr "impossível construir `pipes' para substituição do comando: %s" -#: subst.c:5375 +#: subst.c:5414 #, fuzzy msgid "cannot make child for command substitution" msgstr "impossível criar um processo filho para substituição do comando: %s" -#: subst.c:5394 +#: subst.c:5433 #, fuzzy msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" "command_substitute: impossível duplicar o `pipe' como\n" "descritor de arquivo (fd) 1: %s" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parâmetro nulo ou não inicializado" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: expressão de substring < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: substituição incorreta" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: impossível atribuir desta maneira" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, fuzzy, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "substituição incorreta: nenhum `%s' em %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "" @@ -1858,18 +1878,18 @@ msgstr "faltando `]'" msgid "invalid signal number" msgstr "número do sinal incorreto" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" -#: trap.c:413 +#: trap.c:428 #, fuzzy, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: Sinal incorreto %d" @@ -1898,48 +1918,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: impossível atribuir uma lista a um membro de uma matriz (array)" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: parâmetro nulo ou não inicializado" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: impossível criar: %s" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 1997-08-17 18:42+0300\n" "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" @@ -19,7 +19,7 @@ msgstr "" msgid "bad array subscript" msgstr "incluziune greºitã în interval" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -63,6 +63,21 @@ msgstr "" msgid "%s: missing colon separator" msgstr "" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -185,7 +200,7 @@ msgstr "numãr de semnal invalid" msgid "invalid hex number" msgstr "numãr de semnal invalid" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 #, fuzzy msgid "invalid number" msgstr "numãr de semnal invalid" @@ -200,7 +215,7 @@ msgstr "" msgid "`%s': not a pid or valid job spec" msgstr "" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: variabilã doar în citire" @@ -303,7 +318,7 @@ msgstr "" msgid "can only be used in a function" msgstr "poate fi folosit doar într-o funcþie, ºi face ca variabila NUME" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -313,21 +328,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funcþie doar în citire (readonly)" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, fuzzy, c-format msgid "%s: cannot destroy array variables in this way" msgstr "$%s: nu se poate asigna în acest mod" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -356,7 +371,7 @@ msgstr "" msgid "%s: cannot delete: %s" msgstr "%s: nu s-a putut crea: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -573,6 +588,11 @@ msgstr "" msgid "warning: %s: %s" msgstr "" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "" @@ -830,27 +850,27 @@ msgstr "ultima comandã." msgid "Aborting..." msgstr "" -#: error.c:410 +#: error.c:440 #, fuzzy msgid "unknown command error" msgstr "Eroare necunoscutã %d" -#: error.c:411 +#: error.c:441 #, fuzzy msgid "bad command type" msgstr "ºi nume de comandã." -#: error.c:412 +#: error.c:442 #, fuzzy msgid "bad connector" msgstr "conector greºit `%d'" -#: error.c:413 +#: error.c:443 #, fuzzy msgid "bad jump" msgstr "Salt invalid %d" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: variabilã fãrã limitã" @@ -865,52 +885,52 @@ msgstr "%ca expirat aºteptând introducere de date: auto-logout\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "eroare de legãturã (pipe): %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: limitat: nu se poate specifica `/' în numele comenzilor" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: comandã negãsitã" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, fuzzy, c-format msgid "%s: %s: bad interpreter" msgstr "%s: este director" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: nu se poate executa fiºierul binar" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, fuzzy, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "nu se poate duplica fd %d în fd 0: %s" @@ -932,7 +952,7 @@ msgstr "eroare de sintaxã în expresie " msgid "attempted assignment to non-variable" msgstr "s-a încercat asignare cãtre non-variabilã" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "împãrþire la 0" @@ -945,41 +965,41 @@ msgstr "bug: identificator(token) expassign greºit %d" msgid "`:' expected for conditional expression" msgstr "`:' aºteptat dupã expresie condiþionalã" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "`)' lipsã" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 #, fuzzy msgid "syntax error: operand expected" msgstr "eroare de sintaxã: sfârºit de fiºier neaºteptat" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "" -#: expr.c:1407 +#: expr.c:1416 #, fuzzy, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s: %s: %s (identificatorul erorii este \"%s\")\n" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "valoare prea mare pentru bazã" -#: expr.c:1534 +#: expr.c:1543 #, fuzzy, c-format msgid "%s: expression error\n" msgstr "eroare de redirectare" @@ -989,7 +1009,7 @@ msgstr "eroare de redirectare" msgid "getcwd: cannot access parent directories" msgstr "getwd: nu s-au putut accesa directoarele pãrinte" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "" @@ -1009,147 +1029,147 @@ msgstr "check_bash_input: buffer deja existent pentru fd nou %d" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, fuzzy, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: Nu existã pid-ul (%d)!\n" -#: jobs.c:1448 +#: jobs.c:1450 #, fuzzy, c-format msgid "Signal %d" msgstr "Semnal Necunoscut #%d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Finalizat" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Stopat" -#: jobs.c:1471 +#: jobs.c:1473 #, fuzzy, c-format msgid "Stopped(%s)" msgstr "Stopat" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "În rulare" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Finalizat(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Ieºire %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Stare necunoscutã" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(core dumped) " -#: jobs.c:1600 +#: jobs.c:1602 #, fuzzy, c-format msgid " (wd: %s)" msgstr "(wd actual: %s)\n" -#: jobs.c:1817 +#: jobs.c:1819 #, fuzzy, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid copil (de la %d la %d) a întâlnit o eroare %d: %s\n" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, fuzzy, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "aºteptaþi: pid-ul %d nu este rezultat(child) al acestui shell" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: jobul a fost terminat" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, fuzzy, c-format msgid "%s: line %d: " msgstr "slot %3d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (core dumped)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd actual: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 #, fuzzy msgid "initialize_job_control: getpgrp failed" msgstr "initialize_jobs: getpgrp eºuat: %s" -#: jobs.c:3841 +#: jobs.c:3843 #, fuzzy msgid "initialize_job_control: line discipline" msgstr "initialize_jobs: disciplinã linie: %s" -#: jobs.c:3851 +#: jobs.c:3853 #, fuzzy msgid "initialize_job_control: setpgid" msgstr "initialize_jobs: getpgrp eºuat: %s" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "nici un control de job în acest shell" @@ -1302,103 +1322,103 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, fuzzy, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "EOF brusc în cãutare dupã `%c'" -#: parse.y:4099 +#: parse.y:4163 #, fuzzy msgid "unexpected EOF while looking for `]]'" msgstr "EOF brusc în cãutare dupã `%c'" -#: parse.y:4104 +#: parse.y:4168 #, fuzzy, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "eroare de sintaxã neaºteptatã lângã `%s'" -#: parse.y:4108 +#: parse.y:4172 #, fuzzy msgid "syntax error in conditional expression" msgstr "eroare de sintaxã în expresie " -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "" -#: parse.y:4190 +#: parse.y:4254 #, fuzzy msgid "expected `)'" msgstr "se aºteaptã `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, fuzzy, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "%s: se aºteaptã operator binar" -#: parse.y:4272 +#: parse.y:4336 #, fuzzy msgid "conditional binary operator expected" msgstr "%s: se aºteaptã operator binar" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, fuzzy, c-format msgid "unexpected token `%c' in conditional command" msgstr "`:' aºteptat dupã expresie condiþionalã" -#: parse.y:4312 +#: parse.y:4376 #, fuzzy, c-format msgid "unexpected token `%s' in conditional command" msgstr "`:' aºteptat dupã expresie condiþionalã" -#: parse.y:4316 +#: parse.y:4380 #, fuzzy, c-format msgid "unexpected token %d in conditional command" msgstr "`:' aºteptat dupã expresie condiþionalã" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "eroare de sintaxã neaºteptatã lângã `%s'" -#: parse.y:5684 +#: parse.y:5748 #, fuzzy, c-format msgid "syntax error near `%s'" msgstr "eroare de sintaxã neaºteptatã lângã `%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "eroare de sintaxã: sfârºit de fiºier neaºteptat" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "eroare de sintaxã" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Folosiþi \"%s\" pentru a pãrãsi shellul.\n" -#: parse.y:5918 +#: parse.y:5982 #, fuzzy msgid "unexpected EOF while looking for matching `)'" msgstr "EOF brusc în cãutare dupã `%c'" @@ -1543,7 +1563,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "" @@ -1717,93 +1737,93 @@ msgstr "Semnal Necunoscut #" msgid "Unknown Signal #%d" msgstr "Semnal Necunoscut #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, fuzzy, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "substituþie invalidã: nu existã '%s' în %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: nu pot asigna listã membrului intervalului" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 #, fuzzy msgid "cannot make pipe for process substitution" msgstr "nu pot face legãturã (pipe) pentru substituþia procesului: %s" -#: subst.c:5074 +#: subst.c:5113 #, fuzzy msgid "cannot make child for process substitution" msgstr "nu pot crea un proces copil pentru substituirea procesului: %s" -#: subst.c:5119 +#: subst.c:5158 #, fuzzy, c-format msgid "cannot open named pipe %s for reading" msgstr "nu pot deschide legãtura numitã %s pentru %s: %s" -#: subst.c:5121 +#: subst.c:5160 #, fuzzy, c-format msgid "cannot open named pipe %s for writing" msgstr "nu pot deschide legãtura numitã %s pentru %s: %s" -#: subst.c:5139 +#: subst.c:5178 #, fuzzy, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "nu se poate duplica legãtura numitã %s ca fd %d: %s " -#: subst.c:5337 +#: subst.c:5376 #, fuzzy msgid "cannot make pipe for command substitution" msgstr "nu pot face legãturi(pipes) pentru substituþia de comenzi: %s" -#: subst.c:5375 +#: subst.c:5414 #, fuzzy msgid "cannot make child for command substitution" msgstr "nu pot crea un copil pentru substituþia de comenzi: %s" -#: subst.c:5394 +#: subst.c:5433 #, fuzzy msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: nu se poate duplica legãtura (pipe) ca fd 1: %s" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametru null sau nesetat" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: expresie subºir < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: substituþie invalidã" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: nu se poate asigna în acest mod" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, fuzzy, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "substituþie invalidã: nu existã ')' de final în %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "" @@ -1845,18 +1865,18 @@ msgstr "lipseºte ']'" msgid "invalid signal number" msgstr "numãr de semnal invalid" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" -#: trap.c:413 +#: trap.c:428 #, fuzzy, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: Semnal invalid %d" @@ -1885,48 +1905,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: nu pot asigna listã membrului intervalului" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: parametru null sau nesetat" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: nu s-a putut crea: %s" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bash 3.1-release\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2006-01-05 21:28+0300\n" "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n" "Language-Team: Russian <ru@li.org>\n" @@ -23,7 +23,7 @@ msgstr "" msgid "bad array subscript" msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÉÎÄÅËÓ ÍÁÓÓÉ×Á" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -67,6 +67,21 @@ msgstr "ÎÅÔ ÚÁËÒÙ×ÁÀÝÅÇÏ `%c' × %s" msgid "%s: missing colon separator" msgstr "%s: ÐÒÏÐÕÝÅÎ ÒÁÚÄÅÌÉÔÅÌØ Ä×ÏÅÔÏÞÉÅ" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -188,7 +203,7 @@ msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÎÏÍÅÒ ÓÉÇÎÁÌÁ" msgid "invalid hex number" msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÞÉÓÌÏ" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÞÉÓÌÏ" @@ -202,7 +217,7 @@ msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ÓÉÇÎÁÌÁ" msgid "`%s': not a pid or valid job spec" msgstr "`%s': ÎÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÒÏÃÅÓÓÁ ÉÌÉ ÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÚÁÄÁÞÉ" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: ÄÏÓÔÕÐÎÁÑ ÔÏÌØËÏ ÎÁ ÞÔÅÎÉÅ ÐÅÒÅÍÅÎÎÁÑ" @@ -301,7 +316,7 @@ msgstr "" msgid "can only be used in a function" msgstr "ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ × ÆÕÎËÃÉÉ" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -311,21 +326,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: ÄÏÓÔÕÐÎÁÑ ÔÏÌØËÏ ÎÁ ÞÔÅÎÉÅ ÆÕÎËÃÉÑ" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: ÎÅ ÍÏÇÕ ÕÄÁÌÉÔØ ÐÅÒÅÍÅÎÎÕÀ-ÍÁÓÓÉ× ÔÁËÉÍ ÓÐÏÓÏÂÏÍ" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -354,7 +369,7 @@ msgstr "" msgid "%s: cannot delete: %s" msgstr "%s: ÎÅ ÍÏÇÕ ÕÄÁÌÉÔØ: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -571,6 +586,11 @@ msgstr "%c': ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ ÆÏÒÍÁÔÉÒÏ×ÁÎÉÑ" msgid "warning: %s: %s" msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ:" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "" @@ -821,23 +841,23 @@ msgstr "ÐÏÓÌÅÄÎÑÑ ËÏÍÁÎÄÁ: %s\n" msgid "Aborting..." msgstr "úÁ×ÅÒÛÁÀ ÒÁÂÏÔÕ..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ ËÏÍÁÎÄÙ" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "" @@ -852,52 +872,52 @@ msgstr "" msgid "cannot redirect standard input from /dev/null: %s" msgstr "" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ: %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: ËÏÍÁÎÄÁ ÎÅ ÎÁÊÄÅÎÁ" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: ÐÌÏÈÏÊ ÉÎÔÅÒÐÒÅÔÁÔÏÒ" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÂÉÎÁÒÎÙÊ ÆÁÊÌ" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s: ÎÅ ×ÓÔÒÏÅÎÎÁ × ÏÂÏÌÏÞËÕ" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "ÎÅ ÍÏÇÕ ÄÕÂÌÉÒÏ×ÁÔØ fd %d × fd %d" @@ -918,7 +938,7 @@ msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÅ" msgid "attempted assignment to non-variable" msgstr "ÐÏÐÙÔËÁ ÐÒÉÓ×ÏÅÎÉÑ ÎÅ-ÐÅÒÅÍÅÎÎÏÊ" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "ÄÅÌÅÎÉÅ ÎÁ 0" @@ -930,40 +950,40 @@ msgstr "" msgid "`:' expected for conditional expression" msgstr "" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "ÐÒÏÐÕÝÅÎ `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "ÏÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ: ÏÖÉÄÁÅÔÓÑ ÏÐÅÒÁÎÄ" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "" -#: expr.c:1534 +#: expr.c:1543 #, fuzzy, c-format msgid "%s: expression error\n" msgstr "ÏÖÉÄÁÌÏÓØ ×ÙÒÁÖÅÎÉÅ" @@ -972,7 +992,7 @@ msgstr "ÏÖÉÄÁÌÏÓØ ×ÙÒÁÖÅÎÉÅ" msgid "getcwd: cannot access parent directories" msgstr "" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, fuzzy, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "ÎÅ ÍÏÇÕ ÄÕÂÌÉÒÏ×ÁÔØ fd %d × fd %d" @@ -991,144 +1011,144 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr "" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, fuzzy, c-format msgid "%s: line %d: " msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ:" -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr "" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "" @@ -1280,99 +1300,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "ÏÖÉÄÁÌÓÑ `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "ÏÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ ÏËÏÌÏ `%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "ÏÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ: ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "ÏÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "éÓÐÏÌØÚÕÊÔÅ \"%s\", ÞÔÏÂÙ ÚÁ×ÅÒÛÉÔØÓÑ ÒÁÂÏÔÕ Ó ÏÂÏÌÏÞËÏÊ.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "" @@ -1511,7 +1531,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "" @@ -1686,88 +1706,88 @@ msgstr "" msgid "Unknown Signal #%d" msgstr "" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÉÍÅÎÎÏÊ ËÁÎÁÌ %s ÄÌÑ ÞÔÅÎÉÑ" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÉÍÅÎÎÏÊ ËÁÎÁÌ %s ÄÌÑ ÚÁÐÉÓÉ" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%d: ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÅÓËÒÉÐÔÏÒ ÆÁÊÌÁ: %s" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: ÐÁÒÁÍÅÔÒ null ÉÌÉ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, fuzzy, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "ÎÅÔ ÚÁËÒÙ×ÁÀÝÅÇÏ `%c' × %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "ÎÅÔ ÓÏ×ÐÁÄÅÎÉÑ Ó: %s" @@ -1808,18 +1828,18 @@ msgstr "ÐÒÏÐÕÝÅÎ `]'" msgid "invalid signal number" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÎÏÍÅÒ ÓÉÇÎÁÌÁ" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "" @@ -1848,48 +1868,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s: ÎÅ ÐÅÒÅÍÅÎÎÁÑ-ÍÁÓÓÉ×" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, fuzzy, c-format msgid "%s has null exportstr" msgstr "%s: ÐÁÒÁÍÅÔÒ null ÉÌÉ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ: %s" -#: variables.c:5216 +#: variables.c:5262 #, fuzzy, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%d: ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÅÓËÒÉÐÔÏÒ ÆÁÊÌÁ: %s" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s ×ÙÈÏÄÉÔ ÚÁ ÐÒÅÄÅÌÙ ÄÏÐÕÓÔÉÍÙÈ ÚÎÁÞÅÎÉÊ" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2011-03-16 21:22+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "bad array subscript" msgstr "chybný index poľa" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: nie je možné previesÅ¥ indexované pole na asociatÃvne" @@ -66,6 +66,21 @@ msgstr "chýba zatvárajúca „%c“ v %s" msgid "%s: missing colon separator" msgstr "%s: chýba oddeľovaÄ dvojbodka" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -188,7 +203,7 @@ msgstr "neplatné osmiÄkové ÄÃslo" msgid "invalid hex number" msgstr "neplatné Å¡estnástkové ÄÃslo" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "neplatné ÄÃslo" @@ -202,7 +217,7 @@ msgstr "%s: neplatné urÄenie signálu" msgid "`%s': not a pid or valid job spec" msgstr "„%s“: nie je pid ani platný Å¡pecifikátor úlohy" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: premenná len na ÄÃtanie" @@ -301,7 +316,7 @@ msgstr "momentálne sa nevykonáva funkcia doplňovania" msgid "can only be used in a function" msgstr "je možné použiÅ¥ iba vo funkcii" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -311,21 +326,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "nie je možné použiÅ¥ „-f“ pre tvorbu funkciÃ" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funkcia iba na ÄÃtanie" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: nie je možné takto robiÅ¥ deÅ¡trukciu premenných polÃ" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: nie je možné previesÅ¥ asociatÃvne pole na indexované" @@ -354,7 +369,7 @@ msgstr "%s: nie je dynamicky naÄÃtané" msgid "%s: cannot delete: %s" msgstr "%s: nie je možné zmazaÅ¥: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -580,6 +595,11 @@ msgstr "„%c“: neplatný formátovacà znak" msgid "warning: %s: %s" msgstr "upozornenie: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "chýba hexadecimálna ÄÃslica v \\x" @@ -887,23 +907,23 @@ msgstr "posledný prÃkaz: %s\n" msgid "Aborting..." msgstr "RuÅ¡Ã sa..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "chyba neznámeho prÃkazu" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "chybný typ prÃkazu" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "chybný konektor" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "chybný skok" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: neviazaná premenná" @@ -918,51 +938,51 @@ msgstr "\aÄas vyprÅ¡al pri Äakanà na vstup: automatické odhlásenie\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "nie je možné presmerovaÅ¥ Å¡tandardný vstup z /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: „%c“: neplatný formátovácà znak" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "chyba rúry" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: obmedzené: nie jemožné uviesÅ¥ „/“ v názvoch prÃkazov" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: prÃkaz nenájdený" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: chybný interpreter" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: nie je možné vykonaÅ¥ binárny súbor" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s je vstavaný prÃkaz (builtin) shellu\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "nie je možné duplikovaÅ¥ fd %d na fd %d" @@ -983,7 +1003,7 @@ msgstr "chyba syntaxe vo výraze" msgid "attempted assignment to non-variable" msgstr "pokus o priradenie mimo premennej" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "delenie nulou" @@ -995,40 +1015,40 @@ msgstr "chyba: chybný expassign token" msgid "`:' expected for conditional expression" msgstr "pre podmienený výraz sa oÄakáva „:“" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "exponent menÅ¡Ã ako 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "po pre-inkrementácii alebo pre-dekrementácii sa oÄakáva identifikátor" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "chýba „)“" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "chyba syntaxe: oÄakáva sa operand" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "chyba syntaxe: neplatný aritmetický operátor" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (chybný token je „%sâ€)" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "neplatný aritmetický základ" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "hodnota je ako základ prÃliÅ¡ veľká" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: chyba výrazu\n" @@ -1037,7 +1057,7 @@ msgstr "%s: chyba výrazu\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: nie je možné pristupovaÅ¥ k rodiÄovským adresárom" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "nie j emožné resetovaÅ¥ nodelay režim fd %d" @@ -1056,144 +1076,144 @@ msgstr "save_bash_input: bufer už existuje pre nový fd %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp rúra" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "pid %d zÃskaný pomocou fork sa vyskytuje v bežiacej úlohe %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "mažem zastavenú úlohu %d so skupinou procesu %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: proces %5ld (%s) v the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) je stále oznaÄený ako živý" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: taký pid neexistuje" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signál %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Hotovo" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Zastavené" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Zastavené(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "BežÃ" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Hotovo(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "UkonÄenie %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Neznámy stav" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(bol uložený výpis pamäte) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid detského procesu (%ld to %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld nie je dieÅ¥a tohto shellu" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Neexistuje záznam o procese %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: úloha %d je zastavená" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: úloha skonÄila" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: úloha %d už je v pozadÃ" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: zapÃna sa WNOHANG aby sme sa vyhli neurÄitému blokovaniu" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: riadok %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (bol uložený výpis pamäte)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd teraz: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: funkcia getpgrp zlyhala" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: riadkový systém" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "nie je možné nastaviÅ¥ skupinu procesu terminálu (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "v tomto shelli nie je riadenie úloh" @@ -1347,99 +1367,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: inÅ¡trukcia presmerovania „%d“ mimo rozsahu" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "neoÄakávaný koniec súboru poÄas hľadania zodpovedajúceho „%c“" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "neoÄakávaný koniec súboru poÄas hľadania „]]“" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "chyba syntaxe v podmieneÄnom prÃkaze: neoÄakávaný token „%s“" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "chyba syntaxe v podmieneÄnom prÃkaze" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "neoÄakávaný token „%s“, oÄakávalo sa `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "oÄakávalo sa `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "neoÄakávaný argument „%s“ podmieneÄného unárneho operátora" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "neoÄakávaný argument podmieneÄného unárneho operátora" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "neoÄakávaný token „%s“, oÄakáva sa podmieneÄný binárny operátor" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "oÄakáva sa podmieneÄný binárny operátor" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "neoÄakávaný argument „%s“ v podmieneÄnom binárnom operátore" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "neoÄakávaný argument v podmieneÄnom binárnom operátore" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "neoÄakávaný token „%c“ v podmieneÄnom prÃkaze" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "neoÄakávaný token „%s“ v podmieneÄnom prÃkaze" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "neoÄakávaný token %d v podmieneÄnom prÃkaze" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "chyba syntaxe neÄaleko neoÄakávaného tokenu „%s“" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "chyba syntaxe neÄaleko „%s“" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "chyba syntaxe: neoÄakávaný koniec súboru" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "chyba syntaxe" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Na opustenie shellu použite „%s“.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "neoÄakávaný koniec súboru poÄas hľadania zodpovedajúceho „)“" @@ -1581,7 +1601,7 @@ msgstr "" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Na ohlasovanie chýb použite prÃkaz „bashbug“.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: neplatná operácia" @@ -1755,77 +1775,77 @@ msgstr "Neznáme ÄÃslo signálu" msgid "Unknown Signal #%d" msgstr "Neznámy signál #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "chybná substitúcia: chýba „%s“ v %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: nie je možné priradiÅ¥ zoznam položke poľa" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "nie je možné vytvoriÅ¥ rúru pre substitúciu procesov" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "nie je možné vytvoriÅ¥ potomka pre substitúciu procesov" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "nie je možné otvoriÅ¥ pomenovanú rúru %s na ÄÃtanie" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "nie je možné otvoriÅ¥ pomenovanú rúru %s na zápis" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "nie je možné duplikovaÅ¥ pomenovanú rúru %s ako fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "nie je možné vytvoriÅ¥ rúru pre substitúciu prÃkazov" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "nie je možné vytvoriÅ¥ potomka pre substitúciu prÃkazov" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: nie je možné duplikovaÅ¥ rúru ako fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: neplatná hodnota popisovaÄa trasovacieho súboru" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parameter je null alebo nenastavený" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: výraz podreÅ¥azca < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: chybná substitúcia" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: nie je možné vykonaÅ¥ priradenie takýmto spôsobom" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1833,12 +1853,12 @@ msgstr "" "budúce verzie shellu budú vynucovaÅ¥ vyhodnocovanie ako aritmetickú " "substitúciu" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "chybná substitúcia: : v reÅ¥azci %s chýba uzatvárajúci „`â€" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "bez zhody: %s" @@ -1879,19 +1899,19 @@ msgstr "chýba „]“" msgid "invalid signal number" msgstr "neplatné ÄÃslo signálu" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: chybná hodnota v trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" "run_pending_traps: obsluha signálu je SIG_DFL, znovu posielam %d (%s) sebe" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: chybný signál %d" @@ -1920,48 +1940,48 @@ msgstr "make_local_variable: v aktuálnom rozsahu sa nenachádza kontext funkcie msgid "%s: variable may not be assigned value" msgstr "%s: nie je možné priradiÅ¥ popisovaÄ súboru premennej" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: v aktuálnom rozsahu sa nenachádza kontext funkcie" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s má null exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "neplatný znak %d v exportstr %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "žiadne „=“ v exportstr %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: hlaviÄka shell_variables nie je kontext funkcie" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: chýba kontext global_variables" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: hlaviÄka shell_variables nie je doÄasný rozsah prostredia" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: nemožno otvoriÅ¥ ako SÚBOR" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: neplatná hodnota popisovaÄa trasovacieho súboru" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s je mimo rozsahu" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2012-05-29 16:17+0100\n" "Last-Translator: Klemen KoÅ¡ir <klemen.kosir@gmx.com>\n" "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n" @@ -24,7 +24,7 @@ msgstr "" msgid "bad array subscript" msgstr "slab podpis polja" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: ni mogoÄe pretvoriti zabeleženega polja v povezano polje" @@ -69,6 +69,21 @@ msgstr "brez zakljuÄka `%c' v %s" msgid "%s: missing colon separator" msgstr "%s: manjka loÄilnik dvopiÄja" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -191,7 +206,7 @@ msgstr "neveljavno osmiÅ¡ko Å¡tevilo" msgid "invalid hex number" msgstr "neveljavno Å¡estnajstiÅ¡ko Å¡tevilo" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "neveljavno Å¡tevilo" @@ -205,7 +220,7 @@ msgstr "%s: neveljavno doloÄilo signala" msgid "`%s': not a pid or valid job spec" msgstr "`%s': ni doloÄilo opravila ali neveljavno doloÄilo posla" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: spremenljivka le za branje" @@ -304,7 +319,7 @@ msgstr "trenutno se ne izvaja funkcija dopolnjevanja" msgid "can only be used in a function" msgstr "se lahko uporabi samo v funkciji" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -314,21 +329,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "ni mogoÄe uporabiti `-f' za ustvarjanje funkcij" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: funkcija samo za branje" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: na ta naÄin ni mogoÄe uniÄiti spremenljivk polja" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: ni mogoÄe pretvoriti povezanega polja v zabeleženo polje" @@ -357,7 +372,7 @@ msgstr "%s: ni dinamiÄno naloženo" msgid "%s: cannot delete: %s" msgstr "%s: ni mogoÄe izbrisati: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -584,6 +599,11 @@ msgstr "`%c': neveljaven znak oblike" msgid "warning: %s: %s" msgstr "opozorilo: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "manjka Å¡estnajstiÅ¡ka Å¡tevka za \\x" @@ -889,23 +909,23 @@ msgstr "zadnji ukaz: %s\n" msgid "Aborting..." msgstr "Prekinjanje ..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "neznana napaka ukaza" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "slaba vrsta ukaza" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "slab povezovalnik" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "slab skok" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: nedoloÄena spremenljivka" @@ -920,51 +940,51 @@ msgstr "\apotekla je Äasovna omejitev med Äakanjem na vnos: samodejna odjava\n msgid "cannot redirect standard input from /dev/null: %s" msgstr "ni mogoÄe preusmeriti obiÄajnega vnosa iz /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': neveljaven znak oblike" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "napaka cevi" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: omejeno: ni mogoÄe doloÄiti `/' v imenih ukaza" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: ukaza ni mogoÄe najti" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: slab tolmaÄ" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: ni mogoÄe izvesti binarne datoteke" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s je vgrajena lupina\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "ni mogoÄe podvajati fd %d v fd %d" @@ -985,7 +1005,7 @@ msgstr "skladenjska napaka v izrazu" msgid "attempted assignment to non-variable" msgstr "poskus dodelitve ne-spremenljivki" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "delitev z 0" @@ -997,40 +1017,40 @@ msgstr "hroÅ¡Ä: slab žeton expassign" msgid "`:' expected for conditional expression" msgstr "`:' priÄakovano za pogojni izraz" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "eksponent je manjÅ¡i kot 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "po predhodnem veÄanju ali manjÅ¡anju je priÄakovano doloÄilo" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "manjka `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "skladenjska napaka: priÄakovan operand" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "skladenjska napaka: neveljaven aritmetiÄni operand" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (žeton napake je \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "neveljavna aritmetiÄna zbirka" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "vrednost je prevelika za zbirko" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: napaka izraza\n" @@ -1039,7 +1059,7 @@ msgstr "%s: napaka izraza\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: ni mogoÄe dostopati do nadrejenih map" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "ni mogoÄe ponastaviti naÄina brez zakasnitve za fd %d" @@ -1058,144 +1078,144 @@ msgstr "save_bash_input: medpomnilnik že obstaja za nov fd %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: cev pgrp" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "razvejen id opravila %d se pojavi v izvajajoÄem se poslu %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "brisanje ustavljenega posla %d s skupino opravila %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: opravilo %5ld (%s) v the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: id opravila %5ld (%s) je oznaÄen kot Å¡e živ" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: ni takÅ¡nega doloÄila opravila" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "KonÄano" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Zaustavljeno" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Zaustavljeno(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Se izvaja" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "KonÄano(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "KonÄaj %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Neznano stanje" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(izpis jedra) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "podrejeno opravilo setpgid (%ld v %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: opravilo z id %ld ni podrejeno opravilo te lupine" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: ni zapisov o opravilu %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: posel %d je zaustavljen" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: posel je uniÄen" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: posel %d se že izvaja v ozadju" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: vklop WNOHANG za prepreÄitev nedoloÄenosti bloka" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: vrstica %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (izpis jedra)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd zdaj: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp je spodletel" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: vrstiÄna disciplina" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "ni mogoÄe nastaviti skupine opravil terminala (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "brez nadzora posla v tej lupini" @@ -1352,99 +1372,99 @@ msgstr "here-document v vrstici %d razmejen z end-of-file (želeno `%s')" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: navodilo preusmeritve `%d' je izven dosega" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "nepriÄakovan konec datoteke med iskanjem ujemanja z `%c'" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "nepriÄakovan konec datoteke med iskanjem ujemanja z `]]'" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "skladenjska napaka v pogojnem izrazu: nepriÄakovan žeton `%s'" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "skladenjska napaka v pogojnem izrazu" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "nepriÄakovan žeton `%s', priÄakovan je bil `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "priÄakovan `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "nepriÄakovan argument `%s' do pogojnega enoslovnega operatorja" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "nepriÄakovan argument do pogojnega enoslovnega operatorja" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "nepriÄakovan žeton `%s', priÄakovan je binarni pogojni operator" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "priÄakovan je binarni pogojni operator" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "nepriÄakovan argument `%s' do pogojnega binarnega operatorja" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "nepriÄakovan argument do pogojnega binarnega operatorja" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "nepriÄakovan žeton `%c' v pogojnem ukazu" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "nepriÄakovan žeton `%s' v pogojnem ukazu" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "nepriÄakovan žeton %d v pogojnem ukazu" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "skladenjska napaka blizu nepriÄakovanega žetona `%s'" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "skladenjska napaka blizu `%s'" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "skladenjska napaka: nepriÄakovan konec datoteke" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "skladenjska napaka" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Uporabite \"%s\", Äe želite zapustiti lupino.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "nepriÄakovan konec datoteke med iskanjem ujemanja z `)'" @@ -1583,7 +1603,7 @@ msgstr "VpiÅ¡ite `%s -c help' za veÄ podrobnosti o možnostih ukazov lupine.\n" msgid "Use the `bashbug' command to report bugs.\n" msgstr "Uporabite ukaz `bashbug' za poroÄanje hroÅ¡Äev.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: neveljavno opravilo" @@ -1757,89 +1777,89 @@ msgstr "Neznan signal #" msgid "Unknown Signal #%d" msgstr "Neznan signal #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "slaba zamenjava: ni zakljuÄka `%s' v %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: ni mogoÄe dodeliti seznama Älanu polja" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "ni mogoÄe ustvariti pipe za zamenjavo opravila" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "ni mogoÄe ustvariti podrejenega opravila za zamenjavo opravila" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "ni mogoÄe odpreti imenovane cevi %s za branje" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "ni mogoÄe odpreti imenovane cevi %s za pisanje" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "ni mogoÄe podvajati imenovane cevi %s kot fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "ni mogoÄe ustvariti cevi za zamenjavo ukaza" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "ni mogoÄe ustvariti podrejenega opravila za zamenjavo ukaza" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: ni mogoÄe podvajati cevi kot fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: neveljavna vrednost za opisnik sledenja datotek" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parameter je prazen ali pa ni doloÄen" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: izraz podniza < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: slaba zamenjava" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: ni mogoÄe dodeliti na tak naÄin" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" "prihodnje razliÄice lupine bodo prisilile ocenitev kot aritmetiÄno zamenjavo" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "slaba zamenjava: ni zakljuÄka \"`\" v %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "ni ujemanja: %s" @@ -1880,19 +1900,19 @@ msgstr "manjka `]'" msgid "invalid signal number" msgstr "neveljavna Å¡tevka signala" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: slaba vrednost v trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" "run_pending_traps: roÄnik signala je SIG_DFL, ponovno poÅ¡iljanje %d (%s) sebi" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: slab signal %d" @@ -1921,48 +1941,48 @@ msgstr "make_local_variable: v trenutnem dosegu ni vsebine funkcije" msgid "%s: variable may not be assigned value" msgstr "%s: ni mogoÄe dodeliti fd spremenljivki" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: v trenutnem dosegu ni vsebine funkcije" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s ima prazen exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "neveljaven znak %d v exportstr za %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "ni `=' v exportstr za %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: glava shell_variables ni vsebina funkcije" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: ni vsebine global_variables" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: glava shell_variables ni trenuten obseg okolja" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: ni mogoÄe odpreti kot DATOTEKO" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: neveljavna vrednost za opisnik sledenja datotek" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s izven dosega" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-08-25 20:00+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -22,7 +22,7 @@ msgstr "" msgid "bad array subscript" msgstr "felaktigt vektorindex" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: det gÃ¥r inte att konvertera en indexerad vektor till associativ" @@ -68,6 +68,21 @@ msgstr "ingen avslutande \"%c\" i %s" msgid "%s: missing colon separator" msgstr "%s: kolonseparator saknas" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -190,7 +205,7 @@ msgstr "ogiltigt oktalt tal" msgid "invalid hex number" msgstr "ogiltigt hexadecimalt tal" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "ogiltigt tal" @@ -204,7 +219,7 @@ msgstr "%s: ogiltig signalspecifikation" msgid "`%s': not a pid or valid job spec" msgstr "\"%s\": inte en pid eller giltig jobbspecifikation" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: endast läsbar variabel" @@ -303,7 +318,7 @@ msgstr "kör inte en kompletteringsfunktion" msgid "can only be used in a function" msgstr "kan endast användas i en funktion" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: en referensvariabel kan inte vara en vektor" @@ -313,21 +328,21 @@ msgstr "%s: en referensvariabel kan inte vara en vektor" msgid "%s: nameref variable self references not allowed" msgstr "%s: att en namnreferensvariabel självrefererar är inte tillÃ¥tet" -#: builtins/declare.def:422 +#: builtins/declare.def:398 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:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: endast läsbar funktion" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, 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:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: det gÃ¥r inte att konvertera en associativ vektor till indexerad" @@ -356,7 +371,7 @@ msgstr "%s: inte dynamiskt laddad" msgid "%s: cannot delete: %s" msgstr "%s: kan inte ta bort: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -580,6 +595,11 @@ msgstr "\"%c\": ogiltigt formateringstecken" msgid "warning: %s: %s" msgstr "varning: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "hexadecimal siffra saknas för \\x" @@ -887,23 +907,23 @@ msgstr "senaste kommando: %s\n" msgid "Aborting..." msgstr "Avbryter..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "okänt kommandofel" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "felaktig kommandotyp" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "felaktig anslutning" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "felaktigt hopp" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: obunden variabel" @@ -918,51 +938,51 @@ msgstr "\atiden gick ut i väntan pÃ¥ indata: automatisk utloggning\n" 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:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: \"%c\": ogiltigt formateringstecken" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "rörfel" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: maximal nästning av funktioner överskriden (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, 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:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: kommandot finns inte" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: felaktig tolk" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: det gÃ¥r inte att köra binär fil: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "â€%sâ€: är en speciell inbyggd" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "det gÃ¥r inte att duplicera fb %d till fb %d" @@ -983,7 +1003,7 @@ msgstr "syntaxfel i uttrycket" msgid "attempted assignment to non-variable" msgstr "försök att tilldela till en icke-variabel" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "division med 0" @@ -995,40 +1015,40 @@ msgstr "bug: felaktig expassign-token" msgid "`:' expected for conditional expression" msgstr "\":\" förväntades i villkorligt uttryck" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "exponenten är mindre än 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "en identifierare förväntades efter pre-ökning eller pre-minskning" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "\")\" saknas" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "syntaxfel: en operand förväntades" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "syntaxfel: ogiltig aritmetisk operator" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (felsymbol är \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "ogiltig aritmetisk bas" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "värdet är för stort för basen" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: uttrycksfel\n" @@ -1037,7 +1057,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:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, 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" @@ -1057,144 +1077,144 @@ msgstr "save_bash_input: buffert finns redan för ny fb %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp rör" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "avgrenad pid %d fins i körande jobb %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "tar bort stoppat jobb %d med processgrupp %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: process %5ld (%s) i the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, 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:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: ingen sÃ¥dan pid" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Klart" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Stoppat" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Stoppat(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Kör" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Klart(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Avslut %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Okänd status" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(minnesutskrift skapad) " -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (ak: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "barns setpgid (%ld till %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, 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:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Ingen uppgift om process %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: jobb %d är stoppat" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: jobbet har avslutat" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: jobb %d är redan i bakgrunden" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: slÃ¥r pÃ¥ WNOHANG för att undvika oändlig blockering" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: rad %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (minnesutskrift skapad)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(ak nu: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp misslyckades" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: linjedisciplin" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "det gÃ¥r inte att sätta terminalprocessgrupp (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "ingen jobbstyrning i detta skal" @@ -1348,99 +1368,99 @@ msgid "make_redirection: redirection instruction `%d' out of range" msgstr "" "make_redirection: omdirigeringsinstruktion \"%d\" utanför giltigt intervall" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "oväntat filslut vid sökning efter matchande \"%c\"" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "oväntat filslut vid sökning efter \"]]\"" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "syntaxfel i villkorligt uttryck: oväntad symbol \"%s\"" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "syntaxfel i villkorligt uttryck" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "oväntad symbol \"%s\", \")\" förväntades" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "\")\" förväntades" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "oväntat argument \"%s\" till villkorlig unär operator" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "oväntat argument till villkorlig unär operator" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "oväntad symbol \"%s\", villkorlig binär operator förväntades" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "villkorlig binär operato förväntades" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "oväntat argument \"%s\" till villkorlig binär operator" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "oväntat argument till villkorlig binär operator" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "oväntad symbol \"%c\" i villkorligt kommando" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "oväntad symbol \"%s\" i villkorligt kommando" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "oväntad symbol %d i villkorligt kommando" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "syntaxfel nära den oväntade symbolen \"%s\"" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "syntaxfel nära \"%s\"" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "syntaxfel: oväntat filslut" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "syntaxfel" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Använd \"%s\" fär att lämna skalet.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "oväntat filslut när matchande \")\" söktes" @@ -1580,7 +1600,7 @@ msgstr "" "Använd kommandot \"bashbug\" för att rapportera fel.\n" "Skicka synpunkter pÃ¥ översättningen till <tp-sv@listor.tp-sv.se>.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: ogiltig operation" @@ -1754,77 +1774,77 @@ msgstr "Okänd signal nr " msgid "Unknown Signal #%d" msgstr "Okänd signal nr %d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "felaktig substitution: ingen avslutande \"%s\" i %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: det gÃ¥r inte att tilldela listor till vektormedlemmar" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "det gÃ¥r inte att skapa rör för processubstitution" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "det gÃ¥r inte att skapa barn för processubstitution" -#: subst.c:5119 +#: subst.c:5158 #, 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:5121 +#: subst.c:5160 #, 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:5139 +#: subst.c:5178 #, 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:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "det gÃ¥r inte att skapa rör för kommandosubstitution" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "det gÃ¥r inte att skapa barn för kommandosubstitution" -#: subst.c:5394 +#: subst.c:5433 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:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: ogiltigt variabelnamn för referens" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametern tom eller inte satt" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: delstränguttryck < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: felaktig substitution" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: det gÃ¥r inte att tilldela pÃ¥ detta sätt" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1832,12 +1852,12 @@ msgstr "" "framtida versioner av skalet kommer att framtvinga evaluering som en " "aritmetisk substition" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "felaktig ersättning: ingen avslutande \"`\" i %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "ingen match: %s" @@ -1878,12 +1898,12 @@ msgstr "\"]\" saknas" msgid "invalid signal number" msgstr "ogiltigt signalnummer" -#: trap.c:355 +#: trap.c:371 #, 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:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1891,7 +1911,7 @@ msgstr "" "run_pending_traps: signalhanterare är SIG_DFL, skickar om %d (%s) till mig " "själv" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: felaktig signal %d" @@ -1920,50 +1940,50 @@ msgstr "make_local_variable: ingen funktionskontext i aktuellt sammanhang" msgid "%s: variable may not be assigned value" msgstr "%s: variabeln fÃ¥r inte tilldelas ett värde" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: ingen funktionskontext i aktuellt sammanhang" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s har tom exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "ogiltigt tecken %d i exportstr för %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "inget \"=\" i exportstr för %s" -#: variables.c:4298 +#: variables.c:4344 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:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: ingen kontext global_variables" -#: variables.c:4385 +#: variables.c:4431 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" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: gÃ¥r inte att öppna som FILE" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: ogiltigt värde för spÃ¥rningsfilbeskrivare" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: kompatibilitetsvärde utanför giltigt intervall" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-11-07 22:11+0100\n" "Last-Translator: Volkan Gezer <vlkngzr@gmail.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" @@ -23,7 +23,7 @@ msgstr "" msgid "bad array subscript" msgstr "hatalı dizi indisi" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: indisli dizi, iliÅŸkisel diziye dönüştürülemez" @@ -67,6 +67,21 @@ msgstr "%2$s içinde kapatan `%1$c' yok" msgid "%s: missing colon separator" msgstr "%s: ikinokta imi eksik" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "geçersiz sekizli sayı" msgid "invalid hex number" msgstr "geçersiz onaltılık sayı" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "geçersiz sayı" @@ -203,7 +218,7 @@ msgstr "%s: sinyal belirtimi geçersiz" msgid "`%s': not a pid or valid job spec" msgstr "`%s': geçerli bir iÅŸ belirtimi veya süreç numarası deÄŸil" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: salt okunur deÄŸiÅŸken" @@ -302,7 +317,7 @@ msgstr "ÅŸuan tamamlama iÅŸlevi çalıştırılmıyor" msgid "can only be used in a function" msgstr "sadece bir iÅŸlevde kullanılabilir" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: referans deÄŸeri bir dizi olamaz" @@ -312,21 +327,21 @@ msgstr "%s: referans deÄŸeri bir dizi olamaz" msgid "%s: nameref variable self references not allowed" msgstr "%s: nameref deÄŸiÅŸkeninin kendine yaptığı referanslara izin verilmiyor" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "iÅŸlev yapmak için `-f' kullanılamaz" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: salt okunur iÅŸlev" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: dizi deÄŸiÅŸkenleri bu yolla iptal edilemez" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: iliÅŸkisel dizi, indisli diziye dönüştürülemez" @@ -355,7 +370,7 @@ msgstr "%s: özdevimli olarak yüklenmemiÅŸ" msgid "%s: cannot delete: %s" msgstr "%s: silinemiyor: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -579,6 +594,11 @@ msgstr "`%c': biçim karakteri geçersiz" msgid "warning: %s: %s" msgstr "uyarı: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "\\x için onaltılık rakam eksik" @@ -884,23 +904,23 @@ msgstr "son komut: %s\n" msgid "Aborting..." msgstr "Çıkılıyor..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "bilinmeyen komut hatası" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "hatalı komut türü" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "hatalı baÄŸlantı" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "hatalı sıçrama" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: baÄŸlanmamış deÄŸiÅŸken" @@ -915,51 +935,51 @@ msgstr "\agirdi beklerken zamanaşımı: auto-logout\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "/dev/null'dan standart girdiye yönlendirme yapılamaz: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': biçim karakteri geçersiz" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "iletiÅŸim tüneli hatası" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: azami fonksiyon yuvalama sınırı aşıldı (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: kısıtlı: komut adında `/' kullanamazsınız" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: komut yok" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: hatalı yorumlayıcı" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: ikili dosya çalıştırılamıyor: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "%s: bir kabuk yerleÅŸiÄŸidir" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "fd %d, fd %d olarak yinelenemiyor" @@ -980,7 +1000,7 @@ msgstr "ifadede sözdizimi hatası" msgid "attempted assignment to non-variable" msgstr "deÄŸiÅŸken olmayana atama yapmaya çalışıldı" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "sıfırla bölme" @@ -992,40 +1012,40 @@ msgstr "yazılım hatası: bad expassign token" msgid "`:' expected for conditional expression" msgstr "koÅŸullu ifade için `:' bekleniyordu" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "üs sıfırdan küçük" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "belirteç ön-arttırım veya ön-eksiltim sonrası bekleniyordu" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "eksik `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "sözdizimi hatası: terim umuluyordu" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "sözdizimi hatası: geçersiz aritmetik iÅŸleci" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (hata belirtisi \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "geçersiz sayı tabanı" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "deÄŸer taban için fazla büyük" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: ifade hatası\n" @@ -1034,7 +1054,7 @@ msgstr "%s: ifade hatası\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: üst dizinlere eriÅŸilemiyor" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "fd %d için geciktirmeme kipi sıfırlanamıyor" @@ -1054,144 +1074,144 @@ msgstr "save_bash_input: yeni fd %d için tampon zaten var" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp iletiÅŸim tüneli" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "çatallanan pid %d, çalışan iÅŸ %d içinde görünüyor" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "durdurulan %2$ld süreç gruplu iÅŸ %1$d siliniyor" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: %5ld (%s) süreci iletiÅŸim_tünelinde" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: %5ld (%s) program kimliÄŸi hala canlı olarak iÅŸaretli" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: böyle bir pid yok" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Sinyal %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Bitti" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Durdu" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Durdu(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Çalışıyor" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Bitti(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Çıkış %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Bilinmeyen durum" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(çekirdek döküldü)" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "alt setpgid (ÅŸuradan: %ld ÅŸuraya: %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld bu kabuÄŸun bir alt sürecine ait deÄŸil" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: süreç %ld için kayıt yok" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: iÅŸ %d durdu" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: iÅŸ sonlanmış" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: iÅŸ %d zaten artalanda" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: belirsiz blok önlenmek için WNOHANG açılıyor" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: satır %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (çekirdek döküldü)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd artık: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp baÅŸarısız" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: satır düzeni" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "uçbirim süreç grunu (%d) ayarlanamaz" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "bu kabukta iÅŸ denetimi yok" @@ -1344,99 +1364,99 @@ msgstr "bu belgede %d satırında dosya sonu sonlandırılmış (istenen `%s')" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: yönlendirme yönergesi `%d' aralık dışında" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "`%c' için eÅŸleÅŸme aranırken beklenmedik dosya sonu" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "`]]' aranırken beklenmedik dosya sonu" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "koÅŸullu ifadede sözdizimi hatası: beklenmedik dizgecik `%s'" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "koÅŸullu ifadede sözdizimi hatası" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "beklenmedik dizgecik `%s', `)' umuluyordu" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "`)' umuluyordu" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "koÅŸullu tek terimli iÅŸlece beklenmedik argüman `%s'" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "koÅŸullu tek terimli iÅŸlece beklenmedik argüman" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "beklenmedik dizgecik `%s', koÅŸullu iki terimli iÅŸleç umuluyordu" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "koÅŸullu iki terimli iÅŸleç umuluyordu" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "koÅŸullu iki terimli iÅŸlece beklenmedik argüman `%s'" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "koÅŸullu iki terimli iÅŸlece beklenmedik argüman" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "koÅŸullu komutta beklenmeyen dizgecik `%c'" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "koÅŸullu komutta beklenmeyen dizgecik `%s'" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "koÅŸullu komutta beklenmeyen dizgecik %d" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "beklenmeyen dizgecik `%s' yakınında sözdizimi hatası" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "`%s' yakınında sözdizimi hatası" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "sözdizimi hatası: beklenmeyen dosya sonu" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "sözdizimi hatası" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "KabuÄŸu bırakmak için \"%s\" kullanın.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "`)' için eÅŸleÅŸme aranırken beklenmedik dosya sonu" @@ -1579,7 +1599,7 @@ msgstr "" "Yazılım hatalarını raporlamak için `bashbug' komutunu kullanınız.\n" "Çeviri hatalarını ise <gnu-tr@belgeler.org> adresine bildiriniz.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: geçersiz iÅŸlem" @@ -1753,77 +1773,77 @@ msgstr "Bilinmeyen Sinyal #" msgid "Unknown Signal #%d" msgstr "Bilinmeyen Sinyal #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "hatalı ikame: %2$s içinde kapatan `%1$s' yok" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: dizi üyesine liste atanamaz" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "süreç ikamesi için borulama yapılamıyor" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "süreç ikamesi için alt süreç yapılamıyor" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "isimli boru %s okumak için açılamıyor" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "isimli boru %s yazmak için açılamıyor" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "isimli boru %s fd %d olarak yinelenemiyor" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "komut ikamesi için boru yapılamıyor" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "komut ikamesi için alt süreç yapılamıyor" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: boru fd 1 olarak yinelenemiyor" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: dosya izleme tanımlayıcısı için geçersiz deÄŸer" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametre boÅŸ ya da deÄŸer atanmamış" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: altdizge ifadesi < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: hatalı ikame" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: bu yolla atama yapılmaz" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1831,12 +1851,12 @@ msgstr "" "kabuk gelecekteki sürümlerinde, bir aritmetik ikame olarak deÄŸerlendirmeye " "zorlayacak" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "hatalı ikame: %s içinde kapatan \"`\" yok" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "eÅŸleÅŸme yok: %s" @@ -1877,19 +1897,19 @@ msgstr "eksik `]'" msgid "invalid signal number" msgstr "geçersiz sinyal numarası" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps:trap_list[%d] içinde hatalı deÄŸer: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "" "run_pending_traps: sinyal yakalayıcı SIG_DFL'dir, kendime %d (%s) göndererek" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler:hatalı sinyal %d" @@ -1918,49 +1938,49 @@ msgstr "make_local_variable: geçerli etki alanında hiç iÅŸlev baÄŸlamı yok" msgid "%s: variable may not be assigned value" msgstr "%s: deÄŸiÅŸkene deÄŸer atanmamış olabilir" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: geçerli etki alanında hiç iÅŸlev baÄŸlamı yok" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s boÅŸ exportstr içeriyor" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "%2$s için exportstr içinde geçersiz karakter %1$d" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "%s için exportstr içinde `=' yok" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: kabuk deÄŸiÅŸkenlerinin başı bir iÅŸlev baÄŸlamı deÄŸil" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: genel deÄŸiÅŸkenler baÄŸlamı yok" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: kabuk deÄŸiÅŸkenlerinin başı bir geçici ortam etki alanı deÄŸil" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: DOSYA olarak açılamaz" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: dosya izleme tanımlayıcısı için geçersiz deÄŸer" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: uyumlulukdeÄŸeri aralık dışı" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-08-14 13:16+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" @@ -25,7 +25,7 @@ msgstr "" msgid "bad array subscript" msgstr "неправильний Ñ–Ð½Ð´ÐµÐºÑ Ð¼Ð°Ñиву" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: неможливо перетворити індекÑований маÑив на аÑоціативний" @@ -72,6 +72,21 @@ msgstr "нема заключної «%c» у %s" msgid "%s: missing colon separator" msgstr "%s: пропущено двокрапку-роздільник" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -194,7 +209,7 @@ msgstr "неправильне віÑімкове чиÑло" msgid "invalid hex number" msgstr "неправильне шіÑтнадцÑткове чиÑло" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "неправильне чиÑло" @@ -208,7 +223,7 @@ msgstr "%s: Ñигнал вказано з помилками" msgid "`%s': not a pid or valid job spec" msgstr "«%s»: не Ñ” ідентифікатором процеÑу чи завданнÑ" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: змінна призначена лише Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ" @@ -307,7 +322,7 @@ msgstr "наразі Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ€Ñдку не викРmsgid "can only be used in a function" msgstr "може викориÑтовуватиÑÑ Ð»Ð¸ÑˆÐµ уÑередині функції" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: еталонна змінна не може бути маÑивом" @@ -317,21 +332,21 @@ msgstr "%s: еталонна змінна не може бути маÑивом" msgid "%s: nameref variable self references not allowed" msgstr "%s: не можна викориÑтовувати циклічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñƒ змінній поÑиланнÑ" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "`-f' не викориÑтовуєтьÑÑ Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ð¹" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: незмінна функціÑ" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: неможливо знищити маÑив таким чином" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: неможливо перетворити аÑоціативний маÑив на індекÑований" @@ -360,7 +375,7 @@ msgstr "%s: завантажений не динамічно" msgid "%s: cannot delete: %s" msgstr "%s: не вдалоÑÑ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -588,6 +603,11 @@ msgstr "«%c»: помилковий Ñимвол у шаблоні" msgid "warning: %s: %s" msgstr "попередженнÑ: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "пропущено шіÑтнадцÑткову цифру у \\x" @@ -900,23 +920,23 @@ msgstr "оÑÑ‚Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s\n" msgid "Aborting..." msgstr "ПрипиненнÑ..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "невідома помилка команди" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "неправильний тип команди" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "неправильний з’єднувальний оператор" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "неправильний перехід" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: неозначена змінна" @@ -931,51 +951,51 @@ msgstr "\aÑ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð²Ð¾Ð´Ñƒ вичерпано: автомРmsgid "cannot redirect standard input from /dev/null: %s" msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÑпрÑмувати /dev/null на Ñтандартний ввід: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: «%c»: помилковий Ñимвол шаблону" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "помилка каналу" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: перевищено макÑимальний рівень вкладеноÑÑ‚Ñ– функцій (%d)" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: обмеженнÑ: не можна вказувати `/' у назві команди" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: команду не знайдено" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: неправильний інтерпретатор" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ бінарний файл: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "%s Ñ” Ñпеціальною вбудованою командою оболонки" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "не вдалоÑÑ Ñтворити копію файлового деÑкриптору %d у %d" @@ -996,7 +1016,7 @@ msgstr "ÑинтакÑична помилка у виразі" msgid "attempted assignment to non-variable" msgstr "Ñпроба Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ-змінної" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð½Ð° 0" @@ -1008,40 +1028,40 @@ msgstr "вада: неправильна лекÑема у виразі" msgid "`:' expected for conditional expression" msgstr "очікувалаÑÑ `:' умовного виразу" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "екÑпонента менша за 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "пре-інкремент чи пре-декремент потребують ідентифікатор" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "відÑÑƒÑ‚Ð½Ñ `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "ÑинтакÑична помилка: очікувавÑÑ Ð¾Ð¿ÐµÑ€Ð°Ð½Ð´" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "ÑинтакÑична помилка: помилковий арифметичний оператор" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (позначка помилки \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "некоректна арифметична оÑнова" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "завелике Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¾Ñнови" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: помилка у виразі\n" @@ -1050,7 +1070,7 @@ msgstr "%s: помилка у виразі\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до каталогів вищого рівнÑ" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñтановити режим без затримки файлового деÑкриптору %d" @@ -1071,146 +1091,146 @@ msgstr "save_bash_input: Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ файлового деÑкрипт msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" "ідентифікатор відгалуженого процеÑу %d знайдено у поточному завданні %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ð·ÑƒÐ¿Ð¸Ð½ÐµÐ½Ð¾Ð³Ð¾ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ %d, що має групу процеÑів %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: Ð¿Ñ€Ð¾Ñ†ÐµÑ %5ld (%s) у the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" "add_process: ідентифікатор процеÑу %5ld (%s) вказує на його працездатніÑÑ‚ÑŒ" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: ідентифікатор процеÑу не Ñ–Ñнує" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "Сигнал %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Завершено" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Зупинено" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Зупинено(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Працює" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Зроблено(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Вихід %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Ðевідомий Ñтан" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(збережено знімок оперативної пам’ÑÑ‚Ñ–)" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (РД: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "зміна групи дочірнього процеÑу (%ld на %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: Ð¿Ñ€Ð¾Ñ†ÐµÑ %ld не Ñ” відгалуженим від цієї оболонки" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Ðема запиÑу Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑу %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ %d зупинене" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð¾ÑÑ" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ %d вже працює в фоні" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: увімкнути WNOHANG, щоб уникнути неÑкінченного блокуваннÑ" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: Ñ€Ñдок %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (збережено знімок оперативної пам’ÑÑ‚Ñ–)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(тепер РД: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: помилка getpgrp" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: алгоритм реалізації Ñ€Ñдків" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "не вдалоÑÑ Ð²Ñтановити групу процеÑу Ð´Ð»Ñ Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ð°Ð»Ð° (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "Ñ†Ñ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÐ° не може керувати завданнÑми" @@ -1367,99 +1387,99 @@ msgstr "here-document з Ñ€Ñдка %d закінчено кінцем файлРmsgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: інÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ Ð¿ÐµÑ€ÐµÑпрÑÐ¼ÑƒÐ²Ð°Ð½Ð½Ñ `%d' поза межами" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "файл ÑкінчивÑÑ Ñ€Ð°Ð½Ñ–ÑˆÐµ, ніж було знайдено відповідний «%c»" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "файл ÑкінчивÑÑ Ñ€Ð°Ð½Ñ–ÑˆÐµ, ніж було знайдено `]]'" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "ÑинтакÑична помилка в умовному виразі: неочікувана лекÑема «%s»" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "ÑинтакÑична помилка в умовному виразі" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "неочікувана лекÑема «%s», очікувалаÑÑ `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "очікувалаÑÑ `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "неочікуваний аргумент унарного умовного оператора «%s»" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "неочікуваний аргумент унарного умовного оператора" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "неочікувана лекÑема «%s», очікувавÑÑ Ð±Ñ–Ð½Ð°Ñ€Ð½Ð¸Ð¹ умовний оператор" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "очікувавÑÑ Ð±Ñ–Ð½Ð°Ñ€Ð½Ð¸Ð¹ умовний оператор" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "неочікуваний аргумент бінарного умовного оператора «%s»" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "неочікуваний аргумент бінарного умовного оператора" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "неочікувана лекÑема «%c» в умовній команді" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "неочікувана лекÑема «%s» в умовній команді" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "неочікувана лекÑема %d в умовній команді" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "ÑинтакÑична помилка коло неочікуваної лекÑеми «%s»" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "ÑинтакÑична помилка коло «%s»" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "ÑинтакÑична помилка: раптово ÑкінчивÑÑ Ñ„Ð°Ð¹Ð»" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "ÑинтакÑична помилка" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "ВикориÑтовуйте \"%s\", щоб вийти з оболонки.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "файл ÑкінчивÑÑ, перш ніж було знайдено відповідну `)'" @@ -1604,7 +1624,7 @@ msgid "Use the `bashbug' command to report bugs.\n" msgstr "" "Щоб повідомити про помилку в програмі, викориÑтовуйте команду `bashbug'.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: некоректна операціÑ" @@ -1778,79 +1798,79 @@ msgstr "Ðевідомий Ñигнал â„–" msgid "Unknown Signal #%d" msgstr "Ðевідомий Ñигнал â„–%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "неправильна заміна: немає заключної «%s» у %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: неможливо означити елемент маÑиву ÑпиÑком" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "не вдалоÑÑ Ñтворити канал Ð´Ð»Ñ Ð¿Ñ–Ð´ÑтавлÑÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑу" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "не вдалоÑÑ Ñтворити дочірній Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð´Ð»Ñ Ð¿Ñ–Ð´ÑтавлÑÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑу" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ іменований канал %s Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ іменований канал %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "не вдалоÑÑ Ð·Ð´ÑƒÐ±Ð»ÑŽÐ²Ð°Ñ‚Ð¸ іменований канал %s Ñк fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "не вдалоÑÑ Ñтворити канал Ð´Ð»Ñ Ð¿Ñ–Ð´ÑтавлÑÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "не вдалоÑÑ Ñтворити дочірній Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð´Ð»Ñ Ð¿Ñ–Ð´ÑтавлÑÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" "command_substitute: не вдалоÑÑ Ñтворити копію каналу із файловим " "деÑкриптором 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: некоректна назва змінної Ð´Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð·Ð° назвою" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: параметр нульової довжини чи не вказаний" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: підрÑдок коротший за 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: неправильна заміна" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: не можна призначити таким чином" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" @@ -1858,12 +1878,12 @@ msgstr "" "у наÑтупних верÑÑ–ÑÑ… оболонки буде виконуватиÑÑ Ð¾Ð±Ñ‡Ð¸ÑÐ»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð·Ð°Ð¼Ñ–Ð½Ð¸ " "арифметичних виразів" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "неправильна заміна: немає заключної \"`\" у %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "нема відповідника: %s" @@ -1904,12 +1924,12 @@ msgstr "відÑÑƒÑ‚Ð½Ñ `]'" msgid "invalid signal number" msgstr "неправильний номер Ñигналу" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: неправильне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñƒ trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1917,7 +1937,7 @@ msgstr "" "run_pending_traps: обробник Ñигналу Ñ” SIG_DFL, %d (%s) повторно надÑилаєтьÑÑ " "Ñобі" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: неправильний Ñигнал %d" @@ -1946,50 +1966,50 @@ msgstr "make_local_variable: немає контекÑту функції у пРmsgid "%s: variable may not be assigned value" msgstr "%s: змінною не може бути значеннÑ, Ñке приймають інші змінні" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: немає контекÑту функції у поточній облаÑÑ‚Ñ–" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s має нульове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ€Ñдка екÑпортуваннÑ" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "Помилковий Ñимвол %d у Ñ€Ñдку екÑпорту Ð´Ð»Ñ %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "немає `=' у Ñ€Ñдку екÑпорту Ð´Ð»Ñ %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context: перший елемент shell_variables не Ñ” контекÑтом функції" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: немає контекÑту global_variables" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: перший елемент shell_variables не Ñ” тимчаÑовим оточеннÑм виконаннÑ" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ ФÐЙЛ" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: некоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´ÐµÑкриптора файла траÑуваннÑ" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÑуміÑноÑÑ‚Ñ– не належить припуÑтимому діапазону значень" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-08-17 15:01+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -25,7 +25,7 @@ msgstr "" msgid "bad array subscript" msgstr "chỉ số của mảng sai" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: không thể chuyển đổi mảng kiểu chỉ số sang mảng kết hợp" @@ -69,6 +69,21 @@ msgstr "thiếu dấu đóng “%c†trong %s" msgid "%s: missing colon separator" msgstr "%s: thiếu dấu hai chấm phân cách" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -191,7 +206,7 @@ msgstr "số bát phân không hợp lệ" msgid "invalid hex number" msgstr "số tháºp lục không hợp lệ" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "số không hợp lệ" @@ -205,7 +220,7 @@ msgstr "%s: sai đặc tả tÃn hiệu" msgid "`%s': not a pid or valid job spec" msgstr "“%sâ€: không phải má»™t pid hoặc đặc tả công việc hợp lệ" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: biến chỉ Ä‘á»c" @@ -304,7 +319,7 @@ msgstr "hiện thá»i không thá»±c thi hà m đầy đủ" msgid "can only be used in a function" msgstr "chỉ có thể dùng trong má»™t hà m" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s: biến tham chiếu không thể là má»™t mảng" @@ -314,21 +329,21 @@ msgstr "%s: biến tham chiếu không thể là má»™t mảng" msgid "%s: nameref variable self references not allowed" msgstr "%s: biến nameref tá»± tham chiếu là không được phép" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "không thể dùng “-f†để tạo hà m" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: hà m chỉ Ä‘á»c" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: không thể hủy biến mảng bằng cách nà y" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: không thể chuyển đổi mảng kết hợp sang mảng chỉ số" @@ -357,7 +372,7 @@ msgstr "%s không được nạp Ä‘á»™ng" msgid "%s: cannot delete: %s" msgstr "%s: không thể xoá: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -578,6 +593,11 @@ msgstr "“%câ€: ký tá»± định dạng không hợp lệ" msgid "warning: %s: %s" msgstr "cảnh báo: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "thiếu chữ số tháºp phân cho \\x" @@ -880,23 +900,23 @@ msgstr "lệnh cuối: %s\n" msgid "Aborting..." msgstr "Hủy bá»..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "lá»—i lệnh không rõ" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "kiểu lệnh sai" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "bá»™ kết nối sai" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "nhảy sai" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: biến chÆ°a liên kết" @@ -911,51 +931,51 @@ msgstr "\aquá thá»i hạn đợi dữ liệu nháºp: tá»± Ä‘á»™ng đăng xuấ msgid "cannot redirect standard input from /dev/null: %s" msgstr "không thể chuyển hÆ°á»›ng đầu và o chuẩn từ /dev/null: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "ÄỊNH DẠNG THỜI GIAN: “%câ€: ký tá»± định dạng không hợp lệ" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "lá»—i ống dẫn" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s: vượt quá mức Ä‘á»™ tối Ä‘a các hà m lồng nhau (%d)." -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: bị hạn chế: không thể dùng “/†trong tên lệnh" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: không tìm thấy lệnh" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: bá»™ thông dịch sai" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: không thể thá»±c hiện táºp tin nhị phân: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, c-format msgid "`%s': is a special builtin" msgstr "“%sâ€: là lệnh dá»±ng sẵn đặc biệt" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "không thể nhân đôi fd %d thà nh fd %d" @@ -976,7 +996,7 @@ msgstr "lá»—i cú pháp trong biểu thức" msgid "attempted assignment to non-variable" msgstr "thá» gán cho thứ không phải biến" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "chia cho không" @@ -988,40 +1008,40 @@ msgstr "lá»—i: “token expassign†sai" msgid "`:' expected for conditional expression" msgstr "cần “:†cho biểu thức Ä‘iá»u kiện" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "số mÅ© nhá» hÆ¡n 0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "cần định danh sau tăng/giảm dần trÆ°á»›c" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "thiếu “)â€" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "lá»—i cú pháp: cần toán hạng" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "lá»—i cú pháp: toán tá» số há»c không hợp lệ" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (thẻ bà i lá»—i là \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "cÆ¡ số (số há»c) không hợp lệ" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "cÆ¡ số có giá trị quá lá»›n" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: lá»—i biểu thức\n" @@ -1030,7 +1050,7 @@ msgstr "%s: lá»—i biểu thức\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: không thể truy cáºp thÆ° mục cấp trên" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "không thể đặt lại chế Ä‘á»™ “nodelay†cho fd %d" @@ -1050,145 +1070,145 @@ msgstr "save_bash_input: đã có bá»™ đệm cho fd má»›i %d" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "pid được tánh nhánh %d có vẻ Ä‘ang chạy trong công việc %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "Ä‘ang xoá công việc bị dừng chạy %d vá»›i nhóm tiến trình %ld" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: tiến trình %5ld (%s) trong the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) được đánh dấu vẫn hoạt Ä‘á»™ng" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: không có pid nhÆ° váºy" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "TÃn hiệu %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "Hoà n tất" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "Bị dừng" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "Bị dừng(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "Äang chạy" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "Xong(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "Thoát %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "Không rõ trạng thái" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(xuất ra core)" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "setpgid tiến trình con (%ld thà nh %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld không phải là tiến trình con của shell nà y" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Không có mục ghi vá» tiến trình %ld" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: công việc %d bị dừng chạy" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: công việc bị chấm dứt" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: công việc %d đã Ä‘ang chạy ná»n" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: Ä‘ang báºt WNOHANG để tránh bị chặn vô hạn" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: dòng %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (xuất ra core)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd bây giá»: %s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp bị lá»—i" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: ká»· luáºt dòng" # NghÄ©a chữ : dừng dịch -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "không thể đặt nhóm tiến trình cuối cùng (%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "không có Ä‘iá»u khiển công việc trong shell nà y" @@ -1343,99 +1363,99 @@ msgstr "tà i liệu nà y ở dòng %d định giá»›i bằng kết thúc táºp ti msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: chỉ dẫn chuyển hÆ°á»›ng “%d†nằm ngoà i phạm vi" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "gặp kết thúc táºp tin bất thÆ°á»ng trong khi tìm “%c†tÆ°Æ¡ng ứng" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "gặp kết thúc táºp tin bất thÆ°á»ng trong khi tìm “]]â€" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "gặp lá»—i cú pháp trong biểu thức Ä‘iá»u kiện: thẻ bà i bất thÆ°á»ng “%sâ€" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "gặp lá»—i cú pháp trong biểu thức Ä‘iá»u kiện" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "gặp thẻ bà i bất thÆ°á»ng “%sâ€, cần “)â€" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "cần “)â€" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "đối số bất thÆ°á»ng “%s†cho toán tá» má»™t ngôi Ä‘iá»u kiện" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "đối số bất thÆ°á»ng cho toán tá» má»™t ngôi Ä‘iá»u kiện" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "thẻ bà i bất thÆ°á»ng “%sâ€, cần toán tá» hai ngôi Ä‘iá»u kiện" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "cần toán tá» hai ngôi Ä‘iá»u kiện" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "đối số bất thÆ°á»ng “%s†cho toán tá» hai ngôi Ä‘iá»u kiện" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "đối số bất thÆ°á»ng cho toán tá» hai ngôi Ä‘iá»u kiện" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "gặp thẻ bà i bất thÆ°á»ng “%c†trong câu lệnh Ä‘iá»u kiện" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "gặp thẻ bà i bất thÆ°á»ng “%s†trong câu lệnh Ä‘iá»u kiện" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "gặp thẻ bà i bất thÆ°á»ng “%d†trong câu lệnh Ä‘iá»u kiện" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "có lá»—i cú pháp ở gần thẻ bà i bất thÆ°á»ng “%sâ€" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "lá»—i cú pháp ở gần “%sâ€" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "lá»—i cú pháp: kết thúc táºp tin bất thÆ°á»ng" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "lá»—i cú pháp" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Dùng \"%s\" để rá»i shell.\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "gặp kết thúc táºp tin bất thÆ°á»ng trong khi tìm “)†tÆ°Æ¡ng ứng" @@ -1576,7 +1596,7 @@ msgstr "" "Dùng lệnh “bashbug†để thông báo lá»—i.\n" "Báo cáo các lá»—i dịch cho: <http://translationproject.org/team/vi.html>.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: thao tác không hợp lệ" @@ -1750,89 +1770,89 @@ msgstr "TÃn hiệu lạ #" msgid "Unknown Signal #%d" msgstr "TÃn hiệu lạ #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "sai chỉ số phụ: không có đóng “%s†trong %s" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: không thể gán danh sách cho bá»™ pháºn của mảng" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "không thể tạo ống dẫn để thay thế tiến trình" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "không thể tạo tiến trình con để thay thế tiến trình" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "không thể mở ống dẫn đặt tên %s để Ä‘á»c" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "không thể mở ống dẫn có tên %s để ghi" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "không thể nhân đôi ống dẫn đặt tên %s thà nh fd %d" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "không thể tạo ống dẫn để thay thế lệnh" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "không thể tạo tiến trình con để thay thế lệnh" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: không thể nhân đôi ống dẫn thà nh fd 1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: tên biến không hợp lệ cho má»™t tham chiếu tên" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: tham số null hoặc chÆ°a được đặt" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: biểu thức chuá»—i con < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: thay thế sai" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: không thể gán bằng cách nà y" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" "phiên bản shell má»›i sẽ ép buá»™c Æ°á»›c lượng dÆ°á»›i dạng má»™t hà m thay thế số há»c" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "sai thay thế: không có \"`\" đóng trong %s" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "không khá»›p: %s" @@ -1873,12 +1893,12 @@ msgstr "thiếu “]â€" msgid "invalid signal number" msgstr "số thứ tá»± tÃn hiệu không hợp lệ" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: giá trị sai trong danh sách trap_list[%d]: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" @@ -1886,7 +1906,7 @@ msgstr "" "run_pending_traps: bá»™ xá» lý tÃn hiệu là SIG_DFL, Ä‘ang gá»i lại %d (%s) cho " "chÃnh mình" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: tÃn hiệu sai %d" @@ -1915,53 +1935,53 @@ msgstr "make_local_variable: không có ngữ cảnh hà m ở phạm vi hiện t msgid "%s: variable may not be assigned value" msgstr "%s: không thể gán giá trị cho biến" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: không có ngữ cảnh hà m ở phạm vi hiện thá»i" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s có exportstr null" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "sai ký tá»± %d trong exportstr cho %s" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "không có “=†trong exportstr cho %s" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" "pop_var_context: đầu của shell_variables (các biến shell) không phải là ngữ " "cảnh hà m" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" "pop_var_context: không có ngữ cảnh global_variables (các biến toà n cục)" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" "pop_scope: đầu của shell_variables (các biến shell) không phải là phạm vi " "môi trÆ°á»ng tạm thá»i" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: không thể mở nhÆ° là TẬP-TIN" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: sai đặt giá trị cho bá»™ mô tả táºp tin vết" -#: variables.c:5261 +#: variables.c:5307 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s: giá trị so sánh nằm ngoà i phạm vi" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex 0bbe1c5e..4081478d 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index 1858ee96..7436b0e5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: bash 4.3-pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2013-09-02 05:15+0800\n" "Last-Translator: Anthony Fok <foka@debian.org>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -23,7 +23,7 @@ msgstr "" msgid "bad array subscript" msgstr "æ•°ç»„ä¸‹æ ‡ä¸æ£ç¡®" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: æ— æ³•å°†ç´¢å¼•æ•°ç»„è½¬åŒ–ä¸ºå…³è”数组" @@ -67,6 +67,21 @@ msgstr "%2$s ä¸æ²¡æœ‰é—åˆçš„ `%1$c'" msgid "%s: missing colon separator" msgstr "%s: 缺少冒å·åˆ†éš”符" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, c-format msgid "`%s': invalid alias name" @@ -189,7 +204,7 @@ msgstr "æ— æ•ˆçš„å…«è¿›åˆ¶æ•°" msgid "invalid hex number" msgstr "æ— æ•ˆçš„åå…进制数" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "æ— æ•ˆæ•°å—" @@ -203,7 +218,7 @@ msgstr "%s: æ— æ•ˆçš„ä¿¡å·å£°æ˜Ž" msgid "`%s': not a pid or valid job spec" msgstr "`%s': ä¸æ˜¯æœ‰æ•ˆçš„进程å·æˆ–者任务声明" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: åªè¯»å˜é‡" @@ -302,7 +317,7 @@ msgstr "当å‰æœªæ‰§è¡Œè¡¥å®ŒåŠŸèƒ½" msgid "can only be used in a function" msgstr "åªèƒ½åœ¨å‡½æ•°ä¸ä½¿ç”¨" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -312,21 +327,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "æ— æ³•ç”¨ `-f' 生æˆå‡½æ•°" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s: åªè¯»å‡½æ•°" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: æ— æ³•ä»¥è¿™ç§æ–¹å¼é”€æ¯æ•°ç»„å˜é‡" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: æ— æ³•å°†å…³è”数组转化为索引数组" @@ -355,7 +370,7 @@ msgstr "%s: 未以动æ€æ–¹å¼åŠ è½½" msgid "%s: cannot delete: %s" msgstr "%s: æ— æ³•åˆ é™¤: %s" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -576,6 +591,11 @@ msgstr "`%c': æ— æ•ˆæ ¼å¼å—符" msgid "warning: %s: %s" msgstr "è¦å‘Š: %s: %s" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "使用了 \\x 但缺少åå…进制数" @@ -882,23 +902,23 @@ msgstr "上一个命令: %s\n" msgid "Aborting..." msgstr "ä¸æ¢..." -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "未知的命令错误" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "错误的命令类型" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "错误的æ¡ä»¶è¿žæŽ¥ç¬¦" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "错误的跳转" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: 未绑定的å˜é‡" @@ -913,51 +933,51 @@ msgstr "\a ç‰å¾…输入超时:自动注销\n" msgid "cannot redirect standard input from /dev/null: %s" msgstr "æ— æ³•ä»Ž /dev/null é‡å®šå‘æ ‡å‡†è¾“å…¥: %s" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "æ—¶é—´æ ¼å¼: `%c': æ— æ•ˆçš„æ ¼å¼å—符" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "管é“错误" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: å—é™çš„: æ— æ³•åœ¨å‘½ä»¤åä¸ä½¿ç”¨ `/'" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s: 未找到命令" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: 解释器错误" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s: æ— æ³•æ‰§è¡ŒäºŒè¿›åˆ¶æ–‡ä»¶" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s 是 shell 内建\n" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "æ— æ³•å¤åˆ¶æ–‡ä»¶æ述符 %d 到文件æ述符 %d" @@ -978,7 +998,7 @@ msgstr "表达å¼ä¸æœ‰è¯æ³•é”™è¯¯" msgid "attempted assignment to non-variable" msgstr "å°è¯•ç»™éžå˜é‡èµ‹å€¼" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "除0" @@ -990,40 +1010,40 @@ msgstr "错误:表达å¼èµ‹å€¼ç¬¦å·é”™è¯¯" msgid "`:' expected for conditional expression" msgstr "æ¡ä»¶è¡¨è¾¾å¼éœ€è¦ `:'" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "指数å°äºŽ0" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "预增符或预å‡ç¬¦åŽåº”è·Ÿæœ‰æ ‡è¯†ç¬¦" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "缺少 `)'" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "è¯æ³•é”™è¯¯: 需è¦æ“作数" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "è¯æ³•é”™è¯¯: æ— æ•ˆçš„ç®—æœ¯è¿ç®—符" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (错误符å·æ˜¯ \"%s\")" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "æ— æ•ˆçš„ç®—æ•°è¿›åˆ¶" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "数值太大ä¸å¯ä¸ºç®—数进制的基" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: 表达å¼é”™è¯¯\n" @@ -1032,7 +1052,7 @@ msgstr "%s: 表达å¼é”™è¯¯\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: æ— æ³•è®¿é—®çˆ¶ç›®å½•" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "æ— æ³•ä¸ºæ–‡ä»¶æ述符 %d é‡ç½®nodelay模å¼" @@ -1051,144 +1071,144 @@ msgstr "save_bash_input: å·²ç»å˜åœ¨æ–°çš„文件æ述符 %d 的缓冲区" msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: 进程组管é“" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "生æˆçš„è¿›ç¨‹å· %d 显示为è¿è¡Œä¸çš„任务 %d" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "åˆ é™¤è¿›ç¨‹ç»„ %2$ld ä¸å·²åœæ¢çš„任务 %1$d" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: 进程 %5ld(%s) 进入 the_pipeline" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: è¿›ç¨‹å· %5ld(%s) æ ‡æ³¨ä¸ºä»æ´»ç€" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: æ— æ¤è¿›ç¨‹å·" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "ä¿¡å· %d" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "已完æˆ" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "å·²åœæ¢" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "å·²åœæ¢(%s)" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "è¿è¡Œä¸" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "已完æˆ(%d)" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "退出 %d" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "未知状æ€" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(æ ¸å¿ƒå·²è½¬å‚¨)" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (工作目录: %s)" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "å进程 setpgid (%ld 到 %ld)" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: è¿›ç¨‹å· %ld ä¸æ˜¯å½“å‰ shell çš„å进程" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wiat_for: 没有进程 %ld 的记录" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: 任务 %d å·²åœæ¢" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: 任务已ç»ç»ˆæ¢" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: 任务 %d 已在åŽå°" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: 打开 WNOHANG 以é¿å…æ— é™é˜»å¡ž" -#: jobs.c:3709 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: è¡Œ %d: " -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (æ ¸å¿ƒå·²è½¬å‚¨)" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(当å‰å·¥ä½œç›®å½•ï¼š%s)\n" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp 失败" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: 行规则" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "æ— æ³•è®¾å®šç»ˆç«¯è¿›ç¨‹ç»„(%d)" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "æ¤ shell ä¸æ— 任务控制" @@ -1341,99 +1361,99 @@ msgstr "ç«‹å³æ–‡æ¡£åœ¨ç¬¬ %d 行被文件结æŸç¬¦åˆ†éš” (éœ€è¦ `%s')" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: é‡å®šå‘指令 `%d' 越界" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "寻找匹é…çš„ `%c' 是é‡åˆ°äº†æœªé¢„期的文件结æŸç¬¦" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "寻找 `]]' 是é‡åˆ°äº†æœªé¢„期的文件结æŸç¬¦" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "æ¡ä»¶è¡¨è¾¾å¼ä¸æœ‰è¯æ³•é”™è¯¯: æœªé¢„æœŸçš„ç¬¦å· `%s'" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "æ¡ä»¶è¡¨è¾¾å¼ä¸æœ‰è¯æ³•é”™è¯¯" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "æœªé¢„æœŸçš„ç¬¦å· `%s' ï¼Œéœ€è¦ `)'" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "éœ€è¦ `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "一元æ¡ä»¶è¿ç®—符使用了未预期的å‚æ•° `%s'" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "一元æ¡ä»¶è¿ç®—符使用了未预期的å‚æ•°" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "æœªé¢„æœŸçš„ç¬¦å· `%s',需è¦äºŒå…ƒæ¡ä»¶è¿ç®—符" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "需è¦äºŒå…ƒæ¡ä»¶è¿ç®—符" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "二元æ¡ä»¶è¿ç®—符使用了未预期的å‚æ•° `%s'" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "二元æ¡ä»¶è¿ç®—符使用了未预期的å‚æ•°" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "æ¡ä»¶å‘½ä»¤ä¸æœ‰æœªé¢„æœŸçš„ç¬¦å· `%c'" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "æ¡ä»¶å‘½ä»¤ä¸æœ‰æœªé¢„æœŸçš„ç¬¦å· `%s'" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "æ¡ä»¶å‘½ä»¤ä¸æœ‰æœªé¢„æœŸçš„ç¬¦å· %d" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "æœªé¢„æœŸçš„ç¬¦å· `%s' 附近有è¯æ³•é”™è¯¯" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "`%s' 附近有è¯æ³•é”™è¯¯" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "è¯æ³•é”™è¯¯: 未预期的文件结尾" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "è¯æ³•é”™è¯¯" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "使用 \"%s\" 退出 shell 。\n" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "寻找匹é…çš„ `)' æ—¶é‡åˆ°äº†æœªé¢„期的文件结æŸç¬¦" @@ -1572,7 +1592,7 @@ msgstr "请输入 `%s -c help' 以获得关于 shell å†…å»ºå‘½ä»¤çš„æ›´å¤šä¿¡æ¯ msgid "Use the `bashbug' command to report bugs.\n" msgstr "请使用`bashbug' 命令æ¥æŠ¥å‘Šé”™è¯¯.\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: æ— æ•ˆçš„æ“作" @@ -1747,88 +1767,88 @@ msgstr "æœªçŸ¥ä¿¡å· #" msgid "Unknown Signal #%d" msgstr "æœªçŸ¥ä¿¡å· #%d" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "错误的替æ¢: 在 %2$s ä¸æ²¡æœ‰é—åˆçš„ `%1$s'" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: æ— æ³•å°†é“¾è¡¨èµ‹å€¼ç»™æ•°ç»„æˆå‘˜" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "æ— æ³•ä¸ºè¿›ç¨‹æ›¿æ¢åˆ›å»ºç®¡é“" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "æ— æ³•ä¸ºè¿›ç¨‹æ›¿æ¢åˆ›å»ºå进程" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "æ— æ³•æ‰“å¼€å‘½åç®¡é“ %s 进行读å–" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "æ— æ³•æ‰“å¼€å‘½åç®¡é“ %s 进行写入" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "æ— æ³•å°†å‘½åç®¡é“ %s 作为文件æ述符 %d å¤åˆ¶" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "æ— æ³•ä¸ºå‘½ä»¤æ›¿æ¢åˆ›å»ºç®¡é“" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "æ— æ³•ä¸ºå‘½ä»¤æ›¿æ¢åˆ›å»ºå进程" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: æ— æ³•å°†ç®¡é“å¤åˆ¶ä¸ºæ–‡ä»¶æ述符1" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, fuzzy, c-format msgid "%s: invalid variable name for name reference" msgstr "%s: %s: 追踪文件æè¿°ç¬¦çš„å€¼æ— æ•ˆ" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: å‚数为空或未设置" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: åä¸²è¡¨è¾¾å¼ < 0" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: 错误的替æ¢" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: æ— æ³•è¿™æ ·èµ‹å€¼" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "未æ¥ç‰ˆæœ¬çš„ shell 会强制估值为算数替æ¢" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "错误的替æ¢: 在 %s ä¸æ²¡æœ‰é—åˆçš„ \"`\"" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "æ— åŒ¹é…: %s" @@ -1869,18 +1889,18 @@ msgstr "缺少 `]'" msgid "invalid signal number" msgstr "æ— æ•ˆçš„ä¿¡å·æ•°" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: trap_list[%d] ä¸çš„错误值: %p" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "run_pending_traps: ä¿¡å·å¤„ç†å™¨æ˜¯ SIG_DFL,é‡æ–°å‘é€ %d (%s) 给自己" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: é”™è¯¯çš„ä¿¡å· %d" @@ -1909,48 +1929,48 @@ msgstr "make_local_variable: 当å‰ä½œç”¨åŸŸä¸æ²¡æœ‰å‡½æ•°ä¸Šä¸‹æ–‡" msgid "%s: variable may not be assigned value" msgstr "%s: æ— æ³•å°†æ–‡ä»¶æ述符赋值给å˜é‡" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: 当å‰ä½œç”¨åŸŸä¸æ²¡æœ‰å‡½æ•°ä¸Šä¸‹æ–‡" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s 有空的 exportstr" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "%2$s çš„ exportstr ä¸æœ‰æ— 效的å—符 %1$d" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "%s çš„ exportstr ä¸æ²¡æœ‰ `='" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: shell_variables 的头部ä¸æ˜¯å‡½æ•°ä¸Šä¸‹æ–‡" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: 没有 global_variables 上下文" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: shell_variables 的头部ä¸æ˜¯ä¸´æ—¶çŽ¯å¢ƒä½œç”¨åŸŸ" -#: variables.c:5211 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: æ— æ³•ä½œä¸ºæ–‡ä»¶æ‰“å¼€" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: 追踪文件æè¿°ç¬¦çš„å€¼æ— æ•ˆ" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s: %s 越界" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex 6a72fa10..84b64735 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index fc6ca08e..45c25316 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bash-3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-20 07:51-0500\n" +"POT-Creation-Date: 2014-01-23 16:04-0500\n" "PO-Revision-Date: 2008-08-20 20:12+0800\n" "Last-Translator: Zi-You Dai <ioppooster@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "bad array subscript" msgstr "" -#: arrayfunc.c:356 builtins/declare.def:585 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "" @@ -65,6 +65,21 @@ msgstr "" msgid "%s: missing colon separator" msgstr "" +#: braces.c:321 +#, c-format +msgid "brace expansion: cannot allocate memory for %s" +msgstr "" + +#: braces.c:413 +#, c-format +msgid "brace expansion: failed to allocate memory for %d elements" +msgstr "" + +#: braces.c:452 +#, c-format +msgid "brace expansion: failed to allocate memory for `%s'" +msgstr "" + #: builtins/alias.def:132 #, fuzzy, c-format msgid "`%s': invalid alias name" @@ -186,7 +201,7 @@ msgstr "無效信號數" msgid "invalid hex number" msgstr "%s:無效的號碼" -#: builtins/common.c:242 expr.c:1461 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "" @@ -200,7 +215,7 @@ msgstr "%s:無效的信號è¦æ ¼" msgid "`%s': not a pid or valid job spec" msgstr "`%s':ä¸æ˜¯ä¸€å€‹ pid 或有效的工作è¦æ ¼" -#: builtins/common.c:264 error.c:458 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s:åªè®€è®Šæ•¸" @@ -299,7 +314,7 @@ msgstr "" msgid "can only be used in a function" msgstr "åªèƒ½ç”¨åœ¨ä¸€å€‹å‡½æ•¸" -#: builtins/declare.def:315 builtins/declare.def:533 +#: builtins/declare.def:315 builtins/declare.def:509 #, c-format msgid "%s: reference variable cannot be an array" msgstr "" @@ -309,21 +324,21 @@ msgstr "" msgid "%s: nameref variable self references not allowed" msgstr "" -#: builtins/declare.def:422 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "" -#: builtins/declare.def:434 execute_cmd.c:5329 +#: builtins/declare.def:410 execute_cmd.c:5349 #, c-format msgid "%s: readonly function" msgstr "%s:åªè®€å‡½æ•¸" -#: builtins/declare.def:572 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "" -#: builtins/declare.def:579 builtins/read.def:733 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "" @@ -352,7 +367,7 @@ msgstr "" msgid "%s: cannot delete: %s" msgstr "" -#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5176 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196 #: shell.c:1481 #, c-format msgid "%s: is a directory" @@ -565,6 +580,11 @@ msgstr "" msgid "warning: %s: %s" msgstr "%s:è¦å‘Šï¼š" +#: builtins/printf.def:768 +#, c-format +msgid "format parsing problem: %s" +msgstr "" + #: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "" @@ -815,23 +835,23 @@ msgstr "最後的命令: %s\n" msgid "Aborting..." msgstr "" -#: error.c:410 +#: error.c:440 msgid "unknown command error" msgstr "未知命令錯誤" -#: error.c:411 +#: error.c:441 msgid "bad command type" msgstr "壞的命令類型" -#: error.c:412 +#: error.c:442 msgid "bad connector" msgstr "壞的連接器" -#: error.c:413 +#: error.c:443 msgid "bad jump" msgstr "" -#: error.c:451 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "" @@ -846,52 +866,52 @@ msgstr "" msgid "cannot redirect standard input from /dev/null: %s" msgstr "" -#: execute_cmd.c:1230 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "" -#: execute_cmd.c:2284 +#: execute_cmd.c:2287 #, fuzzy msgid "pipe error" msgstr "寫入錯誤: %s" -#: execute_cmd.c:4359 +#: execute_cmd.c:4374 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "" -#: execute_cmd.c:4852 +#: execute_cmd.c:4872 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "" -#: execute_cmd.c:4941 +#: execute_cmd.c:4961 #, c-format msgid "%s: command not found" msgstr "%s:命令找ä¸åˆ°" -#: execute_cmd.c:5174 +#: execute_cmd.c:5194 #, c-format msgid "%s: %s" msgstr "" -#: execute_cmd.c:5211 +#: execute_cmd.c:5231 #, c-format msgid "%s: %s: bad interpreter" msgstr "" -#: execute_cmd.c:5248 +#: execute_cmd.c:5268 #, fuzzy, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s:ä¸èƒ½å¾—到 limit: %s" -#: execute_cmd.c:5320 +#: execute_cmd.c:5340 #, fuzzy, c-format msgid "`%s': is a special builtin" msgstr "%s:ä¸æ˜¯ä¸€å€‹å…§å»º shell" -#: execute_cmd.c:5372 +#: execute_cmd.c:5392 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "" @@ -912,7 +932,7 @@ msgstr "表é”語法錯誤" msgid "attempted assignment to non-variable" msgstr "" -#: expr.c:495 expr.c:851 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "" @@ -924,40 +944,40 @@ msgstr "" msgid "`:' expected for conditional expression" msgstr "" -#: expr.c:910 +#: expr.c:919 msgid "exponent less than 0" msgstr "" -#: expr.c:967 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "" -#: expr.c:993 +#: expr.c:1002 msgid "missing `)'" msgstr "" -#: expr.c:1044 expr.c:1381 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "" -#: expr.c:1383 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "" -#: expr.c:1407 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "" -#: expr.c:1465 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "" -#: expr.c:1485 +#: expr.c:1494 msgid "value too great for base" msgstr "" -#: expr.c:1534 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "" @@ -966,7 +986,7 @@ msgstr "" msgid "getcwd: cannot access parent directories" msgstr "" -#: input.c:102 subst.c:5129 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "" @@ -985,144 +1005,144 @@ msgstr "" msgid "start_pipeline: pgrp pipe" msgstr "" -#: jobs.c:892 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "" -#: jobs.c:1010 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "" -#: jobs.c:1115 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "" -#: jobs.c:1118 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "" -#: jobs.c:1433 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "" -#: jobs.c:1448 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "" -#: jobs.c:1462 jobs.c:1487 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "" -#: jobs.c:1467 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "" -#: jobs.c:1471 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "" -#: jobs.c:1475 +#: jobs.c:1477 msgid "Running" msgstr "" -#: jobs.c:1489 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "" -#: jobs.c:1491 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "" -#: jobs.c:1494 +#: jobs.c:1496 msgid "Unknown status" msgstr "" -#: jobs.c:1581 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "" -#: jobs.c:1600 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr "" -#: jobs.c:1817 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "" -#: jobs.c:2136 nojobs.c:605 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "" -#: jobs.c:2383 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "" -#: jobs.c:2692 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "" -#: jobs.c:2984 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "" -#: jobs.c:2993 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "" -#: jobs.c:3218 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "" -#: jobs.c:3709 +#: jobs.c:3711 #, fuzzy, c-format msgid "%s: line %d: " msgstr "%s:è¦å‘Šï¼š" -#: jobs.c:3723 nojobs.c:843 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr "" -#: jobs.c:3735 jobs.c:3748 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "" -#: jobs.c:3780 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "" -#: jobs.c:3841 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "" -#: jobs.c:3851 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "" -#: jobs.c:3872 jobs.c:3881 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "" -#: jobs.c:3886 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "" @@ -1274,99 +1294,99 @@ msgstr "" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection:é‡æ–°å°Žå‘指示 `%d' 超出範åœ" -#: parse.y:3210 parse.y:3493 +#: parse.y:3273 parse.y:3556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "" -#: parse.y:4099 +#: parse.y:4163 msgid "unexpected EOF while looking for `]]'" msgstr "" -#: parse.y:4104 +#: parse.y:4168 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "" -#: parse.y:4108 +#: parse.y:4172 msgid "syntax error in conditional expression" msgstr "語法錯誤,在有æ¢ä»¶çš„表é”" -#: parse.y:4186 +#: parse.y:4250 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "" -#: parse.y:4190 +#: parse.y:4254 msgid "expected `)'" msgstr "é 期 `)'" -#: parse.y:4218 +#: parse.y:4282 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "" -#: parse.y:4222 +#: parse.y:4286 msgid "unexpected argument to conditional unary operator" msgstr "" -#: parse.y:4268 +#: parse.y:4332 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "" -#: parse.y:4272 +#: parse.y:4336 msgid "conditional binary operator expected" msgstr "" -#: parse.y:4294 +#: parse.y:4358 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "" -#: parse.y:4298 +#: parse.y:4362 msgid "unexpected argument to conditional binary operator" msgstr "" -#: parse.y:4309 +#: parse.y:4373 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "" -#: parse.y:4312 +#: parse.y:4376 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "" -#: parse.y:4316 +#: parse.y:4380 #, c-format msgid "unexpected token %d in conditional command" msgstr "" -#: parse.y:5666 +#: parse.y:5730 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "" -#: parse.y:5684 +#: parse.y:5748 #, c-format msgid "syntax error near `%s'" msgstr "" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error: unexpected end of file" msgstr "" -#: parse.y:5694 +#: parse.y:5758 msgid "syntax error" msgstr "語法錯誤" -#: parse.y:5756 +#: parse.y:5820 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "" -#: parse.y:5918 +#: parse.y:5982 msgid "unexpected EOF while looking for matching `)'" msgstr "" @@ -1505,7 +1525,7 @@ msgstr "輸入 `%s -c help' 更多訊æ¯é—œæ–¼å…§å»º shell 命令。\n" msgid "Use the `bashbug' command to report bugs.\n" msgstr "使用 `bashbug' å‘½ä»¤å ±å‘Šè‡èŸ²ã€‚\n" -#: sig.c:679 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d:無效æ“作" @@ -1681,88 +1701,88 @@ msgstr "" msgid "Unknown Signal #%d" msgstr "" -#: subst.c:1358 subst.c:1516 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "" -#: subst.c:2829 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "" -#: subst.c:5026 subst.c:5042 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "" -#: subst.c:5074 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "" -#: subst.c:5119 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "" -#: subst.c:5121 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "" -#: subst.c:5139 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "" -#: subst.c:5337 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "" -#: subst.c:5375 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "" -#: subst.c:5394 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "" -#: subst.c:5798 subst.c:8001 +#: subst.c:5837 subst.c:8050 #, c-format msgid "%s: invalid variable name for name reference" msgstr "" -#: subst.c:6009 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "" -#: subst.c:6281 subst.c:6296 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "" -#: subst.c:7457 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "" -#: subst.c:7534 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "" -#: subst.c:7868 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "" -#: subst.c:8372 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "" -#: subst.c:9273 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "" @@ -1803,18 +1823,18 @@ msgstr "" msgid "invalid signal number" msgstr "無效信號數" -#: trap.c:355 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "" -#: trap.c:359 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "run_pending_traps: 信號處ç†æ˜¯ SIG_DFL, resending %d (%s) to myself" -#: trap.c:413 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler:壞的信號 %d" @@ -1843,48 +1863,48 @@ msgstr "" msgid "%s: variable may not be assigned value" msgstr "%s:åªè®€è®Šæ•¸" -#: variables.c:3600 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "" -#: variables.c:3845 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "" -#: variables.c:3850 variables.c:3859 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "" -#: variables.c:3865 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "" -#: variables.c:4298 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "" -#: variables.c:4311 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "" -#: variables.c:4385 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" -#: variables.c:5211 +#: variables.c:5257 #, fuzzy, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s:ä¸èƒ½è®€å–: %s" -#: variables.c:5216 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "" -#: variables.c:5261 +#: variables.c:5307 #, fuzzy, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s:%s 超出範åœ" @@ -1607,7 +1607,7 @@ set_shell_name (argv0) { if (*shell_name == '-') shell_name++; - login_shell++; + login_shell = 1; } if (shell_name[0] == 's' && shell_name[1] == 'h' && shell_name[2] == '\0') @@ -43,6 +43,7 @@ #include "trap.h" #include "builtins/common.h" +#include "builtins/builtext.h" #if defined (READLINE) # include "bashline.h" @@ -64,6 +65,8 @@ extern int parse_and_execute_level, shell_initialized; extern int history_lines_this_session; #endif extern int no_line_editing; +extern int wait_signal_received; +extern sh_builtin_func_t *this_shell_builtin; extern void initialize_siglist (); @@ -263,7 +266,7 @@ initialize_terminating_signals () if (interactive_shell == 0 && XHANDLER (i) == SIG_IGN) { sigaction (XSIG (i), &oact, &act); - set_signal_ignored (XSIG (i)); + set_signal_hard_ignored (XSIG (i)); } #if defined (SIGPROF) && !defined (_MINIX) if (XSIG (i) == SIGPROF && XHANDLER (i) != SIG_DFL && XHANDLER (i) != SIG_IGN) @@ -287,7 +290,7 @@ initialize_terminating_signals () if (interactive_shell == 0 && XHANDLER (i) == SIG_IGN) { signal (XSIG (i), SIG_IGN); - set_signal_ignored (XSIG (i)); + set_signal_hard_ignored (XSIG (i)); } #ifdef SIGPROF if (XSIG (i) == SIGPROF && XHANDLER (i) != SIG_DFL && XHANDLER (i) != SIG_IGN) @@ -597,6 +600,15 @@ sigint_sighandler (sig) if (interrupt_state == 0) ADDINTERRUPT; + /* We will get here in interactive shells with job control active; allow + an interactive wait to be interrupted. */ + if (this_shell_builtin && this_shell_builtin == wait_builtin) + { + last_command_exit_value = 128 + sig; + wait_signal_received = sig; + SIGRETURN (0); + } + if (interrupt_immediately) { interrupt_immediately = 0; @@ -96,6 +96,8 @@ extern int errno; #define RBRACE '}' #define LPAREN '(' #define RPAREN ')' +#define LBRACK '[' +#define RBRACK ']' #if defined (HANDLE_MULTIBYTE) #define WLPAREN L'(' @@ -218,6 +220,8 @@ static WORD_LIST *expand_string_leave_quoted __P((char *, int)); static WORD_LIST *expand_string_for_rhs __P((char *, int, int *, int *)); static WORD_LIST *list_quote_escapes __P((WORD_LIST *)); +static WORD_LIST *list_dequote_escapes __P((WORD_LIST *)); + static char *make_quoted_char __P((int)); static WORD_LIST *quote_list __P((WORD_LIST *)); @@ -1809,6 +1813,20 @@ skip_to_delim (string, start, delims, flags) continue; } #endif + else if ((flags & SD_GLOB) && c == LBRACK) + { + si = i + 1; + if (string[si] == '\0') + CQ_RETURN(si); + + temp = extract_delimited_string (string, &si, "[", "[", "]", SX_NOALLOC); /* ] */ + + i = si; + if (string[i] == '\0') /* don't increment i past EOS in loop */ + break; + i++; + continue; + } else if ((skipquote || invert) && (member (c, delims) == 0)) break; else @@ -3234,13 +3252,16 @@ cond_expand_word (w, special) l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0); if (l) { - if (special == 0) + if (special == 0) /* LHS */ { dequote_list (l); r = string_list (l); } else { + /* Need to figure out whether or not we should call dequote_escapes + or a new dequote_ctlnul function here, and under what + circumstances. */ qflags = QGLOB_CVTNULL; if (special == 2) qflags |= QGLOB_REGEXP; @@ -3528,6 +3549,7 @@ quote_escapes (string) COPY_CHAR_P (t, s, send); } *t = '\0'; + return (result); } @@ -3593,9 +3615,26 @@ dequote_escapes (string) COPY_CHAR_P (t, s, send); } *t = '\0'; + return result; } +static WORD_LIST * +list_dequote_escapes (list) + WORD_LIST *list; +{ + register WORD_LIST *w; + char *t; + + for (w = list; w; w = w->next) + { + t = w->word->word; + w->word->word = dequote_escapes (t); + free (t); + } + return list; +} + /* Return a new string with the quoted representation of character C. This turns "" into QUOTED_NULL, so the W_HASQUOTEDNULL flag needs to be set in any resultant WORD_DESC where this value is the word. */ @@ -7404,7 +7443,13 @@ parameter_brace_expand (string, indexp, quoted, pflags, quoted_dollar_atp, conta ret = alloc_word_desc (); ret->word = temp1; - if (temp1 && QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) + /* We test quoted_dollar_atp because we want variants with double-quoted + "$@" to take a different code path. In fact, we make sure at the end + of expand_word_internal that we're only looking at these flags if + quoted_dollar_at == 0. */ + if (temp1 && + (quoted_dollar_atp == 0 || *quoted_dollar_atp == 0) && + QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) ret->flags |= W_QUOTED|W_HASQUOTEDNULL; return ret; } @@ -7422,7 +7467,9 @@ parameter_brace_expand (string, indexp, quoted, pflags, quoted_dollar_atp, conta ret = alloc_word_desc (); ret->word = temp1; - if (temp1 && QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) + if (temp1 && + (quoted_dollar_atp == 0 || *quoted_dollar_atp == 0) && + QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) ret->flags |= W_QUOTED|W_HASQUOTEDNULL; return ret; } @@ -7441,7 +7488,9 @@ parameter_brace_expand (string, indexp, quoted, pflags, quoted_dollar_atp, conta ret = alloc_word_desc (); ret->word = temp1; - if (temp1 && QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) + if (temp1 && + (quoted_dollar_atp == 0 || *quoted_dollar_atp == 0) && + QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) ret->flags |= W_QUOTED|W_HASQUOTEDNULL; return ret; } @@ -46,6 +46,7 @@ #define ASS_MKLOCAL 0x0002 #define ASS_MKASSOC 0x0004 #define ASS_MKGLOBAL 0x0008 /* force global assignment */ +#define ASS_NAMEREF 0x0010 /* assigning to nameref variable */ /* Flags for the string extraction functions. */ #define SX_NOALLOC 0x0001 /* just skip; don't return substring */ @@ -282,6 +283,7 @@ extern char *cond_expand_word __P((WORD_DESC *, int)); #define SD_NOSKIPCMD 0x08 /* don't skip over $(, <(, or >( command/process substitution */ #define SD_EXTGLOB 0x10 /* skip over extended globbing patterns if appropriate */ #define SD_IGNOREQUOTE 0x20 /* single and double quotes are not special */ +#define SD_GLOB 0x40 /* skip over glob patterns like bracket expressions */ extern int skip_to_delim __P((char *, int, char *, int)); diff --git a/support/._config.guess b/support/._config.guess Binary files differnew file mode 100644 index 00000000..310fddf8 --- /dev/null +++ b/support/._config.guess diff --git a/support/config.guess b/support/config.guess index d622a44e..9afd6762 100755..100644 --- a/support/config.guess +++ b/support/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-11-29' # This file 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 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to <config-patches@gnu.org> and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include <features.h> + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,31 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1297,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1371,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <<EOF #ifdef _SEQUENT_ diff --git a/support/config.sub b/support/config.sub index 59bb593f..61cb4bc2 100755..100644 --- a/support/config.sub +++ b/support/config.sub @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-04-18' +timestamp='2013-10-01' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file 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 2 of the License, or +# This file 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. # -# This program 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. +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. @@ -26,11 +20,12 @@ timestamp='2012-04-18' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -270,10 +265,11 @@ case $basic_machine in | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +287,17 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -328,7 +325,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -370,13 +367,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -385,11 +382,13 @@ case $basic_machine in | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +406,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,11 +788,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -828,7 +832,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1019,7 +1023,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1354,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1500,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1548,12 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1583,6 +1594,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/support/shobj-conf b/support/shobj-conf index fd665925..e536f5a7 100755 --- a/support/shobj-conf +++ b/support/shobj-conf @@ -10,7 +10,7 @@ # Chet Ramey # chet@po.cwru.edu -# Copyright (C) 1996-2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is part of GNU Bash, the Bourne Again SHell. # @@ -171,43 +171,31 @@ freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*) ;; # Darwin/MacOS X -darwin[89]*|darwin1[0123]*) - SHOBJ_STATUS=supported - SHLIB_STATUS=supported - +darwin*) + # Common definitions for all darwin/mac os x versions SHOBJ_CFLAGS='-fno-common' -# SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}' - # we can finally kill Mac OS X 10.3 SHOBJ_LD='${CC}' SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' SHLIB_LIBSUFF='dylib' - SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - - SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 - ;; - -darwin*|macosx*) - SHOBJ_STATUS=unsupported - SHLIB_STATUS=supported - - SHOBJ_CFLAGS='-fno-common' - - SHOBJ_LD='${CC}' - - SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' - SHLIB_LIBSUFF='dylib' + # unused at this time + SHLIB_SONAME='$(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)' case "${host_os}" in - darwin[789]*|darwin1[0123]*) SHOBJ_LDFLAGS='' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; - *) SHOBJ_LDFLAGS='-dynamic' - SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; + # Darwin versions 1, 5, 6, 7 correspond to Mac OS X 10.0, 10.1, 10.2, + # and 10.3, respectively. + darwin[1-7].*) + SHOBJ_STATUS=unsupported + SHOBJ_LDFLAGS='-dynamic' + SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; + # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 + *) + SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; esac SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 diff --git a/tests/builtins.right b/tests/builtins.right index 35fcc234..bafc53fb 100644 --- a/tests/builtins.right +++ b/tests/builtins.right @@ -117,6 +117,23 @@ three - OK 0 four - OK 0 +abc +def +ghi +after +one.1 subshell +two.1 subshell +three.1 subshell +four.1 subshell +one.2 subshell +two.2 subshell +three.2 subshell +four.2 subshell +x29 - done +abc +def +ghi +ok AVAR foo foo @@ -127,11 +144,11 @@ AVAR foo declare -x foo="" declare -x FOO="\$\$" -./builtins.tests: line 210: declare: FOO: not found +./builtins.tests: line 213: declare: FOO: not found declare -x FOO="\$\$" ok ok -./builtins.tests: line 242: kill: 4096: invalid signal specification +./builtins.tests: line 245: kill: 4096: invalid signal specification 1 a\n\n\nb a @@ -151,4 +168,4 @@ declare -a c='([0]="1" [1]="2" [2]="3")' declare -a c='([0]="1" [1]="2" [2]="3")' unset unset -./builtins.tests: line 257: exit: status: numeric argument required +./builtins.tests: line 260: exit: status: numeric argument required diff --git a/tests/builtins.tests b/tests/builtins.tests index 69515ada..9d775201 100644 --- a/tests/builtins.tests +++ b/tests/builtins.tests @@ -179,6 +179,9 @@ ${THIS_SH} ./source5.sub # test bugs in sourcing non-regular files, fixed post-bash-3.2 ${THIS_SH} ./source6.sub +# test bugs with source called from multiline aliases and other contexts +${THIS_SH} ./source7.sub + # in posix mode, assignment statements preceding special builtins are # reflected in the shell environment. `.' and `eval' need special-case # code. diff --git a/tests/cond-regexp3.sub b/tests/cond-regexp3.sub new file mode 100644 index 00000000..aaca0239 --- /dev/null +++ b/tests/cond-regexp3.sub @@ -0,0 +1,66 @@ +# simple expansion -- no problem, it's quote_string_for_globbing that was flawed +c=$'\177' +r="\\$c" + +recho $r + +# first, match some regular expressions containing ^A, ^G, ^? +[[ $'\001' =~ $'\001' ]] ; echo $? +[[ $'\001' =~ $'\\\001' ]] ; echo $? +[[ $'\001' =~ $'\\[\001]' ]] ; echo $? + +[[ $'\a' =~ $'\a' ]] ; echo $? +[[ $'\a' =~ $'\\\a' ]] ; echo $? +[[ $'\a' =~ $'\\[\a]' ]] ; echo $? + +[[ $'\177' =~ $'\177' ]] ; echo $? +[[ $'\177' =~ $'\\\177' ]] ; echo $? +[[ $'\177' =~ $'\\[\177]' ]] ; echo $? + +# Now let's try it with variables expanding to those values +for c in $'\001' $'\a' $'\177' ; do + for r in "$c" "\\$c" "\\[$c]"; do + [[ $c =~ $r ]]; + printf '[[ %q =~ %q ]] -> %d\n' "$c" "$r" "$?"; + done; + printf %s\\n --- +done + +# try again with literals + +[[ '' =~ $'' ]] ; echo $? +[[ '' =~ '\' ]] ; echo $? +[[ '' =~ '\[]' ]] ; echo $? + +[[ '' =~ '' ]] ; echo $? +[[ '' =~ '\' ]] ; echo $? +[[ '' =~ '\[]' ]] ; echo $? + +[[ '' =~ $'' ]] ; echo $? +[[ '' =~ '\' ]] ; echo $? +[[ '' =~ '\[]' ]] ; echo $? + +# more expansions, but with literal non-special characters +[[ x =~ \x ]] ; echo $? +[[ x =~ \\x ]] ; echo $? + +bs='\' +[[ x =~ ${bs}x ]] ; echo $? + +[[ x =~ $'\\'x ]] ; echo $? +[[ x =~ '\'x ]] ; echo $? + +c=$'\001' + +recho $c "$c" + +[[ $c == $c ]] && echo ok 1 +[[ $c =~ $c ]] && echo ok 2 +[[ $c =~ \\$c ]] || echo ok 3 +[[ $c =~ \\"$c" ]] || echo ok 4 + +[[ $c =~ "\\"$c ]] || echo ok 5 +[[ $c =~ '\'$c ]] || echo ok 6 + +[[ $c =~ "\\""$c" ]] || echo ok 7 +[[ $c =~ '\'"$c" ]] || echo ok 8 diff --git a/tests/cond.right b/tests/cond.right index c7150e1b..b172a128 100644 --- a/tests/cond.right +++ b/tests/cond.right @@ -78,3 +78,49 @@ ok 9 ok 10 ok 11 ok 12 +argv[1] = <\^?> +0 +1 +1 +0 +1 +1 +0 +1 +1 +[[ $'\001' =~ $'\001' ]] -> 0 +[[ $'\001' =~ $'\\\001' ]] -> 1 +[[ $'\001' =~ $'\\[\001]' ]] -> 1 +--- +[[ $'\a' =~ $'\a' ]] -> 0 +[[ $'\a' =~ $'\\\a' ]] -> 1 +[[ $'\a' =~ $'\\[\a]' ]] -> 1 +--- +[[ $'\177' =~ $'\177' ]] -> 0 +[[ $'\177' =~ $'\\\177' ]] -> 1 +[[ $'\177' =~ $'\\[\177]' ]] -> 1 +--- +0 +1 +1 +0 +1 +1 +0 +1 +1 +0 +1 +1 +1 +1 +argv[1] = <^A> +argv[2] = <^A> +ok 1 +ok 2 +ok 3 +ok 4 +ok 5 +ok 6 +ok 7 +ok 8 diff --git a/tests/cond.tests b/tests/cond.tests index 0c096496..d91ddddf 100755 --- a/tests/cond.tests +++ b/tests/cond.tests @@ -183,3 +183,5 @@ if [[ "123abc" == *?(a)bc ]]; then echo ok 43; else echo bad 43; fi ${THIS_SH} ./cond-regexp1.sub ${THIS_SH} ./cond-regexp2.sub + +${THIS_SH} ./cond-regexp3.sub diff --git a/tests/dollar-at-star b/tests/dollar-at-star index 45e4ed4d..9a5d402a 100755 --- a/tests/dollar-at-star +++ b/tests/dollar-at-star @@ -246,6 +246,10 @@ ${THIS_SH} ./dollar-at4.sub # through bash-4.2 ${THIS_SH} ./dollar-at5.sub +# tests for problems with "${@:1}" and other expansions with null entries +# in positional parameters +${THIS_SH} ./dollar-at6.sub + # tests for expansions of $* when $1 == ""; problem through bash-4.2 ${THIS_SH} ./dollar-star6.sub diff --git a/tests/dollar-at6.sub b/tests/dollar-at6.sub new file mode 100644 index 00000000..039e11f8 --- /dev/null +++ b/tests/dollar-at6.sub @@ -0,0 +1,30 @@ +set -- ''; + +recho "${@}" x +recho "${@:1}" x + +set -- "${@:1}" +echo "$#" + +set -- '' '' + +recho "${@:1}" x +recho "${@:1:1}" x + +typeset -a A # ksh93 needs this +A=('' '') +recho "${A[@]:0}" x + +recho "${A[@]:0:1}" x + +recho "${A[@]:1}" x + +set -- '' + +recho "${@/foo/bar}" +recho "${@^^[abcde]}" + +A=( '' ) + +recho "${A[@]/foo/bar}" +recho "${A[@],,[abcde]}" diff --git a/tests/dollar.right b/tests/dollar.right index 92f15d54..6af02b1b 100644 --- a/tests/dollar.right +++ b/tests/dollar.right @@ -233,6 +233,27 @@ ${@:2}c$1 c2 c3 #works as long as quoting omitted set y zcx c2 c3 0 declare -a c='([0]="y" [1]="zcx" [2]="c2" [3]="c3")' +argv[1] = <> +argv[2] = <x> +argv[1] = <> +argv[2] = <x> +1 +argv[1] = <> +argv[2] = <> +argv[3] = <x> +argv[1] = <> +argv[2] = <x> +argv[1] = <> +argv[2] = <> +argv[3] = <x> +argv[1] = <> +argv[2] = <x> +argv[1] = <> +argv[2] = <x> +argv[1] = <> +argv[1] = <> +argv[1] = <> +argv[1] = <> argv[1] = <AwR> argv[1] = <AwR> argv[1] = <AR> diff --git a/tests/nameref.right b/tests/nameref.right index e3251c54..26ae369b 100644 --- a/tests/nameref.right +++ b/tests/nameref.right @@ -111,8 +111,19 @@ final state: ref -> three, value: 3 ./nameref6.sub: line 2: typeset: x: nameref variable self references not allowed ./nameref6.sub: line 12: typeset: x: reference variable cannot be an array the -- 1 -./nameref6.sub: line 25: 42: invalid variable name for name reference 42 -- 0 -./nameref6.sub: line 40: 2: invalid variable name for name reference -./nameref6.sub: line 41: 2: invalid variable name for name reference +y -- 0 2 -- 0 +2 -- 0 +y -- 0 +bar +unset +inside +inside: one +outside: two +foo +local +./nameref8.sub: line 47: typeset: v: nameref variable self references not allowed +./nameref8.sub: line 54: warning: x: circular name reference +./nameref8.sub: line 55: warning: x: circular name reference +x = diff --git a/tests/nameref.tests b/tests/nameref.tests index 9cf50812..438133c6 100644 --- a/tests/nameref.tests +++ b/tests/nameref.tests @@ -114,3 +114,5 @@ ${THIS_SH} ./nameref3.sub ${THIS_SH} ./nameref4.sub ${THIS_SH} ./nameref5.sub ${THIS_SH} ./nameref6.sub +${THIS_SH} ./nameref7.sub +${THIS_SH} ./nameref8.sub diff --git a/tests/nameref7.sub b/tests/nameref7.sub new file mode 100644 index 00000000..19bdc989 --- /dev/null +++ b/tests/nameref7.sub @@ -0,0 +1,18 @@ +fn () +{ + declare -n var=foo; var=bar +} + +unset foo +fn +echo ${foo:-unset} + +unset -f fn +unset foo +fn() +{ + declare -n var; var=foo +} + +fn +echo ${foo:-unset} diff --git a/tests/nameref8.sub b/tests/nameref8.sub new file mode 100644 index 00000000..6837f6f4 --- /dev/null +++ b/tests/nameref8.sub @@ -0,0 +1,57 @@ +function f1 +{ + typeset -n v=$1 + + v=inside +} + +v=global +f1 v +echo $v + +unset v +unset -f f1 + +function foo +{ + typeset x=one + + typeset -n y=$1 + y=two + echo inside: $x +} + +foo x +echo outside: $x + +function foo2 +{ + typeset -n x=$1 + + x=foo +} + +foo2 x +echo $x + +unset -f foo +function foo { typeset -n v=$1; v=local; } + +v=global +foo v +echo $v + +unset v + +# invalid self reference at global scope +typeset -n v=v + +# can we catch a circular self-reference? +typeset -n v=w +typeset -n w=x +typeset -n x=v + +x=4 +echo x = $x + +unset -n v w x diff --git a/tests/source7.sub b/tests/source7.sub new file mode 100644 index 00000000..8ca0aeff --- /dev/null +++ b/tests/source7.sub @@ -0,0 +1,40 @@ +shopt -s expand_aliases + +: ${TMPDIR:=/var/tmp} + +echo '((echo abc; echo def;); echo ghi)' > $TMPDIR/x28-$$ +. $TMPDIR/x28-$$ +rm -f $TMPDIR/x28-$$ + +echo after + +TMPFILE=$TMPDIR/x29-$$ + +echo "#! ${THIS_SH}" >$TMPFILE +cat >> $TMPFILE << \EOF + +(echo -n "$1 "; echo subshell) +EOF +chmod 755 $TMPFILE + +alias foo1='$TMPFILE one.1; source $TMPFILE two.1; source $TMPFILE three.1; $TMPFILE four.1' +alias foo2='$TMPFILE one.2; +source $TMPFILE two.2; +source $TMPFILE three.2; +$TMPFILE four.2; +' + +foo1 +foo2 + +echo x29 - done +rm -f $TMPFILE + +# this is also treated similarly to an alias expansion internally +((echo abc; echo def;); echo ghi) + +if (((4+4) + (4 + 7))); then + echo ok +fi + +(()) # make sure the null expression works OK @@ -288,7 +288,16 @@ run_pending_traps () return; if (running_trap > 0) - return; /* no recursive trap invocations */ + { +#if defined (DEBUG) + internal_warning ("run_pending_traps: recursive invocation while running trap for signal %d", running_trap-1); +#endif +#if 0 + return; /* no recursive trap invocations */ +#else + ; +#endif + } catch_flag = trapped_signal_received = 0; @@ -304,14 +313,14 @@ run_pending_traps () while (pending_traps[sig]--) instead of the if statement. */ if (pending_traps[sig]) { - sigset_t set, oset; - - BLOCK_SIGNAL (sig, set, oset); + if (running_trap == sig+1) + /*continue*/; running_trap = sig + 1; if (sig == SIGINT) { + pending_traps[sig] = 0; /* XXX */ run_interrupt_trap (); CLRINTERRUPT; } @@ -331,9 +340,16 @@ run_pending_traps () /* This can happen when run_pending_traps is called while running a SIGCHLD trap handler. */ running_trap = 0; - UNBLOCK_SIGNAL (oset); + /* want to leave pending_traps[SIGCHLD] alone here */ continue; /* XXX */ } + else if (sig == SIGCHLD && (sigmodes[SIGCHLD] & SIG_INPROGRESS)) + { + /* whoops -- print warning? */ + running_trap = 0; /* XXX */ + /* want to leave pending_traps[SIGCHLD] alone here */ + continue; + } #endif else if (trap_list[sig] == (char *)DEFAULT_SIG || trap_list[sig] == (char *)IGNORE_SIG || @@ -370,20 +386,19 @@ run_pending_traps () #if defined (JOB_CONTROL) save_pipeline (1); /* XXX only provides one save level */ #endif + /* XXX - set pending_traps[sig] = 0 here? */ + pending_traps[sig] = 0; evalstring (savestring (trap_list[sig]), "trap", SEVAL_NONINT|SEVAL_NOHIST|SEVAL_RESETLINE); #if defined (JOB_CONTROL) restore_pipeline (1); #endif - restore_parser_state (&pstate); - subst_assign_varlist = save_subst_varlist; + restore_parser_state (&pstate); } - pending_traps[sig] = 0; + pending_traps[sig] = 0; /* XXX - move before evalstring? */ running_trap = 0; - - UNBLOCK_SIGNAL (oset); } } @@ -852,6 +867,8 @@ run_trap_cleanup (sig) sigmodes[sig] &= ~(SIG_INPROGRESS|SIG_CHANGED); } +#define RECURSIVE_SIG(s) (SPECIAL_TRAP(s) == 0) + /* Run a trap command for SIG. SIG is one of the signals the shell treats specially. Returns the exit status of the executed trap command list. */ static int @@ -865,6 +882,7 @@ _run_trap_internal (sig, tag) int flags; procenv_t save_return_catch; WORD_LIST *save_subst_varlist; + sh_parser_state_t pstate; #if defined (ARRAY_VARS) ARRAY *ps; #endif @@ -874,7 +892,13 @@ _run_trap_internal (sig, tag) currently executing in the trap handler. */ if ((sigmodes[sig] & SIG_TRAPPED) && ((sigmodes[sig] & SIG_IGNORED) == 0) && (trap_list[sig] != (char *)IMPOSSIBLE_TRAP_HANDLER) && +#if 0 + /* Uncomment this to allow some special signals to recursively execute + trap handlers. */ + (RECURSIVE_SIG (sig) || (sigmodes[sig] & SIG_INPROGRESS) == 0)) +#else ((sigmodes[sig] & SIG_INPROGRESS) == 0)) +#endif { old_trap = trap_list[sig]; sigmodes[sig] |= SIG_INPROGRESS; @@ -882,15 +906,19 @@ _run_trap_internal (sig, tag) trap_command = savestring (old_trap); running_trap = sig + 1; - trap_saved_exit_value = last_command_exit_value; + #if defined (ARRAY_VARS) ps = save_pipestatus_array (); #endif - token_state = save_token_state (); + save_parser_state (&pstate); save_subst_varlist = subst_assign_varlist; subst_assign_varlist = 0; +#if defined (JOB_CONTROL) + save_pipeline (1); /* XXX only provides one save level */ +#endif + /* If we're in a function, make sure return longjmps come here, too. */ save_return_catch_flag = return_catch_flag; if (return_catch_flag) @@ -905,13 +933,15 @@ _run_trap_internal (sig, tag) if (function_code == 0) parse_and_execute (trap_command, tag, flags); - restore_token_state (token_state); - free (token_state); + trap_exit_value = last_command_exit_value; + +#if defined (JOB_CONTROL) + restore_pipeline (1); +#endif subst_assign_varlist = save_subst_varlist; + restore_parser_state (&pstate); - trap_exit_value = last_command_exit_value; - last_command_exit_value = trap_saved_exit_value; #if defined (ARRAY_VARS) restore_pipestatus_array (ps); #endif @@ -1207,13 +1237,20 @@ signal_is_hard_ignored (sig) } void -set_signal_ignored (sig) +set_signal_hard_ignored (sig) int sig; { sigmodes[sig] |= SIG_HARD_IGNORE; original_signals[sig] = SIG_IGN; } +void +set_signal_ignored (sig) + int sig; +{ + original_signals[sig] = SIG_IGN; +} + int signal_in_progress (sig) int sig; @@ -102,6 +102,7 @@ extern int signal_is_trapped __P((int)); extern int signal_is_pending __P((int)); extern int signal_is_ignored __P((int)); extern int signal_is_hard_ignored __P((int)); +extern void set_signal_hard_ignored __P((int)); extern void set_signal_ignored __P((int)); extern int signal_in_progress __P((int)); diff --git a/variables.c b/variables.c index 685a2aa2..9e72e433 100644 --- a/variables.c +++ b/variables.c @@ -2196,7 +2196,7 @@ make_local_variable (name) old_var = find_variable (name); if (old_var && local_p (old_var) && old_var->context == variable_context) { - VUNSETATTR (old_var, att_invisible); + VUNSETATTR (old_var, att_invisible); /* XXX */ return (old_var); } @@ -2277,6 +2277,8 @@ make_local_variable (name) if (ifsname (name)) setifs (new_var); + if (was_tmpvar == 0) + VSETATTR (new_var, att_invisible); /* XXX */ return (new_var); } @@ -2650,7 +2652,14 @@ bind_variable (name, value, flags) { nv = find_variable_last_nameref_context (v, vc, &nvc); if (nv && nameref_p (nv)) - return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags)); + { + /* If this nameref variable doesn't have a value yet, + set the value. Otherwise, assign using the value as + normal. */ + if (nameref_cell (nv) == 0) + return (bind_variable_internal (nv->name, value, nvc->table, 0, flags)); + return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags)); + } else v = nv; } @@ -2694,7 +2703,9 @@ bind_variable_value (var, value, aflags) int aflags; { char *t; + int invis; + invis = invisible_p (var); VUNSETATTR (var, att_invisible); if (var->assign_func) @@ -2709,6 +2720,17 @@ bind_variable_value (var, value, aflags) else { t = make_variable_value (var, value, aflags); +#if defined (ARRAY_VARS) + if ((aflags & ASS_NAMEREF) && (t == 0 || *t == 0 || (legal_identifier (t) == 0 && valid_array_reference (t) == 0))) +#else + if ((aflags & ASS_NAMEREF) && (t == 0 || *t == 0 || legal_identifier (t) == 0)) +#endif + { + free (t); + if (invis) + VSETATTR (var, att_invisible); /* XXX */ + return ((SHELL_VAR *)NULL); + } FREE (value_cell (var)); var_setvalue (var, t); } @@ -3131,6 +3153,30 @@ unbind_function_def (name) } #endif /* DEBUGGER */ +int +delete_var (name, vc) + const char *name; + VAR_CONTEXT *vc; +{ + BUCKET_CONTENTS *elt; + SHELL_VAR *old_var; + VAR_CONTEXT *v; + + for (elt = (BUCKET_CONTENTS *)NULL, v = vc; v; v = v->down) + if (elt = hash_remove (name, v->table, 0)) + break; + + if (elt == 0) + return (-1); + + old_var = (SHELL_VAR *)elt->data; + free (elt->key); + free (elt); + + dispose_variable (old_var); + return (0); +} + /* Make the variable associated with NAME go away. HASH_LIST is the hash table from which this variable should be deleted (either shell_variables or shell_functions). diff --git a/variables.h b/variables.h index 2911b97e..1a783b92 100644 --- a/variables.h +++ b/variables.h @@ -291,6 +291,7 @@ extern int unbind_variable __P((const char *)); extern int unbind_nameref __P((const char *)); extern int unbind_func __P((const char *)); extern int unbind_function_def __P((const char *)); +extern int delete_var __P((const char *, VAR_CONTEXT *)); extern int makunbound __P((const char *, VAR_CONTEXT *)); extern int kill_local_variable __P((const char *)); extern void delete_all_variables __P((HASH_TABLE *)); @@ -4104,6 +4104,10 @@ restore_token_state (ts) * implement alias expansion on a per-token basis. */ +#define PSH_ALIAS 0x01 +#define PSH_DPAREN 0x02 +#define PSH_SOURCE 0x04 + typedef struct string_saver { struct string_saver *next; int expand_alias; /* Value to set expand_alias to when string is popped. */ @@ -4113,6 +4117,7 @@ typedef struct string_saver { #endif size_t saved_line_size, saved_line_index; int saved_line_terminator; + int flags; } STRING_SAVER; STRING_SAVER *pushed_string_list = (STRING_SAVER *)NULL; @@ -4138,8 +4143,11 @@ push_string (s, expand, ap) temp->saved_line_size = shell_input_line_size; temp->saved_line_index = shell_input_line_index; temp->saved_line_terminator = shell_input_line_terminator; + temp->flags = 0; #if defined (ALIAS) temp->expander = ap; + if (ap) + temp->flags = PSH_ALIAS; #endif temp->next = pushed_string_list; pushed_string_list = temp; @@ -4150,7 +4158,7 @@ push_string (s, expand, ap) #endif shell_input_line = s; - shell_input_line_size = strlen (s); + shell_input_line_size = STRLEN (s); shell_input_line_index = 0; shell_input_line_terminator = '\0'; #if 0 @@ -4224,6 +4232,34 @@ free_pushed_string_input () #endif } +int +parser_expanding_alias () +{ + return (expanding_alias ()); +} + +void +parser_save_alias () +{ +#if defined (ALIAS) || defined (DPAREN_ARITHMETIC) + push_string ((char *)NULL, 0, (alias_t *)NULL); + pushed_string_list->flags = PSH_SOURCE; /* XXX - for now */ +#else + ; +#endif +} + +void +parser_restore_alias () +{ +#if defined (ALIAS) || defined (DPAREN_ARITHMETIC) + if (pushed_string_list) + pop_string (); +#else + ; +#endif +} + /* Return a line of text, taken from wherever yylex () reads input. If there is no more input, then we return NULL. If REMOVE_QUOTED_NEWLINE is non-zero, we remove unquoted \<newline> pairs. This is used by @@ -4718,8 +4754,13 @@ next_alias_char: because we have fully consumed the result of the last alias expansion. Do it transparently; just return the next character of the string popped to. */ + /* If pushed_string_list != 0 but pushed_string_list->expander == 0 (not + currently tested) and the flags value is not PSH_SOURCE, we are not + parsing an alias, we have just saved one (push_string, when called by + the parse_dparen code) In this case, just go on as well. The PSH_SOURCE + case is handled below. */ pop_alias: - if (uc == 0 && (pushed_string_list != (STRING_SAVER *)NULL)) + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) { pop_string (); uc = shell_input_line[shell_input_line_index]; @@ -4759,6 +4800,28 @@ pop_alias: if (uc == 0 && shell_input_line_terminator == EOF) return ((shell_input_line_index != 0) ? '\n' : EOF); +#if defined (ALIAS) || defined (DPAREN_ARITHMETIC) + /* We already know that we are not parsing an alias expansion because of the + check for expanding_alias() above. This knows how parse_and_execute + handles switching to st_string input while an alias is being expanded, + hence the check for pushed_string_list without pushed_string_list->expander + and the check for PSH_SOURCE as pushed_string_list->flags. + parse_and_execute and parse_string both change the input type to st_string + and place the string to be parsed and executed into location.string, so + we should not stop reading that until the pointer is '\0'. + The check for shell_input_line_terminator may be superfluous. + + This solves the problem of `.' inside a multi-line alias with embedded + newlines executing things out of order. */ + if (uc == 0 && bash_input.type == st_string && *bash_input.location.string && + pushed_string_list && pushed_string_list->flags == PSH_SOURCE && + shell_input_line_terminator == 0) + { + shell_input_line_index = 0; + goto restart_read; + } +#endif + return (uc); } @@ -6334,6 +6397,7 @@ parse_dparen (c) else if (cmdtyp == 0) /* nested subshell */ { push_string (wval, 0, (alias_t *)NULL); + pushed_string_list->flags = PSH_DPAREN; if ((parser_state & PST_CASEPAT) == 0) parser_state |= PST_SUBSHELL; return (c); |