Prtksxna has submitted this change and it was merged. Change subject: Updated quotes and images for quotes ......................................................................
Updated quotes and images for quotes Change-Id: I17bf5b37b48d4a0e691337c3851aa08372b2f3b2 --- M locales/en.yml A source/images/quote_netanel.png A source/images/[email protected] A source/images/quote_orwell.png A source/images/[email protected] A source/images/quote_paine.png A source/images/[email protected] A source/images/quote_sotomayor.png A source/images/[email protected] M source/localizable/content.html.erb M source/localizable/index.html.erb M source/localizable/privacy.html.erb 12 files changed, 12 insertions(+), 12 deletions(-) Approvals: Prtksxna: Verified; Looks good to me, approved diff --git a/locales/en.yml b/locales/en.yml index 362f848..a4dfac1 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -26,8 +26,8 @@ privacy: "Requests for <br/>User Data" content: "Requests for Content Alteration & Takedown" faq: "Frequently Asked<br/>Questions" - quote: "I have realized that mystery is what keeps people away, and I’ve grown tired of smoke and mirrors. I yearn for the clean, well-lighted place." - cite: "<a href='//en.wikipedia.org/wiki/Amy_Poehler'>Amy Poehler</a><small>Actress & Author (<a href='//en.wikiquote.org/wiki/Amy_Poehler'>2014</a>)</small>" + quote: "Such is the irresistible nature of truth, that all it asks, and all it wants, is the liberty of appearing. The sun needs no inscription to distinguish him from darkness." + cite: "<a href='//en.wikipedia.org/wiki/Thomas_Paine'>Thomas Paine</a><small>Political Theorist (<a href='//en.wikiquote.org/wiki/Thomas_Paine'>1791</a>)</small>" stories: title: "Stories" @@ -38,8 +38,8 @@ percentage_of_times_information_produced: "Percentage of Times Information Produced" lead: "<a href='//meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'>Freedom of speech is essential</a> to the Wikimedia movement—our projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously." intro: "<p>However, every year, governments, individuals, and corporations ask us to disclose user data. Often, we have no nonpublic information to disclose because we <a href='//wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It'>collect little nonpublic information</a> about users and retain that information for a <a href='//meta.wikimedia.org/wiki/Data_retention_guidelines'>short period of time</a>. But when we do have data, we carefully evaluate every request before considering disclosure. If the requests do not meet our <a href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'>standards</a>—if they are overly broad, unclear, or irrelevant—we will push back on behalf of our users.</p><p>If we must produce information due to a legally valid request, we will <a href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Notifying_Our_Users_of_Your_Request'>notify the affected user</a> before we disclose, if we are <a href='/faq.html#nonpublic_personal_information'>legally permitted and have the means</a> to do so. In certain cases, we may <a href='/faq.html#my_personal_information'>help find assistance</a> for users to fight an invalid request.</p><p>Below, you will find more information about the requests for user data we receive.</p>" - quote: "The best weapon of a dictatorship is secrecy, but the best weapon of a democracy should be the weapon of openness." - cite: "<a href='//en.wikipedia.org/wiki/Niels_Bohr'>Niels Bohr</a><small>Physics Nobel Prize Laureate</small>" + quote: "Awareness that the Government may be watching chills associational and expressive freedoms. And the Government’s unrestrained power to assemble data that reveal private aspects of identity is susceptible to abuse." + cite: "<a href='//en.wikipedia.org/wiki/Sonia_Sotomayor'>Justice Sonia Sotomayor</a><small><a href='//en.wikipedia.org/wiki/Supreme_Court_of_the_United_States'>U.S. Supreme Court</a> (<a href='//www.law.cornell.edu/supremecourt/text/10-1259#writing-10-1259_CONCUR_4'>2012</a>)</small>" summary: "Summary" govt_requests: "Government requests breakdown" compared_to_others: "Compared to other companies, we received relatively few requests" @@ -83,8 +83,8 @@ total_number_of_dmca_requests: "Total Number of DMCA Takedown Requests" lead: "<h2>Imagine a world in which <span class='blackout'>every single human being can freely share in the sum of all knowledge.</span></h2>" intro: "<p>The Wikimedia projects make up one of the world's largest repositories of human knowledge. With that much information, someone is bound to get upset by some of the content from time to time. While the vast majority of content disputes are <a href='/faq.html#resolve_content_disputes'>resolved by users</a> themselves, in some extreme cases the Wikimedia Foundation may receive a legal demand to override our users.</p><p>The Wikimedia projects are yours, not ours. People just like you from around the world write, upload, edit, and curate all of the content. Therefore, we believe users should decide what belongs on Wikimedia projects whenever legally possible.</p><p>Below, you will find more information about the number of requests we receive, where they come from, and how they could impact free knowledge. You can also learn more about how we fight for freedom of speech through our user assistance programs in the <a href='/faq.html#im_being_sued'>FAQ</a>.</p>" - quote: "If all printers were determined not to print anything till they were sure it would offend nobody, there would be very little printed." - cite: "<a href='//en.wikipedia.org/wiki/Benjamin_Franklin'>Benjamin Franklin</a><small>Statesperson (<a href='//en.wikiquote.org/wiki/Benjamin_Franklin#Quotes'>1730</a>)</small>" + quote: "Threats to freedom of speech, writing and action, though often trivial in isolation, are cumulative in their effect and, unless checked, lead to a general disrespect for the rights of the citizen." + cite: "<a href='//en.wikipedia.org/wiki/George_Orwell'>George Orwell</a><small>Writer (<a href='//books.google.com/books?id=zaxG_3ivhVAC&printsec=frontcover&source=gbs_ge_summary_r&redir_esc=y#v=onepage&q=447&f=false'>1948</a>)</small>" story1_title: "French Intelligence Agency<br><small>March 2013</small>" story1_body: "A <a href='//en.wikipedia.org/wiki/Direction_centrale_du_renseignement_int%C3%A9rieur'>French intelligence agency</a> summoned a Wikipedia user to its offices, and threatened him with severe criminal penalties if he did not use his administrative rights to delete information about a <a href='//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute'>military base</a> from <a href='//fr.wikipedia.org/'>French Wikipedia</a> that the agency deemed classified. The supposedly classified information was actually publicly available because the military had provided interviews and a tour of the base to local reporters. We defended the user involved and fought to keep the content up on Wikipedia. <a href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Statement_on_France'>Read more...</a>" story2_title: "Monkey Selfie<br><small>January 2014</small>" @@ -112,8 +112,8 @@ forgotten_title: "Right To Be Forgotten Requests" forgotten_intro: "<p>Last year, a European court decision, <a href='//en.wikipedia.org/wiki/Google_Spain_v_AEPD_and_Mario_Costeja_Gonz%C3%A1lez'>Google Spain v. AEPD and Mario Costeja González</a>, granted individuals the ability to request that search engines “de-index” content about them under the so-called “<a href='//en.wikipedia.org/wiki/Right_to_be_forgotten'>right to be forgotten</a>” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a <a href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'>statement</a> opposing the decision.</p><p>However, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects.*</p><p><small>* Please note that this information only reflects requests made directly to us. Wikimedia project pages continue to disappear from search engine results without any notice, much less, request to us. We have a dedicated page where we post the notices about attempts to remove links to Wikimedia projects that we have received from the search engines who provide such notices as part of their own commitments to transparency. But we suspect that many search engines are not even giving notice, which we find contrary to core principles of free expression, due process, and transparency.</small></p>" - forgotten_quote: "Because if you don’t stand up for the stuff you don’t like, when they come for the stuff you do like, you’ve already lost." - forgotten_cite: "<a href='//en.wikipedia.org/wiki/Neil_Gaiman'>Neil Gaiman</a><small>Author (<a href='//en.wikiquote.org/wiki/Neil_Gaiman'>2008</a>)</small>" + forgotten_quote: "Copyright law's perennial dilemma is to determine where exclusive rights should end and unrestrained public access should begin." + forgotten_cite: "<a href='//law.ucla.edu/faculty/faculty-profiles/neil-w-netanel/'>Neil Weinstock Netanel</a><small>Law Professor (<a href='//ecohist.history.ox.ac.uk//readings/ip/netanel.htm'>1996</a>)</small>" total_number_of_forgotten_requests: "Total number of requests" number_of_forgotten_requests_granted: "Number of requests granted" dmca_title: "DMCA Takedown Notices" diff --git a/source/images/quote_netanel.png b/source/images/quote_netanel.png new file mode 100644 index 0000000..88dade6 --- /dev/null +++ b/source/images/quote_netanel.png Binary files differ diff --git a/source/images/[email protected] b/source/images/[email protected] new file mode 100644 index 0000000..e421e57 --- /dev/null +++ b/source/images/[email protected] Binary files differ diff --git a/source/images/quote_orwell.png b/source/images/quote_orwell.png new file mode 100644 index 0000000..528d36a --- /dev/null +++ b/source/images/quote_orwell.png Binary files differ diff --git a/source/images/[email protected] b/source/images/[email protected] new file mode 100644 index 0000000..0d5b1e3 --- /dev/null +++ b/source/images/[email protected] Binary files differ diff --git a/source/images/quote_paine.png b/source/images/quote_paine.png new file mode 100644 index 0000000..2d70f8f --- /dev/null +++ b/source/images/quote_paine.png Binary files differ diff --git a/source/images/[email protected] b/source/images/[email protected] new file mode 100644 index 0000000..af5484a --- /dev/null +++ b/source/images/[email protected] Binary files differ diff --git a/source/images/quote_sotomayor.png b/source/images/quote_sotomayor.png new file mode 100644 index 0000000..4bb49ae --- /dev/null +++ b/source/images/quote_sotomayor.png Binary files differ diff --git a/source/images/[email protected] b/source/images/[email protected] new file mode 100644 index 0000000..2a6bb52 --- /dev/null +++ b/source/images/[email protected] Binary files differ diff --git a/source/localizable/content.html.erb b/source/localizable/content.html.erb index 0a78e8e..beec03a 100644 --- a/source/localizable/content.html.erb +++ b/source/localizable/content.html.erb @@ -34,7 +34,7 @@ <blockquote> <p><%= t('content.quote') %></p> <footer> - <a href="//commons.wikimedia.org/wiki/Benjamin_Franklin#mediaviewer/File:Benjamin_Franklin.PNG"><img src="/images/quote_franklin.png"></a> + <a href="//commons.wikimedia.org/wiki/File:George_Orwell_press_photo.jpg"><img src="/images/quote_orwell.png"></a> <p><%= t('content.cite') %></p> </footer> </blockquote> @@ -220,7 +220,7 @@ <blockquote> <p><%= t('content.forgotten_quote') %></p> <footer> - <a href="//commons.wikimedia.org/wiki/File:Kyle-cassidy-neil-gaiman-April-2013.jpg"><img src="/images/quote_gaiman.png"></a> + <img src="/images/quote_netanel.png"> <p><%= t('content.forgotten_cite') %></p> </footer> </blockquote> diff --git a/source/localizable/index.html.erb b/source/localizable/index.html.erb index e99219f..6e383b4 100644 --- a/source/localizable/index.html.erb +++ b/source/localizable/index.html.erb @@ -48,7 +48,7 @@ <blockquote class="middle"> <p><%= t('home.quote') %></p> <footer> - <a href="//en.wikipedia.org/wiki/Amy_Poehler#mediaviewer/File:Amy_Poehler_2012.jpg"><img src="/images/quote_poehler.png"></a> + <a href="//en.wikipedia.org/wiki/File:Thomas_Paine_by_Matthew_Pratt,_1785-95.jpg"><img src="/images/quote_paine.png"></a> <p><%= t('home.cite') %></p> </footer> </blockquote> diff --git a/source/localizable/privacy.html.erb b/source/localizable/privacy.html.erb index abef897..fda8256 100644 --- a/source/localizable/privacy.html.erb +++ b/source/localizable/privacy.html.erb @@ -35,7 +35,7 @@ <blockquote> <p><%= t('privacy.quote') %></p> <footer> - <a href="//commons.wikimedia.org/wiki/File:Niels_Bohr.jpg"><img src="/images/quote_bohr.png"></a> + <a href="//commons.wikimedia.org/wiki/File:Sonia_Sotomayor_in_SCOTUS_robe.jpg"><img src="/images/quote_sotomayor.png"></a> <p><%= t('privacy.cite') %></p> </footer> </blockquote> -- To view, visit https://gerrit.wikimedia.org/r/224376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17bf5b37b48d4a0e691337c3851aa08372b2f3b2 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: MSyed <[email protected]> Gerrit-Reviewer: Prtksxna <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
