Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…

…me_error_message

administrator/components/com_languages/config.xml

@@ -2,14 +2,14 @@
 <config>
 	<fieldset
 		name="permissions"
-		label="JConfig_Permissions_Label"
-		description="JConfig_Permissions_Desc"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field
 			name="rules"
 			type="rules"
-			label="JConfig_Permissions_Label"
+			label="JCONFIG_PERMISSIONS_LABEL"
 			filter="rules"
 			validate="rules"
 			component="com_languages"

installation/language/de-AT/de-AT.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="installation">
 	<name>German (Austria)</name>
-	<version>3.7.3</version>
-	<creationDate>June 2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>J!German</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
@@ -15,5 +15,5 @@
 		<tag>de-AT</tag>
 		<rtl>0</rtl>
 	</metadata>
-	<params/>
+	<params />
 </metafile>

installation/language/de-CH/de-CH.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="installation">
 	<name>German (Switzerland)</name>
-	<version>3.7.3</version>
-	<creationDate>June 2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>J!German</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
@@ -15,5 +15,5 @@
 		<tag>de-CH</tag>
 		<rtl>0</rtl>
 	</metadata>
-	<params/>
+	<params />
 </metafile>

installation/language/de-DE/de-DE.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="installation">
 	<name>German (Germany)</name>
-	<version>3.7.3</version>
-	<creationDate>June 2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>J!German</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
@@ -15,5 +15,5 @@
 		<tag>de-DE</tag>
 		<rtl>0</rtl>
 	</metadata>
-	<params/>
+	<params />
 </metafile>

installation/language/de-LI/de-LI.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="installation">
 	<name>German (Lichtenstein)</name>
-	<version>3.7.3</version>
-	<creationDate>June 2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>J!German</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
@@ -15,5 +15,5 @@
 		<tag>de-LI</tag>
 		<rtl>0</rtl>
 	</metadata>
-	<params/>
+	<params />
 </metafile>

installation/language/de-LU/de-LU.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="installation">
 	<name>German (Luxembourg)</name>
-	<version>3.7.3</version>
-	<creationDate>June 2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>J!German</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
@@ -15,5 +15,5 @@
 		<tag>de-LU</tag>
 		<rtl>0</rtl>
 	</metadata>
-	<params/>
+	<params />
 </metafile>

installation/language/en-GB/en-GB.ini

@@ -31,9 +31,9 @@ INSTL_DATABASE="Database Configuration"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database query failed."
 INSTL_DATABASE_HOST_DESC="This is usually "localhost" or a name provided by your host."
 INSTL_DATABASE_HOST_LABEL="Host Name"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You want to use a database host which is not localhost. For security reason, you need to verify the ownership of the used webhosting account. Please see here [docspagelink] for more information."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the the owner of this webhost please delete the file %s we have just created in the "installation" folder of your Joomla."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="For some reason we are not able to create the file. Please manually create a file called %s and upload it to the "installation" folder of your Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named "%s" and upload it to the "installation" folder of your Joomla site."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the the owner of this website please delete the file named "%s" we have just created in the "installation" folder of your Joomla site."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href="_QQ_"%s"_QQ_">Please read the documentation</a> for more information."
 INSTL_DATABASE_NAME_DESC="Some hosts allow only a certain DB name per site. Use table prefix in this case for distinct Joomla! sites."
 INSTL_DATABASE_NAME_LABEL="Database Name"
 INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type."

libraries/cms/version/version.php

@@ -70,15 +70,15 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '11-July-2017';
+	const RELDATE = '18-July-2017';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '16:52';
+	const RELTIME = '16:03';
 
 	/**
 	 * Release timezone.