jenkins-bot has submitted this change and it was merged.

Change subject: Consistency tweaks
......................................................................


Consistency tweaks

Spotted by Siebrand

* correct notation of CC license
** Per https://creativecommons.org/licenses/by-sa/3.0/legalcode
** 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Config-license-cc-by-nc-sa/qqq
** 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Config-license-cc-by-sa/en

* Add punctation
** 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Config-sqlite-fts3-downgrade/en
** 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Config-db-username-empty/en

* Wrap function mame in code tag
** 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Config-install-subscribe-notpossible/en

Change-Id: I3e9489943c6456eda997a7bd5ea8f3f902472001
---
M includes/installer/i18n/en.json
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index de27766..9217188 100644
--- 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 
\"{{int:config-db-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.",
@@ -157,7 +157,7 @@
     "config-sqlite-connection-error": "$1.\n\nCheck the data directory and 
database name below and try again.",
     "config-sqlite-readonly": "The file <code>$1</code> is not writeable.",
     "config-sqlite-cant-create-db": "Could not create database file 
<code>$1</code>.",
-    "config-sqlite-fts3-downgrade": "PHP is missing FTS3 support, downgrading 
tables",
+    "config-sqlite-fts3-downgrade": "PHP is missing FTS3 support, downgrading 
tables.",
     "config-can-upgrade": "There are MediaWiki tables in this database.\nTo 
upgrade them to MediaWiki $1, click <strong>Continue</strong>.",
     "config-upgrade-done": "Upgrade complete.\n\nYou can now [$1 start using 
your wiki].\n\nIf you want to regenerate your <code>LocalSettings.php</code> 
file, click the button below.\nThis is <strong>not recommended</strong> unless 
you are having problems with your wiki.",
     "config-upgrade-done-no-regenerate": "Upgrade complete.\n\nYou can now [$1 
start using your wiki].",
@@ -223,9 +223,9 @@
     "config-profile-help": "Wikis work best when you let as many people edit 
them as possible.\nIn MediaWiki, it is easy to review the recent changes, and 
to revert any damage that is done by naive or malicious users.\n\nHowever, many 
have found MediaWiki to be useful in a wide variety of roles, and sometimes it 
is not easy to convince everyone of the benefits of the wiki way.\nSo you have 
the choice.\n\nThe <strong>{{int:config-profile-wiki}}</strong> model allows 
anyone to edit, without even logging in.\nA wiki with 
<strong>{{int:config-profile-no-anon}}</strong> provides extra accountability, 
but may deter casual contributors.\n\nThe 
<strong>{{int:config-profile-fishbowl}}</strong> scenario allows approved users 
to edit, but the public can view the pages, including history.\nA 
<strong>{{int:config-profile-private}}</strong> only allows approved users to 
view pages, with the same group allowed to edit.\n\nMore complex user rights 
configurations are available after installation, see the 
[//www.mediawiki.org/wiki/Manual:User_rights relevant manual entry].",
     "config-license": "Copyright and license:",
     "config-license-none": "No license footer",
-    "config-license-cc-by-sa": "Creative Commons Attribution Share Alike",
+    "config-license-cc-by-sa": "Creative Commons Attribution-ShareAlike",
     "config-license-cc-by": "Creative Commons Attribution",
-    "config-license-cc-by-nc-sa": "Creative Commons Attribution Non-Commercial 
Share Alike",
+    "config-license-cc-by-nc-sa": "Creative Commons 
Attribution-NonCommercial-ShareAlike",
     "config-license-cc-0": "Creative Commons Zero (Public Domain)",
     "config-license-gfdl": "GNU Free Documentation License 1.3 or later",
     "config-license-pd": "Public Domain",
@@ -301,7 +301,7 @@
     "config-insecure-keys": "<strong>Warning:</strong> {{PLURAL:$2|A secure 
key|Secure keys}} ($1) generated during installation {{PLURAL:$2|is|are}} not 
completely safe. Consider changing {{PLURAL:$2|it|them}} manually.",
     "config-install-sysop": "Creating administrator user account",
     "config-install-subscribe-fail": "Unable to subscribe to 
mediawiki-announce: $1",
-    "config-install-subscribe-notpossible": "cURL is not installed and 
allow_url_fopen is not available.",
+    "config-install-subscribe-notpossible": "cURL is not installed and 
<code>allow_url_fopen</code> is not available.",
     "config-install-mainpage": "Creating main page with default content",
     "config-install-extension-tables": "Creating tables for enabled 
extensions",
     "config-install-mainpage-failed": "Could not insert main page: $1",

-- 
To view, visit https://gerrit.wikimedia.org/r/128945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e9489943c6456eda997a7bd5ea8f3f902472001
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Waldir <wal...@email.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to