Merge pull request #18397 from pshipton/nlsfix1

Fix some errors with nls messages

runtime/nls/cfre/cfrerr.nls

@@ -1623,13 +1623,15 @@ J9NLS_CFR_ERR_CATCH_IS_REFERENCETYPE_DESCRIPTOR=Exception handler type cannot be
 J9NLS_CFR_ERR_CATCH_IS_REFERENCETYPE_DESCRIPTOR.explanation=Please consult the Java Virtual Machine Specification for a detailed explanation.
 J9NLS_CFR_ERR_CATCH_IS_REFERENCETYPE_DESCRIPTOR.system_action=The JVM will throw a verification or classloading-related exception such as java.lang.ClassFormatError.
 J9NLS_CFR_ERR_CATCH_IS_REFERENCETYPE_DESCRIPTOR.user_response=Contact the provider of the classfile for a corrected version.
+# END NON-TRANSLATABLE
 
 # ReferenceType is not translatable
 J9NLS_CFR_ERR_EXCEPTION_IS_REFERENCETYPE_DESCRIPTOR=Exception type cannot be a ReferenceType descriptor
 # START NON-TRANSLATABLE
 J9NLS_CFR_ERR_EXCEPTION_IS_REFERENCETYPE_DESCRIPTOR.explanation=Please consult the Java Virtual Machine Specification for a detailed explanation.
 J9NLS_CFR_ERR_EXCEPTION_IS_REFERENCETYPE_DESCRIPTOR.system_action=The JVM will throw a verification or classloading-related exception such as java.lang.ClassFormatError.
 J9NLS_CFR_ERR_EXCEPTION_IS_REFERENCETYPE_DESCRIPTOR.user_response=Contact the provider of the classfile for a corrected version.
+# END NON-TRANSLATABLE
 
 # ReferenceType is not translatable
 # CONSTANT_Class_info is not translatable
@@ -1639,13 +1641,15 @@ J9NLS_CFR_ERR_INNER_CLASS_REFERENCETYPE=The CONSTANT_Class_info at the inner_cla
 J9NLS_CFR_ERR_INNER_CLASS_REFERENCETYPE.explanation=Please consult the Java Virtual Machine Specification for a detailed explanation.
 J9NLS_CFR_ERR_INNER_CLASS_REFERENCETYPE.system_action=The JVM will throw a verification or classloading-related exception such as java.lang.ClassFormatError.
 J9NLS_CFR_ERR_INNER_CLASS_REFERENCETYPE.user_response=Contact the provider of the classfile for a corrected version.
+# END NON-TRANSLATABLE
 
 # ReferenceType is not translatable
 J9NLS_CFR_ERR_ENCLOSING_METHOD_CLASS_INDEX_IS_REFERENCETYPE=The class index of an enclosing method cannot be a ReferenceType descriptor
 # START NON-TRANSLATABLE
 J9NLS_CFR_ERR_ENCLOSING_METHOD_CLASS_INDEX_IS_REFERENCETYPE.explanation=Please consult the Java Virtual Machine Specification for a detailed explanation.
 J9NLS_CFR_ERR_ENCLOSING_METHOD_CLASS_INDEX_IS_REFERENCETYPE.system_action=The JVM will throw a verification or classloading-related exception such as java.lang.ClassFormatError.
 J9NLS_CFR_ERR_ENCLOSING_METHOD_CLASS_INDEX_IS_REFERENCETYPE.user_response=Contact the provider of the classfile for a corrected version.
+# END NON-TRANSLATABLE
 
 # ReferenceType is not translatable
 # CONSTANT_Class_info is not translatable
@@ -1655,6 +1659,7 @@ J9NLS_CFR_ERR_NEST_HOST_INVALID_REFERENCETYPE_DESCRIPTOR=The CONSTANT_Class_info
 J9NLS_CFR_ERR_NEST_HOST_INVALID_REFERENCETYPE_DESCRIPTOR.explanation=Please consult the Java Virtual Machine Specification for a detailed explanation.
 J9NLS_CFR_ERR_NEST_HOST_INVALID_REFERENCETYPE_DESCRIPTOR.system_action=The JVM will throw a verification or classloading-related exception such as java.lang.ClassFormatError.
 J9NLS_CFR_ERR_NEST_HOST_INVALID_REFERENCETYPE_DESCRIPTOR.user_response=Contact the provider of the classfile for a corrected version.
