diff --git a/common/logging/src/main/resources/error-codes/cordapp-duplicate-cordapps-installed.properties b/common/logging/src/main/resources/error-codes/cordapp-duplicate-cordapps-installed.properties index 0fd778435c..b6ff9290cb 100644 --- a/common/logging/src/main/resources/error-codes/cordapp-duplicate-cordapps-installed.properties +++ b/common/logging/src/main/resources/error-codes/cordapp-duplicate-cordapps-installed.properties @@ -1,4 +1,4 @@ errorTemplate = The CorDapp (name: {0}, file: {1}) is installed multiple times on the node. The following files correspond to the exact same content: {2} -shortDescription = A CorDapp has been installed multiple times on the same node. -actionsToFix = Investigate the logs to determine the files with duplicate content, and remove one of them from the cordapps directory. +shortDescription = A CorDapp was installed multiple times on the same node. This is not permitted and causes the node to shut down. +actionsToFix = Investigate the logs to determine the CorDapps with duplicate content, and remove one of them from the 'cordapps' directory. It does not matter which of the CorDapps you choose to remove as their content is identical. aliases = iw8d4e \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/cordapp-duplicate-cordapps-installed_en_US.properties b/common/logging/src/main/resources/error-codes/cordapp-duplicate-cordapps-installed_en_US.properties index 2354427df3..b6ff9290cb 100644 --- a/common/logging/src/main/resources/error-codes/cordapp-duplicate-cordapps-installed_en_US.properties +++ b/common/logging/src/main/resources/error-codes/cordapp-duplicate-cordapps-installed_en_US.properties @@ -1,3 +1,4 @@ errorTemplate = The CorDapp (name: {0}, file: {1}) is installed multiple times on the node. The following files correspond to the exact same content: {2} -shortDescription = A CorDapp has been installed multiple times on the same node. -actionsToFix = Investigate the logs to determine the files with duplicate content, and remove one of them from the cordapps directory. \ No newline at end of file +shortDescription = A CorDapp was installed multiple times on the same node. This is not permitted and causes the node to shut down. +actionsToFix = Investigate the logs to determine the CorDapps with duplicate content, and remove one of them from the 'cordapps' directory. It does not matter which of the CorDapps you choose to remove as their content is identical. +aliases = iw8d4e \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/cordapp-invalid-version-identifier.properties b/common/logging/src/main/resources/error-codes/cordapp-invalid-version-identifier.properties index 0922f80bb4..64f4416164 100644 --- a/common/logging/src/main/resources/error-codes/cordapp-invalid-version-identifier.properties +++ b/common/logging/src/main/resources/error-codes/cordapp-invalid-version-identifier.properties @@ -1,4 +1,4 @@ errorTemplate = Version identifier ({0}) for attribute {1} must be a whole number starting from 1. -shortDescription = A version attribute was specified in the CorDapp manifest with an invalid value. The value must be a whole number, and it must be greater than or equal to 1. -actionsToFix = Investigate the logs to find the invalid attribute, and change the attribute value to be valid (a whole number greater than or equal to 1). +shortDescription = A version attribute with an invalid value was specified in the manifest of the CorDapp JAR. The version attribute value must be a whole number that is greater than or equal to 1. +actionsToFix = Investigate the logs to find the invalid version attribute, and change its value to a valid one (a whole number greater than or equal to 1). aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/cordapp-invalid-version-identifier_en_US.properties b/common/logging/src/main/resources/error-codes/cordapp-invalid-version-identifier_en_US.properties index 0922f80bb4..64f4416164 100644 --- a/common/logging/src/main/resources/error-codes/cordapp-invalid-version-identifier_en_US.properties +++ b/common/logging/src/main/resources/error-codes/cordapp-invalid-version-identifier_en_US.properties @@ -1,4 +1,4 @@ errorTemplate = Version identifier ({0}) for attribute {1} must be a whole number starting from 1. -shortDescription = A version attribute was specified in the CorDapp manifest with an invalid value. The value must be a whole number, and it must be greater than or equal to 1. -actionsToFix = Investigate the logs to find the invalid attribute, and change the attribute value to be valid (a whole number greater than or equal to 1). +shortDescription = A version attribute with an invalid value was specified in the manifest of the CorDapp JAR. The version attribute value must be a whole number that is greater than or equal to 1. +actionsToFix = Investigate the logs to find the invalid version attribute, and change its value to a valid one (a whole number greater than or equal to 1). aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/cordapp-missing-version-attribute.properties b/common/logging/src/main/resources/error-codes/cordapp-missing-version-attribute.properties index 772b459195..b820268356 100644 --- a/common/logging/src/main/resources/error-codes/cordapp-missing-version-attribute.properties +++ b/common/logging/src/main/resources/error-codes/cordapp-missing-version-attribute.properties @@ -1,4 +1,4 @@ errorTemplate = Target versionId attribute {0} not specified. Please specify a whole number starting from 1. -shortDescription = A required version attribute was not specified in the manifest of the CorDapp JAR. -actionsToFix = Investigate the logs to find out which version attribute has not been specified, and add that version attribute to the CorDapp manifest. +shortDescription = A required version attribute was not specified in the manifest of the CorDapp JAR. +actionsToFix = Investigate the logs to find out which version attribute was not specified, and add that version attribute to the CorDapp manifest. aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/cordapp-missing-version-attribute_en_US.properties b/common/logging/src/main/resources/error-codes/cordapp-missing-version-attribute_en_US.properties index d8a7ab050a..b820268356 100644 --- a/common/logging/src/main/resources/error-codes/cordapp-missing-version-attribute_en_US.properties +++ b/common/logging/src/main/resources/error-codes/cordapp-missing-version-attribute_en_US.properties @@ -1,3 +1,4 @@ errorTemplate = Target versionId attribute {0} not specified. Please specify a whole number starting from 1. -shortDescription = A required version attribute was not specified in the manifest of the CorDapp JAR. -actionsToFix = Investigate the logs to find out which version attribute has not been specified, and add that version attribute to the CorDapp manifest. \ No newline at end of file +shortDescription = A required version attribute was not specified in the manifest of the CorDapp JAR. +actionsToFix = Investigate the logs to find out which version attribute was not specified, and add that version attribute to the CorDapp manifest. +aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/database-could-not-connect.properties b/common/logging/src/main/resources/error-codes/database-could-not-connect.properties index d2c349f8ca..8d84c07729 100644 --- a/common/logging/src/main/resources/error-codes/database-could-not-connect.properties +++ b/common/logging/src/main/resources/error-codes/database-could-not-connect.properties @@ -1,4 +1,4 @@ errorTemplate = Could not connect to the database. Please check your JDBC connection URL, or the connectivity to the database. -shortDescription = The node failed to connect to the database on node startup, preventing the node from starting correctly. -actionsToFix = This happens either because the database connection has been misconfigured or the database is unreachable. Check that the JDBC URL is configured correctly in your node.conf. If this is correctly configured, then check your database connection. +shortDescription = The node failed to connect to the database on node startup and thus prevented the node from starting correctly. +actionsToFix = This happened either because the database connection was misconfigured or because the database was unreachable. Check that the JDBC URL is configured correctly in your 'node.conf' file. If this is correctly configured, then check your database connection. aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/database-could-not-connect_en_US.properties b/common/logging/src/main/resources/error-codes/database-could-not-connect_en_US.properties index bfd5973209..8d84c07729 100644 --- a/common/logging/src/main/resources/error-codes/database-could-not-connect_en_US.properties +++ b/common/logging/src/main/resources/error-codes/database-could-not-connect_en_US.properties @@ -1,3 +1,4 @@ errorTemplate = Could not connect to the database. Please check your JDBC connection URL, or the connectivity to the database. -shortDescription = The node failed to connect to the database on node startup, preventing the node from starting correctly. -actionsToFix = This happens either because the database connection has been misconfigured or the database is unreachable. Check that the JDBC URL is configured correctly in your node.conf. If this is correctly configured, then check your database connection. \ No newline at end of file +shortDescription = The node failed to connect to the database on node startup and thus prevented the node from starting correctly. +actionsToFix = This happened either because the database connection was misconfigured or because the database was unreachable. Check that the JDBC URL is configured correctly in your 'node.conf' file. If this is correctly configured, then check your database connection. +aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/database-missing-driver.properties b/common/logging/src/main/resources/error-codes/database-missing-driver.properties index dfb6b460db..9be44e623f 100644 --- a/common/logging/src/main/resources/error-codes/database-missing-driver.properties +++ b/common/logging/src/main/resources/error-codes/database-missing-driver.properties @@ -1,4 +1,4 @@ -errorTemplate = Could not find the database driver class. Please add it to the 'drivers' folder. +errorTemplate = Could not find the database driver class. Please add it to the 'drivers' directory. shortDescription = The node could not find the driver in the 'drivers' directory. -actionsToFix = Please ensure that the correct database driver has been placed in the 'drivers' folder. The driver must contain the driver main class specified in 'node.conf'. +actionsToFix = Ensure that the 'drivers' directory contains the correct database driver. The driver must contain the driver class as specified in 'node.conf'. aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/database-missing-driver_en_US.properties b/common/logging/src/main/resources/error-codes/database-missing-driver_en_US.properties index c52708a02b..9be44e623f 100644 --- a/common/logging/src/main/resources/error-codes/database-missing-driver_en_US.properties +++ b/common/logging/src/main/resources/error-codes/database-missing-driver_en_US.properties @@ -1,3 +1,4 @@ -errorTemplate = Could not find the database driver class. Please add it to the 'drivers' folder. +errorTemplate = Could not find the database driver class. Please add it to the 'drivers' directory. shortDescription = The node could not find the driver in the 'drivers' directory. -actionsToFix = Please ensure that the correct database driver has been placed in the 'drivers' folder. The driver must contain the driver main class specified in 'node.conf'. \ No newline at end of file +actionsToFix = Ensure that the 'drivers' directory contains the correct database driver. The driver must contain the driver class as specified in 'node.conf'. +aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/database-password-required-for-h2.properties b/common/logging/src/main/resources/error-codes/database-password-required-for-h2.properties index 7284fa125e..1bf619240d 100644 --- a/common/logging/src/main/resources/error-codes/database-password-required-for-h2.properties +++ b/common/logging/src/main/resources/error-codes/database-password-required-for-h2.properties @@ -1,4 +1,4 @@ -errorTemplate = Database password is required for H2 server listening on {0} -shortDescription = A password is required to access the H2 server the node is trying to access, and this password is missing. -actionsToFix = Add the required password to the 'datasource.password' configuration in 'node.conf'. +errorTemplate = A database password is required for H2 server listening on {0} +shortDescription = The node is trying to access an H2 server that requires a password, which is missing. +actionsToFix = Add the required password to the 'datasource.password' configuration section in the 'node.conf' file. aliases = \ No newline at end of file diff --git a/common/logging/src/main/resources/error-codes/database-password-required-for-h2_en_US.properties b/common/logging/src/main/resources/error-codes/database-password-required-for-h2_en_US.properties index 3afefc34d9..1bf619240d 100644 --- a/common/logging/src/main/resources/error-codes/database-password-required-for-h2_en_US.properties +++ b/common/logging/src/main/resources/error-codes/database-password-required-for-h2_en_US.properties @@ -1,3 +1,4 @@ -errorTemplate = Database password is required for H2 server listening on {0} -shortDescription = A password is required to access the H2 server the node is trying to access, and this password is missing. -actionsToFix = Add the required password to the 'datasource.password' configuration in 'node.conf'. \ No newline at end of file +errorTemplate = A database password is required for H2 server listening on {0} +shortDescription = The node is trying to access an H2 server that requires a password, which is missing. +actionsToFix = Add the required password to the 'datasource.password' configuration section in the 'node.conf' file. +aliases = \ No newline at end of file diff --git a/tools/error-tool/src/main/resources/ErrorPageHeadings.properties b/tools/error-tool/src/main/resources/ErrorPageHeadings.properties index 5741987c8a..176e29b38c 100644 --- a/tools/error-tool/src/main/resources/ErrorPageHeadings.properties +++ b/tools/error-tool/src/main/resources/ErrorPageHeadings.properties @@ -1,4 +1,4 @@ -codeHeading = Error Code +codeHeading = Error code aliasesHeading = Aliases descriptionHeading = Description -toFixHeading = Actions to Fix \ No newline at end of file +toFixHeading = Actions to fix \ No newline at end of file