From 73394f670965893f1d728f7be6f326e0f696e73f Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 13:59:39 +0000
Subject: [PATCH] OPENDJ-2750 Remove server make-ldif tool

---
 opendj-server-legacy/src/messages/org/opends/messages/admin_tool_de.properties                  |    2 
 opendj-server-legacy/src/messages/org/opends/messages/admin_tool_ja.properties                  |    2 
 opendj-server-legacy/src/messages/org/opends/messages/tool_ko.properties                        |   15 -
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java                          |    2 
 opendj-server-legacy/src/messages/org/opends/messages/tool_fr.properties                        |   16 -
 opendj-server-legacy/src/test/java/org/opends/server/tools/ArgumentParserToolsTestCase.java     |    7 
 opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties                     |    3 
 opendj-server-legacy/src/messages/org/opends/messages/admin_tool_es.properties                  |    2 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java |    6 
 opendj-server-legacy/src/messages/org/opends/messages/tool_zh_CN.properties                     |   16 -
 opendj-server-legacy/src/messages/org/opends/messages/tool_zh_TW.properties                     |   15 -
 /dev/null                                                                                       |  458 -----------------------------------
 opendj-server-legacy/src/messages/org/opends/messages/admin_tool_zh_CN.properties               |    2 
 opendj-server-legacy/src/messages/org/opends/messages/tool_de.properties                        |   16 -
 opendj-server-legacy/src/messages/org/opends/messages/tool_ja.properties                        |   16 -
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java      |   98 +++++--
 opendj-server-legacy/src/messages/org/opends/messages/tool_pl.properties                        |    4 
 opendj-server-legacy/src/messages/org/opends/messages/admin_tool_fr.properties                  |    2 
 opendj-server-legacy/src/messages/org/opends/messages/tool.properties                           |   36 --
 opendj-server-legacy/src/messages/org/opends/messages/tool_ca_ES.properties                     |    4 
 opendj-server-legacy/src/messages/org/opends/messages/tool_es.properties                        |   16 -
 21 files changed, 79 insertions(+), 659 deletions(-)

diff --git a/opendj-server-legacy/resource/bin/make-ldif b/opendj-server-legacy/resource/bin/make-ldif
deleted file mode 100644
index b4356f5..0000000
--- a/opendj-server-legacy/resource/bin/make-ldif
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# The contents of this file are subject to the terms of the Common Development and
-# Distribution License (the License). You may not use this file except in compliance with the
-# License.
-#
-# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-# specific language governing permission and limitations under the License.
-#
-# When distributing Covered Software, include this CDDL Header Notice in each file and include
-# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-# Header, with the fields enclosed by brackets [] replaced by your own identifying
-# information: "Portions Copyright [year] [name of copyright owner]".
-#
-# Copyright 2006-2008 Sun Microsystems, Inc.
-# Portions Copyright 2011-2013 ForgeRock AS.
-
-
-# This script may be used to generate LDIF data based on a provided template.
-OPENDJ_INVOKE_CLASS="org.opends.server.tools.makeldif.MakeLDIF"
-export OPENDJ_INVOKE_CLASS
-
-SCRIPT_NAME="make-ldif"
-export SCRIPT_NAME
-
-WORKING_DIR=`pwd`
-
-cd "`dirname "${0}"`"
-SCRIPT_DIR=`pwd`
-
-cd ..
-INSTALL_ROOT=`pwd`
-export INSTALL_ROOT
-
-# Set environment variables
-.  "${INSTALL_ROOT}/lib/_script-util.sh"
-RETURN_CODE=$?
-if test ${RETURN_CODE} -ne 0
-then
-        exit ${RETURN_CODE}
-fi
-
-cd "${WORKING_DIR}"
-
-"${SCRIPT_DIR}/../lib/_server-script.sh" \
-     --resourcePath "${INSTANCE_ROOT}/config/MakeLDIF" "${@}"
diff --git a/opendj-server-legacy/resource/bin/make-ldif.bat b/opendj-server-legacy/resource/bin/make-ldif.bat
deleted file mode 100644
index 5ca5fdd..0000000
--- a/opendj-server-legacy/resource/bin/make-ldif.bat
+++ /dev/null
@@ -1,43 +0,0 @@
-
-@echo off
-rem The contents of this file are subject to the terms of the Common Development and
-rem Distribution License (the License). You may not use this file except in compliance with the
-rem License.
-rem
-rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-rem specific language governing permission and limitations under the License.
-rem
-rem When distributing Covered Software, include this CDDL Header Notice in each file and include
-rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-rem Header, with the fields enclosed by brackets [] replaced by your own identifying
-rem information: "Portions Copyright [year] [name of copyright owner]".
-rem
-rem Copyright 2006-2009 Sun Microsystems, Inc.
-rem Portions Copyright 2011-2012 ForgeRock AS.
-
-setlocal
-
-set NON_ESCAPED=%~dp0..
-
-FOR /F "tokens=1-2* delims=%%" %%1 IN ("%NON_ESCAPED%") DO (
-if NOT "%%2" == "" goto invalidPath)
-
-set DIR_HOME=%~dp0..
-set INSTALL_ROOT=%DIR_HOME%
-
-set INSTANCE_DIR=
-if exist "%INSTALL_ROOT%\instance.loc" (
-  set /p INSTANCE_DIR=<"%INSTALL_ROOT%\instance.loc"
-) else (
-set INSTANCE_DIR=.
-)
-set CUR_DIR=%CD%
-cd /d %INSTALL_ROOT%
-cd /d %INSTANCE_DIR%
-set INSTANCE_ROOT=%CD%
-cd /d %CUR_DIR%
-
-set OPENDJ_INVOKE_CLASS="org.opends.server.tools.makeldif.MakeLDIF"
-set SCRIPT_NAME=make-ldif
-"%INSTALL_ROOT%\lib\_server-script.bat" --resourcePath "%INSTANCE_ROOT%\config\MakeLDIF" %*
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index b54faec..d4e8751 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -109,14 +109,14 @@
         "list-backends", "manage-account", "manage-tasks", "restore.online",
         "stop-ds", "status", "control-panel", "uninstall", "setup",
         "backup.offline", "encode-password", "export-ldif.offline",
-        "ldif-diff", "ldifmodify", "ldifsearch", "make-ldif",
+        "ldif-diff", "ldifmodify", "ldifsearch", "makeldif",
         "rebuild-index", "restore.offline", "upgrade",
         "verify-index", "backendstat"
       );
   private final Set<String> relevantScriptNames = newHashSet(
         "start-ds", "import-ldif.offline", "backup.offline",
         "export-ldif.offline",
-        "ldif-diff", "make-ldif", "rebuild-index", "restore.offline",
+        "ldif-diff", "makeldif", "rebuild-index", "restore.offline",
         "verify-index", "backendstat"
       );
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index d96a65e..0011ec2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -18,6 +18,8 @@
 
 import static org.opends.messages.AdminToolMessages.*;
 import static org.opends.messages.QuickSetupMessages.*;
+import static org.opends.messages.ToolMessages.ERR_MAKELDIF_CANNOT_WRITE_ENTRY;
+import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
 
 import java.awt.Component;
 import java.awt.GridBagConstraints;
@@ -33,6 +35,7 @@
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -84,8 +87,16 @@
 import org.opends.server.tools.BackendTypeHelper.BackendTypeUIAdapter;
 import org.opends.server.tools.ImportLDIF;
 import org.opends.server.tools.LDAPModify;
-import org.opends.server.tools.makeldif.MakeLDIF;
+import org.opends.server.tools.makeldif.EntryWriter;
+import org.opends.server.tools.makeldif.MakeLDIFException;
+import org.opends.server.tools.makeldif.TemplateEntry;
+import org.opends.server.tools.makeldif.TemplateFile;
+import org.opends.server.types.ExistingFileBehavior;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.LDIFExportConfig;
 import org.opends.server.types.OpenDsException;
+import org.opends.server.util.LDIFException;
+import org.opends.server.util.LDIFWriter;
 import org.opends.server.util.SetupUtils;
 
 import com.forgerock.opendj.cli.CommandBuilder;
@@ -1153,41 +1164,26 @@
             }
           });
 
-          File f = SetupUtils.createTemplateFile(newBaseDN, Integer.parseInt(nEntries));
+          final File templateFile = SetupUtils.createTemplateFile(newBaseDN, Integer.parseInt(nEntries));
           if (!isLocal())
           {
-            File tempFile = File.createTempFile("opendj-control-panel", ".ldif");
-            tempFile.deleteOnExit();
-            ldifFile = tempFile.getAbsolutePath();
-
-            // Create the LDIF file locally using make-ldif
-            List<String> makeLDIFArgs = new ArrayList<>();
-            makeLDIFArgs.add("--templateFile");
-            makeLDIFArgs.add(f.getAbsolutePath());
-            makeLDIFArgs.add("--ldifFile");
-            makeLDIFArgs.add(ldifFile);
-            makeLDIFArgs.add("--randomSeed");
-            makeLDIFArgs.add("0");
-            makeLDIFArgs.add("--resourcePath");
-
-            File makeLDIFPath = new File(Installation.getLocal().getConfigurationDirectory(), "MakeLDIF");
-            makeLDIFArgs.add(makeLDIFPath.getAbsolutePath());
-            makeLDIFArgs.addAll(getConfigCommandLineArguments());
-
-            MakeLDIF makeLDIF = new MakeLDIF();
-            String[] array = new String[makeLDIFArgs.size()];
-            makeLDIFArgs.toArray(array);
-            returnCode = makeLDIF.makeLDIFMain(array, false, false, outPrintStream, errorPrintStream);
-            f.delete();
-
-            if (returnCode != 0)
+            try
             {
-              throw new OnlineUpdateException(ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF.get(returnCode), null);
+              ldifFile = generateLdifFile(templateFile);
+            }
+            catch (IOException | OnlineUpdateException | InitializationException | MakeLDIFException e)
+            {
+              throw new OnlineUpdateException(
+                  ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF.get(e.getLocalizedMessage()), null);
+            }
+            finally
+            {
+              templateFile.delete();
             }
           }
           else
           {
-            ldifFile = f.getAbsolutePath();
+            ldifFile = templateFile.getAbsolutePath();
           }
         }
 
@@ -1245,6 +1241,50 @@
       }
     }
 
+    private String generateLdifFile(final File templateFile)
+        throws IOException, OnlineUpdateException, MakeLDIFException, InitializationException
+    {
+      final File resourceDir = new File(Installation.getLocal().getConfigurationDirectory(), "MakeLDIF");
+      final TemplateFile generator = new TemplateFile(resourceDir.getAbsolutePath(), new Random(0));
+      generator.parse(templateFile.getAbsolutePath(), Collections.<LocalizableMessage>emptyList());
+
+      final File tempFile = File.createTempFile("opendj-control-panel", ".ldif");
+      tempFile.deleteOnExit();
+      final String generatedLdifFilePath = tempFile.getAbsolutePath();
+
+
+      try (final LDIFWriter ldifWriter = new LDIFWriter(
+          new LDIFExportConfig(generatedLdifFilePath, ExistingFileBehavior.OVERWRITE));)
+      {
+        generator.generateLDIF(new EntryWriter()
+        {
+          @Override
+          public boolean writeEntry(final TemplateEntry entry) throws IOException, MakeLDIFException
+          {
+            try
+            {
+              if (entry.getDN() != null)
+              {
+                return ldifWriter.writeTemplateEntry(entry);
+              }
+              return true;
+            }
+            catch (final LDIFException e)
+            {
+              throw new MakeLDIFException(
+                  ERR_MAKELDIF_CANNOT_WRITE_ENTRY.get(entry.getDN(), stackTraceToSingleLineString(e)), e);
+            }
+          }
+
+          @Override public void closeEntryWriter()
+          {
+            // Nothing to do in this implementation.
+          }
+        });
+      }
+      return generatedLdifFilePath;
+    }
+
     @Override
     protected String getCommandLinePath()
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
index 8f15640..d13c0af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
@@ -923,7 +923,7 @@
         "backup.offline", "dsreplication.offline",
         "encode-password", "export-ldif.offline",
         IMPORT_SCRIPT_NAME, "ldif-diff", "ldifmodify", "ldifsearch",
