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

Change subject: Story 790: Standardise use of words
......................................................................


Story 790: Standardise use of words

use image instead of photo
use contribution instead of donate
delete unused 'mobile-frontend-needs-photo

Change-Id: I2e7f2e077d9ce615ce5ba96bbb2f5e9e645f41ba
---
M MobileFrontend.i18n.php
1 file changed, 32 insertions(+), 38 deletions(-)

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



diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index 9af9ea9..10082b2 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -140,15 +140,11 @@
        'mobile-frontend-nearby-error' => '{{SITENAME}} Nearby is having some 
issues.',
        'mobile-frontend-nearby-error-guidance' => 'Try refreshing your 
location.',
        'mobile-frontend-nearby-link' => 'Read this page in full',
-       'mobile-frontend-needs-photo' => 'Needs photo',
 
        // image donation
        'mobile-frontend-donate-image-login' => 'You must be logged in to see 
your uploads.',
-       'mobile-frontend-photo-upload-generic' => 'Donate an image',
+       'mobile-frontend-photo-upload-generic' => 'Contribute an image',
        'mobile-frontend-donate-image-title' => 'Uploads',
-       'mobile-frontend-donate-image-summary' => 'Photos bring pages on 
{{SITENAME}} to life.
-There are many pages which have no photos due to a severe lack of freely 
licensed photos.
-Help bring these pages to life by donating your images that you are willing to 
give away and could be of use to the wider {{SITENAME}} editing community.',
        'mobile-frontend-donate-image-heading' => 'Your recent contributions',
        'mobile-frontend-donate-image-anon' => 'A [[Special:UserLogin|user 
account]] is required to view the uploads page',
        'mobile-frontend-listed-image-no-description' => 'No description',
@@ -203,22 +199,22 @@
 
        // photo uploads
        'mobile-frontend-photo-upload' => 'Add an image to this article',
-       'mobile-frontend-photo-article-edit-comment' => 'Added photo for use on 
page',
-       'mobile-frontend-photo-article-donate-comment' => 'Donated image from 
mobile',
-       'mobile-frontend-photo-upload-comment' => 'Added photo to page',
+       'mobile-frontend-photo-article-edit-comment' => 'Added image for use on 
page',
+       'mobile-frontend-photo-article-donate-comment' => 'Contributed image 
from Special:Uploads',
+       'mobile-frontend-photo-upload-comment' => 'Added image to page',
        'mobile-frontend-photo-caption-placeholder' => 'Add a description 
(required)',
        'mobile-frontend-image-loading' => 'Loading image',
        'mobile-frontend-photo-ownership' => 'I, $1, created this image.',
        'mobile-frontend-photo-ownership-help' => 'What does this mean?',
        'mobile-frontend-photo-ownership-confirm' => 'Got it!',
-       'mobile-frontend-photo-ownership-bullet-one' => 'We can only accept 
photos that you took yourself. Please do not upload images you found somewhere 
else on the Internet.',
+       'mobile-frontend-photo-ownership-bullet-one' => 'We can only accept 
images that you own. Please do not upload images you found somewhere else on 
the Internet.',
        'mobile-frontend-photo-ownership-bullet-two' => 'Copyrighted and 
inappropriate images will be removed.',
        'mobile-frontend-photo-ownership-bullet-three' => 'Your uploads are 
released under a license that allows anyone to reuse them for free.',
        'mobile-frontend-photo-nag-1-bullet-1-heading' => 'I\'m not violating 
copyright',
-       'mobile-frontend-photo-nag-1-bullet-1-text' => "It is '''not''' a photo 
I found on the Internet. It is my own work.",
-       'mobile-frontend-photo-nag-1-bullet-2-heading' => 'This is not a 
personal photo',
+       'mobile-frontend-photo-nag-1-bullet-1-text' => "It is '''not''' an 
image I found on the Internet. It is my own work.",
+       'mobile-frontend-photo-nag-1-bullet-2-heading' => 'This is not a 
personal image',
        'mobile-frontend-photo-nag-1-bullet-2-text' => 'And it can help 
illustrate an important topic.',
-       'mobile-frontend-photo-nag-2-bullet-1-heading' => 'Positively not 
violating copyright, and this photo is educational.',
+       'mobile-frontend-photo-nag-2-bullet-1-heading' => 'Positively not 
violating copyright, and this image is educational.',
        'mobile-frontend-photo-nag-3-bullet-1-heading' => 'I understand what to 
upload. Don\'t show this message again.',
        'mobile-frontend-photo-nag-learn-more-heading' => 'What to upload',
        'mobile-frontend-photo-nag-learn-more-1' => "'''Yes!''' Photos you took 
of places, objects, and events.",
@@ -230,7 +226,7 @@
        'mobile-frontend-photo-upload-error' => 'Error, try again.',
        'mobile-frontend-photo-upload-error-filename' => 'Error, please provide 
a more descriptive summary.',
        'mobile-frontend-photo-upload-success-article' => 'Success! Your image 
