commit bash-20150206 snapshot

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 7d26ecbec8d996df0ef8bd14412bdaa1bf4422ee..b49d3e38fa4989a68dfd36cc41657f24be957a74 100644 (file)
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -7945,3 +7945,57 @@ lib/readline/histfile.c
          original.  Report from Jonathan Hankins <jhankins@homewood.k12.al.us>
        - history_do_write: don't attempt to back up non-regular files.
          Report from Jonathan Hankins <jhankins@homewood.k12.al.us>
+
+                                   2/2
+                                   ---
+trap.c
+       - run_interrupt_trap: now takes an argument indicating whether or not
+         it was called just before a longjmp to top_level; change callers
+       - run_interrupt_trap: if running a trap and we are being called before
+         a longjmp to top_level, call run_trap_cleanup on running trap so
+         a QUIT call while running a DEBUG trap, for instance, doesn't leave
+         sigmodes[DEBUG_TRAP] including SIG_INPROGRESS.  Fixes bug reported
+         by Chih-Chieh Chou <ccchou@gmail.com>
+
+sig.c
+       - throw_to_top_level: change call to run_interrupt_trap to pass arg 1
+       - termsig_handler: change call to run_interrupt_trap
+
+trap.h
+       - run_interrupt_trap: update extern prototype declaration
+
+                                   2/4
+                                   ---
+lib/readline/histfile.c
+       - histfile_backup, histfile_restore: new functions to back up and restore
+         history file to `filename-', following (one level of) symlinks through
+         so we don't rename the symlink itself.  From a suggestion by
+         Jonathan Hankins <jhankins@homewood.k12.al.us>
+
+assoc.c
+       - assoc_to_assign: if an index happens to be `@' or `*', make sure it's
+         double-quoted.  Bug report from Greg Wooledge <wooledg@eeg.ccf.org>
+
+                                   2/5
+                                   ---
+lib/readline/bind.c
+       - rl_bind_key: if we are rebinding a key that is not bound to a
+         function or a macro, construct a key sequence and pass it to
+         rl_bind_keyseq.  Make sure that '\' when it is used as a key is
+         changed to "\\" so it can survive rl_translate_keyseq.  Fixes
+         https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776743
+
+                                   2/8
+                                   ---
+include/posixjmp.h
+       - _rl_longjmp, sh_longjmp: new defines, expand to siglongjmp or longjmp
+         depending on autoconf results, used to avoid redefining longjmp,
+         remove _OPENNT conditional code.  Report from Eric Blake
+         <eblake@redhat.com>
+
+{bashjmp,quit}.h,{execute_cmd,expr,jobs,sig,trap}.c,builtins/{evalstring.c,return.def}
+       - change calls to longjmp to use sh_longjmp
+
+lib/readline/util.c
+       - change calls to longjmp to use _rl_longjmp
+

diff --git a/assoc.c b/assoc.c
index 5499043717ab9cb2f6a538f78422e2fcacc4b40c..bf160e587852fa9f1cad90cdcefd8908cd49624c 100644 (file)
--- a/assoc.c
+++ b/assoc.c
@@ -439,6 +439,8 @@ assoc_to_assign (hash, quoted)
 #if 1
        if (sh_contains_shell_metas (tlist->key))
          istr = sh_double_quote (tlist->key);
+       else if (ALL_ELEMENT_SUB (tlist->key[0]) && tlist->key[1] == '\0')
+         istr = sh_double_quote (tlist->key);  
        else
          istr = tlist->key;    
 #else

diff --git a/bashjmp.h b/bashjmp.h
index c26053d4bcea53455d91fc3fdf4443bda5fb63c0..d6b6611c29a353ad86050a23dce903faf1365c8d 100644 (file)
--- a/bashjmp.h
+++ b/bashjmp.h
@@ -27,7 +27,7 @@ extern procenv_t      top_level;
 extern procenv_t       subshell_top_level;
 extern procenv_t       return_catch;   /* used by `return' builtin */
 
-#define SHFUNC_RETURN()        longjmp (return_catch, 1)
+#define SHFUNC_RETURN()        sh_longjmp (return_catch, 1)
 
 #define COPY_PROCENV(old, save) \
        xbcopy ((char *)old, (char *)save, sizeof (procenv_t));

diff --git a/builtins/evalstring.c b/builtins/evalstring.c
index 85481db210a1a63b55f6398d96cce82e41e09514..16f072bab6170e983ce3a8a3d9ea4a2adbeb5483 100644 (file)
--- a/builtins/evalstring.c
+++ b/builtins/evalstring.c
@@ -1,6 +1,6 @@
 /* evalstring.c - evaluate a string as one or more shell commands. */
 
-/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -644,7 +644,7 @@ evalstring (string, from_file, flags)
       if (rcatch && return_catch_flag)
        {
          return_catch_value = r;
-         longjmp (return_catch, 1);
+         sh_longjmp (return_catch, 1);
        }
     }
     

diff --git a/builtins/return.def b/builtins/return.def
index c1053f0f881f417cacb2d8a82047607d685d4af6..4d9fef1d29942d6b2912768cf8ac2d006db69945 100644 (file)
--- a/builtins/return.def
+++ b/builtins/return.def
@@ -1,7 +1,7 @@
 This file is return.def, from which is created return.c.
 It implements the builtin "return" in Bash.
 
-Copyright (C) 1987-2009 Free Software Foundation, Inc.
+Copyright (C) 1987-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -65,7 +65,7 @@ return_builtin (list)
   return_catch_value = get_exitstat (list);
 
   if (return_catch_flag)
-    longjmp (return_catch, 1);
+    sh_longjmp (return_catch, 1);
   else
     {
       builtin_error (_("can only `return' from a function or sourced script"));

diff --git a/eval.c b/eval.c
index 3dee1c0fe848feb28217b86814a58e8f13a458dd..88bb294007685ead01d65495bb3f0ba5afed4aa6 100644 (file)
--- a/eval.c
+++ b/eval.c
@@ -87,7 +87,8 @@ reader_loop ()
       unlink_fifo_list ();
 #endif /* PROCESS_SUBSTITUTION */
 
-      /* XXX - why do we set this every time through the loop? */
+      /* XXX - why do we set this every time through the loop?  And why do
+        it if SIGINT is trapped in an interactive shell? */
       if (interactive_shell && signal_is_ignored (SIGINT) == 0)
        set_signal_handler (SIGINT, sigint_sighandler);
 

diff --git a/execute_cmd.c b/execute_cmd.c
index a65c5c241813eb4334634fb7834cee337a09ff70..583eee9dbe0eb7020a423fb2c80c584b93a26c8b 100644 (file)
--- a/execute_cmd.c
+++ b/execute_cmd.c
@@ -1,6 +1,6 @@
 /* execute_cmd.c -- Execute a COMMAND structure. */
 
-/* Copyright (C) 1987-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -5495,7 +5495,7 @@ shell_execve (command, args, env)
   clear_fifo_list ();  /* pipe fds are what they are now */
 #endif
 
-  longjmp (subshell_top_level, 1);
+  sh_longjmp (subshell_top_level, 1);
   /*NOTREACHED*/
 }
 

diff --git a/expr.c b/expr.c
index 1462c102c3c9648fd34482d383d8f17d5740edd4..ce6c0bde9e9b7e0ca983a814ba57e07f3d1950f7 100644 (file)
--- a/expr.c
+++ b/expr.c
@@ -1,6 +1,6 @@
 /* expr.c -- arithmetic expression evaluation. */
 
-/* Copyright (C) 1990-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1990-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -316,7 +316,7 @@ expr_bind_variable (lhs, rhs)
 
   v = bind_int_variable (lhs, rhs);
   if (v && (readonly_p (v) || noassign_p (v)))
-    longjmp (evalbuf, 1);      /* variable assignment error */
+    sh_longjmp (evalbuf, 1);   /* variable assignment error */
   stupidly_hack_special_variables (lhs);
 }
 
@@ -1416,7 +1416,7 @@ evalerror (msg)
   internal_error (_("%s%s%s: %s (error token is \"%s\")"),
                   name ? name : "", name ? ": " : "", t,
                   msg, (lasttp && *lasttp) ? lasttp : "");
-  longjmp (evalbuf, 1);
+  sh_longjmp (evalbuf, 1);
 }
 
 /* Convert a string to an intmax_t integer, with an arbitrary base.

diff --git a/include/posixjmp.h b/include/posixjmp.h
index 031c8fd896598977774ea515fe4ca2af1450cbd5..9c7e99ed42f01bb85482e7933a4d8431c9b313cb 100644 (file)
--- a/include/posixjmp.h
+++ b/include/posixjmp.h
@@ -27,16 +27,20 @@
 
 #if defined (HAVE_POSIX_SIGSETJMP)
 #  define procenv_t    sigjmp_buf
-#  if !defined (__OPENNT)
-#    define setjmp_nosigs(x)   sigsetjmp((x), 0)
-#    define setjmp_sigs(x)     sigsetjmp((x), 1)
-#    undef longjmp
-#    define longjmp(x, n)      siglongjmp((x), (n))
-#  endif /* !__OPENNT */
+
+#  define setjmp_nosigs(x)     sigsetjmp((x), 0)
+#  define setjmp_sigs(x)       sigsetjmp((x), 1)
+
+#  define _rl_longjmp(x, n)    siglongjmp((x), (n))
+#  define sh_longjmp(x, n)     siglongjmp((x), (n))
 #else
 #  define procenv_t    jmp_buf
-#  define setjmp_nosigs        setjmp
-#  define setjmp_sigs  setjmp
+
+#  define setjmp_nosigs                setjmp
+#  define setjmp_sigs          setjmp
+
+#  define _rl_longjmp(x, n)    longjmp((x), (n))
+#  define sh_longjmp(x, n)     longjmp((x), (n))
 #endif
 
 #endif /* _POSIXJMP_H_ */

diff --git a/jobs.c b/jobs.c
index 223cfc356495e4f541f60aff649bef3396801905..c33ace25f2c3a06108d74f9d6d4deec4cfc2cd44 100644 (file)
--- a/jobs.c
+++ b/jobs.c
@@ -3,7 +3,7 @@
 /* This file works with both POSIX and BSD systems.  It implements job
    control. */
 
-/* Copyright (C) 1989-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -2299,7 +2299,7 @@ wait_sigint_handler (sig)
          if (interrupt_immediately)
            {
              interrupt_immediately = 0;
-             longjmp (wait_intr_buf, 1);
+             sh_longjmp (wait_intr_buf, 1);
            }
          else
            /* Let CHECK_WAIT_INTR handle it in wait_for/waitchld */
@@ -3391,7 +3391,7 @@ itrace("waitchld: waitpid returns %d block = %d children_exited = %d", pid, bloc
          /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
             run_pending_traps will call run_sigchld_trap later  */
          if (sigchld == 0)
-           longjmp (wait_intr_buf, 1);
+           sh_longjmp (wait_intr_buf, 1);
        }
       /* If not in posix mode and not executing the wait builtin, queue the
         signal for later handling.  Run the trap immediately if we are

diff --git a/lib/readline/bind.c b/lib/readline/bind.c
index f52d9f3624e387fe90b930e308f47a89f2a5fad3..60af35acb4c1b3bda6a77b87baf47a2deaf885a5 100644 (file)
--- a/lib/readline/bind.c
+++ b/lib/readline/bind.c
@@ -117,6 +117,9 @@ rl_bind_key (key, function)
      int key;
      rl_command_func_t *function;
 {
+  char keyseq[3];
+  int l;
+
   if (key < 0)
     return (key);
 
@@ -135,8 +138,24 @@ rl_bind_key (key, function)
       return (key);
     }
 
-  _rl_keymap[key].type = ISFUNC;
-  _rl_keymap[key].function = function;
+  /* If it's bound to a function or macro, just overwrite.  Otherwise we have
+     to treat it as a key sequence so rl_generic_bind handles shadow keymaps
+     for us.  If we are binding '\' make sure to escape it so it makes it
+     through the call to rl_translate_keyseq. */
+  if (_rl_keymap[key].type != ISKMAP)
+    {
+      _rl_keymap[key].type = ISFUNC;
+      _rl_keymap[key].function = function;
+    }
+  else
+    {
+      l = 0;
+      if (key == '\\')
+       keyseq[l++] = '\\';
+      keyseq[l++] = key;
+      keyseq[l] = '\0';
+      rl_bind_keyseq (keyseq, function);
+    }
   rl_binding_keymap = _rl_keymap;
   return (0);
 }

diff --git a/lib/readline/histfile.c b/lib/readline/histfile.c
index efd8b33756fa9b10742e36ebd9863421575ad3e7..b8ac322ff6eee59cd93ab9db6a0199ccfbb48b0e 100644 (file)
--- a/lib/readline/histfile.c
+++ b/lib/readline/histfile.c
@@ -116,6 +116,10 @@ int history_lines_written_to_file = 0;
    for more extensive tests. */
 #define HIST_TIMESTAMP_START(s)                (*(s) == history_comment_char && isdigit ((unsigned char)(s)[1]) )
 
+static char *history_backupfile __P((const char *));
+static int histfile_backup __P((const char *, const char *));
+static int histfile_restore __P((const char *, const char *));
+
 /* Return the string that should be used in the place of this
    filename.  This only matters when you don't specify the
    filename to read_history (), or write_history (). */
@@ -165,17 +169,14 @@ history_backupfile (filename)
   ssize_t n;
   struct stat fs;
 
-  fn = filename;
-#if defined (HAVE_LSTAT)
-  if (lstat (filename, &fs) == 0 && S_ISLNK (fs.st_mode))
+  fn = filename;  
+#if defined (HAVE_READLINK)
+  /* Follow symlink to avoid backing up symlink itself; call will fail if
+     not a symlink */
+  if ((n = readlink (filename, linkbuf, sizeof (linkbuf) - 1)) > 0)
     {
-      if ((n = readlink (filename, linkbuf, sizeof (linkbuf) - 1)) > 0)
-       {
-         linkbuf[n] = '\0';
-         fn = linkbuf;
-       }
-      else
-        fn = filename;
+      linkbuf[n] = '\0';
+      fn = linkbuf;
     }
 #endif
       
@@ -347,11 +348,41 @@ read_history_range (filename, from, to)
 }
 
 static int