-        "make-ldif", "rebuild-index", "restore.offline", SERVER_SCRIPT_NAME,
+        "makeldif", "rebuild-index", "restore.offline", SERVER_SCRIPT_NAME,
         "upgrade", "verify-index", "backendstat"
     };
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java
deleted file mode 100644
index b5de130..0000000
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * The contents of this file are subject to the terms of the Common Development and
- * Distribution License (the License). You may not use this file except in compliance with the
- * License.
- *
- * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
- * specific language governing permission and limitations under the License.
- *
- * When distributing Covered Software, include this CDDL Header Notice in each file and include
- * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
- * Header, with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyright [year] [name of copyright owner]".
- *
- * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2016 ForgeRock AS.
- */
-package org.opends.server.tools.makeldif;
-
-import static com.forgerock.opendj.cli.ArgumentConstants.*;
-import static com.forgerock.opendj.cli.Utils.*;
-import static com.forgerock.opendj.cli.CommonArguments.*;
-
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.LinkedList;
-import java.util.Random;
-
-import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
-import org.opends.server.loggers.JDKLogging;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.types.ExistingFileBehavior;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.LDIFExportConfig;
-import org.opends.server.types.NullOutputStream;
-import org.opends.server.util.BuildVersion;
-import org.opends.server.util.LDIFWriter;
-
-import com.forgerock.opendj.cli.ArgumentException;
-import com.forgerock.opendj.cli.ArgumentParser;
-import com.forgerock.opendj.cli.BooleanArgument;
-import com.forgerock.opendj.cli.IntegerArgument;
-import com.forgerock.opendj.cli.StringArgument;
-
-/**
- * This class defines a program that can be used to generate LDIF content based
- * on a template.
- */
-public class MakeLDIF
-       implements EntryWriter
-{
-  /**
-   * The fully-qualified name of this class.
-   */
-  private static final String CLASS_NAME =
-       "org.opends.server.tools.makeldif.MakeLDIF";
-
-  /** The LDIF writer that will be used to write the entries. */
-  private LDIFWriter ldifWriter;
-
-  /** The total number of entries that have been written. */
-  private long entriesWritten;
-
-  private PrintStream out = System.out;
-  private PrintStream err = System.err;
-
-  /**
-   * Invokes the <CODE>makeLDIFMain</CODE> method with the provided set of
-   * arguments.
-   *
-   * @param  args  The command-line arguments provided for this program.
-   */
-  public static void main(String[] args)
-  {
-    MakeLDIF makeLDIF = new MakeLDIF();
-    int returnCode = makeLDIF.makeLDIFMain(args);
-    if (returnCode != 0)
-    {
-      System.exit(filterExitCode(returnCode));
-    }
-  }
-
-  /**
-   * Provides the command-line arguments to the main application for
-   * processing and returns the exit code as an integer.
-   *
-   * @param args
-   *          The set of command-line arguments provided to this
-   *          program.
-   * @param outStream
-   *          The output stream for standard output.
-   * @param errStream
-   *          The output stream for standard error.
-   * @return Zero to indicate that the program completed successfully,
-   *         or non-zero to indicate that an error occurred.
-   */
-  public static int main(final String[] args, final OutputStream outStream, final OutputStream errStream)
-  {
-    return new MakeLDIF().makeLDIFMain(args, false, false, outStream, errStream);
-  }
-
-  /**
-   * Creates a new instance of this utility.  It should just be used for
-   * invoking the <CODE>makeLDIFMain</CODE> method.
-   */
-  public MakeLDIF()
-  {
-    ldifWriter     = null;
-    entriesWritten = 0L;
-  }
-
-  /**
-   * Processes the provided set of command-line arguments and begins generating
-   * the LDIF content.
-   *
-   * @param  args  The command-line arguments provided for this program.
-   * @param  initializeServer  Indicates whether to initialize the server.
-   * @param  initializeSchema  Indicates whether to initialize the schema.
-   * @param  outStream         The output stream to use for standard output, or
-   *                           {@code null} if standard output is not needed.
-   * @param  errStream         The output stream to use for standard error, or
-   *                           {@code null} if standard error is not needed.
-   * @return  A result code of zero if all processing completed properly, or
-   *          a nonzero result if a problem occurred.
-   *
-   */
-  public int makeLDIFMain(String[] args, boolean initializeServer,
-      boolean initializeSchema,
-      OutputStream outStream,
-      OutputStream errStream)
-  {
-    out = NullOutputStream.wrapOrNullStream(outStream);
-    err = NullOutputStream.wrapOrNullStream(errStream);
-    JDKLogging.disableLogging();
-
-
-//  Create and initialize the argument parser for this program.
-    LocalizableMessage toolDescription = INFO_MAKELDIF_TOOL_DESCRIPTION.get();
-    ArgumentParser  argParser = new ArgumentParser(CLASS_NAME, toolDescription,
-                                                   false);
-    argParser.setShortToolDescription(REF_SHORT_DESC_MAKELDIF.get());
-    argParser.setVersionHandler(new DirectoryServerVersionHandler());
-
-    BooleanArgument showUsage;
-    IntegerArgument randomSeed;
-    StringArgument  configFile;
-    StringArgument  templatePath;
-    StringArgument  ldifFile;
-    StringArgument  resourcePath;
-
-    try
-    {
-      configFile =
-              StringArgument.builder("configFile")
-                      .shortIdentifier('c')
-                      .description(INFO_DESCRIPTION_CONFIG_FILE.get())
-                      .hidden()
-                      .required()
-                      .valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get())
-                      .buildAndAddToParser(argParser);
-      resourcePath =
-              StringArgument.builder("resourcePath")
-                      .shortIdentifier('r')
-                      .description(INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH.get())
-                      .hidden()
-                      .required()
-                      .valuePlaceholder(INFO_PATH_PLACEHOLDER.get())
-                      .buildAndAddToParser(argParser);
-      templatePath =
-              StringArgument.builder("templateFile")
-                      .shortIdentifier('t')
-                      .description(INFO_MAKELDIF_DESCRIPTION_TEMPLATE.get())
-                      .required()
-                      .valuePlaceholder(INFO_FILE_PLACEHOLDER.get())
-                      .buildAndAddToParser(argParser);
-      ldifFile =
-              StringArgument.builder("ldifFile")
-                      .shortIdentifier('o')
-                      .description(INFO_MAKELDIF_DESCRIPTION_LDIF.get())
-                      .required()
-                      .valuePlaceholder(INFO_FILE_PLACEHOLDER.get())
-                      .buildAndAddToParser(argParser);
-      randomSeed =
-              IntegerArgument.builder(OPTION_LONG_RANDOM_SEED)
-                      .shortIdentifier(OPTION_SHORT_RANDOM_SEED)
-                      .description(INFO_MAKELDIF_DESCRIPTION_SEED.get())
-                      .defaultValue(0)
-                      .valuePlaceholder(INFO_SEED_PLACEHOLDER.get())
-                      .buildAndAddToParser(argParser);
-
-      showUsage = showUsageArgument();
-      argParser.addArgument(showUsage);
-      argParser.setUsageArgument(showUsage);
-    }
-    catch (ArgumentException ae)
-    {
-      printWrappedText(err, ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
-      return 1;
-    }
-
-
-    // Parse the command-line arguments provided to the program.
-    try
-    {
-      argParser.parseArguments(args);
-    }
-    catch (ArgumentException ae)
-    {
-      argParser.displayMessageAndUsageReference(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
-      return 1;
-    }
-
-
-    // If we should just display usage or version information,
-    // then print it and exit.
-    if (argParser.usageOrVersionDisplayed())
-    {
-      return 0;
-    }
-
-    // Checks the version - if upgrade required, the tool is unusable
-    try
-    {
-      BuildVersion.checkVersionMismatch();
-    }
-    catch (InitializationException e)
-    {
-      printWrappedText(err, e.getMessage());
-      return 1;
-    }
-
-    if (initializeServer)
-    {
-      DirectoryServer directoryServer = DirectoryServer.getInstance();
-      DirectoryServer.bootstrapClient();
-
-      try
-      {
-        DirectoryServer.initializeJMX();
-      }
-      catch (Exception e)
-      {
-        printWrappedText(err, ERR_MAKELDIF_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage()));
-        return 1;
-      }
-
-      try
-      {
-        directoryServer.initializeConfiguration(configFile.getValue());
-      }
-      catch (Exception e)
-      {
-        printWrappedText(err, ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage()));
-        return 1;
-      }
-    }
-
-    if (initializeSchema)
-    {
-      try
-      {
-        DirectoryServer.getInstance().initializeSchema();
-      }
-      catch (Exception e)
-      {
-        printWrappedText(err, ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage()));
-        return 1;
-      }
-    }
-
-
-    // Create the random number generator that will be used for the generation
-    // process.
-    Random random;
-    if (randomSeed.isPresent())
-    {
-      try
-      {
-        random = new Random(randomSeed.getIntValue());
-      }
-      catch (Exception e)
-      {
-        random = new Random();
-      }
-    }
-    else
-    {
-      random = new Random();
-    }
-
-
-    // If a resource path was provided, then make sure it's acceptable.
-    File resourceDir = new File(resourcePath.getValue());
-    if (! resourceDir.exists())
-    {
-      printWrappedText(err, ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY.get(resourcePath.getValue()));
-      return 1;
-    }
-
-
-    // Load and parse the template file.
-    LinkedList<LocalizableMessage> warnings = new LinkedList<>();
-    TemplateFile templateFile = new TemplateFile(resourcePath.getValue(), random);
-    try
-    {
-      templateFile.parse(templatePath.getValue(), warnings);
-    }
-    catch (IOException ioe)
-    {
-      printWrappedText(err, ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE.get(ioe.getMessage()));
-      return 1;
-    }
-    catch (Exception e)
-    {
-      printWrappedText(err, ERR_MAKELDIF_EXCEPTION_DURING_PARSE.get(e.getMessage()));
-      return 1;
-    }
-
-
-    // If there were any warnings, then print them.
-    if (! warnings.isEmpty())
-    {
-      for (LocalizableMessage s : warnings)
-      {
-        printWrappedText(err, s);
-      }
-    }
-
-
-    // Create the LDIF writer that will be used to actually write the LDIF.
-    LDIFExportConfig exportConfig =
-         new LDIFExportConfig(ldifFile.getValue(),
-                              ExistingFileBehavior.OVERWRITE);
-    try
-    {
-      ldifWriter = new LDIFWriter(exportConfig);
-    }
-    catch (IOException ioe)
-    {
-      printWrappedText(err, ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF.get(ldifFile.getValue(), ioe));
-      return 1;
-    }
-
-
-    // Generate the LDIF content.
-    try
-    {
-      templateFile.generateLDIF(this);
-    }
-    catch (Exception e)
-    {
-      printWrappedText(err, ERR_MAKELDIF_ERROR_WRITING_LDIF.get(ldifFile.getValue(), stackTraceToSingleLineString(e)));
-      return 1;
-    }
-    finally
-    {
-      close(ldifWriter);
-    }
-
-
-    // If we've gotten here, then everything was successful.
-    return 0;
-  }
-
-
-  /**
-   * Processes the provided set of command-line arguments and begins generating
-   * the LDIF content.
-   *
-   * @param  args  The command-line arguments provided for this program.
-   *
-   * @return  A result code of zero if all processing completed properly, or
-   *          a nonzero result if a problem occurred.
-   */
-  public int makeLDIFMain(String[] args)
-  {
-     return makeLDIFMain(args, true, true, System.out, System.err);
-  }
-
-
-
-  /**
-   * Writes the provided entry to the appropriate target.
-   *
-   * @param  entry  The entry to be written.
-   *
-   * @return  <CODE>true</CODE> if the entry writer will accept more entries, or
-   *          <CODE>false</CODE> if not.
-   *
-   * @throws  IOException  If a problem occurs while writing the entry to its
-   *                       intended destination.
-   *
-   * @throws  MakeLDIFException  If some other problem occurs.
-   */
-  @Override
-  public boolean writeEntry(TemplateEntry entry)
-         throws IOException, MakeLDIFException
-  {
-    try
-    {
-      if (entry.getDN() != null)
-      {
-        ldifWriter.writeTemplateEntry(entry);
-
-        if ((++entriesWritten % 1000) == 0)
-        {
-          printWrappedText(out, INFO_MAKELDIF_PROCESSED_N_ENTRIES.get(entriesWritten));
-        }
-      }
-      else
-      {
-        AttributeType[] rdnAttrs = entry.getTemplate().getRDNAttributes();
-        String nullRdn = "";
-        for (AttributeType att : rdnAttrs)
-        {
-          if (entry.getValue(att) == null)
-          {
-            nullRdn = att.getNameOrOID();
-            break ;
-          }
-        }
-        printWrappedText(err, ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN.get(nullRdn));
-        return true;
-      }
-
-      return true;
-    }
-    catch (IOException ioe)
-    {
-      throw ioe;
-    }
-    catch (Exception e)
-    {
-      LocalizableMessage message = ERR_MAKELDIF_CANNOT_WRITE_ENTRY.get(
-          entry.getDN(), stackTraceToSingleLineString(e));
-      throw new MakeLDIFException(message, e);
-    }
-  }
-
-
-
-  /**
-   * Notifies the entry writer that no more entries will be provided and that
-   * any associated cleanup may be performed.
-   */
-  @Override
-  public void closeEntryWriter()
-  {
-    printWrappedText(out, INFO_MAKELDIF_PROCESSING_COMPLETE.get(entriesWritten));
-  }
-}
-
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
index 6510b2d..e799d16 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
@@ -2686,8 +2686,7 @@
  Service configuration can only be viewed and updated when the managed server \
  is the local server.
 ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=Could not created local \
- LDIF to populate new base DN with automatically generated data.  Error code: \
- %d.
+ LDIF to populate new base DN with automatically generated data. Error details: %s.
 INFO_CTRL_PANEL_PARENT_BACKUP_ID_LABEL=Parent Backup ID:
 INFO_CTRL_PANEL_PARENT_BACKUP_PATH_LABEL=Parent Backup Path:
 ERR_CTRL_PANEL_NO_PARENT_BACKUP_ID_PROVIDED=No parent backup ID provided.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_de.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_de.properties
index b3f2bc7..1dd9824 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_de.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_de.properties
@@ -1772,7 +1772,7 @@
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_REBUILD_INDEX_SUMMARY=Die Indizes k\u00f6nnen nur dann neu aufgebaut werden, wenn der verwaltete Server der lokale Server ist.
 INFO_CTRL_PANEL_REMOTE_SERVER_PATH=Der Remote-Server muss auf den Pfad zugreifen k\u00f6nnen.
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_WINDOWS_SERVICE_SUMMARY=Die Windows-Dienstkonfiguration kann nur angezeigt und aktualisiert werden, wenn der verwaltete Server der lokale Server ist.
-ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=Lokaler LDIF konnte nicht erstellt werden, um neue Basis-DN mit automatisch generierten Daten zu aktualisieren.  Fehlercode: %d.
+ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=Lokaler LDIF konnte nicht erstellt werden, um neue Basis-DN mit automatisch generierten Daten zu aktualisieren. Fehlerdetails: %s.
 INFO_CTRL_PANEL_PARENT_BACKUP_ID_LABEL=\u00dcbergeordnete Sicherungs-ID:
 INFO_CTRL_PANEL_PARENT_BACKUP_PATH_LABEL=\u00dcbergeordneter Sicherungspfad:
 ERR_CTRL_PANEL_NO_PARENT_BACKUP_ID_PROVIDED=Keine \u00fcbergeordnete Sicherungs-ID angegeben.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_es.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_es.properties
