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
This commit is contained in:
Ramona Neamtu
2015-12-15 12:54:12 +00:00
parent a6d311a245
commit ba1f77de60
2 changed files with 26 additions and 2 deletions

View File

@@ -33,7 +33,7 @@
<parameterGroup> <parameterGroup>
<name>remote_solr_configuration</name> <name>remote_solr_configuration</name>
<title>Remote Solr configuration</title> <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> <ask>0</ask>
<parameterList> <parameterList>
<stringParameter> <stringParameter>
@@ -53,7 +53,7 @@
<choiceParameter> <choiceParameter>
<name>sharded_solr</name> <name>sharded_solr</name>
<title>Sharded Solr installation</title> <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> <default>no</default>
<ask>0</ask> <ask>0</ask>
<cliOptionName>shardedSolr</cliOptionName> <cliOptionName>shardedSolr</cliOptionName>

View File

@@ -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." 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." 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"