Siddparmar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332877 )

Change subject: add bubble graph footnote
......................................................................


add bubble graph footnote

Change-Id: I378cf9ba57a985007ae0b47b77aabf26837cef69
---
M build/privacy.html
M locales/en.yml
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Siddparmar: Verified; Looks good to me, approved



diff --git a/build/privacy.html b/build/privacy.html
index 64d09f2..f147c01 100644
--- a/build/privacy.html
+++ b/build/privacy.html
@@ -219,7 +219,7 @@
                                <span 
class="complied_requests_circle"></span><p>Requests where information was 
produced</p>
                        </div>
                        <div class="fineprint">
-                               <h2>*</h2><p>Due to the inconsistent release 
dates across different organizations, comparison data for the period covered by 
this report (January 2016 - June 2016) was not available, so we are presenting 
the comparison data above for July 2015 - December 2015. 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.</p>
+                               <h2>*</h2><p>Due to the inconsistent release 
dates across different organizations, comparison data for the period covered by 
this report (July 2016 - December 2016) was not available, so we are presenting 
the comparison data above for January 2016 - July 2016. 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.</p>
                        </div>
                </div>
        </div>
diff --git a/locales/en.yml b/locales/en.yml
index 3d87a52..6289be7 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -76,7 +76,7 @@
     information_was_produced: "Requests where information was produced"
     content_requests: "Content requests"
     non-content_requests: "Non-content requests"
-    bubble_graph_fineprint: "Due to the inconsistent release dates across 
different organizations, comparison data for the period covered by this report 
(January 2016 - June 2016) was not available, so we are presenting the 
comparison data above for July 2015 - December 2015. 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 
(July 2016 - December 2016) was not available, so we are presenting the 
comparison data above for January 2016 - July 2016. 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?"
@@ -273,7 +273,7 @@
     a_national_security_request: "<p>&ldquo;National security requests&rdquo; 
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> (<a 
href='//www.law.cornell.edu/uscode/text/50/1801'>50 U.S.C. &sect;1801</a> 
<em>et seq</em>.).</p>"
 
     q_wiretap: "What is a  &ldquo;wiretap&rdquo; or a  &ldquo;pen 
register&rdquo;, and why doesn’t the Wikimedia Foundation list them in its 
Transparency Report?"
-    a_wiretap: "<p>A <a 
href='//en.wikipedia.org/wiki/Telephone_tapping'>wiretap</a> order (see The 
Wiretap Act, <a href='//www.law.cornell.edu/uscode/text/18/2511'>18 U.S.C. 
&sect; 2511</a> <em>et seq</em>.) is an order that requires the real-time 
interception of the content of telephone or internet communications. A <a 
href='//en.wikipedia.org/wiki/Pen_register'>pen register</a> order (see The Pen 
Register Statute, <a href='//www.law.cornell.edu/uscode/text/18/3121'>18 U.S.C. 
&sect; 3121</a> <em>et seq</em>.) requires the real-time interception of 
non-content information associated with telephone or internet communications 
(such as routing information). We have never received a wiretap or pen register 
order. Should we receive such an order, we will disclose it in this report if 
allowed to do so by law.</p>"    
+    a_wiretap: "<p>A <a 
href='//en.wikipedia.org/wiki/Telephone_tapping'>wiretap</a> order (see The 
Wiretap Act, <a href='//www.law.cornell.edu/uscode/text/18/2511'>18 U.S.C. 
&sect; 2511</a> <em>et seq</em>.) is an order that requires the real-time 
interception of the content of telephone or internet communications. A <a 
href='//en.wikipedia.org/wiki/Pen_register'>pen register</a> order (see The Pen 
Register Statute, <a href='//www.law.cornell.edu/uscode/text/18/3121'>18 U.S.C. 
&sect; 3121</a> <em>et seq</em>.) requires the real-time interception of 
non-content information associated with telephone or internet communications 
(such as routing information). We have never received a wiretap or pen register 
order. Should we receive such an order, we will disclose it in this report if 
allowed to do so by law.</p>"
 
     q_potentially_affected: "What do you mean by &ldquo;user accounts 
potentially affected&rdquo;?"
     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, 
since an individual may have multiple accounts across all Wikimedia projects, 
and we record each user account separately. As a result, this number might 
overestimate the number of individuals implicated by user data requests.</p>"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I378cf9ba57a985007ae0b47b77aabf26837cef69
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Siddparmar <siddharth2par...@gmail.com>
Gerrit-Reviewer: Siddparmar <siddharth2par...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to