index 7ab5ff1..4c984c0 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_es.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_es.properties
@@ -1772,7 +1772,7 @@
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_REBUILD_INDEX_SUMMARY=Los \u00edndices s\u00f3lo se pueden reconstruir cuando el servidor administrado es el servidor local.
 INFO_CTRL_PANEL_REMOTE_SERVER_PATH=El servidor remoto debe poder acceder a la ruta.
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_WINDOWS_SERVICE_SUMMARY=La configuraci\u00f3n del servicio de Windows s\u00f3lo se puede ver y actualizar cuando el servidor administrado es el servidor local.
-ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=No pudo crearse un LDIF local para rellenar el nuevo ND de base con datos generados autom\u00e1ticamente.  C\u00f3digo de error: %d.
+ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=No pudo crearse un LDIF local para rellenar el nuevo ND de base con datos generados autom\u00e1ticamente. Detalles del error: %s.
 INFO_CTRL_PANEL_PARENT_BACKUP_ID_LABEL=ID de copia de seguridad principal:
 INFO_CTRL_PANEL_PARENT_BACKUP_PATH_LABEL=Ruta de copia de seguridad principal:
 ERR_CTRL_PANEL_NO_PARENT_BACKUP_ID_PROVIDED=No se ha proporcionado ning\u00fan ID de la copia de seguridad principal.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_fr.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_fr.properties
index 9e32e32..140b6fd 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_fr.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_fr.properties
@@ -1772,7 +1772,7 @@
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_REBUILD_INDEX_SUMMARY=Les index ne peuvent \u00eatre r\u00e9g\u00e9n\u00e9r\u00e9s que si le serveur g\u00e9r\u00e9 est le serveur local.
 INFO_CTRL_PANEL_REMOTE_SERVER_PATH=Le chemin doit \u00eatre accessible par le serveur distant.
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_WINDOWS_SERVICE_SUMMARY=La configuration du service Windows ne peut \u00eatre affich\u00e9e et mise \u00e0 jour que si le serveur g\u00e9r\u00e9 est le serveur local.
-ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=Impossible de cr\u00e9er le LDIF local pour remplir le nouveau DN de base avec les donn\u00e9es g\u00e9n\u00e9r\u00e9es automatiquement.  Code d'erreur\u00a0: %d.
+ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=Impossible de cr\u00e9er le LDIF local pour remplir le nouveau DN de base avec les donn\u00e9es g\u00e9n\u00e9r\u00e9es automatiquement. Details de l'erreur: %s.
 INFO_CTRL_PANEL_PARENT_BACKUP_ID_LABEL=ID de sauvegarde parent\u00a0:
 INFO_CTRL_PANEL_PARENT_BACKUP_PATH_LABEL=Chemin de sauvegarde parent\u00a0:
 ERR_CTRL_PANEL_NO_PARENT_BACKUP_ID_PROVIDED=Aucun ID de sauvegarde parent fourni.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_ja.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_ja.properties
index fda3dcc..738f140 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_ja.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_ja.properties
@@ -1771,7 +1771,7 @@
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_REBUILD_INDEX_SUMMARY=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f\u3001\u7ba1\u7406\u5bfe\u8c61\u306e\u30b5\u30fc\u30d0\u30fc\u304c\u30ed\u30fc\u30ab\u30eb\u30b5\u30fc\u30d0\u30fc\u3067\u3042\u308b\u5834\u5408\u306e\u307f\u306b\u518d\u69cb\u7bc9\u3067\u304d\u307e\u3059
 INFO_CTRL_PANEL_REMOTE_SERVER_PATH=\u30d1\u30b9\u306f\u30ea\u30e2\u30fc\u30c8\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u30a2\u30af\u30bb\u30b9\u53ef\u80fd\u306a\u72b6\u614b\u306b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_WINDOWS_SERVICE_SUMMARY=Windows \u30b5\u30fc\u30d3\u30b9\u306e\u69cb\u6210\u306f\u3001\u7ba1\u7406\u5bfe\u8c61\u306e\u30b5\u30fc\u30d0\u30fc\u304c\u30ed\u30fc\u30ab\u30eb\u30b5\u30fc\u30d0\u30fc\u3067\u3042\u308b\u5834\u5408\u306e\u307f\u8868\u793a\u304a\u3088\u3073\u5909\u66f4\u3067\u304d\u307e\u3059\u3002
-ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=\u81ea\u52d5\u751f\u6210\u3055\u308c\u305f\u30c7\u30fc\u30bf\u3092\u4f7f\u3063\u3066\u65b0\u3057\u3044\u30d9\u30fc\u30b9 DN \u3092\u751f\u6210\u3059\u308b\u305f\u3081\u306e\u30ed\u30fc\u30ab\u30eb LDIF \u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30a8\u30e9\u30fc\u30b3\u30fc\u30c9: %d.
+ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=\u81ea\u52d5\u751f\u6210\u3055\u308c\u305f\u30c7\u30fc\u30bf\u3092\u4f7f\u3063\u3066\u65b0\u3057\u3044\u30d9\u30fc\u30b9 DN \u3092\u751f\u6210\u3059\u308b\u305f\u3081\u306e\u30ed\u30fc\u30ab\u30eb LDIF \u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30a8\u30e9\u30fc\u30b3\u8a73\u7d30: %s.
 INFO_CTRL_PANEL_PARENT_BACKUP_ID_LABEL=\u89aa\u30d0\u30c3\u30af\u30a2\u30c3\u30d7 ID:
 INFO_CTRL_PANEL_PARENT_BACKUP_PATH_LABEL=\u89aa\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30d1\u30b9:
 ERR_CTRL_PANEL_NO_PARENT_BACKUP_ID_PROVIDED=\u89aa\u30d0\u30c3\u30af\u30a2\u30c3\u30d7 ID \u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_zh_CN.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_zh_CN.properties
index c61c36d..f2c6442 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_zh_CN.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool_zh_CN.properties
@@ -1772,7 +1772,7 @@
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_REBUILD_INDEX_SUMMARY=\u4ec5\u5f53\u53d7\u7ba1\u670d\u52a1\u5668\u4e3a\u672c\u5730\u670d\u52a1\u5668\u65f6\uff0c\u624d\u53ef\u4ee5\u91cd\u65b0\u751f\u6210\u7d22\u5f15\u3002
 INFO_CTRL_PANEL_REMOTE_SERVER_PATH=\u8fdc\u7a0b\u670d\u52a1\u5668\u5fc5\u987b\u53ef\u4ee5\u8bbf\u95ee\u8be5\u8def\u5f84\u3002
 INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_WINDOWS_SERVICE_SUMMARY=\u4ec5\u5f53\u53d7\u7ba1\u670d\u52a1\u5668\u4e3a\u672c\u5730\u670d\u52a1\u5668\u65f6\uff0c\u624d\u53ef\u4ee5\u67e5\u770b\u548c\u66f4\u65b0 Windows \u670d\u52a1\u914d\u7f6e\u3002
-ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=\u65e0\u6cd5\u4f7f\u7528\u81ea\u52a8\u751f\u6210\u7684\u6570\u636e\u521b\u5efa\u672c\u5730 LDIF \u586b\u5145\u65b0\u7684\u57fa DN\u3002\u9519\u8bef\u4ee3\u7801: %d\u3002
+ERR_CTRL_PANEL_ERROR_CREATING_NEW_DATA_LDIF=\u65e0\u6cd5\u4f7f\u7528\u81ea\u52a8\u751f\u6210\u7684\u6570\u636e\u521b\u5efa\u672c\u5730 LDIF \u586b\u5145\u65b0\u7684\u57fa DN\u3002\u9519\u8bef\u4ee3\u7801: %s\u3002
 INFO_CTRL_PANEL_PARENT_BACKUP_ID_LABEL=\u7236\u5907\u4efd ID:
 INFO_CTRL_PANEL_PARENT_BACKUP_PATH_LABEL=\u7236\u5907\u4efd\u8def\u5f84:
 ERR_CTRL_PANEL_NO_PARENT_BACKUP_ID_PROVIDED=\u672a\u63d0\u4f9b\u7236\u5907\u4efd ID\u3002
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
index 338cf8c..2ce6ef5 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
@@ -958,23 +958,6 @@
 ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=An unexpected error occurred \
  while trying to create a new instance of tag %s referenced on line %d of the \
  template file:  %s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=The path to the template file with \
- information about the LDIF data to generate
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=The path to the LDIF file to be written
-INFO_MAKELDIF_DESCRIPTION_SEED_578=The seed to use to initialize the random \
- number generator
-ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=An error occurred while \
- attempting to initialize the Directory Server JMX subsystem based on the \
- information in configuration file %s:  %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=An error occurred while \
- attempting to process the Directory Server configuration file %s:  %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=An error occurred while \
- attempting to initialize the Directory Server schema based on the information \
- in configuration file %s:  %s
-ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=An error occurred while \
- attempting to read the template file:  %s
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=An error occurred while \
- attempting to parse the template file:  %s
 ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=Cannot parse value "%s" as an \
  valid format string for tag %s on line %d of the template file
 ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=The random tag on line %d \
@@ -984,13 +967,8 @@
  random tag on line %d of the template file will always be an empty string
 ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=The random tag on line %d of \
  the template file references an unknown random type of %s
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=Path to look for \
- MakeLDIF resources (e.g., data files) not found in the current working \
- directory or template directory path
 ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=Could not find template \
  file %s
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=The specified resource \
- directory %s could not be found
 ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=Cannot find file %s referenced by \
  tag %s on line %d of the template file
 ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=Invalid file access mode \
@@ -998,15 +976,8 @@
  "sequential" or "random"
 ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=An error occurred while trying to \
  read file %s referenced by tag %s on line %d of the template file:  %s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=An error occurred while \
- attempting to open LDIF file %s for writing:  %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF_599=An error occurred while writing data \
- to LDIF file %s:  %s
-INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=Processed %d entries
 ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=An error occurred while attempting \
  to write entry %s to LDIF:  %s
-INFO_MAKELDIF_PROCESSING_COMPLETE_602=LDIF processing complete.  %d entries \
- written
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=Path to a MakeLDIF template to \
  use to generate the import data
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=Neither the %s or the %s \
@@ -1177,8 +1148,6 @@
  of modify, add, and delete operations against data in an LDIF file
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=This utility can be used to perform \
  search operations against data in an LDIF file
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=This utility can be used to generate LDIF \
- data based on a definition in a template file
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=This utility can be used to restore a \
  backup of a Directory Server backend
 INFO_STOPDS_TOOL_DESCRIPTION_699=This utility can be used to request that the \
@@ -2278,9 +2247,6 @@
 INFO_DESCRIPTION_CONNECTION_TIMEOUT_1712=Maximum length of time (in \
  milliseconds) that can be taken to establish a connection.  Use '0' to \
  specify no time out
-ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=An error occurred while \
-attempting to write entry to LDIF:  Could not calculate the DN for the \
-entry (no value found for the RDN attribute %s)
 ERR_CLIENT_SIDE_TIMEOUT_1714=A client side timeout occurred.\
  %nAdditional Information:  %s
 INFO_MAXIMUM_DURATION_PLACEHOLDER_1716={maximum duration}
@@ -2593,7 +2559,6 @@
 REF_SHORT_DESC_LDIFMODIFY_15016=apply LDIF changes to LDIF
 REF_SHORT_DESC_LDIFSEARCH_15017=search LDIF with LDAP filters
 REF_SHORT_DESC_LIST_BACKENDS_15018=list OpenDJ backends and base DNs
-REF_SHORT_DESC_MAKELDIF_15019=generate test LDIF
 REF_SHORT_DESC_MANAGE_ACCOUNT_15020=manage state of OpenDJ server accounts
 REF_SHORT_DESC_MANAGE_TASKS_15021=manage OpenDJ server administration tasks
 REF_SHORT_DESC_REBUILD_INDEX_15022=rebuild index after configuration change
@@ -2639,7 +2604,6 @@
 INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PASSWORD=Password for keystore '%s':
 INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS=>>>> Specify OpenDJ LDAP connection parameters
 ERR_LDAP_CONN_BAD_HOST_NAME=The hostname "%s" could not be resolved. Please check you have provided the correct address
-ERR_LDAP_CONN_BAD_PORT_NUMBER=Invalid port number "%s". Please enter a valid port number between 1 and 65535
 INFO_LDAP_CONN_PROMPT_HOST_NAME=Directory server hostname or IP address [%s]:
 INFO_LDAP_CONN_PROMPT_SECURITY_USE_SECURE_CTX=How do you want to connect?
 INFO_LDAP_CONN_PROMPT_SECURITY_PROTOCOL_DEFAULT_CHOICE=%d
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_ca_ES.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_ca_ES.properties
index 9d1b002..3fc8354 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_ca_ES.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_ca_ES.properties
@@ -165,9 +165,6 @@
 ERR_INSTALLDS_PASSWORDS_DONT_MATCH_530=ERROR:  Els valors de les contrasenyes proporcionades no coincideixen
 INFO_LDIFIMPORT_DESCRIPTION_QUIET_532=Utilitzar mode silenci\u00f3s (sense sortida)
 ERR_MAKELDIF_TAG_INVALID_ARGUMENT_COUNT_535=N\u00famero incorrecte d'arguments proporcionats per l'etiqueta %s en la l\u00ednia n\u00famero %d del fitxer de plantilla:  esperat %d, obtingut %d
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=La ruta al fitxer plantilla amb informaci\u00f3 quant les dades LDIF a generar
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=La ruta al fitxer LDIF a ser escrit
-INFO_MAKELDIF_DESCRIPTION_SEED_578=La llavor a utilitzar per inicialitzar el generador de n\u00fameros aleatoris
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=La ruta a la plantilla MakeLDIF per utilitzar per generar la importaci\u00f3 de dades
 INFO_LDIFIMPORT_DESCRIPTION_RANDOM_SEED_609=La llavor pel generador de n\u00fameros aleatoris MakeLDIF
 INFO_LDIFMODIFY_DESCRIPTION_SOURCE_620=El fitxer LDIF que cont\u00e9 les dades per ser actualitzades