+# END NON-TRANSLATABLE
 
 # ReferenceType is not translatable
 # new is not translatable
@@ -1663,13 +1668,15 @@ J9NLS_CFR_ERR_NEW_INVALID_REFERENCETYPE_DESCRIPTOR=The new instruction cannot op
 J9NLS_CFR_ERR_NEW_INVALID_REFERENCETYPE_DESCRIPTOR.explanation=Please consult the Java Virtual Machine Specification for a detailed explanation.
 J9NLS_CFR_ERR_NEW_INVALID_REFERENCETYPE_DESCRIPTOR.system_action=The JVM will throw a verification or classloading-related exception such as java.lang.ClassFormatError.
 J9NLS_CFR_ERR_NEW_INVALID_REFERENCETYPE_DESCRIPTOR.user_response=Contact the provider of the classfile for a corrected version.
+# END NON-TRANSLATABLE
 
 # aconst_init is not translatable
 J9NLS_CFR_ERR_ACONST_INIT_INVALID_ARRAY=The aconst_init instruction cannot operate on an array
 # START NON-TRANSLATABLE
 J9NLS_CFR_ERR_ACONST_INIT_INVALID_ARRAY.explanation=Please consult the Java Virtual Machine Specification for a detailed explanation.
 J9NLS_CFR_ERR_ACONST_INIT_INVALID_ARRAY.system_action=The JVM will throw a verification or classloading-related exception such as java.lang.ClassFormatError.
 J9NLS_CFR_ERR_ACONST_INIT_INVALID_ARRAY.user_response=Contact the provider of the classfile for a corrected version.
+# END NON-TRANSLATABLE
 
 # ReferenceType is not translatable
 J9NLS_CFR_ERR_OUTER_CLASS_REFERENCETYPE_DESCRIPTOR=Outer class is a ReferenceType descriptor in an InnerClasses attribute

runtime/nls/j9vm/j9vm.nls

@@ -2151,6 +2151,7 @@ J9NLS_VM_ILLEGAL_THREAD_STATE_UPCALL=The JVM failed to proceed due to the wrong
 J9NLS_VM_ILLEGAL_THREAD_STATE_UPCALL.explanation=An error occurred when the JVM attempted to perform upcall in the trivial downcall
 J9NLS_VM_ILLEGAL_THREAD_STATE_UPCALL.system_action=The JVM will throw a IllegalThreadStateException.
 J9NLS_VM_ILLEGAL_THREAD_STATE_UPCALL.user_response=Ensure the specified linker options for downcall are valid.
+# END NON-TRANSLATABLE
 
 J9NLS_VM_CRIU_RESTORE_RESET_VIRTUALTHREAD_FORKJOINPOOL_PARALLELISM_FORKJOINPOOL_CNF=The JVM could not reset java.lang.VirtualThread.ForkJoinPool.parallelism due to java.util.concurrent.ForkJoinPool class not found
 # START NON-TRANSLATABLE

runtime/nls/jnck/jnichk.nls

@@ -1038,9 +1038,9 @@ J9NLS_JNICHK_ARGUMENT_IS_NOT_SUBCLASS2.user_response=Correct the JNI function ca
 # abortonerror is not translatable
 J9NLS_JNICHK_HELP_16=\tabortonerror   cause an abort on fatal errors
 # START NON-TRANSLATABLE
-J9NLS_JNICHK_HELP_15.explanation=NOTAG
-J9NLS_JNICHK_HELP_15.system_action=
-J9NLS_JNICHK_HELP_15.user_response=
+J9NLS_JNICHK_HELP_16.explanation=NOTAG
+J9NLS_JNICHK_HELP_16.system_action=
+J9NLS_JNICHK_HELP_16.user_response=
 # END NON-TRANSLATABLE
 
 # JNI, -Xcheck:jni:nonfatal and JVM are not translatable