Fix diagnostic message formats for 21.x

Author: hach-que

clang/include/clang/Basic/DiagnosticCommonKinds.td

@@ -410,12 +410,12 @@ def err_module_format_unhandled : Error<
 def err_clangrules_message : Error<"%0">;
 def warn_clangrules_message : Warning<"%0">, InGroup<DiagGroup<"clangrules">>;
 def note_clangrules_message : Note<"%0">;
-def err_clangrules_rule_name_is_prefixed : Error<"Rule name '%0' must be unprefixed and not contain a '/' character.">;
-def err_clangrules_ruleset_name_is_prefixed : Error<"Ruleset name '%0' must be unprefixed and not contain a '/' character.">;
-def err_clangrules_ruleset_severity_is_notset : Error<"Ruleset '%0' severity must be a value other than 'NotSet'.">;
-def err_clangrules_rule_name_conflict : Error<"Namespaced rule name '%0' is already declared in another .clang-rules file. Try using a different namespace to avoid conflicts.">;
-def err_clangrules_rule_missing : Error<"Namespaced ruleset '%0' requested namespaced rule '%1' but it wasn't known at runtime. Make sure it is declared in either the same .clang-rules file, or in a .clang-rules file in a parent directory.">;
-def err_clangrules_rule_matcher_parse_failure : Error<"Namespaced rule '%0' matcher failed to parse: %1">;
+def err_clangrules_rule_name_is_prefixed : Error<"rule name '%0' must be unprefixed and not contain a '/' character">;
+def err_clangrules_ruleset_name_is_prefixed : Error<"ruleset name '%0' must be unprefixed and not contain a '/' character">;
+def err_clangrules_ruleset_severity_is_notset : Error<"ruleset '%0' severity must be a value other than 'NotSet'">;
+def err_clangrules_rule_name_conflict : Error<"namespaced rule name '%0' is already declared in another .clang-rules file; try using a different namespace to avoid conflicts">;
+def err_clangrules_rule_missing : Error<"namespaced ruleset '%0' requested namespaced rule '%1' but it wasn't known at runtime; make sure it is declared in either the same .clang-rules file, or in a .clang-rules file in a parent directory">;
+def err_clangrules_rule_matcher_parse_failure : Error<"namespaced rule '%0' matcher failed to parse: %1">;
 
 // API notes
 def err_apinotes_message : Error<"%0">;

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -3668,12 +3668,12 @@ def err_attribute_patchable_function_entry_invalid_section
 
 // @unreal: BEGIN
 def warn_unreal_data_discarded_on_new_specifier : Warning<
-  "previous Unreal Engine data discarded on new specifier">,
+  "previous unreal engine data discarded on new specifier">,
   InGroup<UnrealEngine>;
 def note_unreal_data_previous_location : Note<
   "previously discarded metadata was located here">;
 def err_unreal_annotation_found_in_unexpected_place : Error<
-  "Unreal Engine macro used in unexpected place">;
+  "unreal engine macro used in unexpected place">;
 def warn_iwyu_remove_unused_header : Warning<
   "#include header is completely unused and can be removed">, 
   InGroup<IncludeWhatYouUse>;