Back out previous patch.

data/bison.m4

@@ -328,7 +328,7 @@ m4_pushdef([b4_start], m4_car(m4_shift(b4_occurrence)))dnl
 m4_pushdef([b4_end], m4_shift(m4_shift(b4_occurrence)))dnl
 m4_ifndef($3[(]m4_quote(b4_user_name)[)],
           [b4_warn_at([b4_start], [b4_end],
-                      [[@gettext<%s `%s' is not used@>]],
+                      [[%s `%s' is not used]],
                       [$1], [b4_user_name])])[]dnl
 m4_popdef([b4_occurrence])dnl
 m4_popdef([b4_user_name])dnl

data/c++-skel.m4

@@ -21,7 +21,7 @@
 b4_glr_if(             [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])])
 b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])])
 
-b4_push_if([b4_complain([[@gettext<C++ push parsers are not supported@>]])])
+b4_push_if([b4_complain([[C++ push parsers are not supported]])])
 
 m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]])
 m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])

data/glr.c

@@ -23,7 +23,7 @@
 m4_include(b4_pkgdatadir/[c.m4])
 
 b4_push_if([
-b4_complain([[@gettext<non-deterministic push parsers are not yet supported@>]])])
+b4_complain([[non-deterministic push parsers are not yet supported]])])
 
 ## ---------------- ##
 ## Default values.  ##

data/glr.cc

@@ -53,7 +53,7 @@ m4_define([b4_pure_flag],      [1])
 
 # The header is mandatory.
 b4_defines_if([],
-              [b4_fatal([b4_skeleton[: @gettext<using %%defines is mandatory@>]])])
+              [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
 
 m4_include(b4_pkgdatadir/[c++.m4])
 m4_include(b4_pkgdatadir/[location.cc])

data/lalr1.cc

@@ -27,7 +27,7 @@ m4_define([b4_namespace],
 
 # The header is mandatory.
 b4_defines_if([],
-              [b4_fatal([b4_skeleton[: @gettext<using %%defines is mandatory@>]])])
+              [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
 
 # Backward compatibility.
 m4_define([b4_location_constructors])