jenkins-bot has submitted this change and it was merged.
Change subject: Clarify some Html2Wiki messages
......................................................................
Clarify some Html2Wiki messages
* Avoid reference to screen position in dry-run-heading
* Add documentation for upload error message
Bug: T121883
Bug: T121867
Change-Id: Ie6e7c26a7607a190ecb046fcb8f1f3cfd1dd51a2
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index ada8df4..a796bc6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,7 +9,7 @@
"html2wiki-comment": "File imported by
[https://www.mediawiki.org/wiki/Extension:Html2Wiki Html2Wiki]",
"html2wiki-desc": "Import HTML content into your wiki",
"html2wiki-dry-run": "Dry run:",
- "html2wiki-dry-run-heading": "Preview only! Contents below were not
saved:",
+ "html2wiki-dry-run-heading": "Preview only! Contents were not saved:",
"html2wiki-summary": "Description appearing on top of
[[Special:Html2Wiki]] - but it's not.",
"html2wiki-importbtn": "Import",
"html2wiki-intro": "Use this form to import HTML content into your
wiki.\n\nIf you upload a zip file, the Collection Name field is used to
differentiate the collection from a later version. Also all files will be
grouped in a category by the same name. For example, let's say you're importing
a collection of HTML files output from your software documentation system, you
would enter a unique Collection ID like 'FluxCapacitor-v1.1' so that the whole
collection is imported into an article hierarchy starting with
'FluxCapacitor-v1.1'. This way 10 different collections can be imported without
clobbering each other.\n\nSpecifying an existing Collection Name (or parent
path) will update existing wiki content.\n\nIf you want to import a single file
into an existing article hierarchy, simply specify it's 'parent' as the
Collection Name.\n\nFor example, if importing a new 'advanced_topics.html' that
should exist at <code>'FluxCapacitor-v1.1/docs/advanced_topics.html'</code>,
the parent would be 'FluxCapacitor-v1.1/docs/'",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ebf4174..101b098 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -24,7 +24,7 @@
"html2wiki-log-name": "for the Special:Log log name that appears in the
drop-down on the Special:Log page",
"html2wiki-log-description": "for the Special:Log description that
appears on the Special:Log page when you filter logs on this specific log name",
"html2wiki_multiple_body": "Found more than one set of <body> tags in
\n$1",
- "html2wiki_uploaderror": "There was an error handling the file
upload:\n$1",
+ "html2wiki_uploaderror": "An error message when there is a problem with
the upload. Parameters:\n* $1 - the error message of the particular caught
exception",
"html2wiki_parse-error": "external library QueryPath was unable to
parse the content at $1",
"logentry-html2wiki": "Logentry on import of html pages into a wiki"
}
--
To view, visit https://gerrit.wikimedia.org/r/266625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6e7c26a7607a190ecb046fcb8f1f3cfd1dd51a2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Html2Wiki
Gerrit-Branch: master
Gerrit-Owner: MtDu <justin.d...@gmail.com>
Gerrit-Reviewer: Aklapper <aklap...@wikimedia.org>
Gerrit-Reviewer: Nemo bis <federicol...@tiscali.it>
Gerrit-Reviewer: Purodha <puro...@blissenbach.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
