jenkins-bot has submitted this change and it was merged.
Change subject: Fix text errors
......................................................................
Fix text errors
* Change form-intro-faq to link to 2014 FAQ
* Correct dates of 2014 Wikimania
Bug: 59839
Change-Id: Ic16ce8160f86ec82ad200a2faa227ff5661a1b26
---
M data/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Chad: Looks good to me, approved
Aude: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 08e03d0..4ba4ac0 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -28,8 +28,8 @@
"deadline-passed": "<p>Scholarship application deadline was February
17, 2014, 23:59 UTC.</p>\n<p>We will notify applicants in April 2014 about the
result of their application.</p>\n<p>Please see the <a
href='http://wikimania2014.wikimedia.org/wiki/Scholarships'>scholarships
page</a> on the wiki for more details.</p>",
- "form-intro": "<p>This is the application for sponsorship to attend <a
href=\"http://wikimania2014.wikimedia.org\";>Wikimania 2014</a>, the annual
international conference centered on Wikimedia projects. Awardees will receive
a scholarship which will cover conference registration fees, hotel, and
roundtrip travel to Wikimania in London, 5-10 August 2014.</p>\n<p>This is
<strong>not</strong> a scholarship for university study. Applications not
obviously related to the conference will be discarded.</p>\n<p>Please carefully
consider your financial needs before applying for a scholarship to attend
Wikimania. There are limited funds available and many applicants do not have
the financial means to attend Wikimania without this opportunity. Thank
you.</p>\n<p>The deadline to apply is <strong>February 17, 2014, 23:59
UTC</strong>.</p>",
- "form-intro-faq": "<a
href='http://wikimania2013.wikimedia.org/wiki/Scholarships/FAQ'
target='_blank'>Frequently asked questions</a>",
+ "form-intro": "<p>This is the application for sponsorship to attend <a
href=\"http://wikimania2014.wikimedia.org\";>Wikimania 2014</a>, the annual
international conference centered on Wikimedia projects. Awardees will receive
a scholarship which will cover conference registration fees, hotel, and
roundtrip travel to Wikimania in London, 6-10 August 2014.</p>\n<p>This is
<strong>not</strong> a scholarship for university study. Applications not
obviously related to the conference will be discarded.</p>\n<p>Please carefully
consider your financial needs before applying for a scholarship to attend
Wikimania. There are limited funds available and many applicants do not have
the financial means to attend Wikimania without this opportunity. Thank
you.</p>\n<p>The deadline to apply is <strong>February 17, 2014, 23:59
UTC</strong>.</p>",
+ "form-intro-faq": "<a
href='//wikimania2014.wikimedia.org/wiki/Scholarships/FAQ'
target='_blank'>Frequently asked questions</a>",
"form-error": "Your form has errors. Please correct the errors and
submit the form again.",
"form-save-error": "There was a system error saving your application.
Please try again.",
--
To view, visit https://gerrit.wikimedia.org/r/106444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic16ce8160f86ec82ad200a2faa227ff5661a1b26
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