is now live on this page.',
-       'mobile-frontend-photo-license' => 'By clicking "Submit", you agree to 
our [//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to 
release your photo under the [//creativecommons.org/licenses/by-sa/3.0/ 
Creative Commons Attribution-ShareAlike 3.0 License].',
+       'mobile-frontend-photo-license' => 'By clicking "Submit", you agree to 
our [//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to 
release your image under the [//creativecommons.org/licenses/by-sa/3.0/ 
Creative Commons Attribution-ShareAlike 3.0 License].',
        'mobile-frontend-photo-submit' => 'Submit',
        'mobile-frontend-photo-cancel' => 'Cancel',
        'mobile-frontend-photo-upload-user-count' => 
'{{PLURAL:$1|<span>1</span> upload|<span>$1</span> uploads}}',
@@ -524,17 +520,15 @@
        'mobile-frontend-nearby-error' => 'Text of generic error message when 
querying geodata api',
        'mobile-frontend-nearby-error-guidance' => 'Message explaining actions 
user can take when keying error {{msg-mw|mobile-frontend-nearby-error}}',
        'mobile-frontend-nearby-link' => 'Text of link that takes user to full 
page',
-       'mobile-frontend-needs-photo' => 'Text that appears on page item in 
[[Special:Nearby]] list telling user to upload a photo',
        'mobile-frontend-donate-image-login' => 'Title for 
[[Special:UserLogin]] when being redirected to [[Special:Uploads]].
 
 Used when the user is not logged in.
 {{Related|Mobile-frontend-login}}',
-       'mobile-frontend-photo-upload-generic' => 'Label on donate interface on 
Special:Uploads.',
+       'mobile-frontend-photo-upload-generic' => 'Label on button on 
Special:Uploads.',
        'mobile-frontend-donate-image-title' => 
'{{doc-special|Uploads|unlisted=1}}
 {{Identical|Upload}}',
-       'mobile-frontend-donate-image-summary' => 'Explanation of purpose of 
page and importance of participation.',
        'mobile-frontend-donate-image-heading' => 'heading for a list of recent 
contributions',
-       'mobile-frontend-donate-image-anon' => 'Message shown to user who 
visits the donate image page without a user account',
+       'mobile-frontend-donate-image-anon' => 'Message shown to user who 
visits the Special:Uploads page without a user account',
        'mobile-frontend-listed-image-no-description' => 'What to show when no 
description available',
        'mobile-frontend-donate-photo-upload-success' => 'On upload page - 
notification shown after a successful upload',
        'mobile-frontend-donate-photo-first-upload-success' => 'On upload page 
- notification shown after a successful upload when it is the first upload by 
that user',
@@ -598,42 +592,42 @@
 They can either exit the page and lose them or stay on the page until they are 
complete',
        'mobile-frontend-photo-upload' => 'This appears on articles which have 
no photos and is a call to action to add the first image',
        'mobile-frontend-photo-article-edit-comment' => 'Comment associated 
with edit to page that inserts the image wikitext',
-       'mobile-frontend-photo-article-donate-comment' => 'Edit summary 
associated with donating an image from mobile',
-       'mobile-frontend-photo-upload-comment' => 'Comment associated with the 
upload of a photo',
-       'mobile-frontend-photo-caption-placeholder' => 'Placeholder text 
prompting user to add a mandatory caption to a photo',
+       'mobile-frontend-photo-article-donate-comment' => 'Edit summary 
associated with uploading an image from mobile',
+       'mobile-frontend-photo-upload-comment' => 'Comment associated with the 
upload of an image',
+       'mobile-frontend-photo-caption-placeholder' => 'Placeholder text 
prompting user to add a mandatory caption to an image',
        'mobile-frontend-image-loading' => 'Text that displays while an image 
is loading',
        'mobile-frontend-photo-ownership' => 'A statement saying the user 
created the image. Parameters:
 * $1 - the username. Supports GENDER.',
        'mobile-frontend-photo-ownership-help' => 'A link that allows the user 
to open more information about what {{msg-mw|mobile-frontend-photo-ownership}} 
entails.
 {{Identical|What does this mean}}',
        'mobile-frontend-photo-ownership-confirm' => 'Friendly confirmation 
message expressing understanding',
-       'mobile-frontend-photo-ownership-bullet-one' => 'Explain to users that 
photos must belong to them',
-       'mobile-frontend-photo-ownership-bullet-two' => 'Explain to users their 
photos risk deletion.',
-       'mobile-frontend-photo-ownership-bullet-three' => 'Explain the 
consequences of reuse to a photo donation',
-       'mobile-frontend-photo-nag-1-bullet-1-heading' => "Explain to users 
that the photo they upload can't violate copyrights.",
-       'mobile-frontend-photo-nag-1-bullet-1-text' => 'Explain to users that 
the photo they upload must be their own work.',
-       'mobile-frontend-photo-nag-1-bullet-2-heading' => "Explain to users 
that the photo they upload can't be a self-portrait or a portrait of relatives 
or friends.",
-       'mobile-frontend-photo-nag-1-bullet-2-text' => 'Explain to users that 
the photo they upload should help illustrate an important topic.',
-       'mobile-frontend-photo-nag-2-bullet-1-heading' => "Explain to users 
that the photo can't violate copyrights and must be educational (user's second 
upload).",
+       'mobile-frontend-photo-ownership-bullet-one' => 'Explain to users that 
images must belong to them',
+       'mobile-frontend-photo-ownership-bullet-two' => 'Explain to users their 
images risk deletion.',
+       'mobile-frontend-photo-ownership-bullet-three' => 'Explain the 
consequences of reuse to an image contribution',
+       'mobile-frontend-photo-nag-1-bullet-1-heading' => "Explain to users 
that the image they upload can't violate copyrights.",
+       'mobile-frontend-photo-nag-1-bullet-1-text' => 'Explain to users that 
the image they upload must be their own work.',
+       'mobile-frontend-photo-nag-1-bullet-2-heading' => "Explain to users 
that the image they upload can't be a self-portrait or a portrait of relatives 
or friends.",
+       'mobile-frontend-photo-nag-1-bullet-2-text' => 'Explain to users that 
the image they upload should help illustrate an important topic.',
+       'mobile-frontend-photo-nag-2-bullet-1-heading' => "Explain to users 
that the image can't violate copyrights and must be educational (user's second 
upload).",
        'mobile-frontend-photo-nag-3-bullet-1-heading' => "A confirmation that 
