re PR translation/90041 (Command line option without proper quoting in translation...

	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

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index aeba529b2325cd70355561efea656cc977be23ee..aeceba7beebbfcdd8c02052de67317b0ea3b5f88 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,5 +1,9 @@
 2019-04-12  Jakub Jelinek  <jakub@redhat.com>
 
+       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 0f39ebb3adaa77117bb626c9cd4cae9fcee5a7ba..916cc67b453ff47bf4865f2cb31b2201e6d11f45 100644 (file)
--- 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 e34a9ae8411c72ab3310cc5a44fc0713c5e8f8d3..b94bb09ca09adb0c04a22a7e49a4c2185aadf020 100644 (file)
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,5 +1,10 @@
 2019-04-12  Jakub Jelinek  <jakub@redhat.com>
 
+       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  <ibuclaw@gdcproject.org>

diff --git a/gcc/po/exgettext b/gcc/po/exgettext
index 22bebe4f9ee42600ad0685dac34c8122c7698677..ed6935070abc2e449c698617096a1d7a93f0a90d 100644 (file)
--- 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