@@ -204,7 +201,6 @@
 INFO_LDIFDIFF_TOOL_DESCRIPTION_694=Aquesta utilitat pot utilitzar-se per comparar dos fitxers LDIF i informar de les difer\u00e8ncies en format LDIF
 INFO_LDIFMODIFY_TOOL_DESCRIPTION_695=Aquesta utilitat pot utilitzar-se per aplicar un conjunt d'operacions de modificaci\u00f3, afegiment i eliminacions conta les dades en un fitxer LDIF
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=Aquesta utilitat pot utilitzar-se per realitzar operacions de cerca conta les dades en un fitxer LDIF
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=Aquesta utilitat pot utilitzar-se per generar dades LDIF basades en una definici\u00f3 en un fitxer de plantilla
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=Aquesta utilitat pot utilitzar-se per restaurar una c\u00f2pia de seguretat d'una infraestructura de fons (Backend) del servidor de directori
 INFO_STOPDS_TOOL_DESCRIPTION_699=Aquesta utilitat pot utilitzar-se per sol\u00b7licitar que el servidor de directori aturi l'execuci\u00f3, o realitzar un re-inici
 INFO_VERIFYINDEX_TOOL_DESCRIPTION_700=Aquesta utilitat pot utilitzar-se per assegurar-se que les dades de l'\u00edndex son consistents a l'interior d'una infraestructura de fons (Backend) en la BDD Berkeley edici\u00f3 Java
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_de.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_de.properties
index 9479ec0..031988e 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_de.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_de.properties
@@ -467,29 +467,15 @@
 WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=Das Wertemuster f\u00fcr Zeile %d der Vorlagendatei in der Definition f\u00fcr die Vorlage %s ist leer
 ERR_MAKELDIF_NO_SUCH_TAG_572=Verweis auf undefiniertes Tag %s in Zeile %d der Vorlagendatei
 ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=Unerwarteter Fehler beim Versuch, eine neue Instanz von Tag %s zu erstellen, auf die in Zeile %d der Vorlagendatei verwiesen wird: %s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=Pfad zur Vorlagendatei mit den Informationen \u00fcber die zu erstellenden LDIF-Daten
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=Pfad zu der zu schreibenden LDIF-Datei
-INFO_MAKELDIF_DESCRIPTION_SEED_578=Seed zur Initialisierung des Zufallszahlengenerators
-ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=Fehler beim Versuch, das Directory-Server-JMX-Untersystem auf Grundlage der in der Konfigurationsdatei %s enthaltenen Informationen zu initialisieren:  %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=Fehler beim Versuch, die Directory-Server-Konfigurationsdatei %s zu verarbeiten:  %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=Fehler beim Versuch, das Directory-Server-Schema auf Grundlage der in der Konfigurationsdatei %s enthaltenen Informationen zu initialisieren:  %s
-ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=Fehler beim Versuch, die Vorlagendatei zu lesen:  %s
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=Fehler beim Versuch, die Vorlagendatei zu analysieren:  %s
 ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=Wert "%s" kann nicht als g\u00fcltige Formatzeichenkette f\u00fcr Tag %s in Zeile %d der Vorlagendatei geparst werden
 ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=Das Zufallstag in Zeile %d der Vorlagendatei enth\u00e4lt kein Argument, das den Typ des Zufallswerts festlegt, der generiert werden soll
 WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=Der generierte Wert des Zufalltags in Zeile %d der Vorlagendatei wird immer eine leere Zeichenkette sein
 ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=Der Zufallstag in Zeile %d der Vorlagendatei verweist auf den unbekannten Zufallstyp %s
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=Pfad, um nach MakeLDIF-Ressourcen zu suchen (z. B. Datendateien), die nicht im aktuellen Arbeitsverzeichnis oder dem Vorlagenverzeichnispfad gefunden werden
 ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=Vorlagendatei %s kann nicht gefunden werden
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=Angegebenes Ressourcenverzeichnis %s kann nicht gefunden werden
 ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=Datei %s, auf die von Tag %s in Zeile %d der Vorlagendatei verwiesen wird, kann nicht gefunden werden
 ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=Ung\u00fcltiger Dateizugriffsmodus %s f\u00fcr Tag %s in Zeile %d der Vorlagendatei.  Zul\u00e4ssige Werte sind "sequential" oder "random"
 ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=Fehler beim Versuch, Datei %s zu lesen, auf die von Tag %s in Zeile %d der Vorlagendatei verwiesen wird: %s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=Fehler beim Versuch, LDIF-Datei %s zum Schreiben zu \u00f6ffnen: %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF_599=Fehler beim Schreiben von Daten in LDIF-Datei %s: %s
-INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=%d Eintr\u00e4ge verarbeitet
 ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=Fehler beim Versuch, Eintrag %s in LDIF-Datei zu schreiben: %s
-INFO_MAKELDIF_PROCESSING_COMPLETE_602=LDIF-Verarbeitung vollst\u00e4ndig.  %d Eintr\u00e4ge geschrieben
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=Pfad zu einer MakeLDIF-Vorlage zum Erstellen der Importdaten
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=Weder das Argument %s noch das Argument %s wurde angegeben.  Eines dieser Argumente muss festgelegt werden, um die Quelle f\u00fcr die zu importierenden LDIF-Daten anzugeben
 ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=Die angegebene Datei %s konnte nicht als eine MakeLDIF-Vorlagendatei analysiert werden:  %s
@@ -569,7 +555,6 @@
 INFO_LDIFDIFF_TOOL_DESCRIPTION_694=Dieses Dienstprogramm dient zum Vergleich von zwei LDIF-Dateien und zur Berichterstellung \u00fcber die Unterschiede im LDIF-Format
 INFO_LDIFMODIFY_TOOL_DESCRIPTION_695=Dieses Dienstprogramm dient zur \u00dcbernahme eines Satzes von \u00c4nderungs-, Hinzuf\u00fcge- und L\u00f6schvorg\u00e4ngen in einer LDIF-Datei
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=Dieses Dienstprogramm dient zur Durchf\u00fchrung von Datensuchvorg\u00e4ngen in einer LDIF-Datei
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=Dieses Dienstprogramm dient zur Erstellung von LDIF-Daten auf Grundlage einer Definition in einer Vorlagendatei
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=Dieses Dienstprogramm dient zur Wiederherstellung einer Directory-Server-Backendsicherung
 INFO_STOPDS_TOOL_DESCRIPTION_699=Dieses Dienstprogramm dient zur Aufforderung an den Directory-Server, herunterzufahren oder neu zu starten
 INFO_VERIFYINDEX_TOOL_DESCRIPTION_700=Dieses Dienstprogramm dient zum Sicherstellen, dass Indexdaten innerhalb eines Backends auf Grundlage der Berkeley DB Java Edition konsistent sind
@@ -1172,7 +1157,6 @@
 INFO_DESCRIPTION_BACKEND_DEBUG_STATS_ONLY_1710=JE-Daten nicht anzeigen, nur Statistiken
 INFO_TIMEOUT_PLACEHOLDER_1711={Zeit\u00fcberschreitung}
 INFO_DESCRIPTION_CONNECTION_TIMEOUT_1712=Maximale Dauer (in Millisekunden), die die Verbindungsherstellung in Anspruch nehmen kann
-ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=Ein Fehler ist beim Versuch, den Eintrag in LDIF zu schreiben, aufgetreten:  Der DN konnte nicht f\u00fcr den Eintrag berechnet werden (kein Wert wurde f\u00fcr RDN-Attribut %s gefunden)
 ERR_CLIENT_SIDE_TIMEOUT_1714=Ein Laufzeitfehler auf Client-Seite ist aufgetreten.%nZus\u00e4tzliche Informationen:  %s
 ERR_BACKEND_TOOL_ERROR_READING_TREE_1866=Unerwarteter Fehler beim Versuch, Datens\u00e4tze aus der index zu lesen und/oder zu entschl\u00fcsseln: %s
 ERR_BACKEND_TOOL_ERROR_INITIALIZING_BACKEND_1865=Unerwarteter Fehler beim Versuch, das Backend %s zu initialisieren: %s
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_es.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_es.properties
index 081f2b3..0007fa6 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_es.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_es.properties
@@ -467,29 +467,15 @@
 WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=El patr\u00f3n de valores de la l\u00ednea %d del archivo de plantillas en la definici\u00f3n de plantilla %s est\u00e1 vac\u00edo
 ERR_MAKELDIF_NO_SUCH_TAG_572=Se hace referencia a una etiqueta %s no definida en la l\u00ednea %d del archivo de plantilla
 ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=Se ha producido un error no esperado al intentar crear una nueva instancia de la etiqueta %s a la que se hace referencia en la l\u00ednea %d del archivo de plantilla: %s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=La ruta al archivo de plantilla con informaci\u00f3n acerca de los datos LDIF que generar
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=La ruta al archivo LDIF que escribir
-INFO_MAKELDIF_DESCRIPTION_SEED_578=La semilla que se utilizar\u00e1 para inicializar el generador de n\u00fameros aleatorios
-ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=Se ha producido un error al tratar de inicializar el subsistema JMX del Servidor de directorios basado en la informaci\u00f3n del archivo de configuraci\u00f3n %s:  %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=Se ha producido un error al tratar de procesar el archivo de configuraci\u00f3n del Servidor de directorios %s:  %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=Se ha producido un error al tratar de inicializar el esquema del Servidor de directorios basado en la informaci\u00f3n del archivo de configuraci\u00f3n %s:  %s
-ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=Se ha producido un error al tratar de leer el archivo de plantilla:  %s
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=Se ha producido un error al tratar de analizar el archivo de plantilla:  %s
 ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=No se puede analizar el valor "%s" como una cadena de formato v\u00e1lido para la etiqueta %s de la l\u00ednea %d del archivo de plantilla
 ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=La etiqueta aleatoria en la l\u00ednea %d del archivo de plantilla no incluye un argumento para especificar el tipo de valor aleatorio que se debe generar
 WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=El valor generado a partir de la etiqueta aleatoria en la l\u00ednea %d del archivo de plantilla siempre ser\u00e1 una cadena vac\u00eda
 ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=La etiqueta aleatoria en la l\u00ednea %d del archivo de plantilla hace referencia a un tipo aleatorio desconocido de %s
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=No se ha encontrado la ruta para buscar recursos MakeLDIF (p.ej. archivos de datos) en el directorio de trabajo actual o en la ruta del directorio de plantillas
 ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=No se encuentra el archivo de plantilla %s
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=No se ha podido encontrar el directorio de recursos especificado %s
 ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=No se puede encontrar el archivo %s al que hace referencia la etiqueta %s de la l\u00ednea %d del archivo de plantilla
 ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=Modo de acceso de archivo no v\u00e1lido %s para la etiqueta %s en la l\u00ednea %d del archivo de plantilla.  Debe ser "secuencial" o bien "aleatorio"
 ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=Se ha producido un error al intentar leer el archivo %s al que hace referencia la etiqueta %s en la l\u00ednea %d del archivo de plantilla:  %s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=Se ha producido un error al intentar abrir el archivo LDIF %s para escritura:  %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF_599=Se ha producido un error al escribir datos en el archivo LDIF %s:  %s
-INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=%d entradas procesadas
 ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=Se ha producido un error al intentar escribir la entrada %s en LDIF:  %s
-INFO_MAKELDIF_PROCESSING_COMPLETE_602=Procesamiento LDIF completo.  %d entradas escritas
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=Ruta a una plantilla MakeLDIF que utilizar para generar los datos de importaci\u00f3n
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=No se han proporcionado ni el argumento %s ni el %s.  Debe proporcionarse uno de estos argumentos para especificar el origen para la importaci\u00f3n de los datos LDIF
 ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=No se puede analizar el archivo especificado %s como un archivo de plantilla MakeLDIF:  %s
@@ -569,7 +555,6 @@
 INFO_LDIFDIFF_TOOL_DESCRIPTION_694=Esta utilidad se puede utilizar para comparar dos archivos LDIF y notificar las diferencias en formato LDIF
 INFO_LDIFMODIFY_TOOL_DESCRIPTION_695=Esta utilidad se puede utilizar para aplicar un conjunto de operaciones modificar, agregar y eliminar frente a datos en un archivo LDIF
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=Esta utilidad se puede utilizar para realizar operaciones de b\u00fasqueda frente a datos en un archivo LDIF
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=Esta utilidad se puede utilizar para generar datos LDIF basados en una definici\u00f3n de un archivo de plantilla
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=Esta utilidad se puede utilizar para restaurar la copia de seguridad de un servidor de fondo de Directory Server
 INFO_STOPDS_TOOL_DESCRIPTION_699=Esta utilidad se puede utilizar para solicitar que el servidor de directorios deje de ejecutarse o realice un reinicio
 INFO_VERIFYINDEX_TOOL_DESCRIPTION_700=Esta utilidad se puede utilizar para garantizar que los datos de \u00edndice sean consistentes con un servidor de fondo basado en Berkeley DB Java Edition
@@ -1172,7 +1157,6 @@
 INFO_DESCRIPTION_BACKEND_DEBUG_STATS_ONLY_1710=No mostrar los datos JE, s\u00f3lo estad\u00edsticas
 INFO_TIMEOUT_PLACEHOLDER_1711={timeout}
 INFO_DESCRIPTION_CONNECTION_TIMEOUT_1712=La duraci\u00f3n m\u00e1xima de tiempo (en mil\u00e9simas de segundo) que puede tardarse en establecer una conexi\u00f3n
-ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=Se ha producido un error al tratar de escribir una entrada en LDIF: no ha podido calcularse el DN para la entrada (no se ha encontrado ning\u00fan valor para el atributo RDN %s)
 ERR_CLIENT_SIDE_TIMEOUT_1714=Se ha producido un tiempo de espera en el lado del cliente.%nInformaci\u00f3n adicional:  %s
 INFO_LDIFDIFF_DESCRIPTION_USE_COMPARE_RESULT_1735=Utilice los resultados de comparaci\u00f3n de LDAP como un c\u00f3digo de salida para se\\u00F1alar diferencias entre los dos archivos LDIF
 INFO_LDAPCOMPARE_DESCRIPTION_USE_COMPARE_RESULT_1736=Utilice los resultados de comparaci\u00f3n de LDAP como un c\u00f3digo de salida para las comparaci\u00f3nes LDAP
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_fr.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_fr.properties
index 52a499d..87de936 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_fr.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_fr.properties
@@ -467,29 +467,15 @@
 WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=Le motif de valeur pour la ligne %d du fichier mod\u00e8le dans la d\u00e9finition de mod\u00e8le %s est vide
 ERR_MAKELDIF_NO_SUCH_TAG_572=Une balise non d\u00e9finie %s est r\u00e9f\u00e9renc\u00e9e sur la ligne %d du fichier mod\u00e8le
 ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=Une erreur inattendue s'est produite lors de la tentative de cr\u00e9ation d'une nouvelle instance de balise %s r\u00e9f\u00e9renc\u00e9e sur la ligne %d du fichier mod\u00e8le\u00a0:  %s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=Le chemin vers le fichier mod\u00e8le avec les informations concernant les donn\u00e9es LDIF \u00e0 g\u00e9n\u00e9rer
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=Le chemin vers le fichier LDIF \u00e0 \u00e9crire
-INFO_MAKELDIF_DESCRIPTION_SEED_578=Le germe \u00e0 utiliser pour initialiser le g\u00e9n\u00e9rateur de nombres al\u00e9atoire
-ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=Une erreur s'est produite lors de la tentative d'initialisation du sous-syst\u00e8me JMX Directory Server sur la base des informations du fichier de configuration %s\u00a0: %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=Une erreur s'est produite lors de la tentative de traitement du fichier de configuration Directory Server %s\u00a0: %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=Une erreur s'est produite lors de la tentative d'initialisation du sch\u00e9ma Directory Server sur la base des informations du fichier de configuration %s\u00a0: %s
-ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=Une erreur s'est produite lors de la tentative de lecture du fichier de mod\u00e8le\u00a0: %s
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=Une erreur s'est produite lors de la tentative d'analyse du fichier de mod\u00e8le\u00a0: %s
 ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=Impossible d'analyser la valeur "%s" en tant que cha\u00eene de format valide pour une balise %s sur la ligne %d du fichier mod\u00e8le
 ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=La balise al\u00e9atoire sur la ligne %d du fichier mod\u00e8le n'inclut pas d'argument pour sp\u00e9cifier le type de valeur al\u00e9atoire qui devrait \u00eatre g\u00e9n\u00e9r\u00e9e
 WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=La valeur g\u00e9n\u00e9r\u00e9e \u00e0 partir de la balise al\u00e9atoire sur la ligne %d du fichier mod\u00e8le sera toujours une cha\u00eene vide
 ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=La balise al\u00e9atoire sur la ligne %d du fichier mod\u00e8le fait r\u00e9f\u00e9rence \u00e0 un type al\u00e9atoire inconnu de %s
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=Impossible de trouver le chemin pour rechercher les ressources MakeLDIF (par exemple, des fichiers de donn\u00e9es) dans le r\u00e9pertoire de travail actuel ou dans le chemin du r\u00e9pertoire de mod\u00e8les
 ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=Impossible de trouver le fichier mod\u00e8le %s
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=Impossible de trouver l'annuaire de ressources sp\u00e9cifi\u00e9 %s
 ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=Impossible de trouver le fichier %s r\u00e9f\u00e9renc\u00e9 par la balise %s sur la ligne %d du fichier mod\u00e8le
 ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=Mode d'acc\u00e8s au fichier %s invalide pour la balise %s sur la ligne %d du fichier mod\u00e8le.  Cela doit \u00eatre "s\u00e9quentiel" ou "al\u00e9atoire"
 ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=Une erreur s'est produite lors de la tentative de lecture du fichier %s r\u00e9f\u00e9renc\u00e9 par la balise %s sur la ligne %d du fichier mod\u00e8le\u00a0:  %s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=Une erreur s'est produite lors de la tentative d'ouverture du fichier LDIF %s pour \u00e9crire\u00a0:  %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF_599=Une erreur s'est produite lors de l'\u00e9criture des donn\u00e9es dans le fichier LDIF %s\u00a0:  %s
-INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=%d entr\u00e9es trait\u00e9es
 ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=Une erreur s'est produite lors de la tentative d'\u00e9criture de l'entr\u00e9e %s dans LDIF\u00a0:  %s
-INFO_MAKELDIF_PROCESSING_COMPLETE_602=Traitement LDIF termin\u00e9.  %d entr\u00e9es \u00e9crites
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=Chemin vers un mod\u00e8le MakeLDIF \u00e0 utiliser pour g\u00e9n\u00e9rer les donn\u00e9es d'importation
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=Vous n'avez fourni ni l'argument %s, ni l'argument %s.  Vous devez indiquer l'un de ces arguments pour sp\u00e9cifier la source des donn\u00e9es LDIF \u00e0 importer
 ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=Impossible d'analyser le fichier sp\u00e9cifi\u00e9 (%s) en tant que fichier de mod\u00e8le MakeLDIF\u00a0: %s
@@ -569,7 +555,6 @@
 INFO_LDIFDIFF_TOOL_DESCRIPTION_694=Cet utilitaire permet de comparer deux fichiers LDIF et de rapporter les diff\u00e9rences au format LDIF
 INFO_LDIFMODIFY_TOOL_DESCRIPTION_695=Cet utilitaire permet d'appliquer un jeu d'op\u00e9rations de modification, ajout et suppression sur des donn\u00e9es dans un fichier LDIF
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=Cet utilitaire permet d'effectuer des op\u00e9rations de recherche sur des donn\u00e9es dans un fichier LDIF
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=Cet utilitaire permet de g\u00e9n\u00e9rer des donn\u00e9es LDIF bas\u00e9es sur une d\u00e9finition dans un fichier mod\u00e8le
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=Cet utilitaire permet de restaurer une sauvegarde de backend de Directory Server
 INFO_STOPDS_TOOL_DESCRIPTION_699=Cet utilitaire permet de demander \u00e0 Directory Server de cesser de s'ex\u00e9cuter ou d'effectuer un red\u00e9marrage
 INFO_VERIFYINDEX_TOOL_DESCRIPTION_700=Cet utilitaire permet de s'assurer que les donn\u00e9es d'index sont coh\u00e9rentes avec un backend bas\u00e9 sur Berkeley DB Java Edition
@@ -1172,7 +1157,6 @@
 INFO_DESCRIPTION_BACKEND_DEBUG_STATS_ONLY_1710=Impossible d'afficher les donn\u00e9es JE, uniquement les statistiques
 INFO_TIMEOUT_PLACEHOLDER_1711={Temporisation}
 INFO_DESCRIPTION_CONNECTION_TIMEOUT_1712=Dur\u00e9e maximale (en millisecondes) qui peut \u00eatre n\u00e9cessaire pour \u00e9tablir une connexion
-ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=Une erreur est survenue lors de la tentative d'\u00e9criture d'une entr\u00e9e dans LDIF : Impossible de calculer le DN de l'entr\u00e9e (aucune valeur trouv\u00e9e pour l'attribut RDN %s)
 ERR_CLIENT_SIDE_TIMEOUT_1714=Une expiration du d\u00e9lai s'est produite c\u00f4t\u00e9 client.%nInformations suppl\u00e9mentaires\u00a0:  %s
 INFO_LDIFDIFF_DESCRIPTION_USE_COMPARE_RESULT_1735=Utiliser le r\u00e9sultat de comparaison LDAP en tant que code de sortie pour signaler les diff\u00e9rences entre deux fichiers LDIF
 INFO_LDAPCOMPARE_DESCRIPTION_USE_COMPARE_RESULT_1736=Utiliser le r\u00e9sultat de comparaison LDAP en tant que code de sortie pour les comparaisons LDAP
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_ja.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_ja.properties
index 08aeaf5..e789948 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_ja.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_ja.properties
@@ -467,29 +467,15 @@
 WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8 %2$s \u306e\u5b9a\u7fa9\u5185\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %1$d \u3067\u3001\u5024\u30d1\u30bf\u30fc\u30f3\u304c\u7a7a\u306b\u306a\u3063\u3066\u3044\u307e\u3059
 ERR_MAKELDIF_NO_SUCH_TAG_572=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %2$d \u3067\u672a\u5b9a\u7fa9\u306e\u30bf\u30b0 %1$s \u304c\u53c2\u7167\u3055\u308c\u3066\u3044\u307e\u3059
 ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %2$d \u3067\u53c2\u7167\u3055\u308c\u308b\u30bf\u30b0 %1$s \u306e\u65b0\u898f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u4f5c\u6210\u4e2d\u306b\u3001\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %3$s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=\u751f\u6210\u3059\u308b LDIF \u30c7\u30fc\u30bf\u306e\u60c5\u5831\u3092\u542b\u3080\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u30d1\u30b9
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=\u66f8\u304d\u8fbc\u307f\u5148\u306e LDIF \u30d5\u30a1\u30a4\u30eb\u3078\u306e\u30d1\u30b9
-INFO_MAKELDIF_DESCRIPTION_SEED_578=\u4e71\u6570\u767a\u751f\u95a2\u6570\u306e\u521d\u671f\u5316\u306b\u4f7f\u7528\u3059\u308b\u30b7\u30fc\u30c9
-ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb %s \u306e\u60c5\u5831\u306b\u57fa\u3065\u3044\u3066\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc JMX \u30b5\u30d6\u30b7\u30b9\u30c6\u30e0\u3092\u521d\u671f\u5316\u3057\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u69cb\u6210\u30d5\u30a1\u30a4\u30eb %s \u306e\u51e6\u7406\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb %s \u306e\u60c5\u5831\u306b\u57fa\u3065\u3044\u3066\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u3092\u521d\u671f\u5316\u3057\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
-ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u89e3\u6790\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
 ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %3$d \u306e\u30bf\u30b0 %2$s \u3067\u3001\u5024 "%1$s" \u3092\u6709\u52b9\u306a\u66f8\u5f0f\u6587\u5b57\u5217\u3068\u3057\u3066\u89e3\u6790\u3067\u304d\u307e\u305b\u3093
 ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %d \u306e random \u30bf\u30b0\u306b\u3001\u751f\u6210\u3059\u308b\u30e9\u30f3\u30c0\u30e0\u5024\u306e\u578b\u3092\u6307\u5b9a\u3059\u308b\u5f15\u6570\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093
 WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %d \u306e random \u30bf\u30b0\u304b\u3089\u751f\u6210\u3055\u308c\u308b\u5024\u306f\u5e38\u306b\u7a7a\u306e\u6587\u5b57\u5217\u306b\u306a\u308a\u307e\u3059
 ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %d \u306e random \u30bf\u30b0\u306f\u3001\u4e0d\u660e\u306a\u30e9\u30f3\u30c0\u30e0\u306e\u578b %s \u3092\u53c2\u7167\u3057\u3066\u3044\u307e\u3059
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=MakeLDIF \u30ea\u30bd\u30fc\u30b9 (\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u306a\u3069) \u306e\u691c\u7d22\u30d1\u30b9\u304c\u3001\u73fe\u5728\u306e\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u3082\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d1\u30b9\u5185\u306b\u3082\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
 ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb %s \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=\u6307\u5b9a\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
 ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %3$d \u306e\u30bf\u30b0 %2$s \u3067\u53c2\u7167\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb %1$s \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %3$d \u306e\u30bf\u30b0 %2$s \u306b\u3001\u7121\u52b9\u306a\u30d5\u30a1\u30a4\u30eb\u30a2\u30af\u30bb\u30b9\u30e2\u30fc\u30c9 %1$s \u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002  \u3053\u308c\u306f "sequential" \u307e\u305f\u306f "random" \u306b\u3057\u3066\u304f\u3060\u3055\u3044
 ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u884c %3$d \u306e\u30bf\u30b0 %2$s \u3067\u53c2\u7167\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb %1$s \u306e\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %4$s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=LDIF \u30d5\u30a1\u30a4\u30eb %s \u3092\u66f8\u304d\u8fbc\u307f\u7528\u306b\u958b\u3044\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF_599=\u30c7\u30fc\u30bf\u3092 LDIF \u30d5\u30a1\u30a4\u30eb %s \u306b\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
-INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=%d \u30a8\u30f3\u30c8\u30ea\u304c\u51e6\u7406\u3055\u308c\u307e\u3057\u305f
 ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=\u30a8\u30f3\u30c8\u30ea %s \u3092 LDIF \u306b\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
-INFO_MAKELDIF_PROCESSING_COMPLETE_602=LDIF \u306e\u51e6\u7406\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002  %d \u30a8\u30f3\u30c8\u30ea\u304c\u66f8\u304d\u8fbc\u307e\u308c\u307e\u3057\u305f
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=\u30a4\u30f3\u30dd\u30fc\u30c8\u30c7\u30fc\u30bf\u306e\u751f\u6210\u306b\u4f7f\u7528\u3059\u308b MakeLDIF \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30d1\u30b9
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=%s \u5f15\u6570\u3082 %s \u5f15\u6570\u3082\u6307\u5b9a\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30a4\u30f3\u30dd\u30fc\u30c8\u3059\u308b LDIF \u30c7\u30fc\u30bf\u306e\u30bd\u30fc\u30b9\u3092\u6307\u5b9a\u3059\u308b\u305f\u3081\u306b\u3001\u3053\u308c\u3089\u306e\u5f15\u6570\u306e\u3044\u305a\u308c\u304b\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
 ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=\u6307\u5b9a\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb %s \u3092 MakeLDIF \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3068\u3057\u3066\u89e3\u6790\u3067\u304d\u307e\u305b\u3093:  %s