the user understands what they are allowed to upload (user's third upload).",
-       'mobile-frontend-photo-nag-learn-more-heading' => 'A heading for a text 
describing good photo contribution practices.',
-       'mobile-frontend-photo-nag-learn-more-1' => 'Explain to users what is 
allowed on the photo they upload.',
-       'mobile-frontend-photo-nag-learn-more-2' => 'Explain to users that the 
photo they upload should be a good illustration for an article.',
-       'mobile-frontend-photo-nag-learn-more-3' => "Explain to users that the 
photo can't violate copyrights or else it will be deleted.",
+       'mobile-frontend-photo-nag-learn-more-heading' => 'A heading for a text 
describing good image contribution practices.',
+       'mobile-frontend-photo-nag-learn-more-1' => 'Explain to users what is 
allowed on the image they upload.',
+       'mobile-frontend-photo-nag-learn-more-2' => 'Explain to users that the 
image they upload should be a good illustration for an article.',
+       'mobile-frontend-photo-nag-learn-more-3' => "Explain to users that the 
image can't violate copyrights or else it will be deleted.",
        'mobile-frontend-image-uploading-wait' => 'Text that displays whilst an 
image is being uploaded',
        'mobile-frontend-image-uploading-long' => 'Text that displays whilst an 
image is taking long to upload',
        'mobile-frontend-image-uploading-cancel' => 'Text saying that user can 
cancel the image upload. Word "cancel" should be a link.',
-       'mobile-frontend-photo-upload-error' => 'Text that displays when a 
photo fails to upload',
-       'mobile-frontend-photo-upload-error-filename' => 'Text that displays 
when a photo fails to upload due to filename',
-       'mobile-frontend-photo-upload-success-article' => 'Text that displays 
when a photo has been successfully added to a page.',
+       'mobile-frontend-photo-upload-error' => 'Text that displays when an 
image fails to upload',
+       'mobile-frontend-photo-upload-error-filename' => 'Text that displays 
when an image fails to upload due to filename',
+       'mobile-frontend-photo-upload-success-article' => 'Text that displays 
when an image has been successfully added to a page.',
        'mobile-frontend-photo-license' => 'Text notifying user of license that 
image will be published under. You can change the URL to a "local" Wikipedia 
URL, but you cannot make it point to the country specific CC BY-SA 3.0 
license.',
-       'mobile-frontend-photo-submit' => 'Caption for the submit button on the 
photo uplaod form.
+       'mobile-frontend-photo-submit' => 'Caption for the submit button on the 
image uplaod form.
 {{Identical|Submit}}',
-       'mobile-frontend-photo-cancel' => 'Caption for the cancel button on the 
photo upload form.
+       'mobile-frontend-photo-cancel' => 'Caption for the cancel button on the 
image upload form.
 {{Identical|Cancel}}',
        'mobile-frontend-photo-upload-user-count' => 'Displays the number of 
images the user has uploaded. Parameter is number of images. Wrap the number in 
a span tag to allow the number to be incremented programatically',
        'mobile-frontend-photo-upload-user-count-over-limit' => 'Displayed in 
place of mobile-frontend-photo-upload-user-count when user has uploaded more 
than 500 images.',
-       'mobile-frontend-photo-upload-cta' => 'Appears in a notification when 
user clicks photo upload button (see {{msg-mw|mobile-frontend-photo-upload}}) 
when not logged in.',
+       'mobile-frontend-photo-upload-cta' => 'Appears in a notification when 
user clicks image upload button (see {{msg-mw|mobile-frontend-photo-upload}}) 
when not logged in.',
        'mobile-frontend-photo-upload-login' => 'Message for 
[[Special:UserLogin]] when being redirected back to add an image to a page.
 
 Used when the user is not logged in.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e7f2e077d9ce615ce5ba96bbb2f5e9e645f41ba
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to