From ba1f77de60394d00851f94daebca264eb8ae3bfd Mon Sep 17 00:00:00 2001
From: Ramona Neamtu <ramona.popa@ness.com>
Date: Tue, 15 Dec 2015 12:54:12 +0000
Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1)    119862 jphuynh: Merged
 5.1-MC1 (5.1.0) to HEAD (5.1)       118831 jphuynh: Merged JPHUYNH/BDE-409
 (5.1.0) to 5.1-MC1 (5.1.0)          115753 jphuynh: DOCS-1406: Reviewed
 messages

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 src/main/resources/bitrock/alfrescodm.xml |  4 ++--
 src/main/resources/bitrock/lang/alf-en.po | 24 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/bitrock/alfrescodm.xml b/src/main/resources/bitrock/alfrescodm.xml
index 2383158017..36b909a65a 100644
--- a/src/main/resources/bitrock/alfrescodm.xml
+++ b/src/main/resources/bitrock/alfrescodm.xml
@@ -33,7 +33,7 @@
         <parameterGroup>
             <name>remote_solr_configuration</name>
             <title>Remote Solr configuration</title>
-            <explanation>Please enter the information to connect Alfresco with your Solr installation.</explanation>
+            <explanation>Enter the Solr host and port to connect to Alfresco:</explanation>
             <ask>0</ask>
             <parameterList>
                 <stringParameter>
@@ -53,7 +53,7 @@
         <choiceParameter>
             <name>sharded_solr</name>
             <title>Sharded Solr installation</title>
-            <explanation>Are you using a Sharded Solr installation ?</explanation>
+            <explanation>Are you using a sharded Solr installation?</explanation>
             <default>no</default>
             <ask>0</ask>
             <cliOptionName>shardedSolr</cliOptionName>
diff --git a/src/main/resources/bitrock/lang/alf-en.po b/src/main/resources/bitrock/lang/alf-en.po
index d44375981f..a2934a5f22 100755
--- a/src/main/resources/bitrock/lang/alf-en.po
+++ b/src/main/resources/bitrock/lang/alf-en.po
@@ -663,3 +663,27 @@ msgstr "Unable to bind to the given port number."
 
 msgid "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port."
 msgstr "Unable to bind to the given port number. This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port."
+
+msgid "Remote Solr configuration"
+msgstr "Remote Solr configuration"
+
+msgid "Enter the Solr host and port to connect to Alfresco:"
+msgstr "Enter the Solr host and port to connect to Alfresco:"
+
+msgid "Solr host:"
+msgstr "Solr host:"
+
+msgid "Solr SSL port:"
+msgstr "Solr SSL port:"
+
+msgid "Sharded Solr installation"
+msgstr "Sharded Solr installation"
+
+msgid "Are you using a sharded Solr installation?"
+msgstr "Are you using a sharded Solr installation?"
+
+msgid "Yes"
+msgstr "Yes"
+
+msgid "No"
+msgstr "No"