@@ -569,7 +555,6 @@
 INFO_LDIFDIFF_TOOL_DESCRIPTION_694=\u3053\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u3063\u3066\u30012 \u3064\u306e LDIF \u30d5\u30a1\u30a4\u30eb\u3092\u6bd4\u8f03\u3057\u305f\u308a\u3001LDIF \u5f62\u5f0f\u306e\u76f8\u9055\u70b9\u3092\u5831\u544a\u3057\u305f\u308a\u3067\u304d\u307e\u3059
 INFO_LDIFMODIFY_TOOL_DESCRIPTION_695=\u3053\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u3063\u3066\u3001LDIF \u30d5\u30a1\u30a4\u30eb\u5185\u306e\u30c7\u30fc\u30bf\u306b\u5bfe\u3059\u308b\u5909\u66f4\u3001\u8ffd\u52a0\u3001\u304a\u3088\u3073\u524a\u9664\u64cd\u4f5c\u306e\u30bb\u30c3\u30c8\u3092\u9069\u7528\u3067\u304d\u307e\u3059
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=\u3053\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u3063\u3066\u3001LDIF \u30d5\u30a1\u30a4\u30eb\u5185\u306e\u30c7\u30fc\u30bf\u306b\u5bfe\u3059\u308b\u691c\u7d22\u64cd\u4f5c\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=\u3053\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u3063\u3066\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u5b9a\u7fa9\u306b\u57fa\u3065\u3044\u3066 LDIF \u30c7\u30fc\u30bf\u3092\u751f\u6210\u3067\u304d\u307e\u3059
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=\u3053\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u3063\u3066\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u306e\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u5fa9\u5143\u3067\u304d\u307e\u3059
 INFO_STOPDS_TOOL_DESCRIPTION_699=\u3053\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u3063\u3066\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u505c\u6b62\u307e\u305f\u306f\u518d\u8d77\u52d5\u3092\u8981\u6c42\u3067\u304d\u307e\u3059
 INFO_VERIFYINDEX_TOOL_DESCRIPTION_700=\u3053\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u3063\u3066\u3001Berkeley DB Java Edition \u306b\u57fa\u3065\u3044\u305f\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u5185\u90e8\u3067\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u30c7\u30fc\u30bf\u304c\u4e00\u8cab\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u4fdd\u8a3c\u3067\u304d\u307e\u3059
@@ -1173,7 +1158,6 @@
 INFO_DESCRIPTION_BACKEND_DEBUG_STATS_ONLY_1710=JE \u30c7\u30fc\u30bf\u306f\u8868\u793a\u3057\u307e\u305b\u3093\u3002\u7d71\u8a08\u60c5\u5831\u306e\u307f\u3067\u3059
 INFO_TIMEOUT_PLACEHOLDER_1711={timeout}
 INFO_DESCRIPTION_CONNECTION_TIMEOUT_1712=\u63a5\u7d9a\u3092\u78ba\u7acb\u3059\u308b\u305f\u3081\u306b\u304b\u3051\u3089\u308c\u308b\u6700\u5927\u6642\u9593 (\u30df\u30ea\u79d2)
-ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=\u30a8\u30f3\u30c8\u30ea\u3092 LDIF \u306b\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  \u30a8\u30f3\u30c8\u30ea\u306e DN \u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f (RDN \u5c5e\u6027 %s \u306e\u5024\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093)
 ERR_CLIENT_SIDE_TIMEOUT_1714=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u5074\u306e\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002%n\u8ffd\u52a0\u60c5\u5831:  %s
 ERR_BACKEND_TOOL_ERROR_READING_TREE_1866=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u304b\u3089\u306e\u30ec\u30b3\u30fc\u30c9\u3092\u8aad\u307f\u53d6\u308a\u307e\u305f\u306f\u5fa9\u53f7\u5316\u3001\u3042\u308b\u3044\u306f\u305d\u306e\u4e21\u65b9\u3092\u884c\u3063\u3066\u3044\u308b\u3068\u304d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
 ERR_BACKEND_TOOL_ERROR_INITIALIZING_BACKEND_1865=\u30d0\u30c3\u30af\u30a8\u30f3\u30c9 %s \u306e\u521d\u671f\u5316\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_ko.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_ko.properties
index 06b32cc..5a90b29 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_ko.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_ko.properties
@@ -465,29 +465,15 @@
 WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %d\ud589\uc5d0 \ub300\ud574 %s \ubd84\uae30\uc5d0 \ub300\ud55c \uc815\uc758\uc5d0 \uac12 \ud328\ud134\uc774 \ube44\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.
 ERR_MAKELDIF_NO_SUCH_TAG_572=\uc815\uc758\ub418\uc9c0 \uc54a\uc740 %s \ud0dc\uadf8\uac00 \ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %d\ud589\uc5d0\uc11c \ucc38\uc870\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %2$d\ud589\uc5d0\uc11c \ucc38\uc870\ub41c %1$s \ud0dc\uadf8\uc758 \uc0c8 \uc778\uc2a4\ud134\uc2a4\ub97c \ub9cc\ub4dc\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %3$s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=\uc0dd\uc131\ud560 LDIF \ub370\uc774\ud130\uc5d0 \ub300\ud55c \uc815\ubcf4\uac00 \uc788\ub294 \ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c \uacbd\ub85c
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=\uae30\ub85d\ud560 LDIF \ud30c\uc77c \uacbd\ub85c
-INFO_MAKELDIF_DESCRIPTION_SEED_578=\ub09c\uc218 \uc0dd\uc131\uae30\ub97c \ucd08\uae30\ud654\ud558\ub294 \ub370 \uc0ac\uc6a9\ud558\ub294 \uc2dc\ub4dc
-ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=\uad6c\uc131 \ud30c\uc77c %s\uc758 \uc815\ubcf4\ub97c \uae30\ubc18\uc73c\ub85c \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 JMX \ud558\uc704 \uc2dc\uc2a4\ud15c\uc744 \ucd08\uae30\ud654\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uad6c\uc131 \ud30c\uc77c %s\uc744(\ub97c) \ucc98\ub9ac\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=\uad6c\uc131 \ud30c\uc77c %s\uc758 \uc815\ubcf4\ub97c \uae30\ubc18\uc73c\ub85c \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc2a4\ud0a4\ub9c8\ub97c \ucd08\uae30\ud654\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc744 \uc77d\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc744 \uad6c\ubb38 \ubd84\uc11d\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
 ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=\ud15c\ud50c\ub9bf \ud30c\uc77c\uc758 %3$d\ud589\uc5d0\uc11c \uac12 \"%1$s\"\uc744(\ub97c) %2$s \ud0dc\uadf8\uc5d0 \ub300\ud574 \uc720\ud6a8\ud55c \ud615\uc2dd \ubb38\uc790\uc5f4\ub85c \uad6c\ubb38 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %d\ud589\uc5d0 \uc788\ub294 \uc784\uc758 \ud0dc\uadf8\uc5d0 \uc0dd\uc131\ud560 \uc784\uc758 \uac12 \uc720\ud615\uc744 \uc9c0\uc815\ud558\ub294 \uc778\uc218\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
 WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %d\ud589\uc5d0 \uc788\ub294 \uc784\uc758 \ud0dc\uadf8\ub85c\ubd80\ud130 \uc0dd\uc131\ub418\ub294 \uac12\uc740 \ud56d\uc0c1 \ube48 \ubb38\uc790\uc5f4\uc785\ub2c8\ub2e4.
 ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %d\ud589\uc5d0 \uc788\ub294 \uc784\uc758 \ud0dc\uadf8\uac00 \uc54c \uc218 \uc5c6\ub294 \uc784\uc758 \uc720\ud615 %s\uc744(\ub97c) \ucc38\uc870\ud569\ub2c8\ub2e4.
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=\ud604\uc7ac \uc791\uc5c5 \ub514\ub809\ud1a0\ub9ac \ub610\ub294 \ud15c\ud50c\ub9ac\ud2b8 \ub514\ub809\ud1a0\ub9ac \uacbd\ub85c\uc5d0 \uc5c6\ub294 MakeLDIF \uc790\uc6d0(\uc608: \ub370\uc774\ud130 \ud30c\uc77c)\uc744 \ucc3e\uae30 \uc704\ud55c \uacbd\ub85c
 ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c %s\uc744(\ub97c) \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=\uc9c0\uc815\ub41c \uc790\uc6d0 \ub514\ub809\ud1a0\ub9ac %s\uc744(\ub97c) \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
 ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %3$d\ud589\uc5d0\uc11c %2$s \ud0dc\uadf8\uc5d0 \uc758\ud574 \ucc38\uc870\ub418\ub294 %1$s \ud30c\uc77c\uc744 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %3$d\ud589\uc5d0\uc11c %2$s \ud0dc\uadf8\uc5d0 \ub300\ud55c \ud30c\uc77c \uc561\uc138\uc2a4 \ubaa8\ub4dc %1$s\uc774(\uac00) \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4.  "sequential" \ub610\ub294 "random"\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4.
 ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=\ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 %3$d\ud589\uc5d0\uc11c %2$s \ud0dc\uadf8\uc5d0 \uc758\ud574 \ucc38\uc870\ub418\ub294 %1$s \ud30c\uc77c\uc744 \uc77d\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %4$s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=\uc4f0\uae30 \uc704\ud574 LDIF \ud30c\uc77c %s\uc744(\ub97c) \uc5ec\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF_599=LDIF \ud30c\uc77c %s\uc5d0 \ub370\uc774\ud130\ub97c \uc4f0\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=%d\uac1c \ud56d\ubaa9\uc744 \ucc98\ub9ac\ud588\uc2b5\ub2c8\ub2e4.
 ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=LDIF\uc5d0 %s \ud56d\ubaa9\uc744 \uc4f0\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-INFO_MAKELDIF_PROCESSING_COMPLETE_602=LDIF \ucc98\ub9ac\ub97c \uc644\ub8cc\ud588\uc2b5\ub2c8\ub2e4.  %d\uac1c \ud56d\ubaa9\uc744 \uae30\ub85d\ud588\uc2b5\ub2c8\ub2e4.
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=\uac00\uc838\uc624\uae30 \ub370\uc774\ud130\ub97c \uc0dd\uc131\ud558\ub294 \ub370 \uc0ac\uc6a9\ud560 MakeLDIF \ud15c\ud50c\ub9ac\ud2b8 \uacbd\ub85c
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=%s \ubc0f %s \uc778\uc218\uac00 \ubaa8\ub450 \uc81c\uacf5\ub418\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4.  \uc774\ub7ec\ud55c \uc778\uc218 \uc911 \ud558\ub098\ub97c \uc81c\uacf5\ud558\uc5ec \uac00\uc838\uc62c LDIF \ub370\uc774\ud130\uc5d0 \ub300\ud55c \uc18c\uc2a4\ub97c \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4.
 ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=\uc9c0\uc815\ub41c \ud30c\uc77c %s\uc744(\ub97c) MakeLDIF \ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\ub85c \uad6c\ubb38 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %s
@@ -567,7 +553,6 @@
 INFO_LDIFDIFF_TOOL_DESCRIPTION_694=\uc774 \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec \ub450 LDIF \ud30c\uc77c\uc744 \ube44\uad50\ud558\uace0 \ucc28\uc774\uc810\uc744 LDIF \ud615\uc2dd\uc73c\ub85c \ubcf4\uace0\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
 INFO_LDIFMODIFY_TOOL_DESCRIPTION_695=\uc774 \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec LDIF \ud30c\uc77c\uc758 \ub370\uc774\ud130\uc5d0 \ub300\ud55c \uc218\uc815, \ucd94\uac00, \uc0ad\uc81c \uc791\uc5c5\uc744 \uc801\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=\uc774 \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec LDIF \ud30c\uc77c\uc758 \ub370\uc774\ud130\uc5d0 \ub300\ud55c \uac80\uc0c9 \uc791\uc5c5\uc744 \uc218\ud589\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=\uc774 \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec \ud15c\ud50c\ub9ac\ud2b8 \ud30c\uc77c\uc758 \uc815\uc758\ub97c \uae30\ubc18\uc73c\ub85c LDIF \ub370\uc774\ud130\ub97c \uc0dd\uc131\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=\uc774 \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \ubc31\uc5d4\ub4dc \ubc31\uc5c5\uc744 \ubcf5\uc6d0\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
 INFO_STOPDS_TOOL_DESCRIPTION_699=\uc774 \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uac00 \uc2e4\ud589\uc744 \uc911\uc9c0\ud558\uac70\ub098 \ub2e4\uc2dc \uc2dc\uc791\uc744 \uc218\ud589\ud558\ub3c4\ub85d \uc694\uccad\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
 INFO_VERIFYINDEX_TOOL_DESCRIPTION_700=\uc774 \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec Berkeley DB Java Edition\uc744 \uae30\ubc18\uc73c\ub85c \ubc31\uc5d4\ub4dc \ub0b4\uc5d0\uc11c \uc0c9\uc778 \ub370\uc774\ud130\uac00 \uc77c\uad00\ub418\ub294\uc9c0 \ud655\uc778\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_pl.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_pl.properties
