From 63b8a1665ae189b35f9711a77a99de2540134e41 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 12 Apr 2019 18:12:49 +0200 Subject: [PATCH] re PR translation/90041 (Command line option without proper quoting in translation message) PR translation/90041 * exgettext: Print MissingArgError, UnknownError or Warn *.opt argument using error or warning instead of _ to mark it as gcc-internal-format. * c.opt (-fhandle-exceptions): Use %< and %> around option names in the Warn diagnostics. From-SVN: r270321 --- gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c.opt | 2 +- gcc/po/ChangeLog | 5 +++++ gcc/po/exgettext | 6 +++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index aeba529b232..aeceba7beeb 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,5 +1,9 @@ 2019-04-12 Jakub Jelinek + PR translation/90041 + * c.opt (-fhandle-exceptions): Use %< and %> around option names + in the Warn diagnostics. + PR c/89946 * c-attribs.c (handle_patchable_function_entry_attribute): Add function comment. Warn if arguments of the attribute are not positive diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index 0f39ebb3ada..916cc67b453 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -1516,7 +1516,7 @@ fguiding-decls C++ ObjC++ Deprecated fhandle-exceptions -C++ ObjC++ Optimization Alias(fexceptions) Warn({-fhandle-exceptions has been renamed -fexceptions (and is now on by default)}) +C++ ObjC++ Optimization Alias(fexceptions) Warn({%<-fhandle-exceptions%> has been renamed %<-fexceptions%> (and is now on by default)}) fhonor-std C++ ObjC++ Deprecated diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog index e34a9ae8411..b94bb09ca09 100644 --- a/gcc/po/ChangeLog +++ b/gcc/po/ChangeLog @@ -1,5 +1,10 @@ 2019-04-12 Jakub Jelinek + PR translation/90041 + * exgettext: Print MissingArgError, UnknownError or Warn + *.opt argument using error or warning instead of _ to mark it + as gcc-internal-format. + * de.po, sv.po: Update. 2019-04-02 Iain Buclaw diff --git a/gcc/po/exgettext b/gcc/po/exgettext index 22bebe4f9ee..ed6935070ab 100644 --- a/gcc/po/exgettext +++ b/gcc/po/exgettext @@ -252,7 +252,7 @@ echo "scanning option files..." >&2 } else sub("\\).*", "", line) printf("#line %d \"%s\"\n", lineno, file) - printf("_(\"%s\")\n", line) + printf("error(\"%s\")\n", line) } if ((field == 1) && /UnknownError/) { line = $0 @@ -263,7 +263,7 @@ echo "scanning option files..." >&2 } else sub("\\).*", "", line) printf("#line %d \"%s\"\n", lineno, file) - printf("_(\"%s\")\n", line) + printf("error(\"%s\")\n", line) } if ((field == 1) && /Warn\(/) { line = $0 @@ -274,7 +274,7 @@ echo "scanning option files..." >&2 } else sub("\\).*", "", line) printf("#line %d \"%s\"\n", lineno, file) - printf("_(\"%s\")\n", line) + printf("warning(0, \"%s\")\n", line) } if (field == 2) { line = $0 -- 2.30.2