[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - help3xsl/online_transform.xsl

[Olivier Hallot]

 help3xsl/online_transform.xsl |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 68a448eb80ce2127001d65af18a48ac4616effbd
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date:   Thu May 24 22:28:33 2018 -0300

    Add GDPR in online help
    
    Change-Id: Ic752beee3901bd9963deb4782702a1de745b5406
    Reviewed-on: https://gerrit.libreoffice.org/54785
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    (cherry picked from commit 0affb71917d215b6d76eb5983a39c726fed53f29)
    Reviewed-on: https://gerrit.libreoffice.org/54869
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 899526f19..54dd71c0c 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -240,8 +240,8 @@
                         <xsl:value-of select="$ui_donate"/>
                     </a></p>
                 </div>
+                <p><a href="https://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a> | <a href="https://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="https://www.documentfoundation.org/statutes.pdf" target="_blank">Statutes (non-binding English translation)</a> - <a href="https://www.documentfoundation.org/satzung.pdf" target="_blank">Satzung (binding German version)</a> | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the <a href="https://www.libreoffice.org/download/license/" target="_blank">Mozilla Public License v2.0</a>. “LibreOffice” and “The Document Foundation” are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="https://wiki.documentfoundation.org/TradeMark_Poli
 cy" target="_blank">trademark policy</a>. LibreOffice was based on OpenOffice.org.</p>
             </xsl:if>
-            <p><a href="https://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a> | <a href="https://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="https://www.documentfoundation.org/statutes.pdf" target="_blank">Statutes (non-binding English translation)</a> - <a href="https://www.documentfoundation.org/satzung.pdf" target="_blank">Satzung (binding German version)</a> | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the <a href="https://www.libreoffice.org/download/license/" target="_blank">Mozilla Public License v2.0</a>. “LibreOffice” and “The Document Foundation” are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="https://wiki.documentfoundation.org/TradeMark_Policy" 
 target="_blank">trademark policy</a>. LibreOffice was based on OpenOffice.org.</p>
             <div id="DEBUG" class="debug">
                 <h3 class="bug">Help content debug info:</h3>
                 <p>This page is: <a href="https://opengrok.libreoffice.org/xref/help/source{$filename}" target="_blank"><xsl:value-of select="$filename"/></a></p>
@@ -290,6 +290,7 @@
             <![CDATA[
             var _paq = _paq || [];
             /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+            _paq.push(['disableCookies']);
             _paq.push(['trackPageView']);
             _paq.push(['enableLinkTracking']);
             (function() {