From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .

---
 opends/src/messages/messages/tools.properties |   96 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 95 insertions(+), 1 deletions(-)

diff --git a/opends/src/messages/messages/tools.properties b/opends/src/messages/messages/tools.properties
index 861e82e..77563f2 100644
--- a/opends/src/messages/messages/tools.properties
+++ b/opends/src/messages/messages/tools.properties
@@ -2604,4 +2604,98 @@
 INFO_LDIFDIFF_DESCRIPTION_USE_COMPARE_RESULT_1735=Use the LDAP compare result \
 as an exit code for reporting differences between the two LDIF files
 INFO_LDAPCOMPARE_DESCRIPTION_USE_COMPARE_RESULT_1736=Use the LDAP compare result \
-as an exit code for the LDAP compare operations
\ No newline at end of file
+as an exit code for the LDAP compare operations
+SEVERE_ERR_BUILDVERSION_NOT_FOUND_1737=The version of the installed OpenDJ could not be determined \
+because the version file '%s' could not be found. Restore it from backup before continuing
+SEVERE_ERR_BUILDVERSION_MALFORMED_1738=The version of the installed OpenDJ could not be determined \
+because the version file '%s' exists but contains invalid data. \
+Restore it from backup before continuing
+SEVERE_ERR_BUILDVERSION_MISMATCH_1739=The OpenDJ binary version '%s' does not match the installed \
+version '%s'. Please run upgrade before continuing
+INFO_UPGRADE_OPTION_IGNORE_ERRORS_1740=Ignores any errors which occur during the upgrade. This option \
+should be used with caution and may be useful in automated deployments where potential errors are \
+known in advance and resolved after the upgrade has completed
+INFO_UPGRADE_OPTION_FORCE_1741=Forces a non-interactive upgrade to continue even if it requires user \
+interaction. In particular, long running or critical upgrade tasks, such as re-indexing, which \
+require user confirmation will be skipped. This option may only be used with the '%s' option
+SEVERE_ERR_UPGRADE_USER_INTERACTION_REQUIRED_1742=The upgrade cannot be performed non-interactively \
+because one or more upgrade tasks are critical and require user interaction in order to complete. \
+Please re-run upgrade interactively by removing the '%s' option, or force the upgrade to complete \
+by specifying the '%s' option
+INFO_UPGRADE_DESCRIPTION_CLI_1743=Upgrades OpenDJ configuration and application data so that it is \
+compatible with the installed binaries.%n%nThis tool should be run immediately after upgrading \
+the OpenDJ binaries and before restarting the server.%n%nNOTE: this tool does not provide backup \
+or restore capabilities. Therefore, it is the responsibility of the OpenDJ administrator to take \
+necessary precautions before performing the upgrade
+SEVERE_ERR_UPGRADE_MAIN_UPGRADE_PROCESS_1800=The upgrade failed to complete for the following reason: %s
+INFO_UPGRADE_SUCCESSFUL_1802=OpenDJ was successfully upgraded from version %s to %s
+INFO_UPGRADE_PERFORMING_TASKS_1804=Performing upgrade
+INFO_UPGRADE_TITLE_1805=OpenDJ Upgrade Utility
+INFO_UPGRADE_SUMMARY_1806=OpenDJ will be upgraded from version %s to %s
+SEVERE_ERR_UPGRADE_REQUIRES_SERVER_OFFLINE_1811=OpenDJ cannot be upgraded because the server is currently \
+running. Please stop the server and try again
+SEVERE_ERR_UPGRADE_VERSION_UP_TO_DATE_1812=OpenDJ has already been upgraded to version %s
+SEVERE_ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR_1813=An unexpected error occurred \
+while attempting to display a notification: %s
+SEVERE_ERR_UPGRADE_DISPLAY_CONFIRM_ERROR_1814=An unexpected error occurred \
+while attempting to display a confirmation : %s
+SEVERE_ERR_UPGRADE_DISPLAY_CHECK_ERROR_1815=An unexpected error occurred \
+while attempting to check a user's option: %s
+SEVERE_ERR_UPGRADE_INVALID_USER_OPTIONS_SELECTED_1816=Invalid user's \
+options selected
+INFO_UPGRADE_CHANGE_DONE_IN_SPECIFIC_FILE_1817=...Change(s) done in %s (x%s)
+INFO_UPGRADE_NO_CHANGE_DONE_IN_SPECIFIC_FILE_1818=...No change applied in %s
+SEVERE_ERR_UPGRADE_TASKS_FAIL_1827=\nAn error occurred while performing an upgrade task: %s
+INFO_UPGRADE_TASK_NEEDS_USER_CONFIRM_1828=%s.%nDo you want to make this configuration change?
+INFO_UPGRADE_DISPLAY_CONFIRM_START_1829=The upgrade is ready to proceed. Do you \
+wish to continue?
+INFO_UPGRADE_ABORTED_BY_USER_1830=The upgrade has been canceled
+SEVERE_ERR_UPGRADE_UNKNOWN_OC_ATT_1831=The %s %s doesn't exist \
+in the template configuration
+SEVERE_ERR_UPGRADE_CONFIG_ERROR_UPGRADE_FOLDER_1832=An error occurred when \
+trying to upgrade the config/upgrade folder: %s
+INFO_UPGRADE_REQUIREMENTS_1833=Preparing to upgrade
+INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED_1836=This tool cannot be used for \
+upgrading versions of OpenDJ which are older than '%s'. Please upgrade to \
+'%s' first before attempting further upgrades
+INFO_LICENSE_CLI_ACCEPT_INVALID_RESPONSE_1837=Invalid response
+INFO_LICENSE_DETAILS_CLI_LABEL_1838=Please read the License Agreement above.%n\
+ You must accept the terms of the agreement before continuing with the \
+ installation
+INFO_LICENSE_ACCEPT_1839=Do you accept the License Agreement?
+INFO_ERROR_COPYING_FILE_1840=An error occurred while copying the file '%s' to '%s'
+INFO_ERROR_DELETING_DIRECTORY_1841=An error occurred while deleting directory '%s'. \
+ Check that you have the rights to delete this directory and that there is no other \
+ application using it
+INFO_ERROR_DELETING_FILE_1843=An error occurred while deleting file '%s'. Check \
+that you have the rights to delete this file and that there is no other application using it
+INFO_ERROR_RENAMING_FILE_1844=An error occurred while renaming file '%s' to '%s'
+SEVERE_ERR_UPGRADE_FAILS_1846=The upgrade failed because %d errors were \
+encountered. Please check log for further details
+SEVERE_ERR_UPGRADE_COPYSCHEMA_FAILS_1847=An error occurred while copying \
+the schema file '%s': %s
+SEVERE_ERR_UPGRADE_ADDATTRIBUTE_FAILS_1848=An error occurred while adding \
+one or more attributes to the schema file '%s': %s
+SEVERE_ERR_UPGRADE_ADDOBJECTCLASS_FAILS_1849=An error occurred while adding \
+one or more object classes to the schema file '%s': %s
+INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS_1850=See '%s' for a detailed log of this operation
+INFO_UPGRADE_TASK_REPLACE_SCHEMA_FILE_1851=Replacing schema file '%s'
+INFO_UPGRADE_TASK_REFRESH_UPGRADE_DIRECTORY_1852=Archiving concatenated schema
+
+# Upgrade tasks
+INFO_UPGRADE_TASK_6869_SUMMARY_10000=Fixing de-DE collation matching rule OID
+INFO_UPGRADE_TASK_7192_SUMMARY_10001=Updating password policy configurations
+INFO_UPGRADE_TASK_7364_SUMMARY_10002=Updating audit log publisher configuration
+INFO_UPGRADE_TASK_7748_1_SUMMARY_10003=Adding 'etag' virtual attribute schema
+INFO_UPGRADE_TASK_7748_2_SUMMARY_10004=Configuring 'etag' virtual attribute
+INFO_UPGRADE_TASK_7834_SUMMARY_10005=Configuring 'ds-pwp-password-expiration-time' virtual attribute
+INFO_UPGRADE_TASK_7979_SUMMARY_10006=Updating certificate syntax configuration
+INFO_UPGRADE_TASK_8124_SUMMARY_10007=Updating JPEG syntax configuration
+INFO_UPGRADE_TASK_8133_SUMMARY_10008=Updating country string syntax configuration
+INFO_UPGRADE_TASK_8214_SUMMARY_10009=Modifying filter in 'isMemberOf' virtual attribute configuration
+INFO_UPGRADE_TASK_8214_DESCRIPTION_10010=OpenDJ 2.5.0 modified the default configuration of the 'isMemberOf' \
+virtual attribute so that it is included with group entries. This was done in order to make it easier \
+for users to determine which groups a 'nested' group belongs to
+INFO_UPGRADE_TASK_8387_SUMMARY_10011=Updating dictionary password validator configuration
+INFO_UPGRADE_TASK_8389_SUMMARY_10012=Updating attribute value password validator configuration
+INFO_UPGRADE_TASK_8487_SUMMARY_10013=Adding PBKDF2 password storage scheme configuration

--
Gitblit v1.10.0