-backup (fn, back)
-     const char *fn;
+histfile_backup (filename, back)
+     const char *filename;
      const char *back;
 {
-  return (rename (fn, back));
+#if defined (HAVE_READLINK)
+  char linkbuf[PATH_MAX+1];
+  ssize_t n;
+
+  /* Follow to target of symlink to avoid renaming symlink itself */
+  if ((n = readlink (filename, linkbuf, sizeof (linkbuf) - 1)) > 0)
+    {
+      linkbuf[n] = '\0';
+      return (rename (linkbuf, back));
+    }
+#endif
+  return (rename (filename, back));
+}
+
+static int
+histfile_restore (backup, orig)
+     const char *backup;
+     const char *orig;
+{
+#if defined (HAVE_READLINK)
+  char linkbuf[PATH_MAX+1];
+  ssize_t n;
+
+  /* Follow to target of symlink to avoid renaming symlink itself */
+  if ((n = readlink (orig, linkbuf, sizeof (linkbuf) - 1)) > 0)
+    {
+      linkbuf[n] = '\0';
+      return (rename (backup, linkbuf));
+    }
+#endif
+  return (rename (backup, orig));
 }
 
 /* Truncate the history file FNAME, leaving only LINES trailing lines.
@@ -470,7 +501,7 @@ history_truncate_file (fname, lines)
   if (filename && bakname)
     {
       /* XXX - need to check case where filename is a symlink */
