Fixes for messages quoting each other and punctuation

Use {{int:}} to refer to the localised label.

Change-Id: Ifbc42e993a7c0d3922eedb8aad6401c1c17a4f24

diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index 0c6ff63..de27766 100644 (file)
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -97,7 +97,7 @@
     "config-db-username": "Database username:",
     "config-db-password": "Database password:",
     "config-db-password-empty": "Please enter a password for the new database user: $1.\nWhile it may be possible to create users with no passwords, it is not secure.",
-    "config-db-username-empty": "You must enter a value for \"Database username\"",
+    "config-db-username-empty": "You must enter a value for \"{{int:config-db-username}}\"",
     "config-db-install-username": "Enter the username that will be used to connect to the database during the installation process.\nThis is not the username of the MediaWiki account; this is the username for your database.",
     "config-db-install-password": "Enter the password that will be used to connect to the database during the installation process.\nThis is not the password for the MediaWiki account; this is the password for your database.",
     "config-db-install-help": "Enter the username and password that will be used to connect to the database during the installation process.",
@@ -136,11 +136,11 @@
     "config-header-sqlite": "SQLite settings",
     "config-header-oracle": "Oracle settings",
     "config-header-mssql": "Microsoft SQL Server settings",
-    "config-invalid-db-type": "Invalid database type",
-    "config-missing-db-name": "You must enter a value for \"Database name\"",
-    "config-missing-db-host": "You must enter a value for \"Database host\"",
-    "config-missing-db-server-oracle": "You must enter a value for \"Database TNS\"",
-    "config-invalid-db-server-oracle": "Invalid database TNS \"$1\".\nUse either \"TNS Name\" or an \"Easy Connect\" string ([http://docs.oracle.com/cd/E11882_01/network.112/e10836/naming.htm Oracle Naming Methods])",
+    "config-invalid-db-type": "Invalid database type.",
+    "config-missing-db-name": "You must enter a value for \"{{int:config-db-name}}\".",
+    "config-missing-db-host": "You must enter a value for \"{{int:config-db-host}}\".",
+    "config-missing-db-server-oracle": "You must enter a value for \"{{int:config-db-host-oracle}}\".",
+    "config-invalid-db-server-oracle": "Invalid database TNS \"$1\".\nUse either \"TNS Name\" or an \"Easy Connect\" string ([http://docs.oracle.com/cd/E11882_01/network.112/e10836/naming.htm Oracle Naming Methods]).",
     "config-invalid-db-name": "Invalid database name \"$1\".\nUse only ASCII letters (a-z, A-Z), numbers (0-9), underscores (_) and hyphens (-).",
     "config-invalid-db-prefix": "Invalid database prefix \"$1\".\nUse only ASCII letters (a-z, A-Z), numbers (0-9), underscores (_) and hyphens (-).",
     "config-connection-error": "$1.\n\nCheck the host, username and password and try again.",
@@ -312,4 +312,4 @@
     "config-extension-link": "Did you know that your wiki supports [//www.mediawiki.org/wiki/Manual:Extensions extensions]?\n\nYou can browse [//www.mediawiki.org/wiki/Category:Extensions_by_category extensions by category] or the [//www.mediawiki.org/wiki/Extension_Matrix Extension Matrix] to see the full list of extensions.",
     "mainpagetext": "<strong>MediaWiki has been successfully installed.</strong>",
     "mainpagedocfooter": "Consult the [//meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software.\n\n== Getting started ==\n* [//www.mediawiki.org/wiki/Manual:Configuration_settings Configuration settings list]\n* [//www.mediawiki.org/wiki/Manual:FAQ MediaWiki FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]\n* [//www.mediawiki.org/wiki/Localisation#Translation_resources Localise MediaWiki for your language]"
-}
\ No newline at end of file
+}