index e2f05cb..43ebcc4 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_pl.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_pl.properties
@@ -35,7 +35,6 @@
 INFO_DESCRIPTION_PWPSTATE_GET_SECONDS_UNTIL_IDLE_LOCKOUT_1141=Wy\u015bwietl okres czasu w sekundach do momentu gdy konto u\u017cytkownika zostanie zablokowane, poniewa\u017c by\u0142o bezczynne za d\u0142ugo
 INFO_RESTOREDB_DESCRIPTION_VERIFY_ONLY_295=Weryfikuj zawarto\u015b\u0107 backupu ale nie przywracaj jej
 INFO_RESTOREDB_DESCRIPTION_LIST_BACKUPS_294=Lista dost\u0119pnych backup\u00f3w w katalogu backupu
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=To narz\u0119dzie mo\u017ce by\u0107 u\u017cyte do generowania danych LDIF w oparciu o definicje z pliku szablonu
 INFO_LDIFMODIFY_DESCRIPTION_SOURCE_620=Plik LDIF zawieraj\u0105cy dane przeznaczone do uaktualnienia
 INFO_PROCESSING_OPERATION_104=Przetwarzam \u017c\u0105danie %s dla %s
 INFO_DESCRIPTION_TASK_LDAP_ARGS_1464=Opcje Po\u0142\u0105czenia Z Zapleczem Zada\u0144
@@ -80,7 +79,6 @@
 INFO_BACKUPDB_DESCRIPTION_HASH_251=Generuj sum\u0119 kontroln\u0105 zawarto\u015bci backupu
 INFO_SEARCH_DESCRIPTION_BASEDN_131=Szukaj bazowej DN
 ERR_CONFIGDS_PORT_ALREADY_SPECIFIED_1211=B\u0141\u0104D:  Poda\u0142e\u015b warto\u015b\u0107 %s dla innych port\u00f3w
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=\u015acie\u017cka do pliku LDIF, kt\u00f3ry ma by\u0107 zapisany
 INFO_DESCRIPTION_PWPSTATE_GET_PASSWORD_POLICY_DN_1113=Wy\u015bwietl DN polityki hase\u0142 dla u\u017cytkownika
 INFO_DESCRIPTION_CERT_NICKNAME_805=Przydomek certyfikatu dla autentykacji SSL klienta
 INFO_LDIFSEARCH_DESCRIPTION_OVERWRITE_EXISTING_421=Jakikolwiek istniej\u0105cy plik zostanie nadpisany zamiast do\u0142\u0105czania do niego
@@ -234,7 +232,6 @@
 INFO_LDAPMODIFY_DESCRIPTION_FILENAME_874=Plik LDIF zawieraj\u0105cy zmiany do zastosowania
 INFO_INSTALLDS_ENABLE_STARTTLS_1382=Czy chcesz w\u0142\u0105czy\u0107 Start TLS?
 ERR_BACKUPDB_ERROR_DURING_BACKUP_265=Wyst\u0105pi\u0142 b\u0142\u0105d podczas pr\u00f3by backupu zaplecza %s z podan\u0105 konfiguracj\u0105:  %s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=\u015acie\u017cka do pliku szablonu zawieraj\u0105cego informacje o danych LDIF do wygenerowania
 INFO_LDAPPWMOD_DESCRIPTION_BIND_DN_637=DN do po\u0142\u0105czenia z serwerem
 INFO_STOPDS_DESCRIPTION_BINDDN_378=DN do po\u0142\u0105czenia z serwerem
 INFO_INSTALLDS_DESCRIPTION_USE_JAVAKEYSTORE_1401=\u015acie\u017cka do Java Key Store (JKS) zawieraj\u0105cego certyfikat, kt\u00f3ry ma by\u0107 wykorzystany jako certyfikat serwera
@@ -313,7 +310,6 @@
 INFO_PWPSTATE_DESCRIPTION_PORT_1096=Port administracyjny Directory Servera
 INFO_LDIFMODIFY_DESCRIPTION_TARGET_622=Plik do kt\u00f3rego powinny by\u0107 zapisane uaktualnione dane
 INFO_INSTALLDS_DESCRIPTION_LDAPPORT_493=Port na kt\u00f3rym Directory Server powinien nas\u0142uchiwa\u0107 komunikacji LDAP
-INFO_MAKELDIF_DESCRIPTION_SEED_578=Ziarno u\u017cyte do inicjalizacji generatora liczb losowych
 INFO_DESCRIPTION_TASK_COMPLETION_NOTIFICATION_1469=Adres email odbiorcy infromowanego o zako\u0144czeniu zadania.  Ta opcja mo\u017ce by\u0107 wybrana wi\u0119cej ni\u017c raz
 INFO_COMPARE_DESCRIPTION_FILENAME_413=Plik zawieraj\u0105cy DNy wpis\u00f3w do por\u00f3wnania
 INFO_TASKINFO_CMD_CANCEL_1416=anuluj zadanie
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_zh_CN.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_zh_CN.properties
index 752ce00..85f9fd0 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_zh_CN.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_zh_CN.properties
@@ -467,29 +467,15 @@
 WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=\u6a21\u677f\u6587\u4ef6\u7b2c %d \u884c\u6a21\u677f %s \u5b9a\u4e49\u4e2d\u7684\u503c\u6a21\u5f0f\u4e3a\u7a7a
 ERR_MAKELDIF_NO_SUCH_TAG_572=\u6a21\u677f\u6587\u4ef6\u7684\u7b2c %2$d \u884c\u4e2d\u5f15\u7528\u4e86\u672a\u5b9a\u4e49\u7684\u6807\u8bb0 %1$s
 ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=\u5728\u5c1d\u8bd5\u4e3a\u6a21\u677f\u6587\u4ef6\u7b2c %2$d \u884c\u4e2d\u5f15\u7528\u7684\u6807\u8bb0 %1$s \u521b\u5efa\u65b0\u5b9e\u4f8b\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %3$s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=\u6a21\u677f\u6587\u4ef6\u7684\u8def\u5f84\uff0c\u8be5\u6587\u4ef6\u5305\u542b\u4e0e\u8981\u751f\u6210\u7684 LDIF \u6570\u636e\u76f8\u5173\u7684\u4fe1\u606f
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=\u8981\u5199\u5165\u7684 LDIF \u6587\u4ef6\u7684\u8def\u5f84
-INFO_MAKELDIF_DESCRIPTION_SEED_578=\u7528\u4e8e\u521d\u59cb\u5316\u968f\u673a\u6570\u751f\u6210\u5668\u7684\u521d\u59cb\u5316\u5411\u91cf
-ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=\u5728\u5c1d\u8bd5\u57fa\u4e8e\u914d\u7f6e\u6587\u4ef6 %s \u4e2d\u7684\u4fe1\u606f\u521d\u59cb\u5316 Directory Server JMX \u5b50\u7cfb\u7edf\u65f6\u51fa\u73b0\u9519\u8bef: %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=\u5728\u5c1d\u8bd5\u5904\u7406 Directory Server \u914d\u7f6e\u6587\u4ef6 %s \u65f6\u51fa\u73b0\u9519\u8bef: %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=\u5728\u5c1d\u8bd5\u57fa\u4e8e\u914d\u7f6e\u6587\u4ef6 %s \u4e2d\u7684\u4fe1\u606f\u521d\u59cb\u5316 Directory Server \u6a21\u5f0f\u65f6\u51fa\u73b0\u9519\u8bef: %s
-ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=\u5728\u5c1d\u8bd5\u8bfb\u53d6\u6a21\u677f\u6587\u4ef6\u65f6\u51fa\u73b0\u9519\u8bef: %s
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=\u5728\u5c1d\u8bd5\u89e3\u6790\u6a21\u677f\u6587\u4ef6\u65f6\u51fa\u73b0\u9519\u8bef: %s
 ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=\u65e0\u6cd5\u5c06\u6a21\u677f\u6587\u4ef6\u7b2c %3$d \u884c\u4e2d\u7684\u6807\u8bb0 %2$s \u503c "%1$s" \u89e3\u6790\u4e3a\u6709\u6548\u7684\u683c\u5f0f\u5b57\u7b26\u4e32
 ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=\u6a21\u677f\u6587\u4ef6\u7b2c %d \u884c\u4e2d\u7684\u968f\u673a\u6807\u8bb0\u4e0d\u5305\u542b\u7528\u4e8e\u6307\u5b9a\u5e94\u751f\u6210\u7684\u968f\u673a\u503c\u7c7b\u578b\u7684\u53c2\u6570
 WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=\u901a\u8fc7\u6a21\u677f\u6587\u4ef6\u7b2c %d \u884c\u4e2d\u7684\u968f\u673a\u6807\u8bb0\u751f\u6210\u7684\u503c\u5c06\u59cb\u7ec8\u4e3a\u7a7a\u5b57\u7b26\u4e32
 ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=\u6a21\u677f\u6587\u4ef6\u7b2c %d \u884c\u4e2d\u7684\u968f\u673a\u6807\u8bb0\u5f15\u7528\u4e86\u672a\u77e5\u7684\u968f\u673a\u7c7b\u578b %s
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=\u5728\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u6216\u6a21\u677f\u76ee\u5f55\u8def\u5f84\u4e2d\u627e\u4e0d\u5230\u7528\u4e8e\u67e5\u627e MakeLDIF \u8d44\u6e90\uff08\u5982\u6570\u636e\u6587\u4ef6\uff09\u7684\u8def\u5f84
 ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=\u627e\u4e0d\u5230\u6a21\u677f\u6587\u4ef6 %s
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=\u627e\u4e0d\u5230\u6307\u5b9a\u7684\u8d44\u6e90\u76ee\u5f55 %s
 ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=\u627e\u4e0d\u5230\u6a21\u677f\u6587\u4ef6\u7b2c %3$d \u884c\u4e2d\u7684\u6807\u8bb0 %2$s \u5f15\u7528\u7684\u6587\u4ef6 %1$s
 ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=\u6a21\u677f\u6587\u4ef6\u7b2c %3$d \u884c\u4e2d\u7684\u6807\u8bb0 %2$s \u7684\u6587\u4ef6\u8bbf\u95ee\u6a21\u5f0f %1$s \u65e0\u6548\u3002\u5b83\u5fc5\u987b\u4e3a "sequential" \u6216 "random"
 ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=\u5728\u5c1d\u8bd5\u8bfb\u53d6\u6a21\u677f\u6587\u4ef6\u7b2c %3$d \u884c\u4e2d\u7684\u6807\u8bb0 %2$s \u5f15\u7528\u7684\u6587\u4ef6 %1$s \u65f6\u51fa\u73b0\u9519\u8bef: %4$s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=\u5728\u5c1d\u8bd5\u6253\u5f00 LDIF \u6587\u4ef6 %s \u4ee5\u5199\u5165\u6570\u636e\u65f6\u51fa\u73b0\u9519\u8bef: %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF_599=\u5728\u5c06\u6570\u636e\u5199\u5165 LDIF \u6587\u4ef6 %s \u65f6\u51fa\u73b0\u9519\u8bef: %s
-INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=\u5df2\u5904\u7406 %d \u4e2a\u6761\u76ee
 ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=\u5728\u5c1d\u8bd5\u5c06\u6761\u76ee %s \u5199\u5165 LDIF \u65f6\u51fa\u73b0\u9519\u8bef: %s
-INFO_MAKELDIF_PROCESSING_COMPLETE_602=LDIF \u5904\u7406\u5b8c\u6210\u3002\u5df2\u5199\u5165 %d \u4e2a\u6761\u76ee
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=\u7528\u4e8e\u751f\u6210\u5bfc\u5165\u6570\u636e\u7684 MakeLDIF \u6a21\u677f\u7684\u8def\u5f84
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=\u65e2\u672a\u63d0\u4f9b %s \u53c2\u6570\uff0c\u4e5f\u672a\u63d0\u4f9b %s \u53c2\u6570\u3002\u5fc5\u987b\u63d0\u4f9b\u8fd9\u4e9b\u53c2\u6570\u7684\u5176\u4e2d\u4e00\u4e2a\u4ee5\u6307\u5b9a\u8981\u5bfc\u5165\u7684 LDIF \u6570\u636e\u7684\u6e90
 ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=\u65e0\u6cd5\u5c06\u6307\u5b9a\u7684\u6587\u4ef6 %s \u89e3\u6790\u4e3a MakeLDIF \u6a21\u677f\u6587\u4ef6: %s
@@ -569,7 +555,6 @@
 INFO_LDIFDIFF_TOOL_DESCRIPTION_694=\u6b64\u5b9e\u7528\u7a0b\u5e8f\u53ef\u7528\u4e8e\u6bd4\u8f83\u4e24\u4e2a LDIF \u6587\u4ef6\u5e76\u4ee5 LDIF \u683c\u5f0f\u62a5\u544a\u5dee\u5f02
 INFO_LDIFMODIFY_TOOL_DESCRIPTION_695=\u6b64\u5b9e\u7528\u7a0b\u5e8f\u53ef\u7528\u4e8e\u5bf9 LDIF \u6587\u4ef6\u4e2d\u7684\u6570\u636e\u5e94\u7528\u4e00\u7ec4\u4fee\u6539\u3001\u6dfb\u52a0\u548c\u5220\u9664\u64cd\u4f5c
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=\u6b64\u5b9e\u7528\u7a0b\u5e8f\u53ef\u7528\u4e8e\u5bf9 LDIF \u6587\u4ef6\u4e2d\u7684\u6570\u636e\u6267\u884c\u641c\u7d22\u64cd\u4f5c
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=\u6b64\u5b9e\u7528\u7a0b\u5e8f\u53ef\u7528\u4e8e\u57fa\u4e8e\u6a21\u677f\u6587\u4ef6\u4e2d\u7684\u5b9a\u4e49\u751f\u6210 LDIF \u6570\u636e
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=\u6b64\u5b9e\u7528\u7a0b\u5e8f\u53ef\u7528\u4e8e\u6062\u590d\u76ee\u5f55\u670d\u52a1\u5668\u540e\u7aef\u5907\u4efd
 INFO_STOPDS_TOOL_DESCRIPTION_699=\u6b64\u5b9e\u7528\u7a0b\u5e8f\u53ef\u7528\u4e8e\u8bf7\u6c42\u76ee\u5f55\u670d\u52a1\u5668\u505c\u6b62\u8fd0\u884c\u6216\u6267\u884c\u91cd\u65b0\u542f\u52a8
 INFO_VERIFYINDEX_TOOL_DESCRIPTION_700=\u6b64\u5b9e\u7528\u7a0b\u5e8f\u53ef\u7528\u4e8e\u786e\u4fdd\u57fa\u4e8e Berkeley \u6570\u636e\u5e93 Java Edition \u7684\u540e\u7aef\u4e2d\u7684\u7d22\u5f15\u6570\u636e\u4fdd\u6301\u4e00\u81f4
