Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129889
Change subject: i18n: consistency tweaks
......................................................................
i18n: consistency tweaks
- Replace "can not" by "cannot"
- Add "Special:MyLanguage" to mediawiki.org URLs
Change-Id: Ice4ab37fd2e680e9903643fd6f88e60a44787e2b
---
M includes/installer/i18n/en.json
M languages/i18n/en.json
2 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/89/129889/1
diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index a120e24..b613b09 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -40,15 +40,15 @@
"config-restart": "Yes, restart it",
"config-welcome": "=== Environmental checks ===\nBasic checks will now
be performed to see if this environment is suitable for MediaWiki
installation.\nRemember to include this information if you seek support on how
to complete the installation.",
"config-copyright": "=== Copyright and Terms ===\n\n$1\n\nThis program
is free software; you can redistribute it and/or modify it under the terms of
the GNU General Public License as published by the Free Software Foundation;
either version 2 of the License, or (at your option) any later version.\n\nThis
program is distributed in the hope that it will be useful, but <strong>without
any warranty</strong>; without even the implied warranty of
<strong>merchantability</strong> or <strong>fitness for a particular
purpose</strong>.\nSee the GNU General Public License for more details.\n\nYou
should have received <doclink href=Copying>a copy of the GNU General Public
License</doclink> along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA,
or [http://www.gnu.org/copyleft/gpl.html read it online].",
- "config-sidebar": "* [//www.mediawiki.org MediaWiki home]\n*
[//www.mediawiki.org/wiki/Help:Contents User's Guide]\n*
[//www.mediawiki.org/wiki/Manual:Contents Administrator's Guide]\n*
[//www.mediawiki.org/wiki/Manual:FAQ FAQ]\n----\n* <doclink href=Readme>Read
me</doclink>\n* <doclink href=ReleaseNotes>Release notes</doclink>\n* <doclink
href=Copying>Copying</doclink>\n* <doclink href=UpgradeDoc>Upgrading</doclink>",
+ "config-sidebar": "* [//www.mediawiki.org MediaWiki home]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents User's Guide]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Administrator's
Guide]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ FAQ]\n----\n*
<doclink href=Readme>Read me</doclink>\n* <doclink href=ReleaseNotes>Release
notes</doclink>\n* <doclink href=Copying>Copying</doclink>\n* <doclink
href=UpgradeDoc>Upgrading</doclink>",
"config-env-good": "The environment has been checked.\nYou can install
MediaWiki.",
"config-env-bad": "The environment has been checked.\nYou cannot
install MediaWiki.",
"config-env-php": "PHP $1 is installed.",
"config-env-php-toolow": "PHP $1 is installed.\nHowever, MediaWiki
requires PHP $2 or higher.",
"config-unicode-using-utf8": "Using Brion Vibber's utf8_normalize.so
for Unicode normalization.",
"config-unicode-using-intl": "Using the [http://pecl.php.net/intl intl
PECL extension] for Unicode normalization.",
- "config-unicode-pure-php-warning": "<strong>Warning:</strong> The
[http://pecl.php.net/intl intl PECL extension] is not available to handle
Unicode normalization, falling back to slow pure-PHP implementation.\nIf you
run a high-traffic site, you should read a little on
[//www.mediawiki.org/wiki/Unicode_normalization_considerations Unicode
normalization].",
- "config-unicode-update-warning": "<strong>Warning:</strong> The
installed version of the Unicode normalization wrapper uses an older version of
[http://site.icu-project.org/ the ICU project's] library.\nYou should
[//www.mediawiki.org/wiki/Unicode_normalization_considerations upgrade] if you
are at all concerned about using Unicode.",
+ "config-unicode-pure-php-warning": "<strong>Warning:</strong> The
[http://pecl.php.net/intl intl PECL extension] is not available to handle
Unicode normalization, falling back to slow pure-PHP implementation.\nIf you
run a high-traffic site, you should read a little on
[//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations
Unicode normalization].",
+ "config-unicode-update-warning": "<strong>Warning:</strong> The
installed version of the Unicode normalization wrapper uses an older version of
[http://site.icu-project.org/ the ICU project's] library.\nYou should
[//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations
upgrade] if you are at all concerned about using Unicode.",
"config-no-db": "Could not find a suitable database driver! You need to
install a database driver for PHP.\nThe following database types are supported:
$1.\n\nIf you compiled PHP yourself, reconfigure it with a database client
enabled, for example, using <code>./configure --with-mysqli</code>.\nIf you
installed PHP from a Debian or Ubuntu package, then you also need to install,
for example, the <code>php5-mysql</code> package.",
"config-outdated-sqlite": "<strong>Warning:</strong> you have SQLite
$1, which is lower than minimum required version $2. SQLite will be
unavailable.",
"config-no-fts3": "<strong>Warning:</strong> SQLite is compiled without
the [//sqlite.org/fts3.html FTS3 module], search features will be unavailable
on this backend.",
@@ -79,7 +79,7 @@
"config-no-cli-uri": "<strong>Warning:</strong> No
<code>--scriptpath</code> specified, using default: <code>$1</code>.",
"config-using-server": "Using server name \"<nowiki>$1</nowiki>\".",
"config-using-uri": "Using server URL \"<nowiki>$1$2</nowiki>\".",
- "config-uploads-not-safe": "<strong>Warning:</strong> Your default
directory for uploads <code>$1</code> is vulnerable to arbitrary scripts
execution.\nAlthough MediaWiki checks all uploaded files for security threats,
it is highly recommended to
[//www.mediawiki.org/wiki/Manual:Security#Upload_security close this security
vulnerability] before enabling uploads.",
+ "config-uploads-not-safe": "<strong>Warning:</strong> Your default
directory for uploads <code>$1</code> is vulnerable to arbitrary scripts
execution.\nAlthough MediaWiki checks all uploaded files for security threats,
it is highly recommended to
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security#Upload_security
close this security vulnerability] before enabling uploads.",
"config-no-cli-uploads-check": "<strong>Warning:</strong> Your default
directory for uploads (<code>$1</code>) is not checked for vulnerability\nto
arbitrary script execution during the CLI install.",
"config-brokenlibxml": "Your system has a combination of PHP and
libxml2 versions that is buggy and can cause hidden data corruption in
MediaWiki and other web applications.\nUpgrade to libxml2 2.7.3 or later
([https://bugs.php.net/bug.php?id=45996 bug filed with PHP]).\nInstallation
aborted.",
"config-suhosin-max-value-length": "Suhosin is installed and limits the
GET parameter <code>length</code> to $1 bytes.\nMediaWiki's ResourceLoader
component will work around this limit, but that will degrade performance.\nIf
at all possible, you should set <code>suhosin.get.max_value_length</code> to
1024 or higher in <code>php.ini</code>, and set
<code>$wgResourceLoaderMaxQueryLength</code> to the same value in
<code>LocalSettings.php</code>.",
@@ -220,7 +220,7 @@
"config-profile-no-anon": "Account creation required",
"config-profile-fishbowl": "Authorized editors only",
"config-profile-private": "Private wiki",
- "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-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/Special:MyLanguage/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-ShareAlike",
@@ -246,13 +246,13 @@
"config-email-sender-help": "Enter the email address to use as the
return address on outbound email.\nThis is where bounces will be sent.\nMany
mail servers require at least the domain name part to be valid.",
"config-upload-settings": "Images and file uploads",
"config-upload-enable": "Enable file uploads",
- "config-upload-help": "File uploads potentially expose your server to
security risks.\nFor more information, read the
[//www.mediawiki.org/wiki/Manual:Security security section] in the
manual.\n\nTo enable file uploads, change the mode on the <code>images</code>
subdirectory under MediaWiki's root directory so that the web server can write
to it.\nThen enable this option.",
+ "config-upload-help": "File uploads potentially expose your server to
security risks.\nFor more information, read the
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security security section]
in the manual.\n\nTo enable file uploads, change the mode on the
<code>images</code> subdirectory under MediaWiki's root directory so that the
web server can write to it.\nThen enable this option.",
"config-upload-deleted": "Directory for deleted files:",
"config-upload-deleted-help": "Choose a directory in which to archive
deleted files.\nIdeally, this should not be accessible from the web.",
"config-logo": "Logo URL:",
"config-logo-help": "MediaWiki's default skin includes space for a
135x160 pixel logo above the sidebar menu.\nUpload an image of the appropriate
size, and enter the URL here.\n\nYou can use <code>$wgStylePath</code> or
<code>$wgScriptPath</code> if your logo is relative to those paths.\n\nIf you
do not want a logo, leave this box blank.",
"config-instantcommons": "Enable Instant Commons",
- "config-instantcommons-help": "[//www.mediawiki.org/wiki/InstantCommons
Instant Commons] is a feature that allows wikis to use images, sounds and other
media found on the [//commons.wikimedia.org/ Wikimedia Commons] site.\nIn order
to do this, MediaWiki requires access to the Internet.\n\nFor more information
on this feature, including instructions on how to set it up for wikis other
than the Wikimedia Commons, consult
[//mediawiki.org/wiki/Manual:$wgForeignFileRepos the manual].",
+ "config-instantcommons-help": "[//www.mediawiki.org/wiki/InstantCommons
Instant Commons] is a feature that allows wikis to use images, sounds and other
media found on the [//commons.wikimedia.org/ Wikimedia Commons] site.\nIn order
to do this, MediaWiki requires access to the Internet.\n\nFor more information
on this feature, including instructions on how to set it up for wikis other
than the Wikimedia Commons, consult
[//mediawiki.org/wiki/Special:MyLanguage/Manual:$wgForeignFileRepos the
manual].",
"config-cc-error": "The Creative Commons license chooser gave no
result.\nEnter the license name manually.",
"config-cc-again": "Pick again...",
"config-cc-not-chosen": "Choose which Creative Commons license you want
and click \"proceed\".",
@@ -309,7 +309,7 @@
"config-download-localsettings": "Download
<code>LocalSettings.php</code>",
"config-help": "help",
"config-nofile": "File \"$1\" could not be found. Has it been deleted?",
- "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].",
+ "config-extension-link": "Did you know that your wiki supports
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions
extensions]?\n\nYou can browse
[//www.mediawiki.org/wiki/Special:MyLanguage/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]"
+ "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/Special:MyLanguage/Manual:Configuration_settings
Configuration settings list]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki FAQ]\n*
[https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki
release mailing list]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources
Localise MediaWiki for your language]"
}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index b3ada83..a3eeb4c 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1396,7 +1396,7 @@
"uploadstash-refresh": "Refresh the list of files",
"invalid-chunk-offset": "Invalid chunk offset",
"img-auth-accessdenied": "Access denied",
- "img-auth-nopathinfo": "Missing PATH_INFO.\nYour server is not set up to
pass this information.\nIt may be CGI-based and cannot support img_auth.\nSee
https://www.mediawiki.org/wiki/Manual:Image_Authorization.";,
+ "img-auth-nopathinfo": "Missing PATH_INFO.\nYour server is not set up to
pass this information.\nIt may be CGI-based and cannot support img_auth.\nSee
https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization.";,
"img-auth-notindir": "Requested path is not in the configured upload
directory.",
"img-auth-badtitle": "Unable to construct a valid title from \"$1\".",
"img-auth-nologinnWL": "You are not logged in and \"$1\" is not in the
whitelist.",
@@ -2209,7 +2209,7 @@
"immobile-target-namespace-iw": "Interwiki link is not a valid target for
page move.",
"immobile-source-page": "This page is not movable.",
"immobile-target-page": "Cannot move to that destination title.",
- "bad-target-model": "The desired destination uses a different content
model. Can not convert from $1 to $2.",
+ "bad-target-model": "The desired destination uses a different content
model. Cannot convert from $1 to $2.",
"imagenocrossnamespace": "Cannot move file to non-file namespace",
"nonfile-cannot-move-to-file": "Cannot move non-file to file namespace",
"imagetypemismatch": "The new file extension does not match its type",
@@ -2304,7 +2304,7 @@
"import-error-special": "Page \"$1\" is not imported because it belongs to
a special namespace that does not allow pages.",
"import-error-invalid": "Page \"$1\" is not imported because its name is
invalid.",
"import-error-unserialize": "Revision $2 of page \"$1\" could not be
unserialized. The revision was reported to use content model $3 serialized as
$4.",
- "import-error-bad-location": "Revision $2 using content model $3 can not
be stored on \"$1\" on this wiki, since that model is not supported on that
page.",
+ "import-error-bad-location": "Revision $2 using content model $3 cannot be
stored on \"$1\" on this wiki, since that model is not supported on that page.",
"import-options-wrong": "Wrong {{PLURAL:$2|option|options}}:
<nowiki>$1</nowiki>",
"import-rootpage-invalid": "Given root page is an invalid title.",
"import-rootpage-nosubpage": "Namespace \"$1\" of the root page does not
allow subpages.",
--
To view, visit https://gerrit.wikimedia.org/r/129889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice4ab37fd2e680e9903643fd6f88e60a44787e2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Shirayuki <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
