From c1bd4b2b6f6a2aa7a76d66b2a9f3f1833d87798c Mon Sep 17 00:00:00 2001
From: "Joel E. Denny" <joeldenny@joeldenny.org>
Date: Sun, 25 Apr 2010 17:05:18 -0400
Subject: [PATCH 1/1] i18n: fix untranslatable string.

Reported by Goran Uddeborg at
<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00000.html>.
* src/muscle-tab.c (muscle_percent_define_insert): Here.
(cherry picked from commit e0fda26c8dda7f03443f69fb8c20b7cdeb1b37fd)

Conflicts:

	src/muscle-tab.c
---
 ChangeLog        | 7 +++++++
 src/muscle-tab.c | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 86d3f3c1..34b34f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-25  Joel E. Denny  <joeldenny@joeldenny.org>
+
+	i18n: fix untranslatable string.
+	Reported by Goran Uddeborg at
+	<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00000.html>.
+	* src/muscle-tab.c (muscle_percent_define_insert): Here.
+
 2010-04-13  Akim Demaille  <demaille@gostai.com>
 
 	tests: calc: minor refactoring.
diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index f1267a32..a878da12 100644
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -439,8 +439,8 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
         atoi (muscle_find_const (how_name));
       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;
-      complain_at (variable_loc, _("%s `%s' redefined"),
-                   "%define variable", variable);
+      complain_at (variable_loc, _("%%define variable `%s' redefined"),
+                   variable);
       complain_at (muscle_percent_define_get_loc (variable),
                    _("previous definition"));
     }
-- 
2.45.2