From 847c7a9e4d678995bd935a20226e97c788398c22 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 07 Mar 2013 12:03:26 +0000
Subject: [PATCH] OPENDJ-655 Message about authentication failures should contain identification of the user for easier analysis. 

---
 opendj-sdk/opends/src/messages/messages/core_zh_TW.properties                                              |   13 --
 opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java                         |   41 +++++++
 opendj-sdk/opends/src/messages/messages/core.properties                                                    |   34 +++---
 opendj-sdk/opends/src/messages/messages/core_ko.properties                                                 |   12 --
 opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java |   37 ++-----
 opendj-sdk/opends/src/messages/messages/core_ja.properties                                                 |   13 --
 opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java                                |    3 
 opendj-sdk/opends/src/messages/messages/core_fr.properties                                                 |   24 ++--
 opendj-sdk/opends/src/messages/messages/core_de.properties                                                 |   24 ++--
 opendj-sdk/opends/src/messages/messages/core_zh_CN.properties                                              |   13 --
 opendj-sdk/opends/src/messages/messages/core_es.properties                                                 |   24 ++--
 opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java                   |   16 +-
 12 files changed, 114 insertions(+), 140 deletions(-)

diff --git a/opendj-sdk/opends/src/messages/messages/core.properties b/opendj-sdk/opends/src/messages/messages/core.properties
index 60ad090..670c240 100644
--- a/opendj-sdk/opends/src/messages/messages/core.properties
+++ b/opendj-sdk/opends/src/messages/messages/core.properties
@@ -423,15 +423,14 @@
  canceled because the Directory Server received a bind request on this \
  connection, which requires that all operations in progress to be abandoned
 MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=Unable to bind to the Directory \
- Server as user %s because no such user exists in the server
+ Server because no such user exists in the server
 SEVERE_ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=Unable to process the bind \
  because the server was unable to obtain a read lock on the entry %s
 FATAL_ERR_STARTUP_PLUGIN_ERROR_220=A fatal error occurred when executing one \
  of the Directory Server startup plugins:  %s (error ID %d).  The Directory \
  Server startup process has been aborted
 MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=Unable to bind to the Directory \
- Server as user %s using simple authentication because that user does not have \
- a password
+ Server using simple authentication because that user does not have a password
 MILD_ERR_BIND_OPERATION_UNKNOWN_SASL_MECHANISM_222=Unable to process the bind \
  request because it attempted to use an unknown SASL mechanism %s that is not \
  available in the Directory Server
@@ -578,7 +577,7 @@
 MILD_ERR_ENTRY_ADD_DUPLICATE_OC_277=Object class %s is already present in \
  entry %s and cannot be added a second time
 MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=Password with unknown \
- storage scheme %s included in user entry %s will be ignored
+ storage scheme %s included in user entry will be ignored
 MILD_ERR_BIND_OPERATION_WRONG_PASSWORD_279=The password provided by the user \
  did not match any password(s) stored in the user's entry
 MILD_ERR_BIND_OPERATION_PASSWORD_VALIDATION_EXCEPTION_280=An unexpected error \
@@ -1295,7 +1294,7 @@
  attribute %s in user entry %s as a Boolean value
 SEVERE_ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=The entry %s cannot be \
  added due to insufficient access rights
-SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=The user %s cannot bind \
+SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=The user cannot bind \
  due to insufficient access rights
 SEVERE_ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_510=The entry %s cannot \
  be compared due to insufficient access rights
@@ -1310,20 +1309,19 @@
 SEVERE_ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_515=The entry %s cannot be \
  searched due to insufficient access rights
 MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=Rejecting a simple bind \
- request for user %s because the password policy requires secure \
- authentication
-MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=Rejecting a bind request for \
- user %s because the account has been administrative disabled
+ request because the password policy requires secure authentication
+MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=Rejecting a bind request \
+ because the account has been administratively disabled
 MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=Rejecting a bind request \
- for user %s because the account has been locked due to too many failed \
+ because the account has been locked due to too many failed \
  authentication attempts
-MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=Rejecting a bind request for \
- user %s because the account has been locked after the user's password was not \
+MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=Rejecting a bind request \
+ because the account has been locked after the user's password was not \
  changed in a timely manner after an administrative reset
-MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=Rejecting a bind request for \
- user %s because the account has been locked after remaining idle for too long
-MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=Rejecting a bind request for \
- user %s because that user's password is expired
+MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=Rejecting a bind request \
+ because the account has been locked after remaining idle for too long
+MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=Rejecting a bind request \
+ because that user's password is expired
 MILD_ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=An error occurred while \
  attempting to update password policy state information for user %s:  %s
 MILD_ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=Rejecting a SASL %s bind \
@@ -1347,8 +1345,8 @@
 SEVERE_ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN_530=The alternate \
  root bind DN "%s" is already registered with the Directory Server for actual \
  root entry DN "%s"
-MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=Rejecting a bind request for user \
- %s because the account has expired
+MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=Rejecting a bind request \
+ because the account has expired
 MILD_ERR_MODIFY_PASSWORDS_CANNOT_HAVE_OPTIONS_532=Attributes used to hold \
  user passwords are not allowed to have any attribute options
 MILD_ERR_MODIFY_NO_USER_PW_CHANGES_533=Users are not allowed to change their \
diff --git a/opendj-sdk/opends/src/messages/messages/core_de.properties b/opendj-sdk/opends/src/messages/messages/core_de.properties
index abdcbc9..c4e17da 100644
--- a/opendj-sdk/opends/src/messages/messages/core_de.properties
+++ b/opendj-sdk/opends/src/messages/messages/core_de.properties
@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2010 Sun Microsystems, Inc.
-#      Portions Copyright 2011 ForgeRock AS
+#      Portions Copyright 2011-2013 ForgeRock AS
 
 
 
@@ -233,10 +233,10 @@
 MILD_ERR_ENTRY_SCHEMA_DSR_DISALLOWED_SUPERIOR_OC_215=Eintrag %s verletzt die Schemakonfiguration des Directory-Servers, da die DIT-Strukturregel %s nicht zul\u00e4sst, dass Eintr\u00e4ge des Typs %s unmittelbar unterhalb von Eintr\u00e4gen des Typs %s platziert werden
 MILD_ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR_216=Beim Versuch, den Eintrag %s mit der DIT-Strukturregel %s zu vergleichen, ist ein unerwarteter Fehler aufgetreten:  %s
 INFO_CANCELED_BY_BIND_REQUEST_217=Die Verarbeitung dieses Vorgangs wurde abgebrochen, da der Directory-Server eine Verbindungsanforderung an dieser Verbindung empfangen hat, die erfordert, dass alle laufenden Vorg\u00e4nge abgebrochen werden
-MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=Eine Verbindung zum Directory-Server als Benutzer %s ist nicht m\u00f6glich, da ein solcher Benutzer auf dem Server nicht vorhanden ist
+MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=Eine Verbindung zum Directory-Server ist nicht m\u00f6glich, da ein solcher Benutzer auf dem Server nicht vorhanden ist
 SEVERE_ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=Die Bindung konnte nicht verarbeitet werden, da der Server keine Lesesperre f\u00fcr Eintrag %s empfangen konnte
 FATAL_ERR_STARTUP_PLUGIN_ERROR_220=Ein schwerwiegender Fehler ist beim Ausf\u00fchren eines der Directory-Server-Start-Plugins aufgetreten:  %s (Fehler-ID %d).  Der Directory-Server-Startprozess wurde abgebrochen
-MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=Eine Verbindung zum Directory-Server als Benutzer %s mithilfe einer einfachen Authentifizierung war nicht m\u00f6glich, da dieser Benutzer kein Passwort besitzt
+MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=Eine Verbindung zum Directory-Server mithilfe einer einfachen Authentifizierung war nicht m\u00f6glich, da dieser Benutzer kein Passwort besitzt
 MILD_ERR_BIND_OPERATION_UNKNOWN_SASL_MECHANISM_222=Eine Verarbeitung der Verbindungsanforderung war nicht m\u00f6glich, da diese versuchte, einen unbekannten SASL-Mechanismus %s zu verwenden, der im Directory-Server nicht verf\u00fcgbar ist
 MILD_ERR_ABANDON_OP_NO_SUCH_OPERATION_223=Der Vorgang mit Nachrichten-ID %d konnte nicht abgebrochen werden, da keine Informationen zu diesem Vorgang verf\u00fcgbar sind. Dies k\u00f6nnte bedeuten, dass der Zielvorgang bereits abgeschlossen ist oder niemals angefordert wurde
 SEVERE_ERR_CANCELED_BY_PREPARSE_DISCONNECT_224=Der Vorgang wurde abgebrochen, da die Client-Verbindung durch ein voranalysiertes Plugin beendet wurde
@@ -293,7 +293,7 @@
 MILD_ERR_ENTRY_SET_UNKNOWN_OC_275=Objektklasse %s kann in Eintrag %s nicht verwendet werden, da diese Klasse im Schema des Directory-Servers nicht definiert ist
 MILD_ERR_ENTRY_ADD_UNKNOWN_OC_276=Objektklasse %s kann nicht zu Eintrag %s hinzugef\u00fcgt werden, da diese Klasse im Schema des Directory-Servers nicht definiert ist
 MILD_ERR_ENTRY_ADD_DUPLICATE_OC_277=Objektklasse %s ist bereits in Eintrag %s vorhanden und kann nicht ein zweites Mal hinzugef\u00fcgt werden
-MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=Das Passwort mit unbekanntem Speicherschema %s, das im Benutzereintrag %s enthalten ist, wird ignoriert
+MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=Das Passwort mit unbekanntem Speicherschema %s, das im Benutzereintrag enthalten ist, wird ignoriert
 MILD_ERR_BIND_OPERATION_WRONG_PASSWORD_279=Das vom Benutzer angegebene Passwort stimmte mit keinem der Passw\u00f6rter \u00fcberein, die im Benutzereintrag gespeichert sind
 MILD_ERR_BIND_OPERATION_PASSWORD_VALIDATION_EXCEPTION_280=Beim Versuch, das angegebene Passwort zu validieren, ist ein unerwarteter Fehler aufgetreten:  %s
 INFO_DSCORE_DESCRIPTION_CONFIG_CLASS_281=Vollst\u00e4ndig qualifizierter Name der Java-Klasse f\u00fcr die Verwendung als Konfigurations-Handler des Directory-Servers
@@ -521,19 +521,19 @@
 MILD_ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME_506=Beim Versuch, den Wert "%s" f\u00fcr Attribut %s in Benutzereintrag %s in \u00dcbereinstimmung mit dem allgemeinen Zeitformat zu entschl\u00fcsseln, ist ein Fehler aufgetreten:  %s
 MILD_ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN_507=Wert "%s" f\u00fcr Attribut %s in Benutzereintrag %s konnte nicht als boolescher Wert entschl\u00fcsselt werden
 SEVERE_ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=Der Eintrag %s kann aufgrund unzureichender Zugriffsrechte nicht hinzugef\u00fcgt werden
-SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=Der Benutzer %s kann aufgrund unzureichender Zugriffsrechte nicht verbunden werden
+SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=Der Benutzer kann aufgrund unzureichender Zugriffsrechte nicht verbunden werden
 SEVERE_ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_510=Der Eintrag %s kann aufgrund unzureichender Zugriffsrechte nicht verglichen werden
 SEVERE_ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_511=Der Eintrag %s kann aufgrund unzureichender Zugriffsrechte nicht gel\u00f6scht werden
 SEVERE_ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_512=Der erweiterte Vorgang %s kann aufgrund unzureichender Zugriffsrechte nicht ausgef\u00fchrt werden
 SEVERE_ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_513=Der Eintrag %s kann aufgrund unzureichender Zugriffsrechte nicht umbenannt werden
 SEVERE_ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_514=Der Eintrag %s kann aufgrund unzureichender Zugriffsrechte nicht ge\u00e4ndert werden
 SEVERE_ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_515=Der Eintrag %s kann aufgrund unzureichender Zugriffsrechte nicht gesucht werden
-MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=Zur\u00fcckweisung einer einfachen Verbindungsanforderung f\u00fcr Benutzer %s, da die Passwortrichtlinie eine sichere Authentifizierung erfordert
-MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=Zur\u00fcckweisung einer Verbindungsanforderung f\u00fcr Benutzer %s, da das Konto administrativ deaktiviert wurde
-MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=Zur\u00fcckweisung einer Verbindungsanforderung f\u00fcr Benutzer %s, da das Konto aufgrund zu vieler fehlgeschlagener Authentifizierungsversuche gesperrt wurde
-MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=Zur\u00fcckweisung einer Verbindungsanforderung f\u00fcr Benutzer %s, da das Konto gesperrt wurde, nachdem das Passwort des Benutzers nach einem administrativen Zur\u00fccksetzen nicht rechtzeitig ge\u00e4ndert wurde
-MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=Zur\u00fcckweisung einer Verbindungsanforderung f\u00fcr Benutzer %s, da das Konto gesperrt wurde, nachdem es sich zu lange im Leerlauf befand
-MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=Zur\u00fcckweisung einer Verbindungsanforderung f\u00fcr Benutzer %s, da das Passwort des Benutzers abgelaufen ist
+MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=Zur\u00fcckweisung einer einfachen Verbindungsanforderung, da die Passwortrichtlinie eine sichere Authentifizierung erfordert
+MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=Zur\u00fcckweisung einer Verbindungsanforderung, da das Konto administrativ deaktiviert wurde
+MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=Zur\u00fcckweisung einer Verbindungsanforderung, da das Konto aufgrund zu vieler fehlgeschlagener Authentifizierungsversuche gesperrt wurde
+MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=Zur\u00fcckweisung einer Verbindungsanforderung, da das Konto gesperrt wurde, nachdem das Passwort des Benutzers nach einem administrativen Zur\u00fccksetzen nicht rechtzeitig ge\u00e4ndert wurde
+MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=Zur\u00fcckweisung einer Verbindungsanforderung, da das Konto gesperrt wurde, nachdem es sich zu lange im Leerlauf befand
+MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=Zur\u00fcckweisung einer Verbindungsanforderung, da das Passwort des Benutzers abgelaufen ist
 MILD_ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=Beim Versuch, die Statusinformationen der Passwortrichtlinie f\u00fcr Benutzer %s zu aktualisieren, ist ein Fehler aufgetreten:  %s
 MILD_ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=Zur\u00fcckweisung einer SASL %s Verbindungsanforderung f\u00fcr Benutzer %s, da die Passwortrichtlinie eine sichere Authentifizierung erfordert
 SEVERE_ERR_WORKQ_CANNOT_PARSE_DN_524=Fehler beim Versuch, die Zeichenkette %s als DN des Warteschlangen-Konfigurationseintrags zu analysieren:  %s
