bad.c: Include intl.h.

	* bad.c: Include intl.h.
	(FFEBAD_MSGS1, FFEBAD_MSGS2): Replace by FFEBAD_MSG, SHORT,
	LONG.  Adjust definitions to work with exgettext.
	(ffebad_start_): Translate all error messages.
	(ffebad_finish): Mark constant strings for translation.
	* bad.h: Use FFEBAD_MSG.  Adjust prototype of ffebad_start_
	and definitions of ffebad_start_msg, ffebad_start_msg_lex to
	work with exgettext.
	* bad.def: Use FFEBAD_MSG, SHORT, LONG throughout.

	* com.c: Include intl.h.
	(lang_print_error_function): Always use ffeinfo_kind_message
	to get the kind label for a non-nested construct.  Translate
	it.  Translate constant strings.
	* info.c (FFEINFO_KIND): Adjust definition to work with exgettext.
	* info-k.def: Block xgettext from slurping copyright notice
	into gcc.pot.  Adjust strings for their sole use, in com.c.

	* Make-lang.in (f/bad.o, f/com.o): Depend on intl.h.

From-SVN: r49123

1 files changed, 5 insertions, 25 deletions

diff --git a/gcc/f/com.c b/gcc/f/com.c
index 9abab69..979d735 100644
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -89,6 +89,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "convert.h"
 #include "ggc.h"
 #include "diagnostic.h"
+#include "intl.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
 
@@ -13669,33 +13670,12 @@ lang_print_error_function (diagnostic_context *context __attribute__((unused)),
       if (ffecom_nested_entry_ == NULL)
 	{
 	  s = ffecom_primary_entry_;
-	  switch (ffesymbol_kind (s))
-	    {
-	    case FFEINFO_kindFUNCTION:
-	      kind = "function";
-	      break;
-
-	    case FFEINFO_kindSUBROUTINE:
-	      kind = "subroutine";
-	      break;
-
-	    case FFEINFO_kindPROGRAM:
-	      kind = "program";
-	      break;
-
-	    case FFEINFO_kindBLOCKDATA:
-	      kind = "block-data";
-	      break;
-
-	    default:
-	      kind = ffeinfo_kind_message (ffesymbol_kind (s));
-	      break;
-	    }
+	  kind = _(ffeinfo_kind_message (ffesymbol_kind (s)));
 	}
       else
 	{
 	  s = ffecom_nested_entry_;
-	  kind = "statement function";
+	  kind = _("In statement function");
 	}
     }
 
@@ -13705,12 +13685,12 @@ lang_print_error_function (diagnostic_context *context __attribute__((unused)),
 	fprintf (stderr, "%s: ", file);
 
       if (s == NULL)
-	fprintf (stderr, "Outside of any program unit:\n");
+	fprintf (stderr, _("Outside of any program unit:\n"));
       else
 	{
 	  const char *name = ffesymbol_text (s);
 
-	  fprintf (stderr, "In %s `%s':\n", kind, name);
+	  fprintf (stderr, "%s `%s':\n", kind, name);
 	}
 
       last_g = g;