From 1e24c16e462faace40f6141fdf6fcf00aacb8244 Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Fri, 16 Oct 2015 12:56:37 +0000
Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1)    114422 jphuynh:
 ACE-4447: Fixed messages around Java Validation and Share installer.

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

diff --git a/src/main/resources/bitrock/alfresco-functions.xml b/src/main/resources/bitrock/alfresco-functions.xml
index c75ea1934..ff3f3d7df 100644
--- a/src/main/resources/bitrock/alfresco-functions.xml
+++ b/src/main/resources/bitrock/alfresco-functions.xml
@@ -399,7 +399,7 @@ img.exe=${'${img.root}'}\\convert.exe</value>
                         <autodetectJava>
                             <abortOnError>1</abortOnError>
                             <showMessageOnError>1</showMessageOnError>
-                            <customErrorMessage>This release was packaged to run on J2SE ${java_min_version} or later. Please install a compatible Java version and try again.</customErrorMessage>
+                            <customErrorMessage>This release was packaged to run on J2SE ${java_min_version} or later. Install a compatible Java version and try again.</customErrorMessage>
                             <promptUser>0</promptUser>
                             <validVersionList>
                                 <validVersion>
diff --git a/src/main/resources/bitrock/lang/alf-en.po b/src/main/resources/bitrock/lang/alf-en.po
index 0d81a594a..cdb78f3c7 100755
--- a/src/main/resources/bitrock/lang/alf-en.po
+++ b/src/main/resources/bitrock/lang/alf-en.po
@@ -223,8 +223,8 @@ msgstr "JDK Installation Directory:"
 msgid "Java"
 msgstr "Java"
 
-msgid "Java Component required to run the Alfresco server."
-msgstr "Java Component required to run the Alfresco server."
+msgid "Java Component required to run ${product_fullname}."
+msgstr "Java Component required to run ${product_fullname}."
 
 msgid "Java Home path contains spaces. Alfresco might not work properly, as the JVM has problems when the installation path contains spaces. Reinstall the JVM in a path that does not contain spaces."
 msgstr "Java Home path contains spaces. Alfresco might not work properly, as the JVM has problems when the installation path contains spaces. Reinstall the JVM in a path that does not contain spaces."
@@ -232,8 +232,8 @@ msgstr "Java Home path contains spaces. Alfresco might not work properly, as the
 msgid "This module requires Java, and no Java instance can be found."
 msgstr "This module requires Java, and no Java instance can be found."
 
-msgid "Launch ${product_fullname} Share"
-msgstr "Launch ${product_fullname} Share"
+msgid "Launch ${product_fullname}"
+msgstr "Launch ${product_fullname}"
 
 msgid "LibreOffice"
 msgstr "LibreOffice"
@@ -646,8 +646,8 @@ msgstr "Select at least one of the Solr components."
 msgid "Use ASCII characters only when setting the password in the installer. If you want to use non-ASCII characters, you can do this by resetting the password after installation."
 msgstr "Use ASCII characters only when setting the password in the installer. If you want to use non-ASCII characters, you can do this by resetting the password after installation."
 
-msgid "Connect Alfresco Share to Alfresco Platform"
-msgstr "Connect Alfresco Share to Alfresco Platform"
+msgid "Connect Alfresco Share to the repository"
+msgstr "Connect Alfresco Share to the repository"
 
 msgid "Enter the location of your Alfresco repository."
 msgstr "Enter the location of your Alfresco repository."