-      if (rename (filename, bakname) < 0)
+      if (histfile_backup (filename, bakname) < 0)
        {
          free (bakname);       /* no backups if rename fails */
          bakname = 0;
@@ -499,7 +530,7 @@ history_truncate_file (fname, lines)
   history_lines_written_to_file = orig_lines - lines;
 
   if (rv != 0 && filename && bakname)
-    rename (bakname, filename);
+    histfile_restore (bakname, filename);
   else if (rv == 0 && bakname)
     unlink (bakname);
 
@@ -551,7 +582,7 @@ history_do_write (filename, nelements, overwrite)
   if (output && bakname)
     {
       /* XXX - need to check case where output is a symlink */
-      if (rename (output, bakname) < 0)                /* no backups if rename fails */
+      if (histfile_backup (output, bakname) < 0)               /* no backups if rename fails */
        {
          free (bakname);
          bakname = 0;
@@ -565,7 +596,7 @@ history_do_write (filename, nelements, overwrite)
     {
       rv = errno;
       if (output && bakname)
-        rename (bakname, output);
+        histfile_restore (bakname, output);
       FREE (output);
       FREE (bakname);
       return (rv);
@@ -610,7 +641,7 @@ mmap_error:
        rv = errno;
        close (file);
        if (output && bakname)
-         rename (bakname, output);
+         histfile_restore (bakname, output);
        FREE (output);
        FREE (bakname);
        return rv;
@@ -622,7 +653,7 @@ mmap_error:
        rv = errno;
        close (file);
        if (output && bakname)
-         rename (bakname, output);
+         histfile_restore (bakname, output);
        FREE (output);
        FREE (bakname);
        return rv;
@@ -658,7 +689,7 @@ mmap_error:
     rv = errno;
 
   if (rv != 0 && output && bakname)
-    rename (bakname, output);
+    histfile_restore (bakname, output);
   else if (rv == 0 && bakname)
     unlink (bakname);
 

diff --git a/lib/readline/util.c b/lib/readline/util.c
index 345d84b02581aff97dac6210289d02c50f0709e1..e75e25567ee61ab1e85e735135dbed1de4ea16ca 100644 (file)
--- a/lib/readline/util.c
+++ b/lib/readline/util.c
@@ -111,11 +111,8 @@ _rl_abort_internal ()
   RL_UNSETSTATE (RL_STATE_MULTIKEY);   /* XXX */
 
   rl_last_func = (rl_command_func_t *)NULL;
-#if defined (HAVE_POSIX_SIGSETJMP)
-  siglongjmp (_rl_top_level, 1);
-#else
-  longjmp (_rl_top_level, 1);
-#endif
+
+  _rl_longjmp (_rl_top_level, 1);
   return (0);
 }
 

diff --git a/po/._fr.po b/po/._fr.po
index 67b5381ad39da4f5a94a44424a68bc2a7260257e..d2df2c787f16c920a98b9fafd939d6b8439fd0be 100644 (file)
Binary files a/po/._fr.po and b/po/._fr.po differ

diff --git a/po/._ga.po b/po/._ga.po
new file mode 100644 (file)
index 0000000..cfb3797
Binary files /dev/null and b/po/._ga.po differ

diff --git a/po/ga.po b/po/ga.po
index ca42ada359a3a2b9d5cf86c891e6e188edab8d42..6868a1b2d236fe262447515d612c7f4d91b81988 100644 (file)
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,18 +5,18 @@
 # Séamus Ó Ciardhuáin <seoc(at)iolfree.ie>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: bash 4.0\n"
+"Project-Id-Version: bash 4.3-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-11 11:19-0500\n"
-"PO-Revision-Date: 2009-09-24 23:08+0100\n"
-"Last-Translator: Séamus Ó Ciardhuáin <seoc@iolfree.ie>\n"
+"POT-Creation-Date: 2014-01-23 16:04-0500\n"
+"PO-Revision-Date: 2015-02-05 17:02-0000\n"
+"Last-Translator: Séamus Ó Ciardhuáin <sociardhuain@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
+"X-Generator: Poedit 1.7.4\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :(n>6 && n<11) ? 3 : 4;\n"
 
 #: arrayfunc.c:51
 msgid "bad array subscript"
@@ -25,8 +25,7 @@ msgstr "droch-fhoscript eagair"
 #: arrayfunc.c:356 builtins/declare.def:566
 #, c-format
 msgid "%s: cannot convert indexed to associative array"
-msgstr ""
-"%s: ní féidir eagar innéacsaithe a thiontú go heagar comhthiomsaitheach"
+msgstr "%s: ní féidir eagar innéacsaithe a thiontú go heagar comhthiomsaitheach"
 
 #: arrayfunc.c:539
 #, c-format
@@ -41,30 +40,28 @@ msgstr "%s: ní féidir sannadh go hinnéacs neamhuimhriúil."
 #: arrayfunc.c:586
 #, c-format
 msgid "%s: %s: must use subscript when assigning associative array"
-msgstr ""
-"%s: %s: caithfear foscript a úsáid le sannadh chuig eagar comhthiomsaitheach"
+msgstr "%s: %s: caithfear foscript a úsáid le sannadh chuig eagar comhthiomsaitheach"
 
 #: bashhist.c:388
 #, c-format
 msgid "%s: cannot create: %s"
 msgstr "%s: ní féidir cruthú: %s"
 
-#: bashline.c:3982
+#: bashline.c:3971
 msgid "bash_execute_unix_command: cannot find keymap for command"
-msgstr ""
-"bash_execute_unix_command: ní féidir mapa eochrach an ordaithe a aimsiú"
+msgstr "bash_execute_unix_command: ní féidir mapa eochrach an ordaithe a aimsiú"
 
-#: bashline.c:4069
+#: bashline.c:4058
 #, c-format
 msgid "%s: first non-whitespace character is not `\"'"
 msgstr "%s: ní \" é an chéad charachtar nach spás bán é."
 
-#: bashline.c:4098
+#: bashline.c:4087
 #, c-format
 msgid "no closing `%c' in %s"
 msgstr "Níl \"%c\" dúnta i %s"
 
-#: bashline.c:4132
+#: bashline.c:4121
 #, c-format
 msgid "%s: missing colon separator"
 msgstr "%s: deighilteoir idirstaid ar iarraidh"
@@ -85,9 +82,9 @@ msgid "brace expansion: failed to allocate memory for `%s'"
 msgstr ""
 
 #: builtins/alias.def:132
-#, fuzzy, c-format
+#, c-format
 msgid "`%s': invalid alias name"
-msgstr "\"%s\": ainm neamhbhailí ar mhapa eochrach "
+msgstr "\"%s\": ainm neamhbhailí ar mhapa eochrach"
 
 #: builtins/bind.def:123 builtins/bind.def:126
 msgid "line editing not enabled"
@@ -145,7 +142,7 @@ msgstr ""
 msgid "HOME not set"
 msgstr "Níl HOME socruithe"
 
-#: builtins/cd.def:327 builtins/common.c:166 test.c:876
+#: builtins/cd.def:327 builtins/common.c:166 test.c:855
 msgid "too many arguments"
 msgstr "An iomarca argóintí"
 
@@ -193,7 +190,7 @@ msgstr "%s: rogha neamhbhailí"
 msgid "%s: invalid option name"
 msgstr "%s: ainm neamhbhailí rogha"
 
-#: builtins/common.c:228 general.c:235 general.c:240
+#: builtins/common.c:228 general.c:234 general.c:239
 #, c-format
 msgid "`%s': not a valid identifier"
 msgstr "\"%s\": ní aitheantóir bailí é"
@@ -305,13 +302,11 @@ msgstr "%s: níl sonrú iomlánaithe ann."
 
 #: builtins/complete.def:697
 msgid "warning: -F option may not work as you expect"
-msgstr ""
-"Rabhadh: b'fhéidir nach n-oibríonn an rogha -F mar a bheifeá ag súil leis."
+msgstr "Rabhadh: b'fhéidir nach n-oibríonn an rogha -F mar a bheifeá ag súil leis."
 
 #: builtins/complete.def:699
 msgid "warning: -C option may not work as you expect"
-msgstr ""
-"Rabhadh: b'fhéidir nach n-oibríonn an rogha -C mar a bheifeá ag súil leis."
+msgstr "Rabhadh: b'fhéidir nach n-oibríonn an rogha -C mar a bheifeá ag súil leis."
 
 #: builtins/complete.def:828
 msgid "not currently executing completion function"
@@ -335,7 +330,7 @@ msgstr ""
 msgid "cannot use `-f' to make functions"
 msgstr "Ní féidir \"-f\" a úsáid chun feidhmeanna a dhéanamh"
 
-#: builtins/declare.def:410 execute_cmd.c:5361
+#: builtins/declare.def:410 execute_cmd.c:5349
 #, c-format
 msgid "%s: readonly function"
 msgstr "%s: feidhm inléite amháin"
@@ -348,8 +343,7 @@ msgstr "%s: ní féidir athróga eagair a scrios mar seo."
 #: builtins/declare.def:560 builtins/read.def:733
 #, c-format
 msgid "%s: cannot convert associative to indexed array"
-msgstr ""
-"%s: ní féidir eagar comhthiomsaitheach a thiontú go heagar innéacsaithe"
+msgstr "%s: ní féidir eagar comhthiomsaitheach a thiontú go heagar innéacsaithe"
 
 #: builtins/enable.def:137 builtins/enable.def:145
 msgid "dynamic loading not available"
@@ -375,7 +369,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:5208
+#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5196
 #: shell.c:1481
 #, c-format
 msgid "%s: is a directory"
@@ -473,14 +467,13 @@ msgid_plural "Shell commands matching keywords `"
 msgstr[0] "Ordaithe blaoisce a mheaitseálann an lorgfhocal \""
 msgstr[1] "Ordaithe blaoisce a mheaitseálann na lorgfhocail \""
 msgstr[2] "Ordaithe blaoisce a mheaitseálann na lorgfhocail '"
+msgstr[3] "Ordaithe blaoisce a mheaitseálann na lorgfhocail '"
+msgstr[4] "Ordaithe blaoisce a mheaitseálann na lorgfhocail '"
 
 #: builtins/help.def:182
 #, c-format
-msgid ""
-"no help topics match `%s'.  Try `help help' or `man -k %s' or `info %s'."
-msgstr ""
-"Ní mheaitseálann ábhar cabhrach ar bith \"%s\". Bain triail as \"help help\" "
-"nó \"man -k %s\" nó \"info %s\"."
+msgid "no help topics match `%s'.  Try `help help' or `man -k %s' or `info %s'."
+msgstr "Ní mheaitseálann ábhar cabhrach ar bith \"%s\". Bain triail as \"help help\" nó \"man -k %s\" nó \"info %s\"."
 
 #: builtins/help.def:199
 #, c-format
@@ -502,8 +495,7 @@ msgstr ""
 "Usáid \"help\" leis an liosta seo a thaispeáint.\n"
 "Úsáid \"help ainm\" chun tuilleadh eolais a fháil faoin bhfeidhm \"ainm\".\n"
 "Úsáid \"info bash\" chun tuilleadh eolais a fháil faoin mblaosc féin.\n"
-"Úsáid \"man -k\" nó \"info\" chun tuilleadh eolais a fháil faoi ordaithe "
-"nach bhfuil sa liosta seo.\n"
+"Úsáid \"man -k\" nó \"info\" chun tuilleadh eolais a fháil faoi ordaithe nach bhfuil sa liosta seo.\n"
 "Ciallaíonn réalt (*) ar ainm go bhfuil an t-ordú díchumasaithe.\n"
 "\n"
 
@@ -543,9 +535,9 @@ msgid "expression expected"
 msgstr "Ag súil le slonn"
 
 #: builtins/mapfile.def:172
-#, fuzzy, c-format
+#, c-format
 msgid "%s: not an indexed array"
-msgstr "%s: ní athróg eagair é"
+msgstr "%s: ní eagar innéacsaithe é"
 
 #: builtins/mapfile.def:259 builtins/read.def:302
 #, c-format
@@ -586,9 +578,9 @@ msgid "`%s': missing format character"
 msgstr "\"%s\": carachtar formáide ar iarraidh."
 
 #: builtins/printf.def:456
-#, fuzzy, c-format
+#, c-format
 msgid "`%c': invalid time format specification"
-msgstr "%s: sonrú neamhbhailí teorann ama"
+msgstr "\"%c\": sonrú neamhbhailí formáide ama"
 
 #: builtins/printf.def:658
 #, c-format
@@ -610,18 +602,18 @@ msgid "missing hex digit for \\x"
 msgstr "digit heicsidheachúlach ar iarraidh le haghaidh \\x"
 
 #: builtins/printf.def:880
-#, fuzzy, c-format
+#, c-format
 msgid "missing unicode digit for \\%c"
-msgstr "digit heicsidheachúlach ar iarraidh le haghaidh \\x"
+msgstr "digit Unicode ar iarraidh le haghaidh \\%c"
 
 #: builtins/pushd.def:195
 msgid "no other directory"
 msgstr "Níl comhadlann eile ann"
 
 #: builtins/pushd.def:354
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid argument"
-msgstr "%s: argóint teorann neamhbhailí"
+msgstr "%s: argóint neamhbhailí"
 
 #: builtins/pushd.def:468
 msgid "<no current directory>"
@@ -650,12 +642,10 @@ msgid ""
 "    \twith its position in the stack\n"
 "    \n"
 "    Arguments:\n"
-"      +N\tDisplays the Nth entry counting from the left of the list shown "
-"by\n"
+"      +N\tDisplays the Nth entry counting from the left of the list shown by\n"
 "    \tdirs when invoked without options, starting with zero.\n"
 "    \n"
-"      -N\tDisplays the Nth entry counting from the right of the list shown "
-"by\n"
+"      -N\tDisplays the Nth entry counting from the right of the list shown by\n"
 "\tdirs when invoked without options, starting with zero."
 msgstr ""
 
@@ -717,8 +707,7 @@ msgstr "earráid léite: %d: %s"
 
 #: builtins/return.def:75
 msgid "can only `return' from a function or sourced script"
-msgstr ""
-"ní féidir \"return\" a dhéanamh ach ó fheidhm nó ó script rite le \"source\""
+msgstr "ní féidir \"return\" a dhéanamh ach ó fheidhm nó ó script rite le \"source\""
 
 #: builtins/set.def:782
 msgid "cannot simultaneously unset a function and a variable"
@@ -896,46 +885,45 @@ msgstr "FORMÁID_AMA: \"%c\": carachtar formáide neamhbhaií."
 msgid "pipe error"
 msgstr "earráid phíopa"
 
-#: execute_cmd.c:4386
+#: execute_cmd.c:4374
 #, c-format
 msgid "%s: maximum function nesting level exceeded (%d)"
 msgstr ""
 
-#: execute_cmd.c:4884
+#: 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:4973
+#: execute_cmd.c:4961
 #, c-format
 msgid "%s: command not found"
 msgstr "%s: níor aimsíodh an t-ordú"
 
-#: execute_cmd.c:5206
-#, fuzzy, c-format
+#: execute_cmd.c:5194
+#, c-format
 msgid "%s: %s"
-msgstr "Tá %s %s\n"
+msgstr "%s: %s"
 
-#: execute_cmd.c:5243
+#: execute_cmd.c:5231
 #, c-format
 msgid "%s: %s: bad interpreter"
 msgstr "%s: %s: drochléirmhínitheoir"
 
-#: execute_cmd.c:5280
-#, fuzzy, c-format
+#: execute_cmd.c:5268
+#, c-format
 msgid "%s: cannot execute binary file: %s"
-msgstr "%s: ní féidir comhad dénártha a rith"
+msgstr "%s: ní féidir comhad dénártha a rith: %s"
 
-#: execute_cmd.c:5352
-#, fuzzy, c-format
+#: execute_cmd.c:5340
+#, c-format
 msgid "`%s': is a special builtin"
-msgstr "Is ordú ionsuite blaoisce é %s\n"
+msgstr "Is ordú ionsuite speisialta é \"%s\""
 
-#: execute_cmd.c:5404
+#: execute_cmd.c:5392
 #, c-format
 msgid "cannot duplicate fd %d to fd %d"
-msgstr ""
-"Ní féidir an tuairisceoir comhaid %d a dhúbailt mar thuairisceoir comhaid %d."
+msgstr "Ní féidir an tuairisceoir comhaid %d a dhúbailt mar thuairisceoir comhaid %d."
 
 #: expr.c:259
 msgid "expression recursion level exceeded"
@@ -1003,30 +991,24 @@ msgstr "Tá an luach rómhór don bhonnuimhir."
 msgid "%s: expression error\n"
 msgstr "%s: earráid sloinn\n"
 
-#: general.c:62
+#: general.c:61
 msgid "getcwd: cannot access parent directories"
 msgstr "getcwd: ní féidir na máthairchomhadlanna a rochtain."
 
 #: input.c:102 subst.c:5168
 #, c-format
 msgid "cannot reset nodelay mode for fd %d"
-msgstr ""
-"ní féidir an mód gan mhoill a athshocrú le haghaidh an tuairisceora chomhaid "
-"%d"
+msgstr "ní féidir an mód gan mhoill a athshocrú le haghaidh an tuairisceora chomhaid %d"
 
-#: input.c:271
+#: input.c:269
 #, c-format
 msgid "cannot allocate new file descriptor for bash input from fd %d"
-msgstr ""
-"Ní féidir tuairisceoir comhaid nua a leithdháileadh le haghaidh ionchur bash "
-"ón tuairisceoir comhaid %d."
+msgstr "Ní féidir tuairisceoir comhaid nua a leithdháileadh le haghaidh ionchur bash ón tuairisceoir comhaid %d."
 
-#: input.c:279
+#: input.c:277
 #, c-format
 msgid "save_bash_input: buffer already exists for new fd %d"
-msgstr ""
-"save_bash_input: tá an maolán ann cheana le haghaidh an tuairisceoir comhaid "
-"nua %d"
+msgstr "save_bash_input: tá an maolán ann cheana le haghaidh an tuairisceoir comhaid nua %d"
 
 #: jobs.c:471
 msgid "start_pipeline: pgrp pipe"
@@ -1231,8 +1213,7 @@ msgstr "register_alloc: an bhfuil an tábla leithdháilte lán le FIND_ALLOC?\n"
 #: lib/malloc/table.c:203
 #, c-format
 msgid "register_alloc: %p already in table as allocated?\n"
-msgstr ""
-"register_alloc: an bhfuil %p sa tábla mar atá sé leithdháilte cheana?\n"
+msgstr "register_alloc: an bhfuil %p sa tábla mar atá sé leithdháilte cheana?\n"
 
 #: lib/malloc/table.c:256
 #, c-format
@@ -1265,22 +1246,22 @@ msgstr "Ní thacaítear le oibríochtaí líonra."
 #: locale.c:200
 #, c-format
 msgid "setlocale: LC_ALL: cannot change locale (%s)"
-msgstr ""
+msgstr "setlocale: LC_ALL: ní féidir an logchaighdeán a athrú (%s)"
 
 #: locale.c:202
 #, c-format
 msgid "setlocale: LC_ALL: cannot change locale (%s): %s"
-msgstr ""
+msgstr "setlocale: LC_ALL: ní féidir an logchaighdeán a athrú (%s): %s"
 
 #: locale.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "setlocale: %s: cannot change locale (%s)"
-msgstr "xrealloc: %s:%d: ní féidir %lu beart a leithdháileadh"
+msgstr "setlocale: %s: ní féidir an logchaighdeán a athrú (%s)"
 
 #: locale.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "setlocale: %s: cannot change locale (%s): %s"
-msgstr "xrealloc: %s:%d: ní féidir %lu beart a leithdháileadh"
+msgstr "setlocale: %s: ní féidir an logchaighdeán a athrú (%s): %s"
 
 #: mailcheck.c:439
 msgid "You have mail in $_"
@@ -1316,112 +1297,106 @@ msgstr "make_here_document: drochchineál ordaithe %d"
 #: make_cmd.c:662
 #, c-format
 msgid "here-document at line %d delimited by end-of-file (wanted `%s')"
-msgstr ""
-"cáipéis leabaithe ag líne %d teormharcáilte le deireadh comhaid (\"%s\" á "
-"lorg)"
+msgstr "cáipéis leabaithe ag líne %d teormharcáilte le deireadh comhaid (\"%s\" á lorg)"
 
 #: make_cmd.c:759
 #, c-format
 msgid "make_redirection: redirection instruction `%d' out of range"
 msgstr "make_redirection: ordú atreoraithe \"%d\" as raon."
 
-#: parse.y:3278 parse.y:3561
+#: 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:4170
+#: parse.y:4163
 msgid "unexpected EOF while looking for `]]'"
 msgstr "Deireadh comhaid gan súil leis agus \"]]\" á lorg."
 
-#: parse.y:4175
+#: 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."
+msgstr "Earráid chomhréire i slonn coinníollach: comhartha \"%s\" gan suil leis."
 
-#: parse.y:4179
+#: parse.y:4172
 msgid "syntax error in conditional expression"
 msgstr "Earráid chomhréire i slonn coinníollach."
 
-#: parse.y:4257
+#: parse.y:4250
 #, c-format
 msgid "unexpected token `%s', expected `)'"
 msgstr "Comhartha \"%s\" gan súil leis; ag súil le \")\"."
 
-#: parse.y:4261
+#: parse.y:4254
 msgid "expected `)'"
 msgstr "Ag súil le \")\""
 
-#: parse.y:4289
+#: 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:4293
+#: 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:4339
+#: 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."
+msgstr "Comhartha \"%s\" gan súil leis. Bhíothas ag súil le hoibreoir coinníollach dénártha."
 
-#: parse.y:4343
+#: parse.y:4336
 msgid "conditional binary operator expected"
 msgstr "Bhíothas ag súil le hoibreoir coinníollach dénártha."
 
-#: parse.y:4365
+#: 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:4369
+#: 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:4380
+#: 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:4383
+#: 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:4387
+#: 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:5737
+#: 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."
+msgstr "Earráid chomhréire in aice comhartha \"%s\" nach rabhthas ag súil leis."
 
-#: parse.y:5755
+#: parse.y:5748
 #, c-format
 msgid "syntax error near `%s'"
 msgstr "Earráid chomhréire in aice \"%s\""
 
-#: parse.y:5765
+#: parse.y:5758
 msgid "syntax error: unexpected end of file"
 msgstr "Earráid chomhréire: deireadh comhaid gan súil leis."
 
-#: parse.y:5765
+#: parse.y:5758
 msgid "syntax error"
 msgstr "Earráid chomhréire"
 
-#: parse.y:5827
+#: parse.y:5820
 #, c-format
 msgid "Use \"%s\" to leave the shell.\n"
 msgstr "Úsáid \"%s\" le scoir den mblaosc.\n"
 
-#: parse.y:5989
+#: parse.y:5982
 msgid "unexpected EOF while looking for matching `)'"
 msgstr "Deireadh comhaid gan súil leis agus \")\" á lorg le meaitseáil."
 
@@ -1441,9 +1416,9 @@ msgid "print_command: bad connector `%d'"
 msgstr "print_command: drochnascóir \"%d\""
 
 #: print_cmd.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "xtrace_set: %d: invalid file descriptor"
-msgstr "%d: tuairisceoir comhaid neamhbhailí: %s"
+msgstr "xtrace_set: %d: tuairisceoir comhaid neamhbhailí"
 
 #: print_cmd.c:378
 msgid "xtrace_set: NULL file pointer"
@@ -1452,7 +1427,7 @@ msgstr ""
 #: print_cmd.c:382
 #, c-format
 msgid "xtrace fd (%d) != fileno xtrace fp (%d)"
-msgstr ""
+msgstr "xtrace fd (%d) != fileno xtrace fp (%d)"
 
 #: print_cmd.c:1518
 #, c-format
@@ -1484,9 +1459,9 @@ msgid "cannot create temp file for here-document: %s"
 msgstr "ní féidir cáipéis shealadach a chruthú don cháipéis leabaithe: %s"
 
 #: redir.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot assign fd to variable"
-msgstr "%s: ní féidir liosta a shannadh go ball eagair."
+msgstr "%s: ní féidir tuairisceoir comhaid a shannadh go hathróg."
 
 #: redir.c:582
 msgid "/dev/(tcp|udp)/host/port not supported without networking"
@@ -1536,9 +1511,8 @@ msgid "Shell options:\n"
 msgstr "Roghanna blaoisce:\n"
 
 #: shell.c:1835
-#, fuzzy
 msgid "\t-ilrsD or -c command or -O shopt_option\t\t(invocation only)\n"
-msgstr "\t-irsD nó -c ordú nó -O rogha_shopt\t\t(glaoch amháin)\n"
+msgstr "\t-ilrsD nó -c ordú nó -O rogha_shopt\t\t(glaoch amháin)\n"
 
 #: shell.c:1850
 #, c-format
@@ -1548,16 +1522,12 @@ msgstr "\t-%s nó -o rogha\n"
 #: shell.c:1856
 #, c-format
 msgid "Type `%s -c \"help set\"' for more information about shell options.\n"
-msgstr ""
-"Úsáid %s -c \"help set\" le haghaidh tuilleadh eolais faoi roghanna "
-"blaoisce.\n"
+msgstr "Úsáid %s -c \"help set\" le haghaidh tuilleadh eolais faoi roghanna blaoisce.\n"
 
 #: shell.c:1857
 #, c-format
 msgid "Type `%s -c help' for more information about shell builtin commands.\n"
-msgstr ""
-"Úsáid \"%s -c help\" le haghaidh tuilleadh eolais faoi orduithe ionsuite "
-"blaoisce.\n"
+msgstr "Úsáid \"%s -c help\" le haghaidh tuilleadh eolais faoi orduithe ionsuite blaoisce.\n"
 
 #: shell.c:1858
 #, c-format
@@ -1769,8 +1739,7 @@ msgstr "Ní féidir píopa ainmnithe %s a oscailt le haghaidh scríofa."
 #: 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."
+msgstr "Ní féidir an píopa ainmnithe %s a dhúbailt mar thuairisceoir comhaid %d."
 
 #: subst.c:5376
 msgid "cannot make pipe for command substitution"
@@ -1782,14 +1751,12 @@ msgstr "Ní féidir macphróiseas a dhéanamh le haghaidh ionadú ordaithe."
 
 #: 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."
+msgstr "command_substitute: ní feidir an píopa a dhúbailt mar thuairisceoir comhaid 1."
 
 #: subst.c:5837 subst.c:8050
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid variable name for name reference"
-msgstr "%d: tuairisceoir comhaid neamhbhailí: %s"
+msgstr ""
 
 #: subst.c:6048
 #, c-format
@@ -1812,9 +1779,7 @@ msgid "$%s: cannot assign in this way"
 msgstr "$%s: ní féidir sannadh mar seo."
 
 #: subst.c:7917
-msgid ""
-"future versions of the shell will force evaluation as an arithmetic "
-"substitution"
+msgid "future versions of the shell will force evaluation as an arithmetic substitution"
 msgstr ""
 
 #: subst.c:8421
@@ -1845,17 +1810,17 @@ msgstr "Ag súil le \")\""
 msgid "`)' expected, found %s"
 msgstr "Ag súil le \")\", ach fuarthas %s."
 
-#: test.c:281 test.c:742 test.c:745
+#: test.c:281 test.c:721 test.c:724
 #, c-format
 msgid "%s: unary operator expected"
 msgstr "%s: ag súil le hoibreoir aonártha."
 
-#: test.c:468 test.c:785
+#: test.c:468 test.c:764
 #, c-format
 msgid "%s: binary operator expected"
 msgstr "%s: ag súil le hoibreoir dénártha."
 
-#: test.c:860
+#: test.c:839
 msgid "missing `]'"
 msgstr "\"]\" ar iarraidh"
 
@@ -1870,11 +1835,8 @@ msgstr "run_pending_traps: drochluach sa liosta_gaistí[%d]: %p"
 
 #: trap.c:375
 #, c-format
-msgid ""
-"run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself"
-msgstr ""
-"run_pending_traps: is SIG_DFL an láimhseálaí comharthaí; %d (%s) á "
-"athsheoladh chugam féin."
+msgid "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself"
+msgstr "run_pending_traps: is SIG_DFL an láimhseálaí comharthaí; %d (%s) á athsheoladh chugam féin."
 
 #: trap.c:428
 #, c-format
@@ -1892,18 +1854,18 @@ msgid "shell level (%d) too high, resetting to 1"
 msgstr "Tá an leibhéal blaoisce (%d) ró-ard; á athshocrú go 1."
 
 #: variables.c:1865
-#, fuzzy, c-format
+#, c-format
 msgid "%s: circular name reference"
-msgstr "%d: tuairisceoir comhaid neamhbhailí: %s"
+msgstr ""
 
 #: variables.c:2228
 msgid "make_local_variable: no function context at current scope"
 msgstr "make_local_variable: níl comhthéacs feidhme sa scóip reatha."
 
 #: variables.c:2247
-#, fuzzy, c-format
+#, c-format
 msgid "%s: variable may not be assigned value"
-msgstr "%s: ní féidir liosta a shannadh go ball eagair."
+msgstr "%s: ní féidir luach a shannadh ar an athróg"
 
 #: variables.c:3646
 msgid "all_local_variables: no function context at current scope"
@@ -1911,6 +1873,7 @@ msgstr "all_local_variables: níl comhthéacs feidhme sa scóip reatha"
 
 #: variables.c:3891
 #, fuzzy, c-format
+#| msgid "%s: parameter null or not set"
 msgid "%s has null exportstr"
 msgstr "%s: paraiméadar neamhnitheach nó gan socrú."
 
@@ -1937,32 +1900,29 @@ 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:5257
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s: cannot open as FILE"
-msgstr "%s: ní féidir oscailt: %s"
+msgstr "%s: %s: ní féidir a oscailt mar CHOMHAD"
 
 #: variables.c:5262
 #, fuzzy, c-format
+#| msgid "%d: invalid file descriptor: %s"
 msgid "%s: %s: invalid value for trace file descriptor"
 msgstr "%d: tuairisceoir comhaid neamhbhailí: %s"
 
 #: variables.c:5307
 #, fuzzy, c-format
+#| msgid "%s: %s out of range"
 msgid "%s: %s: compatibility value out of range"
 msgstr "%s: %s as raon"
 
 #: version.c:46
-#, fuzzy
 msgid "Copyright (C) 2013 Free Software Foundation, Inc."
-msgstr "Cóipcheart © 2009 Free Software Foundation, Inc."
+msgstr "Cóipcheart © 2013 Free Software Foundation, Inc."
 
 #: version.c:47 version2.c:47
-msgid ""
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-"html>\n"
-msgstr ""
-"Ceadúnas GPLv3+: GNU GPL leagan 3 nó níos déanaí <http://gnu.org/licenses/"
-"gpl.html>\n"
+msgid "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+msgstr "Ceadúnas GPLv3+: GNU GPL leagan 3 nó níos déanaí <http://gnu.org/licenses/gpl.html>\n"
 
 #: version.c:86 version2.c:86
 #, c-format
@@ -1970,42 +1930,36 @@ msgid "GNU bash, version %s (%s)\n"
 msgstr "GNU bash, leagan %s (%s)\n"
 
 #: version.c:91 version2.c:91
-#, fuzzy
 msgid "This is free software; you are free to change and redistribute it."
-msgstr "Is saorbhogearra é seo; tá cead agat é a athrú agus a dháileadh.\n"
+msgstr "Is saorbhogearra é seo; tá cead agat é a athrú agus  é a athdháileadh."
 
 #: version.c:92 version2.c:92
-#, fuzzy
 msgid "There is NO WARRANTY, to the extent permitted by law."
-msgstr ""
-"Ní ghabhann baránta ar bith leis, sa mhéid is atá sin ceadaithe de réir "
-"dlí.\n"
+msgstr "Ní ghabhann baránta ar bith leis, sa mhéid is atá sin ceadaithe de réir dlí."
 
 #: version2.c:46
-#, fuzzy
 msgid "Copyright (C) 2012 Free Software Foundation, Inc."
-msgstr "Cóipcheart © 2009 Free Software Foundation, Inc."
+msgstr "Cóipcheart © 2012 Free Software Foundation, Inc."
 
 #: xmalloc.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot allocate %lu bytes (%lu bytes allocated)"
-msgstr "xmalloc: ní féidir %lu beart a leithdháileadh (%lu beart leithdháilte)"
+msgstr "%s: ní féidir %lu beart a leithdháileadh (%lu beart leithdháilte)"
 
 #: xmalloc.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot allocate %lu bytes"
-msgstr "xmalloc: ní féidir %lu beart a leithdháileadh"
+msgstr "%s: ní féidir %lu beart a leithdháileadh"
 
 #: xmalloc.c:163
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s:%d: cannot allocate %lu bytes (%lu bytes allocated)"
-msgstr ""
-"xmalloc: %s:%d: ní féidir %lu beart a leithdháileadh (%lu beart leithdháilte)"
+msgstr "%s: %s:%d: ní féidir %lu beart a leithdháileadh (%lu beart leithdháilte)"
 
 #: xmalloc.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s:%d: cannot allocate %lu bytes"
-msgstr "xmalloc: %s:%d: ní féidir %lu beart a leithdháileadh"
+msgstr "%s: %s:%d: ní féidir %lu beart a leithdháileadh"
 
 #: builtins.c:43
 msgid "alias [-p] [name[=value] ... ]"
@@ -2016,9 +1970,7 @@ msgid "unalias [-a] name [name ...]"
 msgstr "unalias [-a] ainm [ainm ...]"
 
 #: builtins.c:51
-msgid ""
-"bind [-lpsvPSVX] [-m keymap] [-f filename] [-q name] [-u name] [-r keyseq] [-"
-"x keyseq:shell-command] [keyseq:readline-function or readline-command]"
+msgid "bind [-lpsvPSVX] [-m keymap] [-f filename] [-q name] [-u name] [-r keyseq] [-x keyseq:shell-command] [keyseq:readline-function or readline-command]"
 msgstr ""
 
 #: builtins.c:54
@@ -2038,9 +1990,8 @@ msgid "caller [expr]"
 msgstr "caller [SLONN]"
 
 #: builtins.c:64
-#, fuzzy
 msgid "cd [-L|[-P [-e]] [-@]] [dir]"
-msgstr "cd [-L|-P] [comhadlann]"
+msgstr "cd [-L|[-P [-e]] [-@]] [comhadlann]"
 
 #: builtins.c:66
 msgid "pwd [-LP]"
@@ -2063,14 +2014,12 @@ msgid "command [-pVv] command [arg ...]"
 msgstr "command [-pVv] ORDÚ [ARGÓINT ...]"
 
 #: builtins.c:76
-#, fuzzy
 msgid "declare [-aAfFgilnrtux] [-p] [name[=value] ...]"
-msgstr "declare [-aAfFilrtux] [-p] [ainm[=luach] ...]"
+msgstr "declare [-aAfFgilnrtux] [-p] [ainm[=luach] ...]"
 
 #: builtins.c:78
-#, fuzzy
 msgid "typeset [-aAfFgilrtux] [-p] name[=value] ..."
-msgstr "typeset [-aAfFilrtux] [-p] ainm[=luach] ..."
+msgstr "typeset [-aAfFgilrtux] [-p] ainm[=luach] ..."
 
 #: builtins.c:80
 msgid "local [option] name[=value] ..."
@@ -2110,8 +2059,7 @@ msgstr "logout [n]"
 
 #: builtins.c:103
 msgid "fc [-e ename] [-lnr] [first] [last] or fc -s [pat=rep] [command]"
-msgstr ""
-"fc [-e AINM_E] [-lnr] [CÉAD] [DEIREANACH] nó fc -s [PATRÚN=IONADAÍ] [ORDÚ]"
+msgstr "fc [-e AINM_E] [-lnr] [CÉAD] [DEIREANACH] nó fc -s [PATRÚN=IONADAÍ] [ORDÚ]"
 
 #: builtins.c:107
 msgid "fg [job_spec]"
@@ -2126,17 +2074,12 @@ msgid "hash [-lr] [-p pathname] [-dt] [name ...]"
 msgstr "hash [-lr] [-p CONAIR] [-dt] [AINM ...]"
 
 #: builtins.c:117
-#, fuzzy
 msgid "help [-dms] [pattern ...]"
-msgstr "help [-ds] [PATRÚN ...]"
+msgstr "help [-dms] [PATRÚN ...]"
 
 #: builtins.c:121
-msgid ""
-"history [-c] [-d offset] [n] or history -anrw [filename] or history -ps arg "
-"[arg...]"
-msgstr ""
-"history [-c] [-d SEACH_CHUR] [n] nó history -anrw [COMHADAINM] nó history -"
-"ps ARGÓINT [ARGÓINT...]"
+msgid "history [-c] [-d offset] [n] or history -anrw [filename] or history -ps arg [arg...]"
+msgstr "history [-c] [-d SEACH_CHUR] [n] nó history -anrw [COMHADAINM] nó history -ps ARGÓINT [ARGÓINT...]"
 
 #: builtins.c:125
 msgid "jobs [-lnprs] [jobspec ...] or jobs -x command [args]"
@@ -2147,48 +2090,36 @@ msgid "disown [-h] [-ar] [jobspec ...]"
 msgstr "disown [-h] [-ar] [SONRÚ_JAB ...]"
 
 #: builtins.c:132
-msgid ""
-"kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l "
-"[sigspec]"
-msgstr ""
-"kill [-s sonrú_comhartha | -n uimhir_chomhartha | -sonrú_comhartha] "
-"aitheantóir_próisis | sonrú_jab ... nó kill -l [sonrú_comhartha]"
+msgid "kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]"
+msgstr "kill [-s sonrú_comhartha | -n uimhir_chomhartha | -sonrú_comhartha] aitheantóir_próisis | sonrú_jab ... nó kill -l [sonrú_comhartha]"
 
 #: builtins.c:134
 msgid "let arg [arg ...]"
 msgstr "let argóint [argóint ...]"
 
 #: builtins.c:136
-#, fuzzy
-msgid ""
-"read [-ers] [-a array] [-d delim] [-i text] [-n nchars] [-N nchars] [-p "
-"prompt] [-t timeout] [-u fd] [name ...]"
-msgstr ""
-"read [-ers] [-a eagar] [-d teormharcóir] [-i téacs] [-n líon_carachtar] [-p "
-"leid] [-t teorainn_ama] [-u tuairisceoir_comhaid] [ainm ...]"
+msgid "read [-ers] [-a array] [-d delim] [-i text] [-n nchars] [-N nchars] [-p prompt] [-t timeout] [-u fd] [name ...]"
+msgstr "read [-ers] [-a eagar] [-d teormharcóir] [-i téacs] [-n líon_carachtar] [-N líon_carachtar] [-p leid] [-t teorainn_ama] [-u tuairisceoir_comhaid] [ainm ...]"
 
 #: builtins.c:138
 msgid "return [n]"
 msgstr "return [n]"
 
 #: builtins.c:140
-#, fuzzy
 msgid "set [-abefhkmnptuvxBCHP] [-o option-name] [--] [arg ...]"
-msgstr "set [--abefhkmnptuvxBCHP] [-o ainm-rogha] [argóint ...]"
+msgstr "set [-abefhkmnptuvxBCHP] [-o ainm-rogha] [--] [argóint ...]"
 
 #: builtins.c:142
-#, fuzzy
 msgid "unset [-f] [-v] [-n] [name ...]"
-msgstr "unset [-f] [-v] [ainm ...]"
+msgstr "unset [-f] [-v] [-n] [ainm ...]"
 
 #: builtins.c:144
 msgid "export [-fn] [name[=value] ...] or export -p"
 msgstr "export [-fn] [ainm[=luach] ...] nó export -p"
 
 #: builtins.c:146
-#, fuzzy
 msgid "readonly [-aAf] [name[=value] ...] or readonly -p"
-msgstr "readonly [-af] [ainm[=luach] ...] nó readonly -p"
+msgstr "readonly [-aAf] [ainm[=luach] ...] nó readonly -p"
 
 #: builtins.c:148
 msgid "shift [n]"
@@ -2227,23 +2158,20 @@ msgid "type [-afptP] name [name ...]"
 msgstr "type [-afptP] ainm [ainm ...]"
 
 #: builtins.c:169
-#, fuzzy
 msgid "ulimit [-SHabcdefilmnpqrstuvxT] [limit]"
-msgstr "ulimit [-SHacdefilmnpqrstuvx] [teorainn]"
+msgstr "ulimit [-SHabcdefilmnpqrstuvxT] [teorainn]"
 
 #: builtins.c:172
 msgid "umask [-p] [-S] [mode]"
 msgstr "umask [-p] [-S] [mód]"
 
 #: builtins.c:175
-#, fuzzy
 msgid "wait [-n] [id ...]"
-msgstr "wait [aitheantas]"
+msgstr "wait [-n] [aitheantas ...]"
 
 #: builtins.c:179
-#, fuzzy
 msgid "wait [pid ...]"
-msgstr "wait [aitheantas]"
+msgstr "wait [aitheantas_próisis ...]"
 
 #: builtins.c:182
 msgid "for NAME [in WORDS ... ] ; do COMMANDS; done"
@@ -2266,12 +2194,8 @@ msgid "case WORD in [PATTERN [| PATTERN]...) COMMANDS ;;]... esac"
 msgstr "case FOCAL in [PATRÚN [| PATRÚN]...) ORDUITHE ;;]... esac"
 
 #: builtins.c:192
-msgid ""
-"if COMMANDS; then COMMANDS; [ elif COMMANDS; then COMMANDS; ]... [ else "
-"COMMANDS; ] fi"
-msgstr ""
-"if ORDUITHE; then ORDUITHE; [ elif ORDUITHE; then ORDUITHE; ]... [ else "
-"ORDUITHE; ] fi"
+msgid "if COMMANDS; then COMMANDS; [ elif COMMANDS; then COMMANDS; ]... [ else COMMANDS; ] fi"
+msgstr "if ORDUITHE; then ORDUITHE; [ elif ORDUITHE; then ORDUITHE; ]... [ else ORDUITHE; ] fi"
 
 #: builtins.c:194
 msgid "while COMMANDS; do COMMANDS; done"
@@ -2330,40 +2254,23 @@ msgid "printf [-v var] format [arguments]"
 msgstr "printf [-v athróg] formáid [argóintí]"
 
 #: builtins.c:229
-#, fuzzy
-msgid ""
-"complete [-abcdefgjksuv] [-pr] [-DE] [-o option] [-A action] [-G globpat] [-"
-"W wordlist]  [-F function] [-C command] [-X filterpat] [-P prefix] [-S "
-"suffix] [name ...]"
-msgstr ""
-"complete [-abcdefgjksuv] [-pr] [-o rogha] [-A gníomh] [-G patrún] [-W "
-"liosta_focal]  [-F feidhm] [-C ordú] [-X patrún_scagaire] [-P réimír] [-S "
-"iarmhír] [ainm ...]"
+msgid "complete [-abcdefgjksuv] [-pr] [-DE] [-o option] [-A action] [-G globpat] [-W wordlist]  [-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] [name ...]"
+msgstr "complete [-abcdefgjksuv] [-pr] [-DE] [-o rogha] [-A gníomh] [-G patrún] [-W liosta_focal]  [-F feidhm] [-C ordú] [-X patrún_scagaire] [-P réimír] [-S iarmhír] [ainm ...]"
 
 #: builtins.c:233
-msgid ""
-"compgen [-abcdefgjksuv] [-o option]  [-A action] [-G globpat] [-W wordlist]  "
-"[-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] [word]"
-msgstr ""
-"compgen [-abcdefgjksuv] [-o rogha]  [-A gníomh] [-G patrún] [-W "
-"liosta_focal]  [-F feidhm] [-C ordú] [-X patrún_scagaire] [-P réimír] [-S "
-"iarmhír] [FOCAL]"
+msgid "compgen [-abcdefgjksuv] [-o option]  [-A action] [-G globpat] [-W wordlist]  [-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] [word]"
+msgstr "compgen [-abcdefgjksuv] [-o rogha]  [-A gníomh] [-G patrún] [-W liosta_focal]  [-F feidhm] [-C ordú] [-X patrún_scagaire] [-P réimír] [-S iarmhír] [FOCAL]"
 
 #: builtins.c:237
-#, fuzzy
 msgid "compopt [-o|+o option] [-DE] [name ...]"
-msgstr "compopt [-o|+o rogha] [ainm ...]"
+msgstr "compopt [-o|+o rogha] [-DE] [ainm ...]"
 
 #: builtins.c:240
-msgid ""
-"mapfile [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c "
-"quantum] [array]"
+msgid "mapfile [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c quantum] [array]"
 msgstr "a"
 
 #: builtins.c:242
-msgid ""
-"readarray [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c "
-"quantum] [array]"
+msgid "readarray [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c quantum] [array]"
 msgstr "t"
 
 #: builtins.c:254
@@ -2381,8 +2288,7 @@ msgid ""
 "      -p\tPrint all defined aliases in a reusable format\n"
 "    \n"
 "    Exit Status:\n"
-"    alias returns true unless a NAME is supplied for which no alias has "
-"been\n"
+"    alias returns true unless a NAME is supplied for which no alias has been\n"
 "    defined."
 msgstr ""
 "Sainigh nó taispeáin ailiasanna.\n"
@@ -2429,24 +2335,20 @@ msgid ""
 "    Options:\n"
 "      -m  keymap         Use KEYMAP as the keymap for the duration of this\n"
 "                         command.  Acceptable keymap names are emacs,\n"
-"                         emacs-standard, emacs-meta, emacs-ctlx, vi, vi-"
-"move,\n"
+"                         emacs-standard, emacs-meta, emacs-ctlx, vi, vi-move,\n"
 "                         vi-command, and vi-insert.\n"
 "      -l                 List names of functions.\n"
 "      -P                 List function names and bindings.\n"
 "      -p                 List functions and bindings in a form that can be\n"
 "                         reused as input.\n"
-"      -S                 List key sequences that invoke macros and their "
-"values\n"
-"      -s                 List key sequences that invoke macros and their "
-"values\n"
+"      -S                 List key sequences that invoke macros and their values\n"
+"      -s                 List key sequences that invoke macros and their values\n"
 "                         in a form that can be reused as input.\n"
 "      -V                 List variable names and values\n"
 "      -v                 List variable names and values in a form that can\n"
 "                         be reused as input.\n"
 "      -q  function-name  Query about which keys invoke the named function.\n"
-"      -u  function-name  Unbind all keys which are bound to the named "
-"function.\n"
+"      -u  function-name  Unbind all keys which are bound to the named function.\n"
 "      -r  keyseq         Remove the binding for KEYSEQ.\n"
 "      -f  filename       Read key bindings from FILENAME.\n"
 "      -x  keyseq:shell-command\tCause SHELL-COMMAND to be executed when\n"
@@ -2488,8 +2390,7 @@ msgid ""
 msgstr ""
 "Lean ar aghaidh le lúba for, while nó until.\n"
 "    \n"
-"    Tosaigh an chéad atriall eile den lúb mhórthimpeall \"for\", \"while\" "
-"nó \"until\".\n"
+"    Tosaigh an chéad atriall eile den lúb mhórthimpeall \"for\", \"while\" nó \"until\".\n"
 "    Má shonraítear N, tosaigh an Nú lúb mhórthimpeall.\n"
 "    \n"
 "    Stádas Scortha:\n"
@@ -2501,8 +2402,7 @@ msgid ""
 "    \n"
 "    Execute SHELL-BUILTIN with arguments ARGs without performing command\n"
 "    lookup.  This is useful when you wish to reimplement a shell builtin\n"
-"    as a shell function, but need to execute the builtin within the "
-"function.\n"
+"    as a shell function, but need to execute the builtin within the function.\n"
 "    \n"
 "    Exit Status:\n"
 "    Returns the exit status of SHELL-BUILTIN, or false if SHELL-BUILTIN is\n"
@@ -2516,8 +2416,7 @@ msgstr ""
 "    laistigh den fheidhm.\n"
 "    \n"
 "    Stádas Scortha:\n"
-"    Aischuirtear stádas scortha ORDÚ-IONSUITE-BLAOISCE, nó falsa mura "
-"bhfuil\n"
+"    Aischuirtear stádas scortha ORDÚ-IONSUITE-BLAOISCE, nó falsa mura bhfuil\n"
 "    ORDÚ-IONSUITE-BLAOISCE ina ordú ionsuite blaoisce."
 
 #: builtins.c:367
@@ -2538,38 +2437,30 @@ msgstr ""
 "Aischuir comhthéacs an ghlaoigh reatha fhoghnáthaimh.\n"
 "    \n"
 "    Gan SLONN, aischuirtear \"$line $filename\". Le SLONN, aischuirtear\n"
-"    \"$line $subroutine $filename\"; is féidir lorg cruaiche a sholáthar "
-"leis an\n"
+"    \"$line $subroutine $filename\"; is féidir lorg cruaiche a sholáthar leis an\n"
 "    fhaisnéis bhreise seo.\n"
 "    \n"
 "    Taispeánann an luach atá ag SLONN an méis frámaí glaoigh le dul siar\n"
 "    roimh an ceann reatha; fráma 0 an ceann atá ar barr.\n"
 "    \n"
 "    Stádas Scortha:\n"
-"    Aischuirtear 0 ach sa chás nach bhfuil an bhlaosc ag rith feidhme "
-"blaoisce, nó\n"
+"    Aischuirtear 0 ach sa chás nach bhfuil an bhlaosc ag rith feidhme blaoisce, nó\n"
 "    sa chás go bhfuil SLONN neamhbhailí."
 
 #: builtins.c:385
 msgid ""
 "Change the shell working directory.\n"
 "    \n"
-"    Change the current directory to DIR.  The default DIR is the value of "
-"the\n"
+"    Change the current directory to DIR.  The default DIR is the value of the\n"
 "    HOME shell variable.\n"
 "    \n"
-"    The variable CDPATH defines the search path for the directory "
-"containing\n"
-"    DIR.  Alternative directory names in CDPATH are separated by a colon "
-"(:).\n"
-"    A null directory name is the same as the current directory.  If DIR "
-"begins\n"
+"    The variable CDPATH defines the search path for the directory containing\n"
+"    DIR.  Alternative directory names in CDPATH are separated by a colon (:).\n"
+"    A null directory name is the same as the current directory.  If DIR begins\n"
 "    with a slash (/), then CDPATH is not used.\n"
 "    \n"
-"    If the directory is not found, and the shell option `cdable_vars' is "
-"set,\n"
-"    the word is assumed to be  a variable name.  If that variable has a "
-"value,\n"
+"    If the directory is not found, and the shell option `cdable_vars' is set,\n"
+"    the word is assumed to be  a variable name.  If that variable has a value,\n"
 "    its value is used for DIR.\n"
 "    \n"
 "    Options:\n"
@@ -2580,18 +2471,15 @@ msgid ""
 "    \tof `..'\n"
 "        -e\tif the -P option is supplied, and the current working directory\n"
 "    \tcannot be determined successfully, exit with a non-zero status\n"
-"        -@  on systems that support it, present a file with extended "
-"attributes\n"
+"        -@  on systems that support it, present a file with extended attributes\n"
 "            as a directory containing the file attributes\n"
 "    \n"
 "    The default is to follow symbolic links, as if `-L' were specified.\n"
-"    `..' is processed by removing the immediately previous pathname "
-"component\n"
+"    `..' is processed by removing the immediately previous pathname component\n"
 "    back to a slash or the beginning of DIR.\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns 0 if the directory is changed, and if $PWD is set successfully "
-"when\n"
+"    Returns 0 if the directory is changed, and if $PWD is set successfully when\n"
 "    -P is used; non-zero otherwise."
 msgstr ""
 
@@ -2614,8 +2502,7 @@ msgstr ""
 "    \n"
 "    Roghanna:\n"
 "      -L\tpriontáil luach $PWD má thugann sé ainm na comhadlainne\n"
-"    \toibre reatha.      -P\tpriontáil an chomhadlann fhisiciúil, gan naisc "
-"shiombalacha\n"
+"    \toibre reatha.      -P\tpriontáil an chomhadlann fhisiciúil, gan naisc shiombalacha\n"
 "    \n"
 "    Mar réamhshocrú, oibríonn \"pwd\" faoi mar a bheadh \"-L\" sonraithe.\n"
 "    \n"
@@ -2668,8 +2555,7 @@ msgid ""
 "Execute a simple command or display information about commands.\n"
 "    \n"
 "    Runs COMMAND with ARGS suppressing  shell function lookup, or display\n"
-"    information about the specified COMMANDs.  Can be used to invoke "
-"commands\n"
+"    information about the specified COMMANDs.  Can be used to invoke commands\n"
 "    on disk when a function with the same name exists.\n"
 "    \n"
 "    Options:\n"
@@ -2683,15 +2569,12 @@ msgid ""
 msgstr ""
 "Rith ordú simplí nó taispeáin eolas maidir le horduithe.\n"
 "    \n"
-"    Ritheann ORDÚ le hARGÓINTÍ gan cuardach feidhme blaoisce, nó "
-"taispeánann\n"
-"    eolas maidir leis na horduithe sonraithe. Is féidir é seo a úsáid chun "
-"orduithe ar\n"
+"    Ritheann ORDÚ le hARGÓINTÍ gan cuardach feidhme blaoisce, nó taispeánann\n"
+"    eolas maidir leis na horduithe sonraithe. Is féidir é seo a úsáid chun orduithe ar\n"
 "    diosca a rith má tá feidhm leis an ainm céanna ann.\n"
 "    \n"
 "    Roghanna:\n"
-"      -p\túsáid luach réamhshocraithe le haghaidh CONAIR a aimseoidh go "
-"cinnte\n"
+"      -p\túsáid luach réamhshocraithe le haghaidh CONAIR a aimseoidh go cinnte\n"
 "        \tgach ceann de na gnáthríomhchláir áirge.\n"
 "      -v\ttaispeáin cur síos ar ORDÚ cosúil leis an ordú ionsuite \"type\"\n"
 "      -V\ttaispeáin cur síos níos faide de gach ORDÚ\n"
@@ -2730,8 +2613,7 @@ msgid ""
 "    Variables with the integer attribute have arithmetic evaluation (see\n"
 "    the `let' command) performed when the variable is assigned a value.\n"
 "    \n"
-"    When used in a function, `declare' makes NAMEs local, as with the "
-"`local'\n"
+"    When used in a function, `declare' makes NAMEs local, as with the `local'\n"
 "    command.  The `-g' option suppresses this behavior.\n"
 "    \n"
 "    Exit Status:\n"
@@ -2751,6 +2633,18 @@ msgstr ""
 
 #: builtins.c:535
 #, fuzzy
+#| msgid ""
+#| "Define local variables.\n"
+#| "    \n"
+#| "    Create a local variable called NAME, and give it VALUE.  OPTION can\n"
+#| "    be any option accepted by `declare'.\n"
+#| "    \n"
+#| "    Local variables can only be used within a function; they are visible\n"
+#| "    only to the function where they are defined and its children.\n"
+#| "    \n"
+#| "    Exit Status:\n"
+#| "    Returns success unless an invalid option is supplied, an error occurs,\n"
+#| "    or the shell is not executing a function."
 msgid ""
 "Define local variables.\n"
 "    \n"
@@ -2766,27 +2660,50 @@ msgid ""
 msgstr ""
 "Sainigh athróga logánta.\n"
 "    \n"
-"    Cruthaítear athróg logánta darbh ainm AINM, agus cuirtear LUACH leis. "
-"Is\n"
-"    féidir le ROGHA a bheith ceann ar bith de na roghanna a ghlacann "
-"\"declare\" leo.\n"
+"    Cruthaítear athróg logánta darbh ainm AINM, agus cuirtear LUACH leis. Is\n"
+"    féidir le ROGHA a bheith ceann ar bith de na roghanna a ghlacann \"declare\" leo.\n"
 "    \n"
-"    Ní féidir athróga logánta a úsáid ach laistigh de fheidhm. Tá siad "
-"infheicthe\n"
+"    Ní féidir athróga logánta a úsáid ach laistigh de fheidhm. Tá siad infheicthe\n"
 "    san fheidhm ina shainítear iad agus a mic amháin.\n"
 "    \n"
 "    Stádas Scortha:\n"
-"    Aischuirtear rath mura thugtar rogha neamhbhailí, nó mura tharlaíonn "
-"earráid,\n"
+"    Aischuirtear rath mura thugtar rogha neamhbhailí, nó mura tharlaíonn earráid,\n"
 "    nó mura bhfuil an bhlaosc ag rith feidhme."
 
 #: builtins.c:552
 #, fuzzy
+#| msgid ""
+#| "Write arguments to the standard output.\n"
+#| "    \n"
+#| "    Display the ARGs on the standard output followed by a newline.\n"
+#| "    \n"
+#| "    Options:\n"
+#| "      -n\tdo not append a newline\n"
+#| "      -e\tenable interpretation of the following backslash escapes\n"
+#| "      -E\texplicitly suppress interpretation of backslash escapes\n"
+#| "    \n"
+#| "    `echo' interprets the following backslash-escaped characters:\n"
+#| "      \\a\talert (bell)\n"
+#| "      \\b\tbackspace\n"
+#| "      \\c\tsuppress further output\n"
+#| "      \\e\tescape character\n"
+#| "      \\f\tform feed\n"
+#| "      \\n\tnew line\n"
+#| "      \\r\tcarriage return\n"
+#| "      \\t\thorizontal tab\n"
+#| "      \\v\tvertical tab\n"
+#| "      \\\\\tbackslash\n"
+#| "      \\0nnn\tthe character whose ASCII code is NNN (octal).  NNN can be\n"
+#| "    \t0 to 3 octal digits\n"
+#| "      \\xHH\tthe eight-bit character whose value is HH (hexadecimal).  HH\n"
+#| "    \tcan be one or two hex digits\n"
+#| "    \n"
+#| "    Exit Status:\n"
+#| "    Returns success unless a write error occurs."
 msgid ""
 "Write arguments to the standard output.\n"
 "    \n"
-"    Display the ARGs, separated by a single space character and followed by "
-"a\n"
+"    Display the ARGs, separated by a single space character and followed by a\n"
 "    newline, on the standard output.\n"
 "    \n"
 "    Options:\n"
@@ -2820,8 +2737,7 @@ msgstr ""
 "    \n"
 "    Roghanna:\n"
 "      -n\tná hiarcheangail líne nua\n"
-"      -n\tcumasaigh na héaluithe cúlslaise       -E\tdíchumasaigh na "
-"héaluithe cúlslaise    \n"
+"      -n\tcumasaigh na héaluithe cúlslaise       -E\tdíchumasaigh na héaluithe cúlslaise    \n"
 "    Tuigeann \"echo\" na carachtair éalaithe le cúlslais seo a leanas:\n"
 "      \\a\tairdeall (clog)\n"
 "      \\b\tcúlspás\n"
@@ -2833,11 +2749,9 @@ msgstr ""
 "      \\t\ttáib chothrománach\n"
 "      \\v\ttáib ingearach\n"
 "      \\\\\tcúlslais\n"
-"      \\0nnn\tan carachtar leis an gcód ASCII NNN (ochtnártha). Is féidir le "
-"NNN\n"
+"      \\0nnn\tan carachtar leis an gcód ASCII NNN (ochtnártha). Is féidir le NNN\n"
 "        \tbheith 0 go 3 digit ochtnártha ar fhad\n"
-"      \\xHH\tan carachtar ocht ngiotán leis an luach HH (heicsidheachúlach). "
-"Is\n"
+"      \\xHH\tan carachtar ocht ngiotán leis an luach HH (heicsidheachúlach). Is\n"
 "        \tféidir le HH bheith 1 nó 2 digit heicsidheachúlach ar fhad.\n"
 "    \n"
 "    Stádas Scortha:\n"
@@ -2896,8 +2810,7 @@ msgstr ""
 msgid ""
 "Execute arguments as a shell command.\n"
 "    \n"
-"    Combine ARGs into a single string, use the result as input to the "
-"shell,\n"
+"    Combine ARGs into a single string, use the result as input to the shell,\n"
 "    and execute the resulting commands.\n"
 "    \n"
 "    Exit Status:\n"
@@ -2909,8 +2822,7 @@ msgstr ""
 "    an bhlaosc, agus rith na horduithe toraidh.\n"
 "    \n"
 "    Stádas Scortha:\n"
-"    Aischuirtear stádas scortha an ordaithe, nó rath más ordú neamhnitheach "
-"é."
+"    Aischuirtear stádas scortha an ordaithe, nó rath más ordú neamhnitheach é."
 
 #: builtins.c:643
 msgid ""
@@ -2958,8 +2870,7 @@ msgid ""
 "Replace the shell with the given command.\n"
 "    \n"
 "    Execute COMMAND, replacing this shell with the specified program.\n"
-"    ARGUMENTS become the arguments to COMMAND.  If COMMAND is not "
-"specified,\n"
+"    ARGUMENTS become the arguments to COMMAND.  If COMMAND is not specified,\n"
 "    any redirections take effect in the current shell.\n"
 "    \n"
 "    Options:\n"
@@ -2967,13 +2878,11 @@ msgid ""
 "      -c\t\texecute COMMAND with an empty environment\n"
 "      -l\t\tplace a dash in the zeroth argument to COMMAND\n"
 "    \n"
-"    If the command cannot be executed, a non-interactive shell exits, "
-"unless\n"
+"    If the command cannot be executed, a non-interactive shell exits, unless\n"
 "    the shell option `execfail' is set.\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns success unless COMMAND is not found or a redirection error "
-"occurs."
+"    Returns success unless COMMAND is not found or a redirection error occurs."
 msgstr ""
 
 #: builtins.c:706
@@ -2992,8 +2901,7 @@ msgstr ""
 msgid ""
 "Exit a login shell.\n"
 "    \n"
-"    Exits a login shell with exit status N.  Returns an error if not "
-"executed\n"
+"    Exits a login shell with exit status N.  Returns an error if not executed\n"
 "    in a login shell."
 msgstr ""
 "Scoir de bhlaosc logála isteach.\n"
@@ -3005,15 +2913,13 @@ msgstr ""
 msgid ""
 "Display or execute commands from the history list.\n"
 "    \n"
-"    fc is used to list or edit and re-execute commands from the history "
-"list.\n"
+"    fc is used to list or edit and re-execute commands from the history list.\n"
 "    FIRST and LAST can be numbers specifying the range, or FIRST can be a\n"
 "    string, which means the most recent command beginning with that\n"
 "    string.\n"
 "    \n"
 "    Options:\n"
-"      -e ENAME\tselect which editor to use.  Default is FCEDIT, then "
-"EDITOR,\n"
+"      -e ENAME\tselect which editor to use.  Default is FCEDIT, then EDITOR,\n"
 "    \t\tthen vi\n"
 "      -l \tlist lines instead of editing\n"
 "      -n\tomit line numbers when listing\n"
@@ -3027,21 +2933,17 @@ msgid ""
 "    the last command.\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns success or status of executed command; non-zero if an error "
-"occurs."
+"    Returns success or status of executed command; non-zero if an error occurs."
 msgstr ""
 "Taispeáin nó rith orduithe ón liosta staire.\n"
 "    \n"
-"    Úsáidtear fc chun orduithe ón liosta staire a liostú, a chur in eagar, "
-"nó a ath-rith.\n"
+"    Úsáidtear fc chun orduithe ón liosta staire a liostú, a chur in eagar, nó a ath-rith.\n"
 "    Más uimhreacha iad CÉAD agus DEIREANACH, sonraíonn siad an raon, nó is\n"
-"    féidir le CÉAD bheith ina theaghrán, rud a chiallaíonn an t-ordú is "
-"deireanaí a\n"
+"    féidir le CÉAD bheith ina theaghrán, rud a chiallaíonn an t-ordú is deireanaí a\n"
 "    thosaíonn leis an teaghrán sin.\n"
 "    \n"
 "    Roghanna:\n"
-"      -e AINM_E\troghnaigh an clár eagarthóra atá le húsáid. FCEDIT an "
-"réamhshocrú,\n"
+"      -e AINM_E\troghnaigh an clár eagarthóra atá le húsáid. FCEDIT an réamhshocrú,\n"
 "               \tansin EDITOR, agus ansin vi.\n"
 "      -n\tfág uimhreacha na línte ar lár agus liosta á thaispeáint\n"
 "      -r\taisiompaigh ord na línte (.i. liostaigh an ceann is nuaí ar dtús)\n"
@@ -3049,12 +2951,10 @@ msgstr ""
 "    San fhormáid \"fc -s [PATRÚN=IONADAÍ ...] [ORDÚ]\", ath-ritear ORDÚ\n"
 "    tar éis an t-ionadú SEAN=NUA a dhéanamh.\n"
 "    \n"
-"    Ailias úsáideach is ea r='fc -s', sa chaoi go ritheann \"r cc\" an t-"
-"ordú is deireanaí\n"
+"    Ailias úsáideach is ea r='fc -s', sa chaoi go ritheann \"r cc\" an t-ordú is deireanaí\n"
 "    a thosaíonn le \"cc\", agus ath-ritheann \"r\" an t-ordú is deireanaí.\n"
 "    \n"
-"    Stádas Scortha:n\\     Aischuirtear rath nó stádas an ordaithe rite; "
-"neamh-nialas má tharlaíonn earráid."
+"    Stádas Scortha:n\\     Aischuirtear rath nó stádas an ordaithe rite; neamh-nialas má tharlaíonn earráid."
 
 #: builtins.c:755
 msgid ""
@@ -3069,10 +2969,8 @@ msgid ""
 msgstr ""
 "Bog jab go dtí an tulra.\n"
 "    \n"
-"    Cuir an jab a shonraítear le SONRÚ_JAB sa tulra agus é mar an jab "
-"reatha.\n"
-"    Mura bhfuil SONRÚ_JAB ann, úsáidtear cibé jab atá reatha de réir na "
-"blaoisce.\n"
+"    Cuir an jab a shonraítear le SONRÚ_JAB sa tulra agus é mar an jab reatha.\n"
+"    Mura bhfuil SONRÚ_JAB ann, úsáidtear cibé jab atá reatha de réir na blaoisce.\n"
 "    \n"
 "    Stádas Scortha:\n"
 "    Stádas an ordaithe curtha sa tulra, nó teip má tharlaíonn earráid."
@@ -3081,10 +2979,8 @@ msgstr ""
 msgid ""
 "Move jobs to the background.\n"
 "    \n"
-"    Place the jobs identified by each JOB_SPEC in the background, as if "
-"they\n"
-"    had been started with `&'.  If JOB_SPEC is not present, the shell's "
-"notion\n"
+"    Place the jobs identified by each JOB_SPEC in the background, as if they\n"
+"    had been started with `&'.  If JOB_SPEC is not present, the shell's notion\n"
 "    of the current job is used.\n"
 "    \n"
 "    Exit Status:\n"
@@ -3092,10 +2988,8 @@ msgid ""
 msgstr ""
 "Bog jabanna go dtí an cúlra.\n"
 "    \n"
-"    Cuir an jab a shonraítear le SONRÚ_JAB sa chúlra cosúil le é a thosú le "
-"\"&\".\n"
-"    Mura bhfuil SONRÚ_JAB ann, úsáidtear cibé jab atá reatha de réir na "
-"blaoisce.\n"
+"    Cuir an jab a shonraítear le SONRÚ_JAB sa chúlra cosúil le é a thosú le \"&\".\n"
+"    Mura bhfuil SONRÚ_JAB ann, úsáidtear cibé jab atá reatha de réir na blaoisce.\n"
 "    \n"
 "    Stádas Scortha:\n"
 "    Aischuirtear rath ach má tharlaíonn earráid nó mura bhfuil\n"
@@ -3106,8 +3000,7 @@ msgid ""
 "Remember or display program locations.\n"
 "    \n"
 "    Determine and remember the full pathname of each command NAME.  If\n"
-"    no arguments are given, information about remembered commands is "
-"displayed.\n"
+"    no arguments are given, information about remembered commands is displayed.\n"
 "    \n"
 "    Options:\n"
 "      -d\t\tforget the remembered location of each NAME\n"
@@ -3143,14 +3036,12 @@ msgid ""
 "      PATTERN\tPattern specifiying a help topic\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns success unless PATTERN is not found or an invalid option is "
-"given."
+"    Returns success unless PATTERN is not found or an invalid option is given."
 msgstr ""
 "Taispeáin eolas maidir le horduithe ionsuite.\n"
 "    \n"
 "    Taispeántar achoimrí na n-orduithe ionsuite. Má shonraítear PATRÚN,\n"
-"    taispeántar cabhair chuimsitheach faoi gach ordú a mheaitseálann "
-"PATRÚN;\n"
+"    taispeántar cabhair chuimsitheach faoi gach ordú a mheaitseálann PATRÚN;\n"
 "    i gcásanna eile taispeántar liosta na n-ábhar cabhrach.\n"
 "    \n"
 "    Roghanna:\n"
@@ -3193,8 +3084,7 @@ msgid ""
 "    \n"
 "    If the $HISTTIMEFORMAT variable is set and not null, its value is used\n"
 "    as a format string for strftime(3) to print the time stamp associated\n"
-"    with each displayed history entry.  No time stamps are printed "
-"otherwise.\n"
+"    with each displayed history entry.  No time stamps are printed otherwise.\n"
 "    \n"
 "    Exit Status:\n"
 "    Returns success unless an invalid option is given or an error occurs."
@@ -3209,7 +3099,7 @@ msgid ""
 "    \n"
 "    Options:\n"
 "      -l\tlists process IDs in addition to the normal information\n"
-"      -n\tlists only processes that have changed status since the last\n"
+"      -n\tlist only processes that have changed status since the last\n"
 "    \tnotification\n"
 "      -p\tlists process IDs only\n"
 "      -r\trestrict output to running jobs\n"
@@ -3284,8 +3174,7 @@ msgid ""
 "    Evaluate each ARG as an arithmetic expression.  Evaluation is done in\n"
 "    fixed-width integers with no check for overflow, though division by 0\n"
 "    is trapped and flagged as an error.  The following list of operators is\n"
-"    grouped into levels of equal-precedence operators.  The levels are "
-"listed\n"
+"    grouped into levels of equal-precedence operators.  The levels are listed\n"
 "    in order of decreasing precedence.\n"
 "    \n"
 "    \tid++, id--\tvariable post-increment, post-decrement\n"
@@ -3327,16 +3216,13 @@ msgid ""
 "Read a line from the standard input and split it into fields.\n"
 "    \n"
 "    Reads a single line from the standard input, or from file descriptor FD\n"
-"    if the -u option is supplied.  The line is split into fields as with "
-"word\n"
+"    if the -u option is supplied.  The line is split into fields as with word\n"
 "    splitting, and the first word is assigned to the first NAME, the second\n"
 "    word to the second NAME, and so on, with any leftover words assigned to\n"
-"    the last NAME.  Only the characters found in $IFS are recognized as "
-"word\n"
+"    the last NAME.  Only the characters found in $IFS are recognized as word\n"
 "    delimiters.\n"
 "    \n"
-"    If no NAMEs are supplied, the line read is stored in the REPLY "
-"variable.\n"
+"    If no NAMEs are supplied, the line read is stored in the REPLY variable.\n"
 "    \n"
 "    Options:\n"
 "      -a array\tassign the words read to sequential indices of the array\n"
@@ -3348,15 +3234,13 @@ msgid ""
 "      -n nchars\treturn after reading NCHARS characters rather than waiting\n"
 "    \t\tfor a newline, but honor a delimiter if fewer than NCHARS\n"
 "    \t\tcharacters are read before the delimiter\n"
-"      -N nchars\treturn only after reading exactly NCHARS characters, "
-"unless\n"
+"      -N nchars\treturn only after reading exactly NCHARS characters, unless\n"
 "    \t\tEOF is encountered or read times out, ignoring any delimiter\n"
 "      -p prompt\toutput the string PROMPT without a trailing newline before\n"
 "    \t\tattempting to read\n"
 "      -r\t\tdo not allow backslashes to escape any characters\n"
 "      -s\t\tdo not echo input coming from a terminal\n"
-"      -t timeout\ttime out and return failure if a complete line of input "
-"is\n"
+"      -t timeout\ttime out and return failure if a complete line of input is\n"
 "    \t\tnot read within TIMEOUT seconds.  The value of the TMOUT\n"
 "    \t\tvariable is the default timeout.  TIMEOUT may be a\n"
 "    \t\tfractional number.  If TIMEOUT is 0, read returns immediately,\n"
@@ -3366,10 +3250,8 @@ msgid ""
 "      -u fd\t\tread from file descriptor FD instead of the standard input\n"
 "    \n"
 "    Exit Status:\n"
-"    The return code is zero, unless end-of-file is encountered, read times "
-"out\n"
-"    (in which case it's greater than 128), a variable assignment error "
-"occurs,\n"
+"    The return code is zero, unless end-of-file is encountered, read times out\n"
+"    (in which case it's greater than 128), a variable assignment error occurs,\n"
 "    or an invalid file descriptor is supplied as the argument to -u."
 msgstr ""
 
@@ -3387,13 +3269,11 @@ msgstr ""
 "Fill ó fheidhm bhlaoisce.\n"
 "    \n"
 "    Filltear ó fheidhm nó ó script léite as comhad leis an luach scortha\n"
-"    a shonraítear i N. Má fhágtar N ar lár, is é an stádas scortha ná "
-"stadas\n"
+"    a shonraítear i N. Má fhágtar N ar lár, is é an stádas scortha ná stadas\n"
 "    an orduithe dheireanaigh a ritheadh laistigh den fheidhm nó script.\n"
 "    \n"
 "    Stádas Scortha:\n"
-"    Aischuirtear N, nó teip sa chás nach bhfuil an bhlaosc ag rith feidhme "
-"nó scripte."
+"    Aischuirtear N, nó teip sa chás nach bhfuil an bhlaosc ag rith feidhme nó scripte."
 
 #: builtins.c:1041
 msgid ""
@@ -3438,8 +3318,7 @@ msgid ""
 "              physical     same as -P\n"
 "              pipefail     the return value of a pipeline is the status of\n"
 "                           the last command to exit with a non-zero status,\n"
-"                           or zero if no command exited with a non-zero "
-"status\n"
+"                           or zero if no command exited with a non-zero status\n"
 "              posix        change the behavior of bash where the default\n"
 "                           operation differs from the Posix standard to\n"
 "                           match the standard\n"
@@ -3492,8 +3371,7 @@ msgid ""
 "      -n\ttreat each NAME as a name reference and unset the variable itself\n"
 "    \trather than the variable it references\n"
 "    \n"
-"    Without options, unset first tries to unset a variable, and if that "
-"fails,\n"
+"    Without options, unset first tries to unset a variable, and if that fails,\n"
 "    tries to unset a function.\n"
 "    \n"
 "    Some variables cannot be unset; also see `readonly'.\n"
@@ -3507,8 +3385,7 @@ msgid ""
 "Set export attribute for shell variables.\n"
 "    \n"
 "    Marks each NAME for automatic export to the environment of subsequently\n"
-"    executed commands.  If VALUE is supplied, assign VALUE before "
-"exporting.\n"
+"    executed commands.  If VALUE is supplied, assign VALUE before exporting.\n"
 "    \n"
 "    Options:\n"
 "      -f\trefer to shell functions\n"
@@ -3533,8 +3410,7 @@ msgid ""
 "      -a\trefer to indexed array variables\n"
 "      -A\trefer to associative array variables\n"
 "      -f\trefer to shell functions\n"
-"      -p\tdisplay a list of all readonly variables or functions, depending "
-"on\n"
+"      -p\tdisplay a list of all readonly variables or functions, depending on\n"
 "            whether or not the -f option is given\n"
 "    \n"
 "    An argument of `--' disables further option processing.\n"
@@ -3616,8 +3492,7 @@ msgid ""
 "      -x FILE        True if the file is executable by you.\n"
 "      -O FILE        True if the file is effectively owned by you.\n"
 "      -G FILE        True if the file is effectively owned by your group.\n"
-"      -N FILE        True if the file has been modified since it was last "
-"read.\n"
+"      -N FILE        True if the file has been modified since it was last read.\n"
 "    \n"
 "      FILE1 -nt FILE2  True if file1 is newer than file2 (according to\n"
 "                       modification date).\n"
@@ -3638,8 +3513,7 @@ msgid ""
 "      STRING1 != STRING2\n"
 "                     True if the strings are not equal.\n"
 "      STRING1 < STRING2\n"
-"                     True if STRING1 sorts before STRING2 "
-"lexicographically.\n"
+"                     True if STRING1 sorts before STRING2 lexicographically.\n"
 "      STRING1 > STRING2\n"
 "                     True if STRING1 sorts after STRING2 lexicographically.\n"
 "    \n"
@@ -3647,8 +3521,7 @@ msgid ""
 "    \n"
 "      -o OPTION      True if the shell option OPTION is enabled.\n"
 "      -v VAR\t True if the shell variable VAR is set\n"
-"      -R VAR\t True if the shell variable VAR is set and is a name "
-"reference.\n"
+"      -R VAR\t True if the shell variable VAR is set and is a name reference.\n"
 "      ! EXPR         True if expr is false.\n"
 "      EXPR1 -a EXPR2 True if both expr1 AND expr2 are true.\n"
 "      EXPR1 -o EXPR2 True if either expr1 OR expr2 is true.\n"
@@ -3682,8 +3555,7 @@ msgstr ""
 msgid ""
 "Display process times.\n"
 "    \n"
-"    Prints the accumulated user and system times for the shell and all of "
-"its\n"
+"    Prints the accumulated user and system times for the shell and all of its\n"
 "    child processes.\n"
 "    \n"
 "    Exit Status:\n"
@@ -3702,8 +3574,7 @@ msgstr ""
 msgid ""
 "Trap signals and other events.\n"
 "    \n"
-"    Defines and activates handlers to be run when the shell receives "
-"signals\n"
+"    Defines and activates handlers to be run when the shell receives signals\n"
 "    or other conditions.\n"
 "    \n"
 "    ARG is a command to be read and executed when the shell receives the\n"
@@ -3712,34 +3583,26 @@ msgid ""
 "    value.  If ARG is the null string each SIGNAL_SPEC is ignored by the\n"
 "    shell and by the commands it invokes.\n"
 "    \n"
-"    If a SIGNAL_SPEC is EXIT (0) ARG is executed on exit from the shell.  "
-"If\n"
-"    a SIGNAL_SPEC is DEBUG, ARG is executed before every simple command.  "
-"If\n"
-"    a SIGNAL_SPEC is RETURN, ARG is executed each time a shell function or "
-"a\n"
-"    script run by the . or source builtins finishes executing.  A "
-"SIGNAL_SPEC\n"
-"    of ERR means to execute ARG each time a command's failure would cause "
-"the\n"
+"    If a SIGNAL_SPEC is EXIT (0) ARG is executed on exit from the shell.  If\n"
+"    a SIGNAL_SPEC is DEBUG, ARG is executed before every simple command.  If\n"
+"    a SIGNAL_SPEC is RETURN, ARG is executed each time a shell function or a\n"
+"    script run by the . or source builtins finishes executing.  A SIGNAL_SPEC\n"
+"    of ERR means to execute ARG each time a command's failure would cause the\n"
 "    shell to exit when the -e option is enabled.\n"
 "    \n"
-"    If no arguments are supplied, trap prints the list of commands "
-"associated\n"
+"    If no arguments are supplied, trap prints the list of commands associated\n"
 "    with each signal.\n"
 "    \n"
 "    Options:\n"
 "      -l\tprint a list of signal names and their corresponding numbers\n"
 "      -p\tdisplay the trap commands associated with each SIGNAL_SPEC\n"
 "    \n"
-"    Each SIGNAL_SPEC is either a signal name in <signal.h> or a signal "
-"number.\n"
+"    Each SIGNAL_SPEC is either a signal name in <signal.h> or a signal number.\n"
 "    Signal names are case insensitive and the SIG prefix is optional.  A\n"
 "    signal may be sent to the shell with \"kill -signal $$\".\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns success unless a SIGSPEC is invalid or an invalid option is "
-"given."
+"    Returns success unless a SIGSPEC is invalid or an invalid option is given."
 msgstr ""
 
 #: builtins.c:1386
@@ -3768,16 +3631,14 @@ msgid ""
 "      NAME\tCommand name to be interpreted.\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns success if all of the NAMEs are found; fails if any are not "
-"found."
+"    Returns success if all of the NAMEs are found; fails if any are not found."
 msgstr ""
 
 #: builtins.c:1417
 msgid ""
 "Modify shell resource limits.\n"
 "    \n"
-"    Provides control over the resources available to the shell and "
-"processes\n"
+"    Provides control over the resources available to the shell and processes\n"
 "    it creates, on systems that allow such control.\n"
 "    \n"
 "    Options:\n"
@@ -3841,12 +3702,10 @@ msgstr ""
 msgid ""
 "Wait for job completion and return exit status.\n"
 "    \n"
-"    Waits for each process identified by an ID, which may be a process ID or "
-"a\n"
+"    Waits for each process identified by an ID, which may be a process ID or a\n"
 "    job specification, and reports its termination status.  If ID is not\n"
 "    given, waits for all currently active child processes, and the return\n"
-"    status is zero.  If ID is a a job specification, waits for all "
-"processes\n"
+"    status is zero.  If ID is a a job specification, waits for all processes\n"
 "    in that job's pipeline.\n"
 "    \n"
 "    If the -n option is supplied, waits for the next job to terminate and\n"
@@ -3861,14 +3720,12 @@ msgstr ""
 msgid ""
 "Wait for process completion and return exit status.\n"
 "    \n"
-"    Waits for each process specified by a PID and reports its termination "
-"status.\n"
+"    Waits for each process specified by a PID and reports its termination status.\n"
 "    If PID is not given, waits for all currently active child processes,\n"
 "    and the return status is zero.  PID must be a process ID.\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns the status of the last PID; fails if PID is invalid or an "
-"invalid\n"
+"    Returns the status of the last PID; fails if PID is invalid or an invalid\n"
 "    option is given."
 msgstr ""
 
@@ -3910,8 +3767,7 @@ msgstr ""
 "    \t\t(( SLONN3 ))\n"
 "    \tdone\n"
 "    Is sloinn uimhreachtúla iad SLONN1, SLONN2 agus SLONN3.\n"
-"    Má fhágtar slonn ar bith ar lár, oibríonn an lúib mar a bheadh luach de "
-"1 air.\n"
+"    Má fhágtar slonn ar bith ar lár, oibríonn an lúib mar a bheadh luach de 1 air.\n"
 "    \n"
 "    Stádas Scortha:\n"
 "    Aischuirtear stádas an ordaithe dheireanaigh a ritheadh."
@@ -3967,17 +3823,12 @@ msgstr ""
 msgid ""
 "Execute commands based on conditional.\n"
 "    \n"
-"    The `if COMMANDS' list is executed.  If its exit status is zero, then "
-"the\n"
-"    `then COMMANDS' list is executed.  Otherwise, each `elif COMMANDS' list "
-"is\n"
+"    The `if COMMANDS' list is executed.  If its exit status is zero, then the\n"
+"    `then COMMANDS' list is executed.  Otherwise, each `elif COMMANDS' list is\n"
 "    executed in turn, and if its exit status is zero, the corresponding\n"
-"    `then COMMANDS' list is executed and the if command completes.  "
-"Otherwise,\n"
-"    the `else COMMANDS' list is executed, if present.  The exit status of "
-"the\n"
-"    entire construct is the exit status of the last command executed, or "
-"zero\n"
+"    `then COMMANDS' list is executed and the if command completes.  Otherwise,\n"
+"    the `else COMMANDS' list is executed, if present.  The exit status of the\n"
+"    entire construct is the exit status of the last command executed, or zero\n"
 "    if no condition tested true.\n"
 "    \n"
 "    Exit Status:\n"
@@ -4024,8 +3875,7 @@ msgid ""
 "Define shell function.\n"
 "    \n"
 "    Create a shell function named NAME.  When invoked as a simple command,\n"
-"    NAME runs COMMANDs in the calling shell's context.  When NAME is "
-"invoked,\n"
+"    NAME runs COMMANDs in the calling shell's context.  When NAME is invoked,\n"
 "    the arguments are passed to the function as $1...$n, and the function's\n"
 "    name is in $FUNCNAME.\n"
 "    \n"
@@ -4036,8 +3886,7 @@ msgstr ""
 "    \n"
 "    Cruthaíonn feidhm bhlaoisce darbh ainm AINM. Nuair a úsáidtear mar ordú\n"
 "    simplí é, ritheann AINM na hORDUITHE i gcomhthéacs na blaoisce glaoigh.\n"
-"    Nuair a ghlaoitear AINM, tugtar na hargóintí don fheidhm mar $0 ... $n, "
-"agus\n"
+"    Nuair a ghlaoitear AINM, tugtar na hargóintí don fheidhm mar $0 ... $n, agus\n"
 "    tá ainm na feidhme i $FUNCNAME.\n"
 "    \n"
 "    Stádas Scortha:\n"
@@ -4090,12 +3939,9 @@ msgstr ""
 msgid ""
 "Execute conditional command.\n"
 "    \n"
-"    Returns a status of 0 or 1 depending on the evaluation of the "
-"conditional\n"
-"    expression EXPRESSION.  Expressions are composed of the same primaries "
-"used\n"
-"    by the `test' builtin, and may be combined using the following "
-"operators:\n"
+"    Returns a status of 0 or 1 depending on the evaluation of the conditional\n"
+"    expression EXPRESSION.  Expressions are composed of the same primaries used\n"
+"    by the `test' builtin, and may be combined using the following operators:\n"
 "    \n"
 "      ( EXPRESSION )\tReturns the value of EXPRESSION\n"
 "      ! EXPRESSION\t\tTrue if EXPRESSION is false; else false\n"
@@ -4243,12 +4089,10 @@ msgid ""
 "    \twith its position in the stack\n"
 "    \n"
 "    Arguments:\n"
-"      +N\tDisplays the Nth entry counting from the left of the list shown "
-"by\n"
+"      +N\tDisplays the Nth entry counting from the left of the list shown by\n"
 "    \tdirs when invoked without options, starting with zero.\n"
 "    \n"
-"      -N\tDisplays the Nth entry counting from the right of the list shown "
-"by\n"
+"      -N\tDisplays the Nth entry counting from the right of the list shown by\n"
 "    \tdirs when invoked without options, starting with zero.\n"
 "    \n"
 "    Exit Status:\n"
@@ -4260,8 +4104,7 @@ msgid ""
 "Set and unset shell options.\n"
 "    \n"
 "    Change the setting of each shell option OPTNAME.  Without any option\n"
-"    arguments, list all shell options with an indication of whether or not "
-"each\n"
+"    arguments, list all shell options with an indication of whether or not each\n"
 "    is set.\n"
 "    \n"
 "    Options:\n"
@@ -4284,34 +4127,27 @@ msgid ""
 "      -v var\tassign the output to shell variable VAR rather than\n"
 "    \t\tdisplay it on the standard output\n"
 "    \n"
-"    FORMAT is a character string which contains three types of objects: "
-"plain\n"
-"    characters, which are simply copied to standard output; character "
-"escape\n"
+"    FORMAT is a character string which contains three types of objects: plain\n"
+"    characters, which are simply copied to standard output; character escape\n"
 "    sequences, which are converted and copied to the standard output; and\n"
-"    format specifications, each of which causes printing of the next "
-"successive\n"
+"    format specifications, each of which causes printing of the next successive\n"
 "    argument.\n"
 "    \n"
-"    In addition to the standard format specifications described in "
-"printf(1),\n"
+"    In addition to the standard format specifications described in printf(1),\n"
 "    printf interprets:\n"
 "    \n"
 "      %b\texpand backslash escape sequences in the corresponding argument\n"
 "      %q\tquote the argument in a way that can be reused as shell input\n"
-"      %(fmt)T output the date-time string resulting from using FMT as a "
-"format\n"
+"      %(fmt)T output the date-time string resulting from using FMT as a format\n"
 "            string for strftime(3)\n"
 "    \n"
 "    The format is re-used as necessary to consume all of the arguments.  If\n"
 "    there are fewer arguments than the format requires,  extra format\n"
-"    specifications behave as if a zero value or null string, as "
-"appropriate,\n"
+"    specifications behave as if a zero value or null string, as appropriate,\n"
 "    had been supplied.\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns success unless an invalid option is given or a write or "
-"assignment\n"
+"    Returns success unless an invalid option is given or a write or assignment\n"
 "    error occurs."
 msgstr ""
 
@@ -4319,10 +4155,8 @@ msgstr ""
 msgid ""
 "Specify how arguments are to be completed by Readline.\n"
 "    \n"
-"    For each NAME, specify how arguments are to be completed.  If no "
-"options\n"
-"    are supplied, existing completion specifications are printed in a way "
-"that\n"
+"    For each NAME, specify how arguments are to be completed.  If no options\n"
+"    are supplied, existing completion specifications are printed in a way that\n"
 "    allows them to be reused as input.\n"
 "    \n"
 "    Options:\n"
@@ -4347,8 +4181,7 @@ msgid ""
 "Display possible completions depending on the options.\n"
 "    \n"
 "    Intended to be used from within a shell function generating possible\n"
-"    completions.  If the optional WORD argument is supplied, matches "
-"against\n"
+"    completions.  If the optional WORD argument is supplied, matches against\n"
 "    WORD are generated.\n"
 "    \n"
 "    Exit Status:\n"
@@ -4356,25 +4189,20 @@ msgid ""
 msgstr ""
 "Taispeáin na hiomlánaithe atá ar fáil de réir na roghanna.\n"
 "    \n"
-"    Tá sé seo ceaptha le húsáid i bhfeidmeanna blaoisce a chruthaíonn "
-"iomlánaithe.\n"
+"    Tá sé seo ceaptha le húsáid i bhfeidmeanna blaoisce a chruthaíonn iomlánaithe.\n"
 "     Má thugtar an argóint roghnach FOCAL, cruthaítear iomlánaithe\n"
 "     atá comhoiriúnach le FOCAL.\n"
 "    \n"
 "    Stádas Scortha:\n"
-"    Aischuirtear rath mura thugtar rogha neamhbhailí agus mura tharlaíonn "
-"earráid."
+"    Aischuirtear rath mura thugtar rogha neamhbhailí agus mura tharlaíonn earráid."
 
 #: builtins.c:1985
 msgid ""
 "Modify or display completion options.\n"
 "    \n"
-"    Modify the completion options for each NAME, or, if no NAMEs are "
-"supplied,\n"
-"    the completion currently being executed.  If no OPTIONs are given, "
-"print\n"
-"    the completion options for each NAME or the current completion "
-"specification.\n"
+"    Modify the completion options for each NAME, or, if no NAMEs are supplied,\n"
+"    the completion currently being executed.  If no OPTIONs are given, print\n"
+"    the completion options for each NAME or the current completion specification.\n"
 "    \n"
 "    Options:\n"
 "    \t-o option\tSet completion option OPTION for each NAME\n"
@@ -4400,24 +4228,18 @@ msgstr ""
 msgid ""
 "Read lines from the standard input into an indexed array variable.\n"
 "    \n"
-"    Read lines from the standard input into the indexed array variable "
-"ARRAY, or\n"
-"    from file descriptor FD if the -u option is supplied.  The variable "
-"MAPFILE\n"
+"    Read lines from the standard input into the indexed array variable ARRAY, or\n"
+"    from file descriptor FD if the -u option is supplied.  The variable MAPFILE\n"
 "    is the default ARRAY.\n"
 "    \n"
 "    Options:\n"
-"      -n count\tCopy at most COUNT lines.  If COUNT is 0, all lines are "
-"copied.\n"
-"      -O origin\tBegin assigning to ARRAY at index ORIGIN.  The default "
-"index is 0.\n"
+"      -n count\tCopy at most COUNT lines.  If COUNT is 0, all lines are copied.\n"
+"      -O origin\tBegin assigning to ARRAY at index ORIGIN.  The default index is 0.\n"
 "      -s count \tDiscard the first COUNT lines read.\n"
 "      -t\t\tRemove a trailing newline from each line read.\n"
-"      -u fd\t\tRead lines from file descriptor FD instead of the standard "
-"input.\n"
+"      -u fd\t\tRead lines from file descriptor FD instead of the standard input.\n"
 "      -C callback\tEvaluate CALLBACK each time QUANTUM lines are read.\n"
-"      -c quantum\tSpecify the number of lines read between each call to "
-"CALLBACK.\n"
+"      -c quantum\tSpecify the number of lines read between each call to CALLBACK.\n"
 "    \n"
 "    Arguments:\n"
 "      ARRAY\t\tArray variable name to use for file data.\n"
@@ -4427,13 +4249,11 @@ msgid ""
 "    element to be assigned and the line to be assigned to that element\n"
 "    as additional arguments.\n"
 "    \n"
-"    If not supplied with an explicit origin, mapfile will clear ARRAY "
-"before\n"
+"    If not supplied with an explicit origin, mapfile will clear ARRAY before\n"
 "    assigning to it.\n"
 "    \n"
 "    Exit Status:\n"
-"    Returns success unless an invalid option is given or ARRAY is readonly "
-"or\n"
+"    Returns success unless an invalid option is given or ARRAY is readonly or\n"
 "    not an indexed array."
 msgstr ""
 
@@ -4447,29 +4267,11 @@ msgstr ""
 "    \n"
 "    Comhchiallach le \"mapfile\"."
 
-#, fuzzy
-#~ msgid "Copyright (C) 2009 Free Software Foundation, Inc.\n"
-#~ msgstr "Cóipcheart © 2009 Free Software Foundation, Inc."
-
-#, fuzzy
-#~ msgid ""
-#~ "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl."
-#~ "html>\n"
-#~ msgstr ""
-#~ "Ceadúnas GPLv3+: GNU GPL leagan 3 nó níos déanaí <http://gnu.org/licenses/"
-#~ "gpl.html>\n"
-
-#~ msgid "wait [pid]"
-#~ msgstr "wait [aitheantas_próisis]"
-
 #~ msgid "xrealloc: cannot reallocate %lu bytes (%lu bytes allocated)"
-#~ msgstr ""
-#~ "xrealloc: ní féidir %lu beart a athleithdháileadh (%lu beart leithdháilte)"
+#~ msgstr "xrealloc: ní féidir %lu beart a athleithdháileadh (%lu beart leithdháilte)"
 
 #~ msgid "xrealloc: cannot allocate %lu bytes"
 #~ msgstr "xrealloc: ní féidir %lu beart a leithdháileadh"
 
 #~ msgid "xrealloc: %s:%d: cannot reallocate %lu bytes (%lu bytes allocated)"
-#~ msgstr ""
-#~ "xrealloc: %s:%d: ní féidir %lu beart a athleithdháileadh (%lu beart "
-#~ "leithdháilte)"
+#~ msgstr "xrealloc: %s:%d: ní féidir %lu beart a athleithdháileadh (%lu beart leithdháilte)"

diff --git a/quit.h b/quit.h
index 704a847069047c0256faef7ea4fb10ee73b728ac..f38412109b8336a10c5dae4140218b7148029fac 100644 (file)
--- a/quit.h
+++ b/quit.h
@@ -41,7 +41,7 @@ extern volatile sig_atomic_t terminating_signal;
 #define CHECK_ALRM \
   do { \
     if (sigalrm_seen) \
-      longjmp (alrmbuf, 1); \
+      sh_longjmp (alrmbuf, 1); \
   } while (0)
 
 #define SETINTERRUPT interrupt_state = 1
@@ -64,7 +64,7 @@ extern volatile sig_atomic_t terminating_signal;
 #define CHECK_WAIT_INTR \
   do { \
     if (wait_signal_received && this_shell_builtin && (this_shell_builtin == wait_builtin)) \
-      longjmp (wait_intr_buf, 1); \
+      sh_longjmp (wait_intr_buf, 1); \
   } while (0)
 
 #define RESET_SIGTERM \

diff --git a/sig.c b/sig.c
index 1078852604c57a03d2774ed0d3fc82f77d385b85..3c2c979a9bf0d45d88f72fef0f86396be10956db 100644 (file)
--- a/sig.c
+++ b/sig.c
@@ -1,6 +1,6 @@
 /* sig.c - interface for shell signal handlers and signal initialization. */
 
-/* Copyright (C) 1994-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -413,15 +413,15 @@ throw_to_top_level ()
                                (last_command_exit_value - 128) : 0;
   last_command_exit_value |= 128;
 
-  /* Run any traps set on SIGINT. */
+  /* Run any traps set on SIGINT, mostly for interactive shells */
   if (signal_is_trapped (SIGINT))
-    run_interrupt_trap ();
+    run_interrupt_trap (1);
 
   /* Clean up string parser environment. */
   while (parse_and_execute_level)
     parse_and_execute_cleanup ();
 
-  if (running_trap)
+  if (running_trap > 0)
     run_trap_cleanup (running_trap - 1);
 
 #if defined (JOB_CONTROL)
@@ -469,7 +469,7 @@ void
 jump_to_top_level (value)
      int value;
 {
-  longjmp (top_level, value);
+  sh_longjmp (top_level, value);
 }
 
 sighandler
@@ -563,7 +563,7 @@ termsig_handler (sig)
 
   /* I don't believe this condition ever tests true. */
   if (sig == SIGINT && signal_is_trapped (SIGINT))
-    run_interrupt_trap ();
+    run_interrupt_trap (0);
 
 #if defined (HISTORY)
   /* If we don't do something like this, the history will not be saved when

diff --git a/test.c b/test.c
index 1b3d1995a9cb3f400b85d5a17d60bf1a0f0b77f6..86e8b0a7bc5eb6e7c2c30fccad8f4095b7d8a524 100644 (file)
--- a/test.c
+++ b/test.c
@@ -101,7 +101,7 @@ extern int errno;
 static procenv_t test_exit_buf;
 static int test_error_return;
 #define test_exit(val) \
-       do { test_error_return = val; longjmp (test_exit_buf, 1); } while (0)
+       do { test_error_return = val; sh_longjmp (test_exit_buf, 1); } while (0)
 
 extern int sh_stat __P((const char *, struct stat *));
 

diff --git a/trap.c b/trap.c
index 4592465ad4b0bf6acbd8e569dcb054bb9b4a5f11..a12bb9e2137af8e3a9c60304e6f5c1c45be3f1f5 100644 (file)
--- a/trap.c
+++ b/trap.c
@@ -1,7 +1,7 @@
 /* trap.c -- Not the trap command, but useful functions for manipulating
    those objects.  The trap command is in builtins/trap.def. */
 
-/* Copyright (C) 1987-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -325,7 +325,7 @@ run_pending_traps ()
          if (sig == SIGINT)
            {
              pending_traps[sig] = 0;   /* XXX */
-             run_interrupt_trap ();
+             run_interrupt_trap (0);
              CLRINTERRUPT;
            }
 #if defined (JOB_CONTROL) && defined (SIGCHLD)
@@ -442,14 +442,13 @@ trap_handler (sig)
 
       catch_flag = 1;
       pending_traps[sig]++;
-
       trapped_signal_received = sig;
 
       if (this_shell_builtin && (this_shell_builtin == wait_builtin))
        {
          wait_signal_received = sig;
          if (interrupt_immediately)
-           longjmp (wait_intr_buf, 1);
+           sh_longjmp (wait_intr_buf, 1);
        }
 
 #if defined (READLINE)
@@ -964,8 +963,8 @@ _run_trap_internal (sig, tag)
       restore_pipestatus_array (ps);
 #endif
 
-      running_trap = 0;
       sigmodes[sig] &= ~SIG_INPROGRESS;
+      running_trap = 0;
       interrupt_state = old_int;
 
       if (sigmodes[sig] & SIG_CHANGED)
@@ -990,7 +989,7 @@ _run_trap_internal (sig, tag)
 #if 0
              from_return_trap = sig == RETURN_TRAP;
 #endif
-             longjmp (return_catch, 1);
+             sh_longjmp (return_catch, 1);
            }
        }
     }
