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

diff --git a/ChangeLog b/ChangeLog
index 86d3f3c10eca18aba06be9136e1346a96ff329f9..34b34f7c7c5355cb4eef77aacba10cf84acb1bee 100644 (file)
--- 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.
 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 f1267a32c43a89d4ec698a3d5d2e6780ff028ad8..a878da126a70cc0e2622a2625c521475840edba1 100644 (file)
--- 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;
         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"));
     }
       complain_at (muscle_percent_define_get_loc (variable),
                    _("previous definition"));
     }