@@ -1172,7 +1157,6 @@
 INFO_DESCRIPTION_BACKEND_DEBUG_STATS_ONLY_1710=\u4e0d\u663e\u793a JE \u6570\u636e\uff0c\u53ea\u663e\u793a\u7edf\u8ba1\u4fe1\u606f
 INFO_TIMEOUT_PLACEHOLDER_1711={timeout}
 INFO_DESCRIPTION_CONNECTION_TIMEOUT_1712=\u5efa\u7acb\u8fde\u63a5\u6240\u80fd\u5360\u7528\u7684\u6700\u5927\u65f6\u95f4\u957f\u5ea6\uff08\u4ee5\u6beb\u79d2\u4e3a\u5355\u4f4d\uff09
-ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=\u5c1d\u8bd5\u5411 LDIF \u5199\u5165\u6761\u76ee\u65f6\u51fa\u73b0\u9519\u8bef\uff1a\u65e0\u6cd5\u8ba1\u7b97\u6761\u76ee\u7684 DN\uff08\u627e\u4e0d\u5230 RDN \u5c5e\u6027 %s \u7684\u503c\uff09
 ERR_CLIENT_SIDE_TIMEOUT_1714=\u51fa\u73b0\u5ba2\u6237\u7aef\u8d85\u65f6\u3002%n\u5176\u4ed6\u4fe1\u606f: %s
 ERR_BACKEND_TOOL_ERROR_READING_TREE_1866=\u5728\u5c1d\u8bd5\u4ece\u7d22\u5f15\u8bfb\u53d6\u548c/\u6216\u89e3\u7801\u8bb0\u5f55\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
 ERR_BACKEND_TOOL_ERROR_INITIALIZING_BACKEND_1865=\u5728\u5c1d\u8bd5\u521d\u59cb\u5316\u540e\u7aef %s \u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool_zh_TW.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool_zh_TW.properties
index cab6c60..71a6052 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool_zh_TW.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool_zh_TW.properties
@@ -465,29 +465,15 @@
 WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=\u5728\u7bc4\u672c\u6a94\u6848\u7684\u7bc4\u672c %2$s \u5b9a\u7fa9\u4e2d\uff0c\u884c %1$d \u7684\u503c\u6a23\u5f0f\u662f\u7a7a\u7684
 ERR_MAKELDIF_NO_SUCH_TAG_572=\u5728\u7bc4\u672c\u6a94\u6848\u7684\u884c %2$d \u4e0a\u53c3\u7167\u4e86\u672a\u5b9a\u7fa9\u7684\u6a19\u8a18 %1$s
 ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=\u5617\u8a66\u5efa\u7acb\u5728\u7bc4\u672c\u6a94\u6848\u7684\u884c %2$d \u4e0a\u53c3\u7167\u4e4b %1$s \u6a19\u8a18\u7684\u65b0\u5be6\u4f8b\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %3$s
-INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=\u7bc4\u672c\u6a94\u6848\u7684\u8def\u5f91\uff0c\u8a72\u6a94\u6848\u542b\u6709\u8981\u7522\u751f\u4e4b LDIF \u8cc7\u6599\u7684\u76f8\u95dc\u8cc7\u8a0a
-INFO_MAKELDIF_DESCRIPTION_LDIF_577=\u8981\u5beb\u5165\u4e4b LDIF \u6a94\u6848\u7684\u8def\u5f91
-INFO_MAKELDIF_DESCRIPTION_SEED_578=\u7528\u4ee5\u521d\u59cb\u5316\u4e82\u6578\u7522\u751f\u5668\u7684\u7a2e\u5b50
-ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=\u5617\u8a66\u6839\u64da\u914d\u7f6e\u6a94\u6848 %s \u4e2d\u7684\u8cc7\u8a0a\u521d\u59cb\u5316\u76ee\u9304\u4f3a\u670d\u5668 JMX \u5b50\u7cfb\u7d71\u6642\u767c\u751f\u932f\u8aa4: %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=\u5617\u8a66\u8655\u7406\u76ee\u9304\u4f3a\u670d\u5668\u914d\u7f6e\u6a94\u6848 %s \u6642\u767c\u751f\u932f\u8aa4: %s
-ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=\u5617\u8a66\u6839\u64da\u914d\u7f6e\u6a94\u6848 %s \u4e2d\u7684\u8cc7\u8a0a\u521d\u59cb\u5316\u76ee\u9304\u4f3a\u670d\u5668\u6a21\u5f0f\u6642\u767c\u751f\u932f\u8aa4: %s
-ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=\u5617\u8a66\u8b80\u53d6\u7bc4\u672c\u6a94\u6848\u6642\u767c\u751f\u932f\u8aa4: %s
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=\u5617\u8a66\u5256\u6790\u7bc4\u672c\u6a94\u6848\u6642\u767c\u751f\u932f\u8aa4: %s
 ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=\u5c0d\u65bc\u7bc4\u672c\u6a94\u6848\u4e4b\u884c %3$d \u4e0a\u7684\u6a19\u8a18 %2$s\uff0c\u7121\u6cd5\u5c07\u503c\u300c%1$s\u300d\u5256\u6790\u70ba\u6709\u6548\u683c\u5f0f\u5b57\u4e32
 ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=\u7bc4\u672c\u6a94\u6848\u4e4b\u884c %d \u4e0a\u7684\u96a8\u6a5f\u6a19\u8a18\u4e0d\u5305\u542b\u7528\u4ee5\u6307\u5b9a\u6240\u61c9\u7522\u751f\u4e4b\u96a8\u6a5f\u503c\u985e\u578b\u7684\u5f15\u6578
 WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=\u5f9e\u7bc4\u672c\u6a94\u6848\u4e4b\u884c %d \u4e0a\u7684\u96a8\u6a5f\u6a19\u8a18\u7522\u751f\u7684\u503c\uff0c\u5c07\u4e00\u5f8b\u70ba\u7a7a\u5b57\u4e32
 ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=\u7bc4\u672c\u6a94\u6848\u4e4b\u884c %d \u4e0a\u7684\u96a8\u6a5f\u6a19\u8a18\u53c3\u7167\u4e86\u4e0d\u660e\u7684\u96a8\u6a5f\u985e\u578b %s
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=\u5728\u76ee\u524d\u7684\u5de5\u4f5c\u76ee\u9304\u6216\u7bc4\u672c\u76ee\u9304\u8def\u5f91\u4e2d\uff0c\u627e\u4e0d\u5230\u5c0b\u627e MakeLDIF \u8cc7\u6e90 (\u5982\u8cc7\u6599\u6a94) \u7684\u8def\u5f91
 ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=\u627e\u4e0d\u5230\u7bc4\u672c\u6a94\u6848 %s
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=\u627e\u4e0d\u5230\u6307\u5b9a\u7684\u8cc7\u6e90\u76ee\u9304 %s
 ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=\u627e\u4e0d\u5230\u7bc4\u672c\u6a94\u6848\u4e4b\u884c %3$d \u4e0a\u7684\u6a19\u8a18 %2$s \u6240\u53c3\u7167\u7684\u6a94\u6848 %1$s
 ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=\u7bc4\u672c\u6a94\u6848\u4e4b\u884c %3$d \u4e0a\u7684\u6a19\u8a18 %2$s \u5177\u6709\u7121\u6548\u7684\u6a94\u6848\u5b58\u53d6\u6a21\u5f0f %1$s\u5b83\u5fc5\u9808\u662f\u300c\u5faa\u5e8f\u300d\u6216\u300c\u96a8\u6a5f\u300d
 ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=\u5617\u8a66\u8b80\u53d6\u7531\u7bc4\u672c\u6a94\u6848\u4e4b\u884c %3$d \u4e0a\u7684\u6a19\u8a18 %2$s \u6240\u53c3\u7167\u7684\u6a94\u6848 %1$s \u6642\u767c\u751f\u932f\u8aa4: %4$s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=\u5617\u8a66\u958b\u555f LDIF \u6a94\u6848 %s \u9032\u884c\u5beb\u5165\u6642\u767c\u751f\u932f\u8aa4: %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF_599=\u5c07\u8cc7\u6599\u5beb\u5165\u81f3 LDIF \u6a94\u6848 %s \u6642\u767c\u751f\u932f\u8aa4: %s
-INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=\u5df2\u8655\u7406 %d \u500b\u9805\u76ee
 ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=\u5617\u8a66\u5c07\u9805\u76ee %s \u5beb\u5165\u81f3 LDIF \u6642\u767c\u751f\u932f\u8aa4: %s
-INFO_MAKELDIF_PROCESSING_COMPLETE_602=LDIF \u8655\u7406\u5b8c\u6210\u3002\u5df2\u5beb\u5165 %d \u500b\u9805\u76ee
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=\u7528\u4ee5\u7522\u751f\u532f\u5165\u8cc7\u6599\u4e4b MakeLDIF \u7bc4\u672c\u7684\u8def\u5f91
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=%s \u6216 %s \u5f15\u6578\u7686\u672a\u63d0\u4f9b\u3002\u5fc5\u9808\u63d0\u4f9b\u5176\u4e2d\u4e00\u500b\u5f15\u6578\uff0c\u70ba\u8981\u532f\u5165\u7684 LDIF \u8cc7\u6599\u6307\u5b9a\u4f86\u6e90
 ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=\u7121\u6cd5\u5c07\u6307\u5b9a\u7684\u6a94\u6848 %s \u5256\u6790\u70ba MakeLDIF \u7bc4\u672c\u6a94\u6848: %s
@@ -567,7 +553,6 @@
 INFO_LDIFDIFF_TOOL_DESCRIPTION_694=\u6b64\u516c\u7528\u7a0b\u5f0f\u53ef\u7528\u65bc\u6bd4\u8f03\u5169\u500b LDIF \u6a94\u6848\uff0c\u4e26\u4ee5 LDIF \u683c\u5f0f\u5831\u544a\u5dee\u7570
 INFO_LDIFMODIFY_TOOL_DESCRIPTION_695=\u6b64\u516c\u7528\u7a0b\u5f0f\u53ef\u7528\u65bc\u5c0d LDIF \u6a94\u6848\u4e2d\u7684\u8cc7\u6599\u5957\u7528\u4e00\u7d44\u4fee\u6539\u3001\u589e\u52a0\u8207\u522a\u9664\u4f5c\u696d
 INFO_LDIFSEARCH_TOOL_DESCRIPTION_696=\u6b64\u516c\u7528\u7a0b\u5f0f\u53ef\u7528\u65bc\u5c0d LDIF \u6a94\u6848\u4e2d\u7684\u8cc7\u6599\u57f7\u884c\u641c\u5c0b\u4f5c\u696d
-INFO_MAKELDIF_TOOL_DESCRIPTION_697=\u6b64\u516c\u7528\u7a0b\u5f0f\u53ef\u7528\u65bc\u6839\u64da\u7bc4\u672c\u6a94\u6848\u4e2d\u7684\u5b9a\u7fa9\u7522\u751f LDIF \u8cc7\u6599
 INFO_RESTOREDB_TOOL_DESCRIPTION_698=\u6b64\u516c\u7528\u7a0b\u5f0f\u53ef\u7528\u65bc\u5fa9\u539f\u76ee\u9304\u4f3a\u670d\u5668\u5f8c\u7aef\u7684\u5099\u4efd
 INFO_STOPDS_TOOL_DESCRIPTION_699=\u6b64\u516c\u7528\u7a0b\u5f0f\u53ef\u7528\u65bc\u8acb\u6c42\u76ee\u9304\u4f3a\u670d\u5668\u505c\u6b62\u57f7\u884c\u6216\u57f7\u884c\u91cd\u65b0\u555f\u52d5
 INFO_VERIFYINDEX_TOOL_DESCRIPTION_700=\u6b64\u516c\u7528\u7a0b\u5f0f\u53ef\u7528\u65bc\u78ba\u4fdd\u4ee5 Berkeley DB Java Edition \u70ba\u57fa\u790e\u4e4b\u5f8c\u7aef\u5167\u7684\u7d22\u5f15\u8cc7\u6599\u4fdd\u6709\u4e00\u81f4\u6027
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/ArgumentParserToolsTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/ArgumentParserToolsTestCase.java
index 7d409d5..1b169e0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/ArgumentParserToolsTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/ArgumentParserToolsTestCase.java
@@ -25,7 +25,6 @@
 
 import org.forgerock.opendj.ldap.ByteStringBuilder;
 import org.opends.server.tools.dsreplication.ReplicationCliMain;
-import org.opends.server.tools.makeldif.MakeLDIF;
 import org.opends.server.tools.status.StatusCli;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -185,12 +184,6 @@
   }
 
   @Test(dataProvider = "invalidArgs")
-  public void testMakeLDIF(final String[] args)
-  {
-    assertToolFailsWithUsage(MakeLDIF.main(args, outStream, errStream));
-  }
-
-  @Test(dataProvider = "invalidArgs")
   public void testManageAccount(final String[] args)
   {
     assertToolFailsWithUsage(ManageAccount.main(args, false, outStream, errStream));

--
Gitblit v1.10.0