Wctaiwan has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157332
Change subject: Merge branch 'contenthandler'
......................................................................
Merge branch 'contenthandler'
Change-Id: I9e4edb664506660a02eaa0373eaa00602fe741b6
---
M MassMessage.alias.php
M i18n/en.json
2 files changed, 1 insertion(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/32/157332/1
diff --git a/MassMessage.alias.php b/MassMessage.alias.php
index a819b8e..3a704c4 100644
--- a/MassMessage.alias.php
+++ b/MassMessage.alias.php
@@ -114,4 +114,4 @@
/** Traditional Chinese (中文（繁體）) */
$specialPageAliases['zh-hant'] = array(
'MassMessage' => array( '大量資訊' ),
-);
+);
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index 94b16ee..2677921 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,48 +1,6 @@
{
"@metadata": {
"authors": [
-<<<<<<< HEAD (e6e7fb Merge "Remove deprecated getResultProperties (since
1.24)")
- "Kunal Mehta"
- ]
- },
- "massmessage": "Send mass message",
- "massmessage-desc": "Allows users to easily send a message to a list of
users",
- "massmessage-form-spamlist": "Page or category containing list of pages
to leave a message on:",
- "massmessage-form-subject": "Subject of the message (also used as the
edit summary):",
- "massmessage-form-message": "Body of the message:",
- "massmessage-form-preview": "Preview",
- "massmessage-form-submit": "Send",
- "massmessage-fieldset-preview": "Preview",
- "massmessage-submitted": "Your message delivery to {{PLURAL:$1|$1
page|$1 pages}} has been queued.",
- "massmessage-just-preview": "This is just a preview. Press
\"{{int:massmessage-form-submit}}\" to send the message.",
- "massmessage-spamlist-doesnotexist": "The specified page-list page does
not exist.",
- "massmessage-empty-subject": "The subject line is empty.",
- "massmessage-empty-message": "The message body is empty.",
- "massmessage-unescaped-langlinks": "Warning: There are unescaped
language links in your message.",
- "massmessage-no-timestamp": "Warning: Your message does not include a
timestamp or signature.",
- "massmessage-form-header": "Use the form below to send messages to a
specified list. All fields are required
([https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:MassMessage
more information]).",
- "massmessage-target": "[//$1$2?title={{urlencode:$3|WIKI}} $3]",
- "massmessage-queued-count": "Queued [[Special:MassMessage|mass
messages]]",
- "massmessage-hidden-comment": "<!-- Message sent by User:$1@$2 using
the list at $3 -->",
- "massmessage-optout-category": "Opted-out of message delivery",
- "massmessage-badhtml": "Your message may have {{PLURAL:$2|an unclosed
HTML tag|unclosed HTML tags}}: $1.",
- "massmessage-parse-badurl": "\"$1\" is not a valid site.",
- "massmessage-parse-badpage": "\"$1\" is not a valid page title.",
- "massmessage-global-disallowed": "Messages can only be sent to local
pages.",
- "right-massmessage": "Send a message to multiple users at once",
- "action-massmessage": "send a message to multiple users at once",
- "log-name-massmessage": "Mass message log",
- "log-description-massmessage": "These events track users sending
messages.",
- "logentry-massmessage-send": "$1 {{GENDER:$2|sent a message}} to $3",
- "logentry-massmessage-failure": "Delivery of \"$4\" to $3 failed with
an error code of <code>$5</code>",
- "logentry-massmessage-skipbadns": "Delivery of \"$4\" to $3 was skipped
because target was in a namespace that cannot be posted in",
- "logentry-massmessage-skipoptout": "Delivery of \"$4\" to $3 was
skipped because target has opted-out of message delivery",
- "logentry-massmessage-skipnouser": "Delivery of \"$4\" to $3 was
skipped because user account does not exist",
- "massmessage-cannot-rename": "This is a system account and cannot be
renamed.",
- "massmessage-message-footer": "",
- "massmessage-nextsteps": "[[Special:MassMessage|Send another message]]
or [[Special:Statistics|view how many messages are queued]]."
-}
-=======
"Kunal Mehta",
"wctaiwan"
]
@@ -146,4 +104,3 @@
"massmessage-list-category": "MassMessage delivery lists",
"massmessage-list-category-desc": "The page is a delivery list for the
[[Special:MassMessage|MassMessage]] extension."
}
->>>>>>> BRANCH (a3ae50 Add tests to Database group)
--
To view, visit https://gerrit.wikimedia.org/r/157332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e4edb664506660a02eaa0373eaa00602fe741b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Wctaiwan <wctai...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
