Prtksxna has submitted this change and it was merged.
Change subject: Fixes from legal
......................................................................
Fixes from legal
Change-Id: I6e7cf45ea8e573426198fd15076a2590f140f642
---
M locales/en.yml
M source/data/other_companies.csv
M source/data/targeted_dmca.csv
A source/images/flags_svg/ro.svg
A source/images/flags_svg/sr.svg
A source/images/flags_svg/tw.svg
M source/javascripts/rag.js
M source/localizable/content.html.erb
M source/localizable/privacy.html.erb
9 files changed, 50 insertions(+), 58 deletions(-)
Approvals:
Prtksxna: Verified; Looks good to me, approved
diff --git a/locales/en.yml b/locales/en.yml
index 8c92230..d9a9ec9 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -36,7 +36,7 @@
title: "Requests for<br/>User Data"
total_number_of_requests: "Total Number of Requests"
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."
+ 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: "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>"
@@ -58,7 +58,7 @@
total_requests: "Total requests"
information_produced: "Information produced"
information_was_produced: "Requests where information was produced"
- bubble_graph_fineprint: "Due to the inconsistent release dates across
different organizations, comparison data for the period covered by this report
(July 2014 - December 2014) was not available, so we are presenting the
comparison data above for July 2013 - June 2014. Please also note that figures
for Wikimedia include additional types of requests for user data that are not
included in the other organizations' figures. See the <a
href='/faq.html#different_compare'>FAQ</a> for more details."
+ bubble_graph_fineprint: "Due to the inconsistent release dates across
different organizations, comparison data for the period covered by this report
(January 2015 - June 2015) was not available, so we are presenting the
comparison data above for July 2014 - December 2014. Please also note that
figures for Wikimedia include additional types of requests for user data that
are not included in the other organizations' figures. See the <a
href='/faq.html#different_compare'>FAQ</a> for more details."
show_all: "Show All"
request_type: "Request Type"
information_produced_title: "Information Produced?"
@@ -94,16 +94,16 @@
story3_body: "A Tasmanian aboriginal language center demanded the removal
of the <a href='//en.wikipedia.org'>English Wikipedia</a> <a
href='//en.wikipedia.org/wiki/Palawa_kani'>article on 'palawa kani'</a>,
claiming copyright over the entirety of the language. We refused to remove the
article because copyright law simply cannot be used to stop people from using
an entire language or to prevent general discussion about the language. Such a
broad claim would have chilled free speech and negatively impacted research,
education, and public discourse—activities that Wikimedia serves to promote."
story_identity_title: "Mistaken Identity<br><small>January, March, and May
2015</small>"
- story_identity_body: "Sometimes, we get takedown requests for websites
that we do not operate. In most cases, we explain to the requester that they’ve
contacted the wrong party, and don’t hear from them again. But recently, a
company sent us three separate DMCA requests, asking that we remove certain
allegedly proprietary content from our sites. The problem? Wikimedia is not
associated with any of the sites in question. The company apparently thought
that all sites that include the word 'wiki' in the URL or use <a
href='//www.mediawiki.org/wiki/MediaWiki'>MediaWiki software</a> are Wikimedia
Projects. We explained that isn't the case, but they continued to send us DMCA
notices."
+ story_identity_body: "Sometimes, we get takedown requests for websites
that we do not operate. In most cases, we explain to the requester that they’ve
contacted the wrong party, and don’t hear from them again. But recently, a
company sent us three separate DMCA requests, asking that we remove certain
allegedly proprietary content from our sites. The problem? Wikimedia is not
associated with any of the sites in question. The company apparently thought
that all sites that include the word 'wiki' in the URL or use <a
href='//www.mediawiki.org/wiki/MediaWiki'>MediaWiki software</a> are Wikimedia
projects. We explained that isn't the case, but they continued to send us DMCA
notices."
- story_barnstar_title: "Home-made Barnstar<br><small>March 2015</small>"
- story_barnstar_body: "The Wikimedia community is large and diverse, but
has many things in common: for example, who doesn’t like getting a <a
href='//en.wikipedia.org/wiki/Wikipedia:Barnstars'>barnstar</a> to recognize
their good work on the Projects? Unfortunately, we recently received a DMCA
request about one of the many barnstar images available across Wikimedia
Projects. Someone had uploaded a unique 'Home-Made Barnstar' from an arts and
crafts site without permission to use for the star. We evaluated the request,
and removed the image. Don’t worry, though: you can still get a homemade
barnstar. There are freely licensed barnstars, like <a
href='//en.wikipedia.org/wiki/File:Homemadebarnstar.png'>this one</a>, just
waiting to be discovered and awarded."
+ story_barnstar_title: "Home-Made Barnstar<br><small>March 2015</small>"
+ story_barnstar_body: "The Wikimedia community is large and diverse, but
has many things in common: for example, who doesn’t like getting a <a
href='//en.wikipedia.org/wiki/Wikipedia:Barnstars'>barnstar</a> to recognize
their good work on the Projects? Unfortunately, we recently received a DMCA
request about one of the many barnstar images available across Wikimedia
projects. Someone had uploaded a unique 'Home-Made Barnstar' from an arts and
crafts site without permission to use the star. We evaluated the request, and
removed the image. Don’t worry, though: you can still get a homemade barnstar.
There are freely licensed barnstars, like <a
href='//en.wikipedia.org/wiki/File:Homemadebarnstar.png'>this one</a>, just
waiting to be discovered and awarded."
story_stock_title: "The Right Way<br><small>March and April 2015</small>"
story_stock_body: "We carefully evaluate every DMCA notice we receive, but
the job is easier when the requester provides all of the necessary information.
Recently, we complied with two DMCA notices from a stock photo agency. One
concerned a photo of a red fox, the other a Nepalese mountain. They also
requested a third photo be removed, but as is often the case, the community
noticed the improper copyright permissions and proactively removed it before we
got the chance to. In each case, the agency had followed the template for DMCA
requests, facilitating our review and consequently the removal of their
content."
story_political_title: "Political Points<br><small>March 2015</small>"
- story_political_body: "A lawyer reached out to us on behalf of a
lesser-known North American political party that was unhappy with edits to <a
href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> articles about
the party and one of its leaders. Her clients apparently wanted previous, more
promotional versions of the articles restored in place of the later versions.
To better engage in discussions with the community, we encouraged them to
familiarize themselves with Wikipedia's <a
href='https://en.wikipedia.org/wiki/Wikipedia:Writing_better_articles#Information_style_and_tone'>recommendations
on style and tone</a> and the <a
href='https://en.wikipedia.org/wiki/Wikipedia:Writing_better_articles#Information_style_and_tone'>policy
restricting use of promotional language</a>. We also advised that one of the
best ways to resolve their concerns is to engage with the community directly."
+ story_political_body: "A lawyer reached out to us on behalf of a
lesser-known North American political party that was unhappy with edits to <a
href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> articles about
the party and one of its leaders. Her clients apparently wanted previous, more
promotional versions of the articles restored in place of the later versions.
To better engage in discussions with the community, we encouraged them to
familiarize themselves with Wikipedia's <a
href='https://en.wikipedia.org/wiki/Wikipedia:Writing_better_articles#Information_style_and_tone'>recommendations
on style and tone</a> and the <a
href='//en.wikipedia.org/wiki/Wikipedia:What_Wikipedia_is_not#Wikipedia_is_not_a_soapbox_or_means_of_promotion'>policy
restricting use of promotional language</a>. We also advised that one of the
best ways to resolve their concerns is to engage with the community directly."
story_guru_title: "Citation Needed<br><small>January 2015</small>"
story_guru_body: "A self-identified religious group wrote us, requesting
that we remove multiple <a href='//en.wikipedia.org/wiki/Main_Page'>English
Wikipedia</a> articles. As support for their request, they cited a
self-publication declaring that the founder of their tradition is the ruler of
the universe. We explained that the Wikimedia Foundation does not edit or
curate content on Wikipedia, and that if they were concerned about
inaccuracies, they could consult Wikipedia's experienced volunteer editors. We
also directed them to Wikipedia’s <a
href='//en.wikipedia.org/wiki/Wikipedia:Verifiability'>policy on
verifiability</a> and <a
href='//en.wikipedia.org/wiki/Wikipedia:Identifying_reliable_sources'>guide to
identifying reliable sources</a>, so that they could better understand the
standards applied to Wikipedia articles and permissible sources to cite in
those articles."
@@ -130,7 +130,7 @@
story_studio_body: "A public relations company demanded that we remove an
image of a rapper. However, the photo had been freely licensed under <a
href='//commons.wikimedia.org/wiki/Main_Page'>Wikimedia Commons</a> policy
apparently by the artist and claimed holder of the copyright. Therefore, we
declined to remove it. The PR company initially alleged that the portrayed
musician was someone different from the rapper. They later appeared to suggest
that the rapper had never intended to give his permission. As the story seemed
to change, the community examined, and then re-examined, the original
permission. In the end the community found that the image should be kept."
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_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: "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"
@@ -161,7 +161,7 @@
a_request_abroad: "<p>Per our <a
href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'>Requests
for User Information Procedures & Guidelines</a>, we require requests
originating from outside of the United States to follow the <a
href='//en.wikipedia.org/wiki/Mutual_Legal_Assistance_Treaty'>mutual legal
assistance treaty</a> (MLAT) process or <a
href='//en.wikipedia.org/wiki/Letter_rogatory'>letters rogatory</a> process so
that a U.S. court will issue the required U.S. legal process to the Wikimedia
Foundation.</p>"
q_nonpublic_personal_information: "When would you not tell a user that his
or her nonpublic personal information is being disclosed as a result of a legal
process, such as a subpoena?"
a_nonpublic_personal_information: "<p>We are committed to notifying users
if we plan on disclosing nonpublic personal information. However, we cannot
notify a user if we are legally restrained from doing so (e.g., by a gag
order), if a credible threat to life or limb is present, or if the user has not
provided us with an e-mail address or valid contact information.</p>"
- q_my_personal_information: "Help! My personal information is being sought
because of something I did on the Wikimedia Projects. What should I do?"
+ q_my_personal_information: "Help! My personal information is being sought
because of something I did on the Wikimedia projects. What should I do?"
a_my_personal_information: "<p>If you are the subject of a subpoena, it is
highly recommended that you consult your own lawyer immediately. There are a
number of organizations that will fight on a user's behalf, like the <a
href='https://www.aclu.org/'>American Civil Liberties Union</a> (ACLU) or the
<a href='https://www.eff.org/'>Electronic Frontier Foundation</a> (EFF). If you
need help finding an attorney, WMF may be able to put you in touch with some of
these organizations or help you secure an attorney at reduced or pro-bono
rates. In rare cases, assistance may also be available under our <a
href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Fees_Assistance_Program'>Legal
Fees Assistance Program</a> or <a
href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Policies#Defense_of_Contributors'>Defense
of Contributors Program</a>.</p><p>Additionally, in certain situations, WMF
may challenge a subpoena on a user’s behalf if it is unnecessarily broad or
burdensome, or if we believe the subpoena threatens the free speech of users on
our Projects. For more information about subpoenas, see our <a
href='//wikimediafoundation.org/wiki/Privacy_policy/Subpoena_FAQ'>Subpoena
FAQ</a>. </p>"
q_information_produced: "What do you mean by 'information produced'?"
a_information_produced: "When we say 'information produced', we mean that
as a result of a legal process (such as a subpoena) that was legally valid,
some or all of the nonpublic user information requested by that legal process
was produced by WMF to the requesting party. ‘Information produced’ also
applies to rare situations where we voluntarily disclose personal information
to law enforcement, usually in order to prevent imminent bodily harm or death."
@@ -176,27 +176,27 @@
q_search_warrant: "What do you mean by 'search warrant'?"
a_search_warrant: "<p>When we say 'search warrant', we mean a warrant
issued under the procedures of the <a
href='http://www.law.cornell.edu/rules/frcrmp'>Federal Rules of Criminal
Procedure</a> or equivalent state warrant procedures, based upon a showing of
<a href='//en.wikipedia.org/wiki/Probable_cause'>probable cause</a> that
specific information held by the Wikimedia Foundation may be related to a
crime. Search warrants are generally reviewed by a judge or a magistrate.</p>"
q_court_order: "What do you mean by 'court order'?"
- a_court_order: "<p>When we say 'court order', we mean an order issued by a
U.S. court of competent jurisdiction directed at the Wikimedia Foundation.
Court orders for user data may be issued under various U.S. federal and state
laws, such as section 2703(d) of the <a
href='//en.wikipedia.org/wiki/ECPA'>Electronic Communications Privacy Act</a>
('ECPA'), a federal privacy law. </p><p>For the avoidance of doubt, we believe
a warrant is required by the <a
href='http://www.law.cornell.edu/constitution/fourth_amendment'>4th
Amendment</a> to the <a
href='http://www.archives.gov/exhibits/charters/constitution_transcript.html'>United
States Constitution</a>, which prohibits unreasonable search and seizure and
overrides conflicting provisions in the ECPA. We believe that the ECPA needs to
be updated so that equivalent protections are granted to electronic
communications and documents that have already been granted to the physical
documents one keeps at home or in their office. To that end, we are a member of
the <a
href='http://digitaldueprocess.org/index.cfm?objectid=37940370-2551-11DF-8E02000C296BA163'>Digital
Due Process Coalition</a> to help in that effort.</p>"
+ a_court_order: "<p>When we say 'court order', we mean an order issued by a
court directed at the Wikimedia Foundation. If an order has been issued by a
court of competent jurisdiction, we will evaluate the request. For example,
court orders for user data may be issued under various U.S. federal and state
laws, such as section 2703(d) of the <a
href='//en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act'>Electronic
Communications Privacy Act</a> ('ECPA'), a federal privacy law. </p><p>For the
avoidance of doubt, we believe a warrant is required by the <a
href='http://www.law.cornell.edu/constitution/fourth_amendment'>4th
Amendment</a> to the <a
href='http://www.archives.gov/exhibits/charters/constitution_transcript.html'>United
States Constitution</a>, which prohibits unreasonable search and seizure and
overrides conflicting provisions in the ECPA. We believe that the ECPA needs to
be updated so that equivalent protections are granted to electronic
communications and documents that have already been granted to the physical
documents one keeps at home or in their office. To that end, we are a member of
the <a
href='http://digitaldueprocess.org/index.cfm?objectid=37940370-2551-11DF-8E02000C296BA163'>Digital
Due Process Coalition</a> to help in that effort.</p>"
q_national_security_request: "What do you mean by 'national security
request'?"
a_national_security_request: "'National security requests' include <a
href='//en.wikipedia.org/wiki/National_security_letter'>national security
letters</a> and orders issued under the <a
href='//en.wikipedia.org/wiki/Foreign_Intelligence_Surveillance_Act'>Foreign
Intelligence Surveillance Act</a>."
q_potentially_affected: "What do you mean by user accounts potentially
affected?"
- a_potentially_affected: "<p>This number represents the number of unique
user accounts implicated by requests for user data and whose data would have
been disclosed if we had granted every request we received. This number may not
reflect the number of unique individuals implicated by requests for user data;
if an individual has multiple accounts across all Wikimedia Projects, and we
receive requests for more than one of these accounts, we record each user
account separately. As a result, this number might overestimate the number of
individuals implicated by user data requests.</p>"
+ a_potentially_affected: "<p>This number represents the number of unique
user accounts implicated by requests for user data and whose data would have
been disclosed if we had granted every request we received. This number may not
reflect the number of unique individuals implicated by requests for user data;
if an individual has multiple accounts across all Wikimedia projects, and we
receive requests for more than one of these accounts, we record each user
account separately. As a result, this number might overestimate the number of
individuals implicated by user data requests.</p>"
q_actually_affected: "What do you mean by user accounts actually affected?"
a_actually_affected: "<p>This number represents the number of unique user
accounts whose nonpublic information was disclosed as a result of WMF receiving
a valid request for user data. This number may not reflect the number of unique
individuals whose data was disclosed as a result of a valid request for user
data; if an individual has multiple accounts across all Wikimedia projects, and
we receive requests for more than one of these accounts, we record each user
account separately. As a result, this number might overestimate the number of
individuals implicated by user data requests.</p>"
q_voluntary_disclosure: "What do you mean by 'voluntary disclosure'?"
a_voluntary_disclosure: "When we say ‘voluntary disclosure’, we mean just
that: times where we voluntarily—and on our own initiative—disclose personal
information to a law enforcement agency. Such disclosures are rare, and we
typically make them in emergency situations, such as when we receive a credible
suicide threat or threat of physical violence. We only make these disclosures
in accordance with the exceptions outlined in our <a
href='//wikimediafoundation.org/wiki/Privacy_policy#sharing'>Privacy
Policy</a>, such as to protect you, ourselves, and others from imminent and
serious bodily harm or death."
- q_right_forgotten: "What do you mean by 'Right to be Forgotten'?"
- a_right_forgotten: "The so-called <a
href='//en.wikipedia.org/wiki/Right_to_be_forgotten'>Right to be Forgotten
(RTBF)</a> is a legal principle in the <a
href='//en.wikipedia.org/wiki/European_Union'>European Union</a> and <a
href='//en.wikipedia.org/wiki/Argentina'>Argentina</a>. The term reached the
mainstream in 2014 when 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 EU individuals the
ability to request that search engines “de-index” content about them.
-While Wikimedia Projects are not search engines, we occasionally receive
requests to remove content based on the RTBF. We began documenting such
requests in July, 2014. To learn more about the problems with RTBF and other
kinds of censorship, please check out our <a
href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'>statement</a>."
+ q_right_forgotten: "What do you mean by 'Right To Be Forgotten'?"
+ a_right_forgotten: "The so-called <a
href='//en.wikipedia.org/wiki/Right_to_be_forgotten'>Right To Be Forgotten
(RTBF)</a> is a legal principle in the <a
href='//en.wikipedia.org/wiki/European_Union'>European Union</a> and <a
href='//en.wikipedia.org/wiki/Argentina'>Argentina</a>. The term reached the
mainstream in 2014 when 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 EU individuals the
ability to request that search engines “de-index” content about them.
+While Wikimedia projects are not search engines, we occasionally receive
requests to remove content based on the RTBF. We began documenting such
requests in July, 2014. To learn more about the problems with RTBF and other
kinds of censorship, please check out our <a
href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'>statement</a>."
q_different_compare: "Why are requests for user data calculated
differently by WMF as compared to other organizations?"
a_different_compare: "In this transparency report, WMF has included all
types of requests for user information it receives, including governmental and
non-governmental requests as well as informal and formal requests. Some other
organizations, including several of those appearing in the 'Compared to other
companies' graph in our report, only disclose requests originating from
governments. Please visit the transparency reports of <a
href='//govtrequests.facebook.com/'>Facebook</a>, <a
href='//www.google.com/transparencyreport/'>Google</a>, <a
href='//transparency.twitter.com/'>Twitter</a>, and <a
href='//www.linkedin.com/legal/transparency'>LinkedIn</a> for more detail about
the types of requests they receive."
q_public_information_included: "Are requests for public information
included in requests for user data?"
a_public_information_included: "<p>No, any requests for purely publicly
available information are not included in this report.</p>"
q_improve_laws: "What is WMF doing to help improve laws related to
disclosure or surveillance of user information?"
- a_improve_laws: "<p>Our core <a
href='//meta.wikimedia.org/wiki/User:Sue_Gardner/Wikimedia_Foundation_Guiding_Principles'>values</a>
of freedom of speech and access to information can be threatened by laws that
compromise user privacy. For this reason, the Wikimedia Foundation has joined
the fight to improve privacy laws around the world. </p><p>In 2013, we joined
the <a
href='http://digitaldueprocess.org/index.cfm?objectid=37940370-2551-11DF-8E02000C296BA163'>Digital
Due Process Coalition</a> (DDPC), an organization focused on reforming the
United States <a
href='//en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act'>Electronic
Communications Privacy Act</a> (ECPA). The ECPA specifies standards for law
enforcement access to electronic communications and associated data, thereby
providing a degree of privacy to users of digital communication services.
However, the ECPA was enacted in 1986, meaning that it does not adequately
protect users anymore and only serves to provide inconsistent standards for law
enforcement when dealing with 'new' technologies. The DDPC's mission is to
simplify, clarify, and unify the ECPA standards—providing clearer privacy
protections for users taking into account changes in technology and usage
patterns, while preserving the legal tools necessary for government agencies to
enforce the laws and protect the public.</p><p>In 2014, <a
href='//blog.wikimedia.org/2014/05/09/opposing-mass-surveillance-on-the-internet/'>we
signed</a> onto the <a
href='//en.necessaryandproportionate.org/take-action/digiges'>Necessary and
Proportionate Principles</a>, which strongly support the application of human
rights to mass surveillance and set forth basic principles to which governments
should adhere when employing modern surveillance technologies. In March 2015,
we took an even stronger stand. The Wikimedia Foundation joined eight other
co-plaintiffs in <a
href='//blog.wikimedia.org/2015/03/10/wikimedia-v-nsa/'>filing a lawsuit</a>
against the <a href='//en.wikipedia.org/wiki/National_Security_Agency'>U.S.
National Security Agency</a> over its <a
href='//en.wikipedia.org/wiki/Upstream_collection'>“Upstream” mass surveillance
program</a>, which captures communications passing through the <a
href='//en.wikipedia.org/wiki/Internet_backbone'>Internet “backbone.”</a> We
strongly oppose mass surveillance by any government or entity, and hope that
this lawsuit becomes an important step in changing current practices.</p>"
+ a_improve_laws: "<p>Our core <a
href='//meta.wikimedia.org/wiki/User:Sue_Gardner/Wikimedia_Foundation_Guiding_Principles'>values</a>
of freedom of speech and access to information can be threatened by laws that
compromise user privacy. For this reason, the Wikimedia Foundation has joined
the fight to improve privacy laws around the world. </p><p>In 2013, we joined
the <a
href='http://digitaldueprocess.org/index.cfm?objectid=37940370-2551-11DF-8E02000C296BA163'>Digital
Due Process Coalition</a> (DDPC), an organization focused on reforming the
United States <a
href='//en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act'>Electronic
Communications Privacy Act</a> (ECPA). The ECPA specifies standards for law
enforcement access to electronic communications and associated data, thereby
providing a degree of privacy to users of digital communication services.
However, the ECPA was enacted in 1986, meaning that it does not adequately
protect users anymore and only serves to provide inconsistent standards for law
enforcement when dealing with 'new' technologies. The DDPC's mission is to
simplify, clarify, and unify the ECPA standards—providing clearer privacy
protections for users taking into account changes in technology and usage
patterns, while preserving the legal tools necessary for government agencies to
enforce the laws and protect the public.</p><p>In 2014, <a
href='//blog.wikimedia.org/2014/05/09/opposing-mass-surveillance-on-the-internet/'>we
signed</a> onto the <a
href='//en.necessaryandproportionate.org/take-action/digiges'>Necessary and
Proportionate Principles</a>, which support the application of human rights to
mass surveillance and set forth basic principles to which governments should
adhere when employing modern surveillance technologies. In March 2015, we took
an even stronger stand. The Wikimedia Foundation joined eight other
co-plaintiffs in <a
href='//blog.wikimedia.org/2015/03/10/wikimedia-v-nsa/'>filing a lawsuit</a>
against the <a href='//en.wikipedia.org/wiki/National_Security_Agency'>U.S.
National Security Agency</a> over its <a
href='//en.wikipedia.org/wiki/Upstream_collection'>“Upstream” mass surveillance
program</a>, which captures communications passing through the <a
href='//en.wikipedia.org/wiki/Internet_backbone'>Internet “backbone.”</a> We
strongly oppose mass surveillance by any government or entity, and hope that
this lawsuit becomes an important step in changing current practices.</p>"
q_resolve_content_disputes: "How do users resolve content disputes and
decide what should appear on the Wikimedia projects?"
a_resolve_content_disputes: "<p>All content on the Wikimedia projects are
written, uploaded, edited, and curated by people just like you from around the
world. For the most part, users—not the Wikimedia Foundation—develop and
enforce the policies and procedures that govern the content on the projects.
This means that users decide what should and shouldn't be included on the
projects, within the bounds of U.S. law. </p><p>Similarly, each project's
community has created policies and procedures to handle disputes about whether
certain content belongs on a particular project or meets that project's
standards.</p><p>When a third party who has an Wikipedia article written about
them and doesn't like some unflattering content included in that article, the
proper way to address their concerns is to take it up with the community
itself, as opposed to the Wikimedia Foundation.</p>"
- q_im_being_sued: "Help! I'm being sued because of something I did on the
Wikimedia Projects. What should I do?"
+ q_im_being_sued: "Help! I'm being sued because of something I did on the
Wikimedia projects. What should I do?"
a_im_being_sued: "<p>Lawsuits against Wikimedia users are exceedingly
uncommon—most disputes about content are resolved by working with the user
community through community-driven processes. In fact, individuals and
organizations that sue over content they wish to remove from the public's eye
often end up causing that content to receive greater public attention as a
result of the lawsuit, a phenomenon known as the <a
href='//en.wikipedia.org/wiki/Streisand_effect'>Streisand Effect</a>.</p><p>In
the unlikely event that you are the subject of a lawsuit, it is highly
recommended that you consult your own lawyer. There are a number of
organizations that fight on a user's behalf, like the <a
href='http://www.casp.net/'>California Anti-SLAPP Project</a> or the <a
href='https://www.eff.org/'>Electronic Frontier Foundation</a> (EFF). If you
need help finding an attorney, WMF may be able to put you in touch with some of
these organizations or help you secure an attorney at reduced or pro-bono
rates. Additionally, in rare cases, assistance may also be available under our
<a
href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Fees_Assistance_Program'>Legal
Fees Assistance Program</a> or <a
href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Policies#Defense_of_Contributors'>Defense
of Contributors Program</a>.</p>"
q_remove_content: "Does WMF ever remove content?"
a_remove_content: "<p>Absent the receipt of a legally valid <a
href='//www.chillingeffects.org/dmca512/faq.cgi#QID130'>DMCA notice</a>, the
Wikimedia Foundation will generally only remove content in exceptional
circumstances. For example, we once removed a blogger’s unredacted travel visa
after somebody else posted the image with his private information exposed.</p>"
@@ -205,9 +205,9 @@
q_transparent_dmca: "How are you transparent about particular DMCA
removals besides in this transparency report?"
a_transparent_dmca: "<p>We record every DMCA takedown request that results
in removal of content on <a
href='//wikimediafoundation.org/wiki/Category:DMCA'>our website</a>. In
addition, every DMCA removal is submitted to the <a
href='//www.chillingeffects.org/'>Chilling Effects Clearinghouse</a> (Chilling
Effects), a web archive managed by the <a
href='https://www.eff.org/'>Electronic Frontier Foundation</a> and several law
school clinics. By collecting takedown notices from a variety of sources,
Chilling Effects provides a large set of data for analysis and allows
recipients and senders of takedown notices to learn more about how the DMCA
operates in the current online environment.</p>"
q_counter_notices: "Did you receive any <a
href='//wikimediafoundation.org/wiki/DMCA_Policy#If_you_are_an_uploader_of_content.E2.80.A6'>DMCA
counter-notices</a>?"
- a_counter_notices: "<p>No, we did not receive any DMCA counter-notices
between July 2012 - June 2015</p>"
+ a_counter_notices: "<p>No, we did not receive any DMCA counter-notices
between July 2012 - June 2015.</p>"
q_six_month: "Why is the information from July 2012 - June 2013 not
available in six-month increments like the information from July 2013 - June
2015?"
- a_six_month: "<p>During the July 2012 - June 2013 period, we recorded
totals only for the entire period, rather than breaking the totals into
six-month terms. In order to provide a better comparison with other reporting
organizations, we changed the date ranges for our charts to line up with those
used by those organizations starting in July 2013.</p>"
+ a_six_month: "<p>During the July 2012 - June 2013 period, we recorded
totals only for the entire period, rather than breaking the totals into
six-month terms. In order to provide a better comparison with other reporting
organizations, we changed the date ranges for our charts to line up with the
timelines used by those organizations starting in July 2013.</p>"
q_count_requests: "How do you count requests?"
a_count_requests: "<p>Each request received counts as one request in the
transparency report, irrespective of the number of webpages, content, or users
that request deals with. For example, a request for user information that asks
for the information of three users counts as one request for user data, and a
DMCA takedown request that requests the removal of 5 images is counted as one
DMCA request. Duplicate requests regarding the same matter from the same
requesting party are also counted as one request. For example, if a requesting
party sends us multiple demand letters to take a particular Wikipedia article
down, it counts as one request.</p>"
q_targeted_takedown: "What do you mean when you say a Project was
'targeted' by a takedown, alteration, or DMCA request?"
diff --git a/source/data/other_companies.csv b/source/data/other_companies.csv
index 38fdf38..ec4b615 100644
--- a/source/data/other_companies.csv
+++ b/source/data/other_companies.csv
@@ -1,5 +1,5 @@
company,requests,complied
-Wikipedia,28,1
+Wikimedia,28,1
LinkedIn,100,60
Twitter,2871,1492
Google,30138,18986
diff --git a/source/data/targeted_dmca.csv b/source/data/targeted_dmca.csv
index 3a66936..3b67099 100644
--- a/source/data/targeted_dmca.csv
+++ b/source/data/targeted_dmca.csv
@@ -13,7 +13,7 @@
Not a WMF site,,1,0,juldec14
Wikimedia Commons,commons.wikimedia.org,6,2,janjun15
English Wikipedia,en.wikipedia.org,6,1,janjun15
-Not a WMF Site,.4,0,janjun15
+Not a WMF Site,,4,0,janjun15
Spanish Wikipedia,es.wikipedia.org,1,0,janjun15
Italian Wikipedia,it.wikipedia.org,1,0,janjun15
Serbian Wikipedia,sr.wikipedia.org,1,0,janjun15
diff --git a/source/images/flags_svg/ro.svg b/source/images/flags_svg/ro.svg
new file mode 100644
index 0000000..c9b6da8
--- /dev/null
+++ b/source/images/flags_svg/ro.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="600" height="400" viewBox="0 0
3 2">
+<rect width="1" height="2" x="0" y="0" fill="#002B7F"/>
+<rect width="1" height="2" x="1" y="0" fill="#FCD116"/>
+<rect width="1" height="2" x="2" y="0" fill="#CE1126"/>
+</svg>
\ No newline at end of file
diff --git a/source/images/flags_svg/sr.svg b/source/images/flags_svg/sr.svg
new file mode 100644
index 0000000..169abda
--- /dev/null
+++ b/source/images/flags_svg/sr.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"; width="900" height="600">
+<rect width="900" height="600" fill="#377e3f" />
+<rect y="120" width="900" height="360" fill="#fff" />
+<rect y="180" width="900" height="240" fill="#b40a2d" />
+<path d="M 450,191.459 520.534,408.541 335.873,274.377 564.127,274.377
379.466,408.541 z" fill="#ecc81d" />
+</svg>
\ No newline at end of file
diff --git a/source/images/flags_svg/tw.svg b/source/images/flags_svg/tw.svg
new file mode 100644
index 0000000..6ae3f6d
--- /dev/null
+++ b/source/images/flags_svg/tw.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg>
+<svg width="900" height="600" viewBox="-60 -40 240 160"
xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <rect x="-60" y="-40" width="100%" height="100%" fill="#fe0000"/>
+ <rect x="-60" y="-40" width="50%" height="50%" fill="#000095"/>
+ <path id="four_rays" d="M 8,0 L 0,30 L -8,0 L 0,-30 M 0,8 L 30,0 L 0,-8 L
-30,0" fill="#fff"/>
+ <use xlink:href="#four_rays" transform="rotate(30)"/>
+ <use xlink:href="#four_rays" transform="rotate(60)"/>
+ <circle r="17" fill="#000095"/>
+ <circle r="15" fill="#fff"/>
+</svg>
\ No newline at end of file
diff --git a/source/javascripts/rag.js b/source/javascripts/rag.js
index 9fed741..0f100a6 100644
--- a/source/javascripts/rag.js
+++ b/source/javascripts/rag.js
@@ -20,6 +20,7 @@
"Iran": "ir",
"Italy": "it",
"South Korea": "kr",
+ "Korea": "kr",
"Luxembourg": "lu",
"Latvia": "lv",
"Mexico": "mx",
@@ -55,7 +56,10 @@
"Turkey": "tr",
"Greece": "gr",
"Cyprus": "cy",
- "Ukraine": "ua"
+ "Ukraine": "ua",
+ "Taiwan": "tw",
+ "Suriname": "sr",
+ "Romania": "ro"
}
window.requestsAndGranted = function( data, el, duration ) {
diff --git a/source/localizable/content.html.erb
b/source/localizable/content.html.erb
index 81fd56b..750ab39 100644
--- a/source/localizable/content.html.erb
+++ b/source/localizable/content.html.erb
@@ -105,12 +105,12 @@
<td>1</td>
</tr>
<tr>
- <td><%= t('graph.usa') %></td>
+ <td class="noborder"><%= t('graph.usa') %></td>
<td><%= t('graph.politicians_candidates')
%></td>
<td>2</td>
</tr>
<tr>
- <td><%= t('graph.usa') %></td>
+ <td></td>
<td><%= t('graph.federal_agency') %></td>
<td>1</td>
</tr>
diff --git a/source/localizable/privacy.html.erb
b/source/localizable/privacy.html.erb
index 620c252..8e09643 100644
--- a/source/localizable/privacy.html.erb
+++ b/source/localizable/privacy.html.erb
@@ -103,7 +103,7 @@
<div class="analytics">
<h2><%= t('privacy.compared_to_others') %>*</h2>
<ul class="tabs">
- <li><a id="bubble_graph_jul13jun14"
class="bubble_graph_tabs active" href="javascript: void(0);"><%= t('dates.jan')
%> - <%= t('dates.jun') %> 2015</a></li>
+ <li><a id="bubble_graph_jul13jun14"
class="bubble_graph_tabs active" href="javascript: void(0);"><%= t('dates.jan')
%> - <%= t('dates.jun') %> 2015</a></li>
</ul>
<div id="compare_graph" class="bubble_graph"></div>
<div class="legends">
@@ -214,41 +214,6 @@
<tr>
<td class="indent"><%= t('graph.italy') %></td>
<td><%= t('graph.local_police') %></td>
- <td>1</td>
- </tr>
- <tr class="highlight">
- <td><%=
t('graph.informal_non_government_requests') %></td>
- <td>Total</td>
- <td>15</td>
- </tr>
- <tr>
- <td class="indent"><%= t('graph.usa') %></td>
- <td></td>
- <td>7</td>
- </tr>
- <tr>
- <td class="indent"><%= t('graph.france') %></td>
- <td></td>
- <td>2</td>
- </tr>
- <tr>
- <td class="indent"><%= t('graph.germany')
%></td>
- <td></td>
- <td>2</td>
- </tr>
- <tr>
- <td class="indent"><%= t('graph.italy') %></td>
- <td></td>
- <td>2</td>
- </tr>
- <tr>
- <td class="indent"><%= t('graph.australia')
%></td>
- <td></td>
- <td>1</td>
- </tr>
- <tr>
- <td class="indent"><%= t('graph.unknown')
%></td>
- <td></td>
<td>1</td>
</tr>
</table>
--
To view, visit https://gerrit.wikimedia.org/r/224756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e7cf45ea8e573426198fd15076a2590f140f642
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
