From deb28cb0afb6d2c5adcdf8f6c5688ab60cb471c8 Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Thu, 15 Oct 2015 15:19:31 +0000
Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1)    114401 jphuynh:
 ACE-4446: Fixed duplicated error messages around port binding.

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

diff --git a/src/main/resources/bitrock/base-functions.xml b/src/main/resources/bitrock/base-functions.xml
index 98af93cd0..ecb26cfd5 100644
--- a/src/main/resources/bitrock/base-functions.xml
+++ b/src/main/resources/bitrock/base-functions.xml
@@ -1676,7 +1676,7 @@ rem RUBY_APPLICATION_STOP</value>
                 <variable>process_binding_port</variable>
             </getProcessUsingPort>
             <setInstallerVariable name="process_binding_message" value=""/>
-            <setInstallerVariable name="process_binding_message" value="${tr('This port is already in use by &quot;${process_binding_port}&quot; process. Please select another ${serverName} Server Port.')}">
+            <setInstallerVariable name="process_binding_message" value="${tr('This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port.')}">
                 <ruleList>
                     <compareText text="${serverIp}" logic="equals" value=""/>
                     <compareText text="${process_binding_port}" logic="does_not_equal" value=""/>
@@ -1685,7 +1685,7 @@ rem RUBY_APPLICATION_STOP</value>
             </setInstallerVariable>
             
             <throwError>
-                <text>Unable to bind to the given port number. ${process_binding_message}Please select another ${serverName} Server Port.</text>
+                <text>Unable to bind to the given port number. ${process_binding_message}</text>
                 <ruleEvaluationLogic>or</ruleEvaluationLogic>
                 <ruleList>
                     <ruleGroup>
diff --git a/src/main/resources/bitrock/lang/alf-en.po b/src/main/resources/bitrock/lang/alf-en.po
index 61f0c924e..9c3555356 100755
--- a/src/main/resources/bitrock/lang/alf-en.po
+++ b/src/main/resources/bitrock/lang/alf-en.po
@@ -657,3 +657,9 @@ msgstr "Repository location: "
 
 msgid "Solr is an open source enterprise search platform that uses Apache Lucene as an indexing and search engine. Solr 4 provides improvements in scalability, performance, and flexibility over Solr 1."
 msgstr "Solr is an open source enterprise search platform that uses Apache Lucene as an indexing and search engine. Solr 4 provides improvements in scalability, performance, and flexibility over Solr 1."
+
+msgid "Unable to bind to the given port number. ${process_binding_message}"
+msgstr "Unable to bind to the given port number. ${process_binding_message}"
+
+msgid "This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port."
+msgstr "This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port."