From: k054 <kosa@riseup.net>
Date: Fri, 27 Nov 2015 01:59:58 +0000 (-0500)
Subject: fixing piwik and librejs
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5134d3a3571575a02dfe32a8ba355e4fac70060f;p=enc-live.git

fixing piwik and librejs
---

diff --git a/ar/index.html b/ar/index.html
index ac3f255..bc9ffbe 100644
--- a/ar/index.html
+++ b/ar/index.html
@@ -507,45 +507,18 @@
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>
diff --git a/de/index.html b/de/index.html
index caff40c..d010802 100644
--- a/de/index.html
+++ b/de/index.html
@@ -521,42 +521,18 @@ type="text/javascript"></script>
 <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js" type="text/javascript"></script>
 
 <!-- Piwik -->
-<script type="text/javascript">
-  /*
-  @licstart The following is the entire license notice for the
-    JavaScript code in this page.
-
-  Copyright 2014 Matthieu Aubry
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-  along with this program.  If not, see http://www.gnu.org/licenses/.
-
-  @licend The above is the entire license notice for the
-    JavaScript code in this page.
-  */
-  var _paq = _paq || [];
-  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-  _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-  _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-    _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "5"]);
-    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];
-    g.type="text/javascript"; g.defer=true; g.async=true; g.src=u+"piwik.js";
-    s.parentNode.insertBefore(g,s);
-  })();
-</script><!-- End Piwik code -->
-
+<script type="text/javascript" >
+  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+  try {
+  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+  piwikTracker.trackPageView();
+  piwikTracker.enableLinkTracking();
+  } catch( err ) {}
+  // @license-end
+</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+x
 </body>
 </html>
diff --git a/el/index.html b/el/index.html
index 7ad778b..dab6cfb 100644
--- a/el/index.html
+++ b/el/index.html
@@ -521,45 +521,18 @@
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
-	</body>
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
+</body>
 </html>
diff --git a/es/index.html b/es/index.html
index c488955..09cb735 100644
--- a/es/index.html
+++ b/es/index.html
@@ -514,45 +514,18 @@
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>
diff --git a/fr/index.html b/fr/index.html
index 002a15e..9370a50 100644
--- a/fr/index.html
+++ b/fr/index.html
@@ -963,12 +963,20 @@ alt=" [Logo de Journalism++] " /></a></p><!-- /.credits -->
   (function() {
     var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
     _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "5"]);
+    _paq.push(["setSiteId", "13"]);
     var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];
     g.type="text/javascript"; g.defer=true; g.async=true; g.src=u+"piwik.js";
     s.parentNode.insertBefore(g,s);
   })();
-</script><!-- End Piwik code -->
+</script>
+<noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik code -->
+
+
+
+<!-- End Piwik Tracking Code -->
+
+
 
 </body>
 </html>
diff --git a/it/index.html b/it/index.html
index 022b396..0bed8a5 100644
--- a/it/index.html
+++ b/it/index.html
@@ -530,45 +530,18 @@ In Enigmail rispondi onestamente nella finestra che si apre e chiede: "Con quant
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>
diff --git a/ja/index.html b/ja/index.html
index b66ef89..21d73af 100644
--- a/ja/index.html
+++ b/ja/index.html
@@ -525,45 +525,18 @@
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>
diff --git a/ko/index.html b/ko/index.html
index 0e1f679..811e68a 100644
--- a/ko/index.html
+++ b/ko/index.html
@@ -516,45 +516,18 @@
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>
diff --git a/ml/index.html b/ml/index.html
index 7e78c29..cbcd811 100755
--- a/ml/index.html
+++ b/ml/index.html
@@ -518,45 +518,18 @@
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>
diff --git a/pt-br/index.html b/pt-br/index.html
index caca60d..d17ba29 100644
--- a/pt-br/index.html
+++ b/pt-br/index.html
@@ -523,45 +523,18 @@ Você também pode ver chaves públicas serem citadas por seus ID's, que são si
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>
diff --git a/ro/index.html b/ro/index.html
index 85ed4ce..79220f7 100644
--- a/ro/index.html
+++ b/ro/index.html
@@ -522,45 +522,18 @@
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>
diff --git a/ru/index.html b/ru/index.html
index 1de62ad..956e3bc 100644
--- a/ru/index.html
+++ b/ru/index.html
@@ -961,42 +961,18 @@ alt="Journalism++" /></a>
 <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
 <!-- Piwik -->
-<script type="text/javascript">
-  /*
-  @licstart The following is the entire license notice for the
-    JavaScript code in this page.
-
-  Copyright 2014 Matthieu Aubry
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-  along with this program.  If not, see http://www.gnu.org/licenses/.
-
-  @licend The above is the entire license notice for the
-    JavaScript code in this page.
-  */
-  var _paq = _paq || [];
-  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-  _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-  _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-    _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "5"]);
-    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];
-    g.type="text/javascript"; g.defer=true; g.async=true; g.src=u+"piwik.js";
-    s.parentNode.insertBefore(g,s);
-  })();
-</script><!-- End Piwik code -->
+<script type="text/javascript" >
+  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+  try {
+  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+  piwikTracker.trackPageView();
+  piwikTracker.enableLinkTracking();
+  } catch( err ) {}
+  // @license-end
+</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
 
 </body>
 </html>
diff --git a/sq/index.html b/sq/index.html
index a80e679..8bf8793 100644
--- a/sq/index.html
+++ b/sq/index.html
@@ -528,45 +528,19 @@
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
+		
 	</body>
 </html>
diff --git a/tr/index.html b/tr/index.html
index 6ba8e19..3d12d66 100644
--- a/tr/index.html
+++ b/tr/index.html
@@ -486,45 +486,18 @@ Kitlesel gözetim, temel haklarımızı ihlal eder ve ifade özgürlüğümüzü
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 		<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
+		<!-- Piwik -->
+		<script type="text/javascript" >
+		  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
+		  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
+		  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		  try {
+		  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
+		  piwikTracker.trackPageView();
+		  piwikTracker.enableLinkTracking();
+		  } catch( err ) {}
+		  // @license-end
+		</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
+		<!-- End Piwik Tracking Code -->
 	</body>
 </html>