@@ -543,7 +543,7 @@
 SEVERE_ERR_WORKQ_CANNOT_LOAD_528=Fehler beim Versuch, Klasse %s f\u00fcr die Verwendung als Directory-Server-Warteschlangenimplementierung zu laden:  %s
 SEVERE_ERR_WORKQ_CANNOT_INSTANTIATE_529=Fehler beim Versuch, eine Instanz der Klasse %s f\u00fcr die Verwendung als Directory-Server-Warteschlange zu erstellen:  %s
 SEVERE_ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN_530=Der alternative Root-Verbinguns-DN "%s" ist bereits mit dem Directory-Server f\u00fcr den aktuellen Root-Eintrags-DN "%s" registriert
-MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=Zur\u00fcckweisung einer Verbindungsanforderung f\u00fcr Benutzer %s, da das Konto abgelaufen ist
+MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=Zur\u00fcckweisung einer Verbindungsanforderung, da das Konto abgelaufen ist
 MILD_ERR_MODIFY_PASSWORDS_CANNOT_HAVE_OPTIONS_532=Attribute, die verwendet werden, um Benutzerpassw\u00f6rter zu speichern, d\u00fcrfen keine Attributoptionen besitzen
 MILD_ERR_MODIFY_NO_USER_PW_CHANGES_533=Benutzer d\u00fcrfen ihre eigenen Passw\u00f6rter nicht \u00e4ndern
 MILD_ERR_MODIFY_REQUIRE_SECURE_CHANGES_534=Passwort\u00e4nderungen m\u00fcssen \u00fcber einen sicheren Authentifizierungskanal durchgef\u00fchrt werden
diff --git a/opendj-sdk/opends/src/messages/messages/core_es.properties b/opendj-sdk/opends/src/messages/messages/core_es.properties
index 743cbaa..8f49989 100644
--- a/opendj-sdk/opends/src/messages/messages/core_es.properties
+++ b/opendj-sdk/opends/src/messages/messages/core_es.properties
@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2010 Sun Microsystems, Inc.
-#      Portions Copyright 2011 ForgeRock AS
+#      Portions Copyright 2011-2013 ForgeRock AS
 
 
 
@@ -233,10 +233,10 @@
 MILD_ERR_ENTRY_SCHEMA_DSR_DISALLOWED_SUPERIOR_OC_215=La entrada %s infringe la configuraci\u00f3n del esquema del servidor de directorios porque la regla estructural de DIT %s no permite que se incluyan entradas del tipo %s justo por debajo de las entradas del tipo %s
 MILD_ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR_216=Se ha producido un error inesperado al intentar comprobar la entrada %s en la regla estructural de DIT %s:  %s
 INFO_CANCELED_BY_BIND_REQUEST_217=Se ha cancelado el procesamiento de esta operaci\u00f3n porque el servidor de directorios ha recibido una solicitud de enlace en esta conexi\u00f3n que requiere que se abandonen todas las operaciones en curso
-MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=No se pueden enlazar con el servidor de directorios como usuario %s, ya que no existe ese usuario en el servidor
+MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=No se pueden enlazar con el servidor de directorios, ya que no existe el usuario en el servidor
 SEVERE_ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=No puede procesarse el enlace porque el servidor no pudo obtener un bloqueo de lectura en la entrada %s
 FATAL_ERR_STARTUP_PLUGIN_ERROR_220=Se ha producido un error grave al ejecutar uno de los complementos de inicio del Servidor de directorios:  %s (Id. de error %d).  Se ha anulado el proceso de inicio del Servidor de directorios
-MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=No se puede enlazar con el servidor de directorios como usuario %s mediante una autenticaci\u00f3n sencilla porque ese usuario no dispone de una contrase\u00f1a
+MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=No se puede enlazar con el servidor de directorios mediante una autenticaci\u00f3n sencilla porque ese usuario no dispone de una contrase\u00f1a
 MILD_ERR_BIND_OPERATION_UNKNOWN_SASL_MECHANISM_222=No se puede procesar la solicitud de enlace porque ha intentado utilizar un mecanismo SASL %s desconocido, que no est\u00e1 disponible en el servidor de directorios
 MILD_ERR_ABANDON_OP_NO_SUCH_OPERATION_223=No se puede abandonar la operaci\u00f3n con el Id. de mensaje %d porque no hay ninguna informaci\u00f3n disponible acerca de la operaci\u00f3n. Esto podr\u00eda indicar que la operaci\u00f3n en cuesti\u00f3n ya se ha completado o que nunca se ha solicitado
 SEVERE_ERR_CANCELED_BY_PREPARSE_DISCONNECT_224=Se ha cancelado la operaci\u00f3n porque un complemento prean\u00e1lisis ha finalizado la conexi\u00f3n del cliente
@@ -293,7 +293,7 @@
 MILD_ERR_ENTRY_SET_UNKNOWN_OC_275=La clase de objeto %s no se puede utilizar en la entrada %s porque no se ha definido en el esquema del servidor de directorios
 MILD_ERR_ENTRY_ADD_UNKNOWN_OC_276=La clase de objeto %s no se puede agregar a la entrada %s porque no se ha definido en el esquema del servidor de directorios
 MILD_ERR_ENTRY_ADD_DUPLICATE_OC_277=La clase de objeto %s ya est\u00e1 presente en la entrada %s, por lo que no puede agregarse otra vez
-MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=Se omitir\u00e1 la contrase\u00f1a con el esquema de almacenamiento desconocido %s incluido en la entrada de usuario %s
+MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=Se omitir\u00e1 la contrase\u00f1a con el esquema de almacenamiento desconocido %s incluido en la entrada de usuario
 MILD_ERR_BIND_OPERATION_WRONG_PASSWORD_279=La contrase\u00f1a especificada por el usuario no coincid\u00eda con la(s) contrase\u00f1a(s) almacenada(s) en la entrada del usuario
 MILD_ERR_BIND_OPERATION_PASSWORD_VALIDATION_EXCEPTION_280=Se ha producido un error inesperado al intentar validar la contrase\u00f1a especificada:  %s
 INFO_DSCORE_DESCRIPTION_CONFIG_CLASS_281=El nombre completo de la clase de Java que se utiliza como controlador de configuraci\u00f3n del servidor de directorios
@@ -521,19 +521,19 @@
 MILD_ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME_506=Se ha producido un error al intentar decodificar el valor "%s" del atributo %s en la entrada de usuario %s de acuerdo con el formato de hora generalizado:  %s
 MILD_ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN_507=No se puede decodificar el valor "%s" del atributo %s en la entrada de usuario %s como valor booleano
 SEVERE_ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=No puede a\u00f1adirse la entrada %s por insuficientes derechos de acceso
-SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=No puede a\u00f1adirse el usuario %s por insuficientes derechos de acceso
+SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=No puede a\u00f1adirse el usuario por insuficientes derechos de acceso
 SEVERE_ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_510=No puede compararse la entrada %s por insuficientes derechos de acceso
 SEVERE_ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_511=No puede eliminarse la entrada %s por insuficientes derechos de acceso
 SEVERE_ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_512=No puede realizarse la operaci\u00f3n extendida %s por insuficientes derechos de acceso
 SEVERE_ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_513=No puede cambiarse el nombre de la entrada %s por insuficientes derechos de acceso
 SEVERE_ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_514=No puede modificarse la entrada %s por insuficientes derechos de acceso
 SEVERE_ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_515=No puede buscarse la entrada %s por insuficientes derechos de acceso
-MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=Rechazando la solicitud de enlace sencilla del usuario %s porque la directiva de contrase\u00f1as requiere una autenticaci\u00f3n segura
-MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=Rechazando la solicitud de enlace del usuario %s porque el administrador ha inhabilitado la cuenta
-MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=Rechazando la solicitud de enlace del usuario %s porque la cuenta se ha bloqueado debido a demasiados intentos de autenticaci\u00f3n fallidos
-MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=Rechazando la solicitud de enlace del usuario %s porque la cuenta se ha bloqueado debido a que no se ha cambiado la contrase\u00f1a del usuario de forma oportuna tras efectuarse un restablecimiento administrativo
-MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=Rechazando la solicitud de enlace del usuario %s porque la cuenta se ha bloqueado despu\u00e9s de permanecer inactiva durante demasiado tiempo
-MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=Rechazando la solicitud de enlace del usuario %s porque ha caducado la contrase\u00f1a del usuario
+MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=Rechazando la solicitud de enlace sencilla porque la directiva de contrase\u00f1as requiere una autenticaci\u00f3n segura
+MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=Rechazando la solicitud de enlace porque el administrador ha inhabilitado la cuenta
+MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=Rechazando la solicitud de enlace porque la cuenta se ha bloqueado debido a demasiados intentos de autenticaci\u00f3n fallidos
+MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=Rechazando la solicitud de enlace porque la cuenta se ha bloqueado debido a que no se ha cambiado la contrase\u00f1a del usuario de forma oportuna tras efectuarse un restablecimiento administrativo
+MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=Rechazando la solicitud de enlace porque la cuenta se ha bloqueado despu\u00e9s de permanecer inactiva durante demasiado tiempo
+MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=Rechazando la solicitud de enlace porque ha caducado la contrase\u00f1a del usuario
 MILD_ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=Se ha producido un error al intentar actualizar la informaci\u00f3n de estado de la directiva de contrase\u00f1as para el usuario %s:  %s
 MILD_ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=Rechazando la solicitud de enlace SASL %s del usuario %s porque la directiva de contrase\u00f1as requiere una autenticaci\u00f3n segura
 SEVERE_ERR_WORKQ_CANNOT_PARSE_DN_524=Se ha producido un error al tratar de analizar la cadena %s como el ND de la entrada de configuraci\u00f3n de la cola de trabajo:  %s
@@ -543,7 +543,7 @@
 SEVERE_ERR_WORKQ_CANNOT_LOAD_528=Se ha producido un error al tratar de cargar la clase %s para su uso como la implementaci\u00f3n de la cola de trabajo del Servidor de directorios:  %s
 SEVERE_ERR_WORKQ_CANNOT_INSTANTIATE_529=Se ha producido un error al tratar de crear una instancia de la clase %s para su uso como cola de trabajo del Servidor de directorios:  %s
 SEVERE_ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN_530=El ND de enlace de la ra\u00edz alternativa "%s" ya est\u00e1 registrado con el Servidor de directorios para el ND de entrada de la ra\u00edz real "%s"
-MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=Rechazando la solicitud de enlace del usuario %s porque la cuenta ha caducado
+MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=Rechazando la solicitud de enlace porque la cuenta ha caducado
 MILD_ERR_MODIFY_PASSWORDS_CANNOT_HAVE_OPTIONS_532=Los atributos utilizados para contener las contrase\u00f1as de usuario no pueden presentar ninguna opci\u00f3n de atributo
 MILD_ERR_MODIFY_NO_USER_PW_CHANGES_533=No se permite a los usuarios que cambien sus propias contrase\u00f1as
 MILD_ERR_MODIFY_REQUIRE_SECURE_CHANGES_534=Los cambios de contrase\u00f1as deben realizarse mediante un canal de autenticaci\u00f3n seguro
diff --git a/opendj-sdk/opends/src/messages/messages/core_fr.properties b/opendj-sdk/opends/src/messages/messages/core_fr.properties
index 3eb7395..fb9946a 100644
--- a/opendj-sdk/opends/src/messages/messages/core_fr.properties
+++ b/opendj-sdk/opends/src/messages/messages/core_fr.properties
@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2010 Sun Microsystems, Inc.
-#      Portions Copyright 2011 ForgeRock AS
+#      Portions Copyright 2011-2013 ForgeRock AS
 
 
 
@@ -233,10 +233,10 @@
 MILD_ERR_ENTRY_SCHEMA_DSR_DISALLOWED_SUPERIOR_OC_215=L'entr\u00e9e %s viole la configuration de sch\u00e9ma de Directory Server car la r\u00e8gle de structure DIT %s n'autorise pas qu'une entr\u00e9e de type %s soit plac\u00e9e directement en dessous des entr\u00e9es de type %s
 MILD_ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR_216=Une erreur inattendue s'est produite lors de la v\u00e9rification de la conformit\u00e9 de l'entr\u00e9e %s \u00e0 la r\u00e8gle de structure DIT %s\u00a0:  %s
 INFO_CANCELED_BY_BIND_REQUEST_217=Cette op\u00e9ration a \u00e9t\u00e9 annul\u00e9e car Directory Server a re\u00e7u une requ\u00eate de liaison sur cette connexion, n\u00e9cessitant l'abandon de toutes les op\u00e9rations en cours
-MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=Impossible d'\u00e9tablir la liaison avec Directory Server en tant qu'utilisateur %s car cet utilisateur n'existe pas sur ce serveur
+MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=Impossible d'\u00e9tablir la liaison avec Directory Server car l'utilisateur n'existe pas sur ce serveur
 SEVERE_ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=Impossible de traiter la liaison car le serveur n\u2019a pas pu obtenir de verrou en lecture sur l\u2019entr\u00e9e %s
 FATAL_ERR_STARTUP_PLUGIN_ERROR_220=Une erreur fatale s\u2019est produite lors de l\u2019ex\u00e9cution de l\u2019un des plug-ins de d\u00e9marrage Directory Server\u00a0: %s (ID d\u2019erreur %d).  Le processus de d\u00e9marrage de Directory Server a \u00e9t\u00e9 abandonn\u00e9
-MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=Impossible d'\u00e9tablir la liaison avec Directory Server en tant qu'utilisateur %s via une authentification simple car cet utilisateur ne dispose pas du mot de passe
+MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=Impossible d'\u00e9tablir la liaison avec Directory Server via une authentification simple car cet utilisateur n'a pas de mot de passe
 MILD_ERR_BIND_OPERATION_UNKNOWN_SASL_MECHANISM_222=Impossible de traiter la requ\u00eate de liaison car elle utilise un m\u00e9canisme SASL %s inconnu qui n'est pas disponible dans Directory Server
 MILD_ERR_ABANDON_OP_NO_SUCH_OPERATION_223=Impossible d'abandonner l'op\u00e9ration avec l'ID de message %d car aucune information n'est disponible concernant cette op\u00e9ration. L'op\u00e9ration cible est peut-\u00eatre d\u00e9j\u00e0 termin\u00e9e ou n'a jamais fait l'objet d'une requ\u00eate
 SEVERE_ERR_CANCELED_BY_PREPARSE_DISCONNECT_224=L\u2019op\u00e9ration a \u00e9t\u00e9 annul\u00e9e car la connexion client a \u00e9t\u00e9 termin\u00e9e par un plug-in pr\u00e9-analyse
@@ -293,7 +293,7 @@
 MILD_ERR_ENTRY_SET_UNKNOWN_OC_275=La classe d'objet %s ne peut pas \u00eatre utilis\u00e9e pour l'entr\u00e9e %s car elle n'est pas d\u00e9finie dans le sch\u00e9ma de Directory Server
 MILD_ERR_ENTRY_ADD_UNKNOWN_OC_276=La classe d'objet %s ne peut pas \u00eatre ajout\u00e9e \u00e0 l'entr\u00e9e %s car elle n'est pas d\u00e9finie dans le sch\u00e9ma de Directory Server
 MILD_ERR_ENTRY_ADD_DUPLICATE_OC_277=La classe d'objet %s est d\u00e9j\u00e0 pr\u00e9sente dans l'entr\u00e9e %s et ne peut pas \u00eatre ajout\u00e9e \u00e0 nouveau
-MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=Le mot de passe avec un sch\u00e9ma de stockage inconnu %s inclus dans l'entr\u00e9e utilisateur %s sera ignor\u00e9
+MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=Le mot de passe avec un sch\u00e9ma de stockage inconnu %s inclus dans l'entr\u00e9e utilisateur sera ignor\u00e9
 MILD_ERR_BIND_OPERATION_WRONG_PASSWORD_279=Le mot de passe fourni par l'utilisateur ne correspond \u00e0 aucun mot(s) de passe enregistr\u00e9(s) dans l'entr\u00e9e utilisateur
 MILD_ERR_BIND_OPERATION_PASSWORD_VALIDATION_EXCEPTION_280=Une erreur inattendue s'est produite lors de la validation du mot de passe fourni\u00a0: %s
 INFO_DSCORE_DESCRIPTION_CONFIG_CLASS_281=Nom complet de la classe Java \u00e0 utiliser en tant que gestionnaire de configuration de Directory Server
@@ -521,19 +521,19 @@
 MILD_ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME_506=Une erreur s'est produite lors du d\u00e9codage de la valeur "%s" de l'attribut %s dans l'entr\u00e9e utilisateur %s conform\u00e9ment au format d'heure standard\u00a0:  %s
 MILD_ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN_507=Impossible de d\u00e9coder la valeur "%s" de l'attribut %s dans l'entr\u00e9e utilisateur %s en tant que valeur bool\u00e9enne
 SEVERE_ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=Impossible d\u2019ajouter l\u2019entr\u00e9e %s car les droits d\u2019acc\u00e8s sont insuffisants
-SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=Impossible de lier l\u2019utilisateur %s car les droits d\u2019acc\u00e8s sont insuffisants
+SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=Impossible de lier l\u2019utilisateur car les droits d\u2019acc\u00e8s sont insuffisants
 SEVERE_ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_510=Impossible de comparer l\u2019entr\u00e9e %s car les droits d\u2019acc\u00e8s sont insuffisants
 SEVERE_ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_511=Impossible de supprimer l\u2019entr\u00e9e %s car les droits d\u2019acc\u00e8s sont insuffisants
 SEVERE_ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_512=Impossible de r\u00e9aliser l\u2019op\u00e9ration \u00e9tendue %s car les droits d\u2019acc\u00e8s sont insuffisants
 SEVERE_ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_513=Impossible de renommer l\u2019entr\u00e9e %s car les droits d\u2019acc\u00e8s sont insuffisants
 SEVERE_ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_514=Impossible de modifier l\u2019entr\u00e9e %s car les droits d\u2019acc\u00e8s sont insuffisants
 SEVERE_ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_515=Impossible de faire une recherche dans l\u2019entr\u00e9e %s car les droits d\u2019acc\u00e8s sont insuffisants
-MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=La requ\u00eate de liaison simple de l'utilisateur %s a \u00e9t\u00e9 rejet\u00e9e car la strat\u00e9gie de mot de passe requiert une authentification en mode s\u00e9curis\u00e9
-MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=La requ\u00eate de liaison de l'utilisateur %s a \u00e9t\u00e9 rejet\u00e9e car le compte a \u00e9t\u00e9 d\u00e9sactiv\u00e9 par l'administrateur
-MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=La requ\u00eate de liaison de l'utilisateur %s a \u00e9t\u00e9 rejet\u00e9e car le compte a \u00e9t\u00e9 verrouill\u00e9 suite \u00e0 de nombreux \u00e9checs d'authentification
-MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=La requ\u00eate de liaison de l'utilisateur %s a \u00e9t\u00e9 rejet\u00e9e car le compte a \u00e9t\u00e9 verrouill\u00e9 apr\u00e8s que l'utilisateur ait modifi\u00e9 son mot de passe dans le d\u00e9lai imparti, suite \u00e0 sa r\u00e9initialisation par l'administrateur
-MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=La requ\u00eate de liaison de l'utilisateur %s a \u00e9t\u00e9 rejet\u00e9e car le compte a \u00e9t\u00e9 verrouill\u00e9 suite \u00e0 une p\u00e9riode d'inactivit\u00e9 trop importante
-MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=La requ\u00eate de liaison de l'utilisateur %s a \u00e9t\u00e9 rejet\u00e9e car le mot de passe utilisateur a expir\u00e9
+MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=La requ\u00eate de liaison simple a \u00e9t\u00e9 rejet\u00e9e car la strat\u00e9gie de mot de passe requiert une authentification en mode s\u00e9curis\u00e9
+MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=La requ\u00eate de liaison a \u00e9t\u00e9 rejet\u00e9e car le compte a \u00e9t\u00e9 d\u00e9sactiv\u00e9 par l'administrateur
+MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=La requ\u00eate de liaison a \u00e9t\u00e9 rejet\u00e9e car le compte a \u00e9t\u00e9 verrouill\u00e9 suite \u00e0 de nombreux \u00e9checs d'authentification
+MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=La requ\u00eate de liaison a \u00e9t\u00e9 rejet\u00e9e car le compte a \u00e9t\u00e9 verrouill\u00e9 apr\u00e8s que l'utilisateur ait modifi\u00e9 son mot de passe dans le d\u00e9lai imparti, suite \u00e0 sa r\u00e9initialisation par l'administrateur
+MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=La requ\u00eate de liaison a \u00e9t\u00e9 rejet\u00e9e car le compte a \u00e9t\u00e9 verrouill\u00e9 suite \u00e0 une p\u00e9riode d'inactivit\u00e9 trop importante
+MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=La requ\u00eate de liaison a \u00e9t\u00e9 rejet\u00e9e car le mot de passe utilisateur a expir\u00e9
 MILD_ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=Une erreur s'est produite lors de la mise \u00e0 jour des informations sur l'\u00e9tat de la strat\u00e9gie de mot de passe pour l'utilisateur %s\u00a0:  %s
 MILD_ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=La requ\u00eate de liaison SASL %s de l'utilisateur %s a \u00e9t\u00e9 rejet\u00e9e car la strat\u00e9gie de mot de passe requiert une authentification en mode s\u00e9curis\u00e9
 SEVERE_ERR_WORKQ_CANNOT_PARSE_DN_524=Une erreur s\u2019est produite lors de la tentative d\u2019analyse de la cha\u00eene %s en tant que DN de l\u2019entr\u00e9e de configuration de file d\u2019attente de travail\u00a0: %s
@@ -543,7 +543,7 @@
 SEVERE_ERR_WORKQ_CANNOT_LOAD_528=Une erreur s\u2019est produite lors de la tentative de chargement de la classe %s \u00e0 utiliser comme impl\u00e9mentation de file d\u2019attente de travail Directory Server\u00a0: %s
 SEVERE_ERR_WORKQ_CANNOT_INSTANTIATE_529=Une erreur s\u2019est produite lors de la tentative de cr\u00e9ation d\u2019une instance de la classe %s \u00e0 utiliser comme file d\u2019attente de travail Directory Server\u00a0: %s
 SEVERE_ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN_530=Le DN de liaison racine de rechange "%s" est d\u00e9j\u00e0 enregistr\u00e9 aupr\u00e8s de Directory Server pour le DN d\u2019entr\u00e9e racine r\u00e9el "%s"
-MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=La requ\u00eate de liaison de l'utilisateur %s a \u00e9t\u00e9 rejet\u00e9e car le compte a expir\u00e9
+MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=La requ\u00eate de liaison a \u00e9t\u00e9 rejet\u00e9e car le compte a expir\u00e9
 MILD_ERR_MODIFY_PASSWORDS_CANNOT_HAVE_OPTIONS_532=Les attributs utilis\u00e9s pour les mots de passe des utilisateurs ne doivent comprendre aucune option d'attribut
 MILD_ERR_MODIFY_NO_USER_PW_CHANGES_533=Les utilisateurs ne doivent pas modifier leurs mots de passe
 MILD_ERR_MODIFY_REQUIRE_SECURE_CHANGES_534=Les modifications de mot de passe doivent \u00eatre effectu\u00e9es via un canal d'authentification s\u00e9curis\u00e9
diff --git a/opendj-sdk/opends/src/messages/messages/core_ja.properties b/opendj-sdk/opends/src/messages/messages/core_ja.properties
index 2c3098c..925c786 100644
--- a/opendj-sdk/opends/src/messages/messages/core_ja.properties
+++ b/opendj-sdk/opends/src/messages/messages/core_ja.properties
@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2010 Sun Microsystems, Inc.
-#      Portions Copyright 2011 ForgeRock AS
+#      Portions Copyright 2011-2013 ForgeRock AS
 
 
 
@@ -233,10 +233,8 @@
 MILD_ERR_ENTRY_SCHEMA_DSR_DISALLOWED_SUPERIOR_OC_215=\u30a8\u30f3\u30c8\u30ea %s \u304c\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u69cb\u6210\u306b\u9055\u53cd\u3057\u3066\u3044\u307e\u3059\u3002DIT \u69cb\u9020\u898f\u5247 %s \u3067\u306f\u3001\u30bf\u30a4\u30d7 %s \u306e\u30a8\u30f3\u30c8\u30ea\u3092\u30bf\u30a4\u30d7 %s \u306e\u30a8\u30f3\u30c8\u30ea\u306e\u76f4\u4e0b\u306b\u914d\u7f6e\u3059\u308b\u3053\u3068\u306f\u8a31\u53ef\u3055\u308c\u307e\u305b\u3093
 MILD_ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR_216=\u30a8\u30f3\u30c8\u30ea %s \u3092 DIT \u69cb\u9020\u898f\u5247 %s \u306b\u5bfe\u3057\u3066\u78ba\u8a8d\u4e2d\u306b\u3001\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
 INFO_CANCELED_BY_BIND_REQUEST_217=\u3053\u306e\u64cd\u4f5c\u306e\u51e6\u7406\u304c\u53d6\u308a\u6d88\u3055\u308c\u307e\u3057\u305f\u3002\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u304c\u3053\u306e\u63a5\u7d9a\u306b\u5bfe\u3059\u308b\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u53d7\u4fe1\u3057\u305f\u305f\u3081\u3001\u9032\u884c\u4e2d\u306e\u3059\u3079\u3066\u306e\u64cd\u4f5c\u3092\u4e2d\u6b62\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3057\u305f
-MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306b\u30e6\u30fc\u30b6\u30fc %s \u3068\u3057\u3066\u30d0\u30a4\u30f3\u30c9\u3067\u304d\u307e\u305b\u3093\u3002\u305d\u306e\u3088\u3046\u306a\u30e6\u30fc\u30b6\u30fc\u306f\u30b5\u30fc\u30d0\u30fc\u306b\u5b58\u5728\u3057\u307e\u305b\u3093
 SEVERE_ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=\u30d0\u30a4\u30f3\u30c9\u3092\u51e6\u7406\u3067\u304d\u307e\u305b\u3093\u3002\u30b5\u30fc\u30d0\u30fc\u306f\u30a8\u30f3\u30c8\u30ea %s \u306e\u8aad\u307f\u53d6\u308a\u30ed\u30c3\u30af\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 FATAL_ERR_STARTUP_PLUGIN_ERROR_220=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u8d77\u52d5\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u3044\u305a\u308c\u304b\u3092\u5b9f\u884c\u4e2d\u306b\u81f4\u547d\u7684\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s (\u30a8\u30e9\u30fc ID %d)\u3002\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u8d77\u52d5\u51e6\u7406\u306f\u4e2d\u6b62\u3055\u308c\u307e\u3057\u305f
-MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=\u5358\u7d14\u8a8d\u8a3c\u3092\u4f7f\u7528\u3057\u3066\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306b\u30e6\u30fc\u30b6\u30fc %s \u3068\u3057\u3066\u30d0\u30a4\u30f3\u30c9\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u30e6\u30fc\u30b6\u30fc\u306b\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u3042\u308a\u307e\u305b\u3093
 MILD_ERR_BIND_OPERATION_UNKNOWN_SASL_MECHANISM_222=\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u51e6\u7406\u3067\u304d\u307e\u305b\u3093\u3002\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u3067\u4f7f\u7528\u4e0d\u53ef\u80fd\u306a\u4e0d\u660e\u306e SASL \u6a5f\u69cb %s \u306e\u4f7f\u7528\u304c\u8a66\u307f\u3089\u308c\u307e\u3057\u305f
 MILD_ERR_ABANDON_OP_NO_SUCH_OPERATION_223=\u30e1\u30c3\u30bb\u30fc\u30b8 ID %d \u306e\u64cd\u4f5c\u3092\u7834\u68c4\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u64cd\u4f5c\u306b\u95a2\u3059\u308b\u5229\u7528\u53ef\u80fd\u306a\u60c5\u5831\u304c\u3042\u308a\u307e\u305b\u3093\u3002 \u30bf\u30fc\u30b2\u30c3\u30c8\u64cd\u4f5c\u304c\u5b8c\u4e86\u6e08\u307f\u3067\u3042\u308b\u304b\u3001\u8981\u6c42\u3055\u308c\u306a\u304b\u3063\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059
 SEVERE_ERR_CANCELED_BY_PREPARSE_DISCONNECT_224=\u89e3\u6790\u524d\u30d7\u30e9\u30b0\u30a4\u30f3\u306b\u3088\u308a\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u63a5\u7d9a\u304c\u7d42\u4e86\u3055\u308c\u305f\u305f\u3081\u3001\u64cd\u4f5c\u304c\u53d6\u308a\u6d88\u3055\u308c\u307e\u3057\u305f
@@ -293,7 +291,6 @@
 MILD_ERR_ENTRY_SET_UNKNOWN_OC_275=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30af\u30e9\u30b9 %s \u3092\u30a8\u30f3\u30c8\u30ea %s \u5185\u3067\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u30af\u30e9\u30b9\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u3067\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 MILD_ERR_ENTRY_ADD_UNKNOWN_OC_276=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30af\u30e9\u30b9 %s \u3092\u30a8\u30f3\u30c8\u30ea %s \u306b\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u30af\u30e9\u30b9\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u3067\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 MILD_ERR_ENTRY_ADD_DUPLICATE_OC_277=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30af\u30e9\u30b9 %s \u306f\u30a8\u30f3\u30c8\u30ea %s \u5185\u306b\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u3053\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30af\u30e9\u30b9\u3092\u518d\u5ea6\u8ffd\u52a0\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
-MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea %2$s \u306b\u542b\u307e\u308c\u308b\u4e0d\u660e\u306e\u8a18\u61b6\u30b9\u30ad\u30fc\u30de %1$s \u3092\u6301\u3064\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u7121\u8996\u3055\u308c\u307e\u3059
 MILD_ERR_BIND_OPERATION_WRONG_PASSWORD_279=\u30e6\u30fc\u30b6\u30fc\u306e\u5165\u529b\u3057\u305f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u3001\u30e6\u30fc\u30b6\u30fc\u306e\u30a8\u30f3\u30c8\u30ea\u306b\u683c\u7d0d\u3055\u308c\u3066\u3044\u308b\u3069\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3068\u3082\u4e00\u81f4\u3057\u307e\u305b\u3093\u3067\u3057\u305f
 MILD_ERR_BIND_OPERATION_PASSWORD_VALIDATION_EXCEPTION_280=\u5165\u529b\u3055\u308c\u305f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u59a5\u5f53\u6027\u691c\u67fb\u4e2d\u306b\u4e88\u671f\u3057\u3066\u3044\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
 INFO_DSCORE_DESCRIPTION_CONFIG_CLASS_281=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u69cb\u6210\u30cf\u30f3\u30c9\u30e9\u3068\u3057\u3066\u4f7f\u7528\u3059\u308b Java \u30af\u30e9\u30b9\u306e\u5b8c\u5168\u6307\u5b9a\u540d
@@ -521,19 +518,12 @@
 MILD_ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME_506=\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea %3$s \u5185\u306e\u5c5e\u6027 %2$s \u306e\u5024 "%1$s" \u3092\u4e00\u822c\u7684\u306a\u6642\u523b\u5f62\u5f0f\u3067\u5fa9\u53f7\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %4$s
 MILD_ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN_507=\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea %3$s \u5185\u306e\u5c5e\u6027 %2$s \u306e\u5024 "%1$s" \u3092\u30d6\u30fc\u30eb\u5024\u3068\u3057\u3066\u5fa9\u53f7\u5316\u3067\u304d\u307e\u305b\u3093
 SEVERE_ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u4e0d\u5341\u5206\u306a\u305f\u3081\u3001\u30a8\u30f3\u30c8\u30ea %s \u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093
-SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u4e0d\u5341\u5206\u306a\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %s \u306f\u30d0\u30a4\u30f3\u30c9\u3067\u304d\u307e\u305b\u3093
 SEVERE_ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_510=\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u4e0d\u5341\u5206\u306a\u305f\u3081\u3001\u30a8\u30f3\u30c8\u30ea %s \u3092\u6bd4\u8f03\u3067\u304d\u307e\u305b\u3093
 SEVERE_ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_511=\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u4e0d\u5341\u5206\u306a\u305f\u3081\u3001\u30a8\u30f3\u30c8\u30ea %s \u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093
 SEVERE_ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_512=\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u4e0d\u5341\u5206\u306a\u305f\u3081\u3001\u62e1\u5f35\u64cd\u4f5c %s \u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093
 SEVERE_ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_513=\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u4e0d\u5341\u5206\u306a\u305f\u3081\u3001\u30a8\u30f3\u30c8\u30ea %s \u306e\u540d\u524d\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
 SEVERE_ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_514=\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u4e0d\u5341\u5206\u306a\u305f\u3081\u3001\u30a8\u30f3\u30c8\u30ea %s \u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
 SEVERE_ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_515=\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u304c\u4e0d\u5341\u5206\u306a\u305f\u3081\u3001\u30a8\u30f3\u30c8\u30ea %s \u3092\u691c\u7d22\u3067\u304d\u307e\u305b\u3093
-MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=\u30d1\u30b9\u30ef\u30fc\u30c9\u30dd\u30ea\u30b7\u30fc\u3067\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u4fdd\u8b77\u3055\u308c\u305f\u8a8d\u8a3c\u304c\u8981\u6c42\u3055\u308c\u308b\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %s \u306e\u30b5\u30f3\u30d7\u30eb\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u62d2\u5426\u3057\u3066\u3044\u307e\u3059
-MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=\u30a2\u30ab\u30a6\u30f3\u30c8\u304c\u7ba1\u7406\u8005\u306b\u3088\u308a\u7121\u52b9\u306b\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %s \u306e\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u62d2\u5426\u3057\u3066\u3044\u307e\u3059
-MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=\u5931\u6557\u3057\u305f\u8a8d\u8a3c\u8a66\u884c\u306e\u56de\u6570\u304c\u591a\u904e\u304e\u3066\u30a2\u30ab\u30a6\u30f3\u30c8\u304c\u30ed\u30c3\u30af\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %s \u306e\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u62d2\u5426\u3057\u3066\u3044\u307e\u3059
-MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=\u7ba1\u7406\u8005\u306b\u3088\u308b\u30ea\u30bb\u30c3\u30c8\u5f8c\u306b\u30e6\u30fc\u30b6\u30fc\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u9069\u5207\u306a\u30bf\u30a4\u30df\u30f3\u30b0\u3067\u5909\u66f4\u3055\u308c\u305a\u306b\u30a2\u30ab\u30a6\u30f3\u30c8\u304c\u30ed\u30c3\u30af\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %s \u306e\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u62d2\u5426\u3057\u3066\u3044\u307e\u3059
-MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=\u30a2\u30ab\u30a6\u30f3\u30c8\u304c\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u30a2\u30a4\u30c9\u30eb\u72b6\u614b\u304c\u9577\u904e\u304e\u305f\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %s \u306e\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u62d2\u5426\u3057\u3066\u3044\u307e\u3059
-MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=\u30e6\u30fc\u30b6\u30fc\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u671f\u9650\u304c\u5207\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %s \u306e\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u62d2\u5426\u3057\u3066\u3044\u307e\u3059
 MILD_ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=\u30e6\u30fc\u30b6\u30fc %s \u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u30dd\u30ea\u30b7\u30fc\u72b6\u614b\u60c5\u5831\u3092\u66f4\u65b0\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
 MILD_ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=\u30d1\u30b9\u30ef\u30fc\u30c9\u30dd\u30ea\u30b7\u30fc\u3067\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u4fdd\u8b77\u3055\u308c\u305f\u8a8d\u8a3c\u304c\u8981\u6c42\u3055\u308c\u308b\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %2$s \u306e SASL %1$s \u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u62d2\u5426\u3057\u3066\u3044\u307e\u3059
 SEVERE_ERR_WORKQ_CANNOT_PARSE_DN_524=\u6587\u5b57\u5217 %s \u3092\u30ef\u30fc\u30af\u30ad\u30e5\u30fc\u69cb\u6210\u30a8\u30f3\u30c8\u30ea\u306e DN \u3068\u3057\u3066\u89e3\u6790\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
@@ -543,7 +533,6 @@
 SEVERE_ERR_WORKQ_CANNOT_LOAD_528=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30ef\u30fc\u30af\u30ad\u30e5\u30fc\u5b9f\u88c5\u3068\u3057\u3066\u4f7f\u7528\u3059\u308b\u30af\u30e9\u30b9 %s \u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
 SEVERE_ERR_WORKQ_CANNOT_INSTANTIATE_529=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30ef\u30fc\u30af\u30ad\u30e5\u30fc\u3068\u3057\u3066\u4f7f\u7528\u3059\u308b\u30af\u30e9\u30b9 %s \u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
 SEVERE_ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN_530=\u4ee3\u66ff\u30eb\u30fc\u30c8\u30d0\u30a4\u30f3\u30c9 DN "%s" \u306f\u3001\u5b9f\u969b\u306e\u30eb\u30fc\u30c8\u30a8\u30f3\u30c8\u30ea DN "%s" \u3068\u3057\u3066\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306b\u3059\u3067\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u307e\u3059
-MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u671f\u9650\u304c\u5207\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30e6\u30fc\u30b6\u30fc %s \u306e\u30d0\u30a4\u30f3\u30c9\u8981\u6c42\u3092\u62d2\u5426\u3057\u3066\u3044\u307e\u3059
 MILD_ERR_MODIFY_PASSWORDS_CANNOT_HAVE_OPTIONS_532=\u30e6\u30fc\u30b6\u30fc\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u4fdd\u6301\u306b\u4f7f\u7528\u3059\u308b\u5c5e\u6027\u3067\u306f\u3001\u5c5e\u6027\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
 MILD_ERR_MODIFY_NO_USER_PW_CHANGES_533=\u30e6\u30fc\u30b6\u30fc\u306f\u81ea\u5206\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3059\u308b\u3053\u3068\u304c\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 MILD_ERR_MODIFY_REQUIRE_SECURE_CHANGES_534=\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4\u306f\u3001\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u4fdd\u8b77\u3055\u308c\u305f\u8a8d\u8a3c\u30c1\u30e3\u30cd\u30eb\u7d4c\u7531\u3067\u5b9f\u884c\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
diff --git a/opendj-sdk/opends/src/messages/messages/core_ko.properties b/opendj-sdk/opends/src/messages/messages/core_ko.properties
index d16d3c3..c5b233e 100644
--- a/opendj-sdk/opends/src/messages/messages/core_ko.properties
+++ b/opendj-sdk/opends/src/messages/messages/core_ko.properties
@@ -21,6 +21,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2009 Sun Microsystems, Inc.
+#      Portions Copyright 2013 ForgeRock AS
 
 
 