@@ -1039,7 +1038,7 @@ run_debug_trap ()
       if (debugging_mode && trap_exit_value == 2 && return_catch_flag)
        {
          return_catch_value = trap_exit_value;
-         longjmp (return_catch, 1);
+         sh_longjmp (return_catch, 1);
        }
 #endif
     }
@@ -1074,8 +1073,11 @@ run_return_trap ()
 /* Run a trap set on SIGINT.  This is called from throw_to_top_level (), and
    declared here to localize the trap functions. */
 void
-run_interrupt_trap ()
+run_interrupt_trap (will_throw)
+     int will_throw;   /* from throw_to_top_level? */
 {
+  if (will_throw && running_trap > 0)
+    run_trap_cleanup (running_trap - 1);
   _run_trap_internal (SIGINT, "interrupt trap");
 }
 
@@ -1204,7 +1206,7 @@ maybe_call_trap_handler (sig)
       switch (sig)
        {
        case SIGINT:
-         run_interrupt_trap ();
+         run_interrupt_trap (0);
          break;
        case EXIT_TRAP:
          run_exit_trap ();

diff --git a/trap.h b/trap.h
index 34a05c4b86f5fc505ede5c9360716cf306722b28..ccb1bcb57544a8aa7e32b6b195821a8d4d413d54 100644 (file)
--- a/trap.h
+++ b/trap.h
@@ -95,7 +95,7 @@ extern void get_all_original_signals __P((void));
 extern char *signal_name __P((int));
 
 extern int decode_signal __P((char *, int));
-extern void run_interrupt_trap __P((void));
+extern void run_interrupt_trap __P((int));
 extern int maybe_call_trap_handler __P((int));
 extern int signal_is_special __P((int));
 extern int signal_is_trapped __P((int));