Merge branch 'master' into i18n

This commit is contained in:
djoate
2019-11-02 02:09:50 -04:00
127 changed files with 2586 additions and 1382 deletions

View File

@ -4,7 +4,7 @@
<strong>{% t windows_10.warning %}</strong>
</div>
<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right" alt="{% t windows_10.alt %}" style="margin-left:10px;">
<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right ml-3" alt="{% t windows_10.alt %}">
<ol>
<li><strong>{% t windows_10.data %}</strong>
@ -80,7 +80,7 @@
<h3>{% t global.related_information %}</h3>
<ul>
<li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows One Drive data, Cortana searches and MS browser history to be sold to third parties.</li>
<li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows OneDrive data, Cortana searches, and MS browser history to be sold to third parties.</li>
<li><a href="https://support.microsoft.com/en-us/help/4468233/cortana-and-privacy-microsoft-privacy">Cortana and privacy</a> - To personalize your experience and provide the best possible suggestions, Cortana accesses your email and other communications and collects data about your contacts (People), like their title, suffix, first name, last name, middle name, nicknames, and company name. If you call, email, or text someone or they call, email, or text you, Cortana collects that persons email address or phone number.</li>
</ul>
@ -89,7 +89,7 @@
<div class="col-md-6">
<h3>Some good news</h3>
<ul>
<li><a href="https://github.com/crazy-max/WindowsSpyBlocker/releases">WindowsSpyBlocker</a> - Open source tool that blocks data collection.</li>
<li><a href="https://github.com/crazy-max/WindowsSpyBlocker/releases">WindowsSpyBlocker</a> - Open-source tool that blocks data collection.</li>
<li><a href="https://www.ghacks.net/2015/08/14/comparison-of-windows-10-privacy-tools/">Comparison of Windows 10 Privacy tools</a> - ghacks.net</li>
</ul>
</div>