@@ -232,10 +233,8 @@
 MILD_ERR_ENTRY_SCHEMA_DSR_DISALLOWED_SUPERIOR_OC_215=DIT \uad6c\uc870 \uaddc\uce59 %2$s\uc5d0\uc11c %3$s \uc720\ud615 \ud56d\ubaa9\uc744 %4$s \uc720\ud615 \ud56d\ubaa9 \ubc14\ub85c \uc544\ub798\uc5d0 \ubc30\uce58\ud558\ub3c4\ub85d \ud5c8\uc6a9\ud558\uc9c0 \uc54a\uae30 \ub54c\ubb38\uc5d0 \ud56d\ubaa9 %1$s\uc774(\uac00) \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2a4\ud0a4\ub9c8 \uad6c\uc131\uc744 \uc704\ubc18\ud569\ub2c8\ub2e4.
 MILD_ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR_216=\ud56d\ubaa9 %s\uc744(\ub97c) DIT \uad6c\uc870 \uaddc\uce59 %s\uc5d0 \ub300\ud574 \uac80\uc0ac\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
 INFO_CANCELED_BY_BIND_REQUEST_217=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uc5d0\uc11c \uc774 \uc5f0\uacb0\uc5d0 \ub300\ud55c \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uc218\uc2e0\ud558\uc5ec \uc9c4\ud589 \uc911\uc778 \ubaa8\ub4e0 \uc791\uc5c5\uc744 \ucde8\uc18c\ud574\uc57c \ud558\uae30 \ub54c\ubb38\uc5d0 \uc774 \uc791\uc5c5 \ucc98\ub9ac\uac00 \ucde8\uc18c\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=\uc0ac\uc6a9\uc790 %s\uc774(\uac00) \uc11c\ubc84\uc5d0 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uc5d0 \ud574\ub2f9 \uc0ac\uc6a9\uc790\ub85c \ubc14\uc778\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=\uc11c\ubc84\uac00 \ud56d\ubaa9 %s\uc5d0 \ub300\ud55c \uc77d\uae30 \uc7a0\uae08\uc744 \uac00\uc838\uc62c \uc218 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \ubc14\uc778\ub4dc\ub97c \ucc98\ub9ac\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 FATAL_ERR_STARTUP_PLUGIN_ERROR_220=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2dc\uc791 \ud50c\ub7ec\uadf8\uc778 \uc911 \ud558\ub098\ub97c \uc2e4\ud589\ud558\ub294 \ub3d9\uc548 \uce58\uba85\uc801 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s(\uc624\ub958 \uc544\uc774\ub514 %d).  \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2dc\uc791 \ud504\ub85c\uc138\uc2a4\uac00 \uc911\ub2e8\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=\uc0ac\uc6a9\uc790 %s\uc740(\ub294) \ube44\ubc00\ubc88\ud638\uac00 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \ub2e8\uc21c \uc778\uc99d\uc744 \uc0ac\uc6a9\ud558\uc5ec \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uc5d0 \ud574\ub2f9 \uc0ac\uc6a9\uc790\ub85c \ubc14\uc778\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 MILD_ERR_BIND_OPERATION_UNKNOWN_SASL_MECHANISM_222=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\ub294 \uc54c \uc218 \uc5c6\ub294 SASL \uba54\ucee4\ub2c8\uc998 %s\uc744(\ub97c) \uc0ac\uc6a9\ud558\ub824\uace0 \ud588\uae30 \ub54c\ubb38\uc5d0 \ubc14\uc778\ub4dc \uc694\uccad\uc744 \ucc98\ub9ac\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 MILD_ERR_ABANDON_OP_NO_SUCH_OPERATION_223=\uba54\uc2dc\uc9c0 \uc544\uc774\ub514\uac00 %d\uc778 \uc791\uc5c5\uc5d0 \ub300\ud574 \uc0ac\uc6a9 \uac00\ub2a5\ud55c \uc815\ubcf4\uac00 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \uc774 \uc791\uc5c5\uc744 \ucde8\uc18c\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ub300\uc0c1 \uc791\uc5c5\uc774 \uc774\ubbf8 \uc644\ub8cc\ub418\uc5c8\uac70\ub098 \uc694\uccad\ub418\uc9c0 \uc54a\uc558\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_CANCELED_BY_PREPARSE_DISCONNECT_224=\ud074\ub77c\uc774\uc5b8\ud2b8 \uc5f0\uacb0\uc774 \uc0ac\uc804 \uad6c\ubb38 \ubd84\uc11d \ud50c\ub7ec\uadf8\uc778\uc5d0 \uc758\ud574 \uc885\ub8cc\ub418\uc5c8\uae30 \ub54c\ubb38\uc5d0 \uc791\uc5c5\uc774 \ucde8\uc18c\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
@@ -292,7 +291,6 @@
 MILD_ERR_ENTRY_SET_UNKNOWN_OC_275=\uac1d\uccb4 \ud074\ub798\uc2a4 %s\uc740(\ub294) \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2a4\ud0a4\ub9c8\uc5d0 \uc815\uc758\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc73c\ubbc0\ub85c \ud56d\ubaa9 %s\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 MILD_ERR_ENTRY_ADD_UNKNOWN_OC_276=\uac1d\uccb4 \ud074\ub798\uc2a4 %s\uc740(\ub294) \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2a4\ud0a4\ub9c8\uc5d0 \uc815\uc758\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc73c\ubbc0\ub85c \ud56d\ubaa9 %s\uc5d0 \ucd94\uac00\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 MILD_ERR_ENTRY_ADD_DUPLICATE_OC_277=\uac1d\uccb4 \ud074\ub798\uc2a4 %s\uc740(\ub294) \ud56d\ubaa9 %s\uc5d0 \uc774\ubbf8 \uc788\uc73c\ubbc0\ub85c \ub2e4\uc2dc \ucd94\uac00\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=\uc0ac\uc6a9\uc790 \ud56d\ubaa9 %s\uc5d0 \ud3ec\ud568\ub418\uc5b4 \uc788\ub294 \uc54c \uc218 \uc5c6\ub294 \uc800\uc7a5\uc18c \uc2a4\ud0a4\ub9c8 %s\uc774(\uac00) \uc788\ub294 \ube44\ubc00\ubc88\ud638\ub294 \ubb34\uc2dc\ub429\ub2c8\ub2e4.
 MILD_ERR_BIND_OPERATION_WRONG_PASSWORD_279=\uc0ac\uc6a9\uc790\uac00 \uc81c\uacf5\ud55c \ube44\ubc00\ubc88\ud638\uac00 \uc0ac\uc6a9\uc790 \ud56d\ubaa9\uc5d0 \uc800\uc7a5\ub41c \ube44\ubc00\ubc88\ud638\uc640 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
 MILD_ERR_BIND_OPERATION_PASSWORD_VALIDATION_EXCEPTION_280=\uc81c\uacf5\ub41c \ube44\ubc00\ubc88\ud638\ub97c \ud655\uc778\ud558\ub294 \ub3d9\uc548 \uc608\uc0c1\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
 INFO_DSCORE_DESCRIPTION_CONFIG_CLASS_281=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uad6c\uc131 \ucc98\ub9ac\uae30\ub85c \uc0ac\uc6a9\ud560 Java \ud074\ub798\uc2a4\uc758 \uc815\uaddc\ud654\ub41c \uc774\ub984
@@ -520,19 +518,12 @@
 MILD_ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME_506=\uc0ac\uc6a9\uc790 \ud56d\ubaa9 %3$s\uc5d0\uc11c %2$s \uc18d\uc131\uc5d0 \ub300\ud55c \uac12 \"%1$s\"\uc744(\ub97c) \uc77c\ubc18 \uc2dc\uac04 \ud615\uc2dd\uc73c\ub85c \ud574\ub3c5\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %4$s
 MILD_ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN_507=\uc0ac\uc6a9\uc790 \ud56d\ubaa9 %3$s\uc5d0\uc11c %2$s \uc18d\uc131\uc5d0 \ub300\ud55c \uac12 \"%1$s\"\uc744(\ub97c) \ubd80\uc6b8 \uac12\uc73c\ub85c \ud574\ub3c5\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=\uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \ubd80\uc871\ud558\uae30 \ub54c\ubb38\uc5d0 \ud56d\ubaa9 %s\uc744(\ub97c) \ucd94\uac00\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=\uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \ubd80\uc871\ud558\uae30 \ub54c\ubb38\uc5d0 \uc0ac\uc6a9\uc790 %s\uc744(\ub97c) \ubc14\uc778\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_510=\uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \ubd80\uc871\ud558\uae30 \ub54c\ubb38\uc5d0 \ud56d\ubaa9 %s\uc744(\ub97c) \ube44\uad50\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_511=\uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \ubd80\uc871\ud558\uae30 \ub54c\ubb38\uc5d0 \ud56d\ubaa9 %s\uc744(\ub97c) \uc0ad\uc81c\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_512=\uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \ubd80\uc871\ud558\uae30 \ub54c\ubb38\uc5d0 \ud655\uc7a5 \uc791\uc5c5 %s\uc744(\ub97c) \uc218\ud589\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_513=\uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \ubd80\uc871\ud558\uae30 \ub54c\ubb38\uc5d0 \ud56d\ubaa9 %s\uc758 \uc774\ub984\uc744 \ubcc0\uacbd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_514=\uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \ubd80\uc871\ud558\uae30 \ub54c\ubb38\uc5d0 \ud56d\ubaa9 %s\uc744(\ub97c) \uc218\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SEVERE_ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_515=\uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \ubd80\uc871\ud558\uae30 \ub54c\ubb38\uc5d0 \ud56d\ubaa9 %s\uc744(\ub97c) \uac80\uc0c9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=\ube44\ubc00\ubc88\ud638 \uc815\ucc45\uc5d0\uc11c \ubcf4\uc548 \uc778\uc99d\uc744 \uc694\uad6c\ud558\ubbc0\ub85c \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud55c \ub2e8\uc21c \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uac70\ubd80\ud569\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=\uacc4\uc815\uc774 \uad00\ub9ac \ubaa9\uc801\uc73c\ub85c \ube44\ud65c\uc131\ud654\ub418\uc5c8\uc73c\ubbc0\ub85c \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud55c \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uac70\ubd80\ud569\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=\uc778\uc99d \uc2dc\ub3c4\uac00 \ub108\ubb34 \ub9ce\uc774 \uc2e4\ud328\ud558\uc5ec \uacc4\uc815\uc774 \uc7a0\uacbc\uc73c\ubbc0\ub85c \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud55c \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uac70\ubd80\ud569\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=\uad00\ub9ac \uc7ac\uc124\uc815 \ud6c4\uc5d0 \uc0ac\uc6a9\uc790\uc758 \ube44\ubc00\ubc88\ud638\uac00 \uc2dc\uae30\uc801\uc808\ud558\uac8c \ubcc0\uacbd\ub418\uc9c0 \uc54a\uc544 \uacc4\uc815\uc774 \uc7a0\uacbc\uc73c\ubbc0\ub85c \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud55c \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uac70\ubd80\ud569\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=\uacc4\uc815\uc774 \ub108\ubb34 \uc624\ub798 \ub3d9\uc548 \uc720\ud734 \uc0c1\ud0dc\ub85c \uc720\uc9c0\ub418\uc5b4 \uc7a0\uacbc\uae30 \ub54c\ubb38\uc5d0 \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud55c \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uac70\ubd80\ud569\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=\uc0ac\uc6a9\uc790\uc758 \ube44\ubc00\ubc88\ud638\uac00 \ub9cc\ub8cc\ub418\uc5c8\uae30 \ub54c\ubb38\uc5d0 \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud55c \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uac70\ubd80\ud569\ub2c8\ub2e4.
 MILD_ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=\uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud55c \ube44\ubc00\ubc88\ud638 \uc815\ucc45 \uc0c1\ud0dc \uc815\ubcf4\ub97c \uc5c5\ub370\uc774\ud2b8\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
 MILD_ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=\ube44\ubc00\ubc88\ud638 \uc815\ucc45\uc5d0\uc11c \ubcf4\uc548 \uc778\uc99d\uc744 \uc694\uad6c\ud558\ubbc0\ub85c \uc0ac\uc6a9\uc790 %2$s\uc5d0 \ub300\ud55c SASL %1$s \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uac70\ubd80\ud569\ub2c8\ub2e4.
 SEVERE_ERR_WORKQ_CANNOT_PARSE_DN_524=\ubb38\uc790\uc5f4 %s\uc744(\ub97c) \uc791\uc5c5 \ub300\uae30\uc5f4 \uad6c\uc131 \ud56d\ubaa9\uc758 DN\uc73c\ub85c \uad6c\ubb38 \ubd84\uc11d\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
@@ -542,7 +533,6 @@
 SEVERE_ERR_WORKQ_CANNOT_LOAD_528=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc791\uc5c5 \ub300\uae30\uc5f4 \uad6c\ud604\uc73c\ub85c \uc0ac\uc6a9\ud560 \ud074\ub798\uc2a4 %s\uc744(\ub97c) \ub85c\ub4dc\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
 SEVERE_ERR_WORKQ_CANNOT_INSTANTIATE_529=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc791\uc5c5 \ub300\uae30\uc5f4\ub85c \uc0ac\uc6a9\ud560 \ud074\ub798\uc2a4 %s\uc758 \uc778\uc2a4\ud134\uc2a4\ub97c \uc791\uc131\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
 SEVERE_ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN_530=\ub300\uccb4 \ub8e8\ud2b8 \ubc14\uc778\ub4dc DN \"%s\"\uc774(\uac00) \uc2e4\uc81c \ub8e8\ud2b8 \ud56d\ubaa9 DN \"%s\"\uc5d0 \ub300\ud574 \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uc5d0 \uc774\ubbf8 \ub4f1\ub85d\ub418\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.
-MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=\uacc4\uc815\uc774 \ub9cc\ub8cc\ub418\uc5c8\uc73c\ubbc0\ub85c \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud55c \ubc14\uc778\ub4dc \uc694\uccad\uc744 \uac70\ubd80\ud569\ub2c8\ub2e4.
 MILD_ERR_MODIFY_PASSWORDS_CANNOT_HAVE_OPTIONS_532=\uc0ac\uc6a9\uc790 \ube44\ubc00\ubc88\ud638\ub97c \ubcf4\uad00\ud558\ub294 \ub370 \uc0ac\uc6a9\ub418\ub294 \uc18d\uc131\uc740 \uc18d\uc131 \uc635\uc158\uc744 \uac00\uc9c8 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 MILD_ERR_MODIFY_NO_USER_PW_CHANGES_533=\uc0ac\uc6a9\uc790\ub294 \uc790\uc2e0\uc758 \ube44\ubc00\ubc88\ud638\ub97c \ubcc0\uacbd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 MILD_ERR_MODIFY_REQUIRE_SECURE_CHANGES_534=\ube44\ubc00\ubc88\ud638 \ubcc0\uacbd\uc740 \ubcf4\uc548 \uc778\uc99d \ucc44\ub110\uc744 \ud1b5\ud574 \uc218\ud589\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
diff --git a/opendj-sdk/opends/src/messages/messages/core_zh_CN.properties b/opendj-sdk/opends/src/messages/messages/core_zh_CN.properties
index 1656a3b..8513a32 100644
--- a/opendj-sdk/opends/src/messages/messages/core_zh_CN.properties
+++ b/opendj-sdk/opends/src/messages/messages/core_zh_CN.properties
@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2010 Sun Microsystems, Inc.
-#      Portions Copyright 2011 ForgeRock AS
+#      Portions Copyright 2011-2013 ForgeRock AS
 
 
 
@@ -233,10 +233,8 @@
 MILD_ERR_ENTRY_SCHEMA_DSR_DISALLOWED_SUPERIOR_OC_215=\u6761\u76ee %s \u8fdd\u53cd\u4e86\u76ee\u5f55\u670d\u52a1\u5668\u6a21\u5f0f\u914d\u7f6e\u8981\u6c42\uff0c\u56e0\u4e3a DIT \u7ed3\u6784\u89c4\u5219 %s \u4e0d\u5141\u8bb8\u5c06\u7c7b\u578b\u4e3a %s \u7684\u6761\u76ee\u76f4\u63a5\u653e\u5728\u7c7b\u578b\u4e3a %s \u7684\u6761\u76ee\u4e0b
 MILD_ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR_216=\u5728\u5c1d\u8bd5\u68c0\u67e5\u6761\u76ee %s\uff08\u6839\u636e DIT \u7ed3\u6784\u89c4\u5219 %s\uff09\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
 INFO_CANCELED_BY_BIND_REQUEST_217=\u5df2\u53d6\u6d88\u5bf9\u6b64\u64cd\u4f5c\u7684\u5904\u7406\uff0c\u56e0\u4e3a\u76ee\u5f55\u670d\u52a1\u5668\u5df2\u6536\u5230\u8fdb\u884c\u6b64\u8fde\u63a5\u7684\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u8fd9\u8981\u6c42\u653e\u5f03\u6240\u6709\u6b63\u5728\u6267\u884c\u7684\u64cd\u4f5c
-MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=\u65e0\u6cd5\u4f5c\u4e3a\u7528\u6237 %s \u6765\u7ed1\u5b9a\u76ee\u5f55\u670d\u52a1\u5668\uff0c\u56e0\u4e3a\u670d\u52a1\u5668\u4e2d\u6ca1\u6709\u6b64\u7c7b\u7528\u6237
 SEVERE_ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=\u65e0\u6cd5\u5904\u7406\u7ed1\u5b9a\uff0c\u56e0\u4e3a\u670d\u52a1\u5668\u65e0\u6cd5\u83b7\u53d6\u6761\u76ee %s \u4e0a\u7684\u8bfb\u53d6\u9501
 FATAL_ERR_STARTUP_PLUGIN_ERROR_220=\u5f53\u6267\u884c\u5176\u4e2d\u4e00\u4e2a\u76ee\u5f55\u670d\u52a1\u5668\u542f\u52a8\u63d2\u4ef6\u65f6\u51fa\u73b0\u81f4\u547d\u9519\u8bef: %s\uff08\u9519\u8bef ID %d\uff09\u3002\u76ee\u5f55\u670d\u52a1\u5668\u542f\u52a8\u8fdb\u7a0b\u5df2\u5f02\u5e38\u4e2d\u6b62
-MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=\u65e0\u6cd5\u4f5c\u4e3a\u7528\u6237 %s \u4f7f\u7528\u7b80\u5355\u9a8c\u8bc1\u6765\u7ed1\u5b9a\u76ee\u5f55\u670d\u52a1\u5668\uff0c\u56e0\u4e3a\u8be5\u7528\u6237\u6ca1\u6709\u5bc6\u7801
 MILD_ERR_BIND_OPERATION_UNKNOWN_SASL_MECHANISM_222=\u65e0\u6cd5\u5904\u7406\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u5b83\u5c1d\u8bd5\u4f7f\u7528\u4e86\u4e00\u4e2a\u672a\u77e5\u7684 SASL \u673a\u5236 %s\uff0c\u8be5\u673a\u5236\u5728\u76ee\u5f55\u670d\u52a1\u5668\u4e2d\u4e0d\u5b58\u5728
 MILD_ERR_ABANDON_OP_NO_SUCH_OPERATION_223=\u65e0\u6cd5\u653e\u5f03\u6d88\u606f ID \u4e3a %d \u7684\u64cd\u4f5c\uff0c\u56e0\u4e3a\u6ca1\u6709\u6709\u5173\u8be5\u64cd\u4f5c\u7684\u76f8\u5173\u4fe1\u606f\u3002\u8fd9\u53ef\u80fd\u610f\u5473\u7740\u76ee\u6807\u64cd\u4f5c\u5df2\u7ecf\u5b8c\u6210\uff0c\u6216\u8005\u6839\u672c\u672a\u8bf7\u6c42
 SEVERE_ERR_CANCELED_BY_PREPARSE_DISCONNECT_224=\u64cd\u4f5c\u5df2\u53d6\u6d88\uff0c\u56e0\u4e3a\u9884\u89e3\u6790\u63d2\u4ef6\u5df2\u7ec8\u6b62\u5ba2\u6237\u7aef\u8fde\u63a5
@@ -293,7 +291,6 @@
 MILD_ERR_ENTRY_SET_UNKNOWN_OC_275=\u65e0\u6cd5\u5728\u6761\u76ee %2$s \u4e2d\u4f7f\u7528\u5bf9\u8c61\u7c7b %1$s\uff0c\u56e0\u4e3a\u76ee\u5f55\u670d\u52a1\u5668\u6a21\u5f0f\u4e2d\u672a\u5b9a\u4e49\u8be5\u7c7b
 MILD_ERR_ENTRY_ADD_UNKNOWN_OC_276=\u65e0\u6cd5\u5c06\u5bf9\u8c61\u7c7b %s \u6dfb\u52a0\u5230\u6761\u76ee %s \u4e2d\uff0c\u56e0\u4e3a\u76ee\u5f55\u670d\u52a1\u5668\u6a21\u5f0f\u4e2d\u672a\u5b9a\u4e49\u8be5\u7c7b
 MILD_ERR_ENTRY_ADD_DUPLICATE_OC_277=\u6761\u76ee %2$s \u4e2d\u5df2\u5b58\u5728\u5bf9\u8c61\u7c7b %1$s\uff0c\u56e0\u6b64\u4e0d\u80fd\u518d\u6b21\u6dfb\u52a0
-MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=\u5305\u542b\u5728\u7528\u6237\u6761\u76ee %2$s \u4e2d\u7684\u672a\u77e5\u5b58\u50a8\u65b9\u6848 %1$s \u7684\u5bc6\u7801\u5c06\u88ab\u5ffd\u7565
 MILD_ERR_BIND_OPERATION_WRONG_PASSWORD_279=\u7528\u6237\u63d0\u4f9b\u7684\u5bc6\u7801\u4e0e\u7528\u6237\u6761\u76ee\u4e2d\u5b58\u50a8\u7684\u4efb\u4f55\u5bc6\u7801\u90fd\u4e0d\u5339\u914d
 MILD_ERR_BIND_OPERATION_PASSWORD_VALIDATION_EXCEPTION_280=\u5728\u5c1d\u8bd5\u9a8c\u8bc1\u63d0\u4f9b\u7684\u5bc6\u7801\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
 INFO_DSCORE_DESCRIPTION_CONFIG_CLASS_281=\u5c06\u7528\u4f5c\u76ee\u5f55\u670d\u52a1\u5668\u914d\u7f6e\u5904\u7406\u7a0b\u5e8f\u7684 Java \u7c7b\u7684\u5168\u9650\u5b9a\u540d\u79f0
@@ -521,19 +518,12 @@
 MILD_ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME_506=\u5728\u6309\u7167\u901a\u7528\u65f6\u95f4\u683c\u5f0f\u5c1d\u8bd5\u5bf9\u7528\u6237\u6761\u76ee %3$s \u4e2d\u7684\u5c5e\u6027 %2$s \u503c "%1$s" \u8fdb\u884c\u89e3\u7801\u65f6\u51fa\u73b0\u9519\u8bef: %4$s
 MILD_ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN_507=\u65e0\u6cd5\u5c06\u7528\u6237\u6761\u76ee %3$s \u4e2d\u7684\u5c5e\u6027 %2$s \u503c "%1$s" \u89e3\u7801\u4e3a\u5e03\u5c14\u503c
 SEVERE_ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=\u56e0\u8bbf\u95ee\u6743\u9650\u4e0d\u8db3\u800c\u65e0\u6cd5\u6dfb\u52a0\u6761\u76ee %s
-SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=\u56e0\u8bbf\u95ee\u6743\u9650\u4e0d\u8db3\u800c\u65e0\u6cd5\u7ed1\u5b9a\u7528\u6237 %s
 SEVERE_ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_510=\u56e0\u8bbf\u95ee\u6743\u9650\u4e0d\u8db3\u800c\u65e0\u6cd5\u6bd4\u8f83\u6761\u76ee %s
 SEVERE_ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_511=\u56e0\u8bbf\u95ee\u6743\u9650\u4e0d\u8db3\u800c\u65e0\u6cd5\u5220\u9664\u6761\u76ee %s
 SEVERE_ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_512=\u56e0\u8bbf\u95ee\u6743\u9650\u4e0d\u8db3\u800c\u65e0\u6cd5\u6267\u884c\u6269\u5c55\u64cd\u4f5c %s
 SEVERE_ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_513=\u56e0\u8bbf\u95ee\u6743\u9650\u4e0d\u8db3\u800c\u65e0\u6cd5\u91cd\u547d\u540d\u6761\u76ee %s
 SEVERE_ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_514=\u56e0\u8bbf\u95ee\u6743\u9650\u4e0d\u8db3\u800c\u65e0\u6cd5\u4fee\u6539\u6761\u76ee %s
 SEVERE_ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_515=\u56e0\u8bbf\u95ee\u6743\u9650\u4e0d\u8db3\u800c\u65e0\u6cd5\u641c\u7d22\u6761\u76ee %s
-MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=\u6b63\u5728\u62d2\u7edd\u7528\u6237 %s \u7684\u7b80\u5355\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u5bc6\u7801\u7b56\u7565\u8981\u6c42\u5b89\u5168\u9a8c\u8bc1
-MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=\u6b63\u5728\u62d2\u7edd\u7528\u6237 %s \u7684\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u5e10\u6237\u5df2\u88ab\u7ba1\u7406\u5458\u7981\u7528
-MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=\u6b63\u5728\u62d2\u7edd\u7528\u6237 %s \u7684\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u5931\u8d25\u7684\u9a8c\u8bc1\u5c1d\u8bd5\u592a\u591a\u800c\u5bfc\u81f4\u5e10\u6237\u88ab\u9501\u5b9a
-MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=\u6b63\u5728\u62d2\u7edd\u7528\u6237 %s \u7684\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u7528\u6237\u7684\u5bc6\u7801\u5728\u7ba1\u7406\u5458\u91cd\u7f6e\u540e\u6ca1\u6709\u53ca\u65f6\u66f4\u6539\u800c\u5bfc\u81f4\u8be5\u5e10\u6237\u88ab\u9501\u5b9a
-MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=\u6b63\u5728\u62d2\u7edd\u7528\u6237 %s \u7684\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u5e10\u6237\u95f2\u7f6e\u7684\u65f6\u95f4\u592a\u957f\u800c\u88ab\u9501\u5b9a
-MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=\u6b63\u5728\u62d2\u7edd\u7528\u6237 %s \u7684\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u8be5\u7528\u6237\u7684\u5bc6\u7801\u5df2\u8fc7\u671f
 MILD_ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=\u5728\u5c1d\u8bd5\u66f4\u65b0\u7528\u6237 %s \u7684\u5bc6\u7801\u7b56\u7565\u72b6\u6001\u4fe1\u606f\u65f6\u51fa\u73b0\u9519\u8bef: %s
 MILD_ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=\u6b63\u5728\u62d2\u7edd\u7528\u6237 %2$s \u7684 SASL %1$s \u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u5bc6\u7801\u7b56\u7565\u8981\u6c42\u5b89\u5168\u9a8c\u8bc1
 SEVERE_ERR_WORKQ_CANNOT_PARSE_DN_524=\u5728\u5c1d\u8bd5\u5c06\u5b57\u7b26\u4e32 %s \u89e3\u6790\u4e3a\u5de5\u4f5c\u961f\u5217\u914d\u7f6e\u6761\u76ee\u7684 DN \u65f6\u51fa\u73b0\u9519\u8bef: %s
@@ -543,7 +533,6 @@
 SEVERE_ERR_WORKQ_CANNOT_LOAD_528=\u5728\u5c1d\u8bd5\u88c5\u5165\u7c7b %s \u4ee5\u7528\u4f5c\u76ee\u5f55\u670d\u52a1\u5668\u5de5\u4f5c\u961f\u5217\u5b9e\u73b0\u65f6\u51fa\u73b0\u9519\u8bef: %s
 SEVERE_ERR_WORKQ_CANNOT_INSTANTIATE_529=\u5728\u5c1d\u8bd5\u521b\u5efa\u7c7b %s \u7684\u5b9e\u4f8b\u4ee5\u7528\u4f5c\u76ee\u5f55\u670d\u52a1\u5668\u5de5\u4f5c\u961f\u5217\u65f6\u51fa\u73b0\u9519\u8bef: %s
 SEVERE_ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN_530=\u5907\u7528\u6839\u7ed1\u5b9a DN "%s" \u5df2\u5728\u76ee\u5f55\u670d\u52a1\u5668\u4e2d\u6ce8\u518c\u4e3a\u5b9e\u9645\u6839\u6761\u76ee DN "%s"
-MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=\u6b63\u5728\u62d2\u7edd\u7528\u6237 %s \u7684\u7ed1\u5b9a\u8bf7\u6c42\uff0c\u56e0\u4e3a\u5e10\u6237\u5df2\u8fc7\u671f
 MILD_ERR_MODIFY_PASSWORDS_CANNOT_HAVE_OPTIONS_532=\u4e0d\u5141\u8bb8\u7528\u4e8e\u4fdd\u7559\u7528\u6237\u5bc6\u7801\u7684\u5c5e\u6027\u5177\u6709\u4efb\u4f55\u5c5e\u6027\u9009\u9879
 MILD_ERR_MODIFY_NO_USER_PW_CHANGES_533=\u4e0d\u5141\u8bb8\u7528\u6237\u66f4\u6539\u81ea\u5df1\u7684\u5bc6\u7801
 MILD_ERR_MODIFY_REQUIRE_SECURE_CHANGES_534=\u5fc5\u987b\u901a\u8fc7\u5b89\u5168\u9a8c\u8bc1\u901a\u9053\u6267\u884c\u5bc6\u7801\u66f4\u6539
diff --git a/opendj-sdk/opends/src/messages/messages/core_zh_TW.properties b/opendj-sdk/opends/src/messages/messages/core_zh_TW.properties
index 334fff4..4dfb5dd 100644
--- a/opendj-sdk/opends/src/messages/messages/core_zh_TW.properties
+++ b/opendj-sdk/opends/src/messages/messages/core_zh_TW.properties
@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2009 Sun Microsystems, Inc.
-#      Portions Copyright 2011 ForgeRock AS
+#      Portions Copyright 2011-2013 ForgeRock AS
 
 
 
@@ -233,10 +233,8 @@
 MILD_ERR_ENTRY_SCHEMA_DSR_DISALLOWED_SUPERIOR_OC_215=\u9805\u76ee %s \u9055\u53cd\u76ee\u9304\u4f3a\u670d\u5668\u6a21\u5f0f\u914d\u7f6e\uff0c\u56e0\u70ba DIT \u7d50\u69cb\u898f\u5247 %s \u4e0d\u5141\u8a31\u985e\u578b %s \u7684\u9805\u76ee\u76f4\u63a5\u7f6e\u65bc\u985e\u578b %s \u7684\u9805\u76ee\u5e95\u4e0b
 MILD_ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR_216=\u5617\u8a66\u4f9d DIT \u7d50\u69cb\u898f\u5247 %2$s \u6aa2\u67e5\u9805\u76ee %1$s \u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %3$s
 INFO_CANCELED_BY_BIND_REQUEST_217=\u5df2\u7d93\u53d6\u6d88\u6b64\u4f5c\u696d\u4e0a\u7684\u8655\u7406\uff0c\u56e0\u70ba\u76ee\u9304\u4f3a\u670d\u5668\u63a5\u6536\u5230\u6b64\u9023\u7dda\u7684\u9023\u7d50\u8acb\u6c42\uff0c\u800c\u9019\u9700\u8981\u653e\u68c4\u6240\u6709\u9032\u884c\u4e2d\u7684\u4f5c\u696d
-MILD_ERR_BIND_OPERATION_UNKNOWN_USER_218=\u7121\u6cd5\u4ee5\u4f7f\u7528\u8005 %s \u8eab\u4efd\u9023\u7d50\u76ee\u9304\u4f3a\u670d\u5668\uff0c\u56e0\u70ba\u9019\u985e\u4f7f\u7528\u8005\u4e0d\u5b58\u5728\u65bc\u4f3a\u670d\u5668\u4e2d
 SEVERE_ERR_BIND_OPERATION_CANNOT_LOCK_USER_219=\u7121\u6cd5\u4ee5\u4f7f\u7528\u8005 %s \u8eab\u4efd\u9023\u7d50\u76ee\u9304\u4f3a\u670d\u5668\uff0c\u56e0\u70ba\u4f3a\u670d\u5668\u4e0d\u5b58\u5728\u6b64\u4f7f\u7528\u8005
 FATAL_ERR_STARTUP_PLUGIN_ERROR_220=\u57f7\u884c\u5176\u4e2d\u4e00\u500b\u76ee\u9304\u4f3a\u670d\u5668\u555f\u52d5\u5916\u639b\u7a0b\u5f0f\u6642\uff0c\u767c\u751f\u56b4\u91cd\u932f\u8aa4: %s (\u932f\u8aa4 ID %d)\u3002\u76ee\u9304\u4f3a\u670d\u5668\u555f\u52d5\u7a0b\u5e8f\u5df2\u7d93\u4e2d\u65b7
-MILD_ERR_BIND_OPERATION_NO_PASSWORD_221=\u7121\u6cd5\u4f7f\u7528\u7c21\u55ae\u8a8d\u8b49\u4ee5\u4f7f\u7528\u8005 %s \u8eab\u4efd\u9023\u7d50\u76ee\u9304\u4f3a\u670d\u5668\uff0c\u56e0\u70ba\u8a72\u4f7f\u7528\u8005\u6c92\u6709\u5bc6\u78bc
 MILD_ERR_BIND_OPERATION_UNKNOWN_SASL_MECHANISM_222=\u7121\u6cd5\u8655\u7406\u9023\u7d50\u8acb\u6c42\uff0c\u56e0\u70ba\u5176\u5617\u8a66\u4f7f\u7528\u76ee\u9304\u4f3a\u670d\u5668\u4e2d\u4e0d\u53ef\u7528\u7684\u672a\u77e5 SASL \u6a5f\u5236 %s
 MILD_ERR_ABANDON_OP_NO_SUCH_OPERATION_223=\u7121\u6cd5\u653e\u68c4\u5177\u6709\u8a0a\u606f ID %d \u7684\u4f5c\u696d\uff0c\u56e0\u70ba\u6c92\u6709\u6b64\u4f5c\u696d\u7684\u76f8\u95dc\u8cc7\u8a0a\u3002\u9019\u53ef\u80fd\u8868\u793a\u5df2\u7d93\u5b8c\u6210\u6216\u5f9e\u672a\u8acb\u6c42\u904e\u6b64\u76ee\u6a19\u4f5c\u696d
 SEVERE_ERR_CANCELED_BY_PREPARSE_DISCONNECT_224=\u5df2\u7d93\u53d6\u6d88\u4f5c\u696d\uff0c\u56e0\u70ba\u7528\u6236\u7aef\u9023\u7dda\u5df2\u7531\u524d\u7f6e\u5256\u6790\u5916\u639b\u7a0b\u5f0f\u6240\u7d42\u6b62
@@ -293,7 +291,6 @@
 MILD_ERR_ENTRY_SET_UNKNOWN_OC_275=\u7269\u4ef6\u985e\u5225 %s \u7121\u6cd5\u5728\u9805\u76ee %s \u4f7f\u7528\uff0c\u56e0\u70ba\u8a72\u985e\u5225\u6c92\u6709\u5b9a\u7fa9\u5728\u76ee\u9304\u4f3a\u670d\u5668\u6a21\u5f0f
 MILD_ERR_ENTRY_ADD_UNKNOWN_OC_276=\u7269\u4ef6\u985e\u5225 %s \u7121\u6cd5\u589e\u52a0\u81f3\u9805\u76ee %s\uff0c\u56e0\u70ba\u8a72\u985e\u5225\u6c92\u6709\u5b9a\u7fa9\u5728\u76ee\u9304\u4f3a\u670d\u5668\u6a21\u5f0f
 MILD_ERR_ENTRY_ADD_DUPLICATE_OC_277=\u7269\u4ef6\u985e\u5225 %s \u5df2\u7d93\u5b58\u5728\u65bc\u9805\u76ee %s\uff0c\u4e14\u7121\u6cd5\u518d\u6b21\u589e\u52a0
-MILD_ERR_BIND_OPERATION_UNKNOWN_STORAGE_SCHEME_278=\u5c07\u5ffd\u7565\u5305\u542b\u5728\u4f7f\u7528\u8005\u9805\u76ee %2$s\uff0c\u5177\u4e0d\u660e\u5132\u5b58\u6a5f\u5236 %1$s \u7684\u5bc6\u78bc
 MILD_ERR_BIND_OPERATION_WRONG_PASSWORD_279=\u4f7f\u7528\u8005\u63d0\u4f9b\u7684\u5bc6\u78bc\u8207\u5132\u5b58\u5728\u4f7f\u7528\u8005\u9805\u76ee\u4e2d\u7684\u4efb\u4f55\u5bc6\u78bc\u4e26\u4e0d\u76f8\u7b26
 MILD_ERR_BIND_OPERATION_PASSWORD_VALIDATION_EXCEPTION_280=\u5617\u8a66\u9a57\u8b49\u63d0\u4f9b\u7684\u5bc6\u78bc\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
 INFO_DSCORE_DESCRIPTION_CONFIG_CLASS_281=\u7576\u4f5c\u76ee\u9304\u4f3a\u670d\u5668\u914d\u7f6e\u8655\u7406\u7a0b\u5f0f\u4f7f\u7528\u7684\u5b8c\u5168\u5408\u683c Java \u985e\u5225\u540d\u7a31
@@ -521,19 +518,12 @@
 MILD_ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME_506=\u5617\u8a66\u4f9d\u7167\u4e00\u822c\u6642\u9593\u683c\u5f0f\u89e3\u78bc\u4f7f\u7528\u8005\u9805\u76ee %3$s \u4e2d\u5c6c\u6027 %2$s \u7684\u503c\u300c%1$s\u300d\u6642\uff0c\u767c\u751f\u932f\u8aa4: %4$s
 MILD_ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN_507=\u7121\u6cd5\u5c07\u4f7f\u7528\u8005\u9805\u76ee %3$s \u4e2d\u5c6c\u6027 %2$s \u7684\u503c\u300c%1$s\u300d\u89e3\u78bc\u70ba\u5e03\u6797\u503c
 SEVERE_ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_508=\u7121\u6cd5\u589e\u52a0\u9805\u76ee %s\uff0c\u56e0\u70ba\u5b58\u53d6\u6b0a\u9650\u4e0d\u8db3
-SEVERE_ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_509=\u4f7f\u7528\u8005 %s \u7121\u6cd5\u9023\u7d50\uff0c\u56e0\u70ba\u5b58\u53d6\u6b0a\u9650\u4e0d\u8db3
 SEVERE_ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_510=\u7121\u6cd5\u6bd4\u8f03\u9805\u76ee %s\uff0c\u56e0\u70ba\u5b58\u53d6\u6b0a\u9650\u4e0d\u8db3
 SEVERE_ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_511=\u7121\u6cd5\u522a\u9664\u9805\u76ee %s\uff0c\u56e0\u70ba\u5b58\u53d6\u6b0a\u9650\u4e0d\u8db3
 SEVERE_ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_512=\u7121\u6cd5\u57f7\u884c\u5ef6\u4f38\u4f5c\u696d %s\uff0c\u56e0\u70ba\u5b58\u53d6\u6b0a\u9650\u4e0d\u8db3
 SEVERE_ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_513=\u7121\u6cd5\u91cd\u65b0\u547d\u540d\u9805\u76ee %s\uff0c\u56e0\u70ba\u5b58\u53d6\u6b0a\u9650\u4e0d\u8db3
 SEVERE_ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_514=\u7121\u6cd5\u4fee\u6539\u9805\u76ee %s\uff0c\u56e0\u70ba\u5b58\u53d6\u6b0a\u9650\u4e0d\u8db3
 SEVERE_ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS_515=\u7121\u6cd5\u641c\u5c0b\u9805\u76ee %s\uff0c\u56e0\u70ba\u5b58\u53d6\u6b0a\u9650\u4e0d\u8db3
-MILD_ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND_516=\u62d2\u7d55\u4f7f\u7528\u8005%s \u7684\u7c21\u55ae\u9023\u7d50\u8acb\u6c42\uff0c\u56e0\u70ba\u5bc6\u78bc\u7b56\u7565\u8981\u6c42\u5b89\u5168\u8a8d\u8b49
-MILD_ERR_BIND_OPERATION_ACCOUNT_DISABLED_517=\u62d2\u7d55\u4f7f\u7528\u8005%s \u7684\u9023\u7d50\u8acb\u6c42\uff0c\u56e0\u70ba\u5e33\u865f\u5df2\u7d93\u7531\u7ba1\u7406\u54e1\u505c\u7528
-MILD_ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED_518=\u62d2\u7d55\u4f7f\u7528\u8005%s \u7684\u9023\u7d50\u8acb\u6c42\uff0c\u56e0\u70ba\u592a\u591a\u6b21\u5931\u6557\u7684\u8a8d\u8b49\u5617\u8a66\u800c\u9020\u6210\u5e33\u865f\u9396\u5b9a
-MILD_ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED_519=\u62d2\u7d55\u4f7f\u7528\u8005%s \u7684\u9023\u7d50\u8acb\u6c42\uff0c\u56e0\u70ba\u5728\u7ba1\u7406\u54e1\u91cd\u8a2d\u5f8c\uff0c\u6c92\u6709\u53ca\u6642\u8b8a\u66f4\u4f7f\u7528\u8005\u5bc6\u78bc\uff0c\u800c\u9020\u6210\u5e33\u865f\u9396\u5b9a
-MILD_ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED_520=\u62d2\u7d55\u4f7f\u7528\u8005%s \u7684\u9023\u7d50\u8acb\u6c42\uff0c\u56e0\u70ba\u9592\u7f6e\u592a\u4e45\uff0c\u800c\u9020\u6210\u5e33\u865f\u9396\u5b9a
-MILD_ERR_BIND_OPERATION_PASSWORD_EXPIRED_521=\u62d2\u7d55\u4f7f\u7528\u8005%s \u7684\u9023\u7d50\u8acb\u6c42\uff0c\u56e0\u70ba\u4f7f\u7528\u8005\u7684\u5bc6\u78bc\u5df2\u7d93\u904e\u671f
 MILD_ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY_522=\u5617\u8a66\u66f4\u65b0\u4f7f\u7528\u8005 %s \u7684\u5bc6\u78bc\u7b56\u7565\u72c0\u614b\u8cc7\u8a0a\u6642\uff0c\u767c\u751f\u932f\u8aa4: %s
 MILD_ERR_BIND_OPERATION_INSECURE_SASL_BIND_523=\u62d2\u7d55 SASL %s \u9023\u7d50\u8acb\u6c42 (\u4f7f\u7528\u8005%s)\uff0c\u56e0\u70ba\u5bc6\u78bc\u7b56\u7565\u8981\u6c42\u5b89\u5168\u8a8d\u8b49
 SEVERE_ERR_WORKQ_CANNOT_PARSE_DN_524=\u5617\u8a66\u5c07\u5b57\u4e32 %s \u5256\u6790\u6210\u5de5\u4f5c\u4f47\u5217\u914d\u7f6e\u9805\u76ee\u7684 DN \u6642\uff0c\u767c\u751f\u932f\u8aa4: %s
@@ -543,7 +533,6 @@
 SEVERE_ERR_WORKQ_CANNOT_LOAD_528=\u5617\u8a66\u8f09\u5165\u985e\u5225 %s \u4ee5\u7576\u4f5c\u76ee\u9304\u4f3a\u670d\u5668\u5de5\u4f5c\u4f47\u5217\u5be6\u4f5c\u4f7f\u7528\u6642\uff0c\u767c\u751f\u932f\u8aa4: %s
 SEVERE_ERR_WORKQ_CANNOT_INSTANTIATE_529=\u5617\u8a66\u5efa\u7acb\u985e\u5225\u5be6\u4f8b %s \u4ee5\u7576\u4f5c\u76ee\u9304\u4f3a\u670d\u5668\u5de5\u4f5c\u4f47\u5217\u4f7f\u7528\u6642\uff0c\u767c\u751f\u932f\u8aa4: %s
 SEVERE_ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN_530=\u66ff\u4ee3 root \u9023\u7d50 DN\u300c%s\u300d\u5df2\u7d93\u4f7f\u7528\u5be6\u969b root \u9805\u76ee DN\u300c%s\u300d\u7684\u76ee\u9304\u4f3a\u670d\u5668\u8a3b\u518a
-MILD_ERR_BIND_OPERATION_ACCOUNT_EXPIRED_531=\u62d2\u7d55\u4f7f\u7528\u8005%s \u7684\u9023\u7d50\u8acb\u6c42\uff0c\u56e0\u70ba\u5e33\u865f\u5df2\u7d93\u904e\u671f
 MILD_ERR_MODIFY_PASSWORDS_CANNOT_HAVE_OPTIONS_532=\u7528\u4f86\u6301\u6709\u4f7f\u7528\u8005\u5bc6\u78bc\u7684\u5c6c\u6027\u4e0d\u5141\u8a31\u64c1\u6709\u4efb\u4f55\u5c6c\u6027\u9078\u9805
 MILD_ERR_MODIFY_NO_USER_PW_CHANGES_533=\u4f7f\u7528\u8005\u4e0d\u5141\u8a31\u8b8a\u66f4\u4ed6\u5011\u7684\u5bc6\u78bc
 MILD_ERR_MODIFY_REQUIRE_SECURE_CHANGES_534=\u5bc6\u78bc\u8b8a\u66f4\u5fc5\u9808\u900f\u904e\u5b89\u5168\u7684\u8a8d\u8b49\u901a\u9053\u57f7\u884c
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java
index 779d94b..1d29a06 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java
@@ -929,8 +929,7 @@
    */
   private void updateOperationErrMsgAndResCode()
   {
-    Message message = ERR_BIND_OPERATION_UNKNOWN_USER.get(
-            String.valueOf(getBindDN()));
+    Message message = ERR_BIND_OPERATION_UNKNOWN_USER.get();
     setResultCode(ResultCode.INVALID_CREDENTIALS);
     setAuthFailureReason(message);
   }
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
index c835838..b5c902d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -23,7 +23,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions copyright 2011 ForgeRock AS.
+ *      Portions copyright 2011-2013 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -31,10 +31,9 @@
 
 import static org.opends.messages.CoreMessages.*;
 import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.getTracer;
-import static org.opends.server.util.ServerConstants.SASL_MECHANISM_PLAIN;
-import static org.opends.server.util.StaticUtils.toLowerCase;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -138,8 +137,6 @@
   @Override()
   public void processSASLBind(BindOperation bindOperation)
   {
-    IdentityMapper<?> identityMapper = this.identityMapper;
-
     // Get the SASL credentials provided by the user and decode them.
     String authzID  = null;
     String authcID  = null;
@@ -510,8 +507,7 @@
       {
         // Check to see if the user is administratively disabled or locked.
         bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
-        Message message = ERR_BIND_OPERATION_ACCOUNT_DISABLED.get(String
-            .valueOf(userEntry.getDN()));
+        Message message = ERR_BIND_OPERATION_ACCOUNT_DISABLED.get();
         bindOperation.setAuthFailureReason(message);
         return;
       }
@@ -596,6 +592,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isConfigurationChangeAcceptable(
                       PlainSASLMechanismHandlerCfg configuration,
                       List<Message> unacceptableReasons)
@@ -608,6 +605,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public ConfigChangeResult applyConfigurationChange(
               PlainSASLMechanismHandlerCfg configuration)
   {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index 25f23d3..3fbd399 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -48,8 +48,29 @@
 import org.opends.server.api.ClientConnection;
 import org.opends.server.api.ExtendedOperationHandler;
 import org.opends.server.config.ConfigException;
-import org.opends.server.core.*;
-import org.opends.server.types.*;
+import org.opends.server.core.AbandonOperation;
+import org.opends.server.core.AddOperation;
+import org.opends.server.core.BindOperation;
+import org.opends.server.core.CompareOperation;
+import org.opends.server.core.DeleteOperation;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ExtendedOperation;
+import org.opends.server.core.ModifyDNOperation;
+import org.opends.server.core.ModifyOperation;
+import org.opends.server.core.SearchOperation;
+import org.opends.server.core.UnbindOperation;
+import org.opends.server.types.AdditionalLogItem;
+import org.opends.server.types.AuthenticationInfo;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.Control;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.DisconnectReason;
+import org.opends.server.types.FilePermission;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.Operation;
+import org.opends.server.types.ResultCode;
 import org.opends.server.util.TimeThread;
 
 
@@ -558,16 +579,30 @@
     final Message failureMessage = bindOperation.getAuthFailureReason();
     if (failureMessage != null)
     {
+      // this code path is mutually exclusive with the if result code is success
+      // down below
       buffer.append(" authFailureID=");
       buffer.append(failureMessage.getDescriptor().getId());
       buffer.append(" ");
       appendLabel(buffer, "authFailureReason", failureMessage);
+      if (bindOperation.getSASLMechanism() != null
+          && bindOperation.getSASLAuthUserEntry() != null)
+      { // SASL bind and we have successfully found a user entry for auth
+        appendLabel(buffer, "authDN", bindOperation.getSASLAuthUserEntry()
+            .getDN());
+      }
+      else
+      { // SASL bind failed to find user entry for auth or simple bind
+        appendLabel(buffer, "authDN", bindOperation.getRawBindDN());
+      }
     }
 
     logAdditionalLogItems(bindOperation, buffer);
 
     if (bindOperation.getResultCode() == ResultCode.SUCCESS)
     {
+      // this code path is mutually exclusive with the if failure message exist
+      // just above
       final AuthenticationInfo authInfo = bindOperation.getAuthenticationInfo();
       if (authInfo != null)
       {
@@ -1219,7 +1254,7 @@
   private void appendLabel(final StringBuilder buffer, final String label,
       final Object obj)
   {
-    buffer.append(" ").append(label).append("=\"");
+    buffer.append(' ').append(label).append("=\"");
     if (obj != null)
     {
       buffer.append(obj);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
index 41fccaa..a458c71 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
@@ -324,8 +324,7 @@
           .isAllowed(this))
       {
         setResultCode(ResultCode.INVALID_CREDENTIALS);
-        setAuthFailureReason(ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS
-            .get(String.valueOf(bindDN)));
+        setAuthFailureReason(ERR_BIND_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get());
         return;
       }
     }
@@ -520,8 +519,7 @@
       if (userEntry == null)
       {
         throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
-                                     ERR_BIND_OPERATION_UNKNOWN_USER.get(
-                                          String.valueOf(bindDN)));
+                                     ERR_BIND_OPERATION_UNKNOWN_USER.get());
       }
       else
       {
@@ -545,7 +543,7 @@
         if ((pwAttr == null) || (pwAttr.isEmpty()))
         {
           throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
-              ERR_BIND_OPERATION_NO_PASSWORD.get(String.valueOf(bindDN)));
+              ERR_BIND_OPERATION_NO_PASSWORD.get());
         }
 
         // Perform a number of password policy state checks for the user.
@@ -620,8 +618,7 @@
         if (authPolicyState.isDisabled())
         {
           throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
-              ERR_BIND_OPERATION_ACCOUNT_DISABLED.get(String.valueOf(userEntry
-                  .getDN())));
+              ERR_BIND_OPERATION_ACCOUNT_DISABLED.get());
         }
 
         // Invoke pre-operation plugins.
@@ -972,8 +969,7 @@
       else
       {
         throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
-                       ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND.get(
-                            String.valueOf(userEntry.getDN())));
+                       ERR_BIND_OPERATION_INSECURE_SIMPLE_BIND.get());
       }
     }
 
@@ -982,13 +978,11 @@
     if (pwPolicyState.isDisabled())
     {
       throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
-                                   ERR_BIND_OPERATION_ACCOUNT_DISABLED.get(
-                                        String.valueOf(userEntry.getDN())));
+                                   ERR_BIND_OPERATION_ACCOUNT_DISABLED.get());
     }
     else if (pwPolicyState.isAccountExpired())
     {
-      Message m = ERR_BIND_OPERATION_ACCOUNT_EXPIRED.get(
-                       String.valueOf(userEntry.getDN()));
+      Message m = ERR_BIND_OPERATION_ACCOUNT_EXPIRED.get();
       pwPolicyState.generateAccountStatusNotification(
            AccountStatusNotificationType.ACCOUNT_EXPIRED, userEntry, m,
            AccountStatusNotification.createProperties(pwPolicyState,
@@ -1004,19 +998,16 @@
       }
 
       throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
-                     ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED.get(
-                          String.valueOf(userEntry.getDN())));
+                     ERR_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED.get());
     }
     else if (pwPolicyState.lockedDueToIdleInterval())
     {
-      Message m = ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED.get(
-              String.valueOf(userEntry.getDN()));
-
       if (pwPolicyErrorType == null)
       {
         pwPolicyErrorType = PasswordPolicyErrorType.ACCOUNT_LOCKED;
       }
 
+      Message m = ERR_BIND_OPERATION_ACCOUNT_IDLE_LOCKED.get();
       pwPolicyState.generateAccountStatusNotification(
            AccountStatusNotificationType.ACCOUNT_IDLE_LOCKED, userEntry, m,
            AccountStatusNotification.createProperties(pwPolicyState, false, -1,
@@ -1033,14 +1024,12 @@
       // Check to see if the account is locked due to the maximum reset age.
       if (pwPolicyState.lockedDueToMaximumResetAge())
       {
-        Message m = ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED.get(
-                         String.valueOf(userEntry.getDN()));
-
         if (pwPolicyErrorType == null)
         {
           pwPolicyErrorType = PasswordPolicyErrorType.ACCOUNT_LOCKED;
         }
 
+        Message m = ERR_BIND_OPERATION_ACCOUNT_RESET_LOCKED.get();
         pwPolicyState.generateAccountStatusNotification(
              AccountStatusNotificationType.ACCOUNT_RESET_LOCKED, userEntry, m,
              AccountStatusNotification.createProperties(pwPolicyState, false,
@@ -1079,8 +1068,7 @@
           }
           else
           {
-            Message m = ERR_BIND_OPERATION_PASSWORD_EXPIRED.get(
-                             String.valueOf(userEntry.getDN()));
+            Message m = ERR_BIND_OPERATION_PASSWORD_EXPIRED.get();
 
             pwPolicyState.generateAccountStatusNotification(
                  AccountStatusNotificationType.PASSWORD_EXPIRED, userEntry, m,
@@ -1093,8 +1081,7 @@
         }
         else
         {
-          Message m = ERR_BIND_OPERATION_PASSWORD_EXPIRED.get(
-                           String.valueOf(userEntry.getDN()));
+          Message m = ERR_BIND_OPERATION_PASSWORD_EXPIRED.get();
 
           pwPolicyState.generateAccountStatusNotification(
                AccountStatusNotificationType.PASSWORD_EXPIRED, userEntry, m,

--
Gitblit v1.10.0