This repository has been archived by the owner on Jun 24, 2022. It is now read-only.
Merge master into i18n branch #1454
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The correct configuration name is "network.security.esni.enabled"
* Add NixNet DNS * No text wrap update * Add source + state filtering
* Fix readonly and disabled input forms colors * Fix the fix
…ction. (#1251) * Update browser-addons.html * Update browser-addons.html
* operating-systemd.html: add a warning for Linux/CPU vulns * operating-systems: expand the Linux instructions for MDS mitigation * operating-systems: s/multithreading/hyperthreading/ * operating-systems: address feedback, fix typo * operating-systems: remove update-grub, close li tags * operating-systems: @nitrohorse's first feedback Doing this in a separate commit in case I misunderstood, so I can revert * operating-systems: address feedback * operating-systems: dd a duplicate paragraph * operating-systems: add missing "grub" word * operating-systems: fix the last step of nosmt * operating-systems: mention macOS link * operating-systems: address feedback * operating-systems: add a dot * operating-systems: fix link
* dns: document usage profiles & Android automatic mode Resolves: #1239 * dns: fix typo, sslstrip * dns: add space between SSL and strip
…nbound (#1219) * dns: mention Unbound & my config file * source_code: add Unbound * dns: close a tag * dns: attempt to fix warning * dns: remove extra < * dns.html: apply @nitrohorse's wording suggestion * dns: replace link to my config with ctrl.blog
* Replace DNSCrypt with DNSCrypt-Proxy * Update source_code.md * Add logo and forum link * Remove redundant platform links * Update _includes/sections/dns.html Co-Authored-By: Mikaela Suomalainen <[email protected]> * Update description
* Add US & DK as choices to UncensoredDNS * Fix Danish flag
* Add hosting providers * Remove RIPE and APNIC * Remove BuyVM and Vultr
#1234) * Add Resolve-DnsName * Add Resolve-DnsName to Contributing and Issue Template * Remove dig and Resolve-DnsName hyperlinks
* Add MAT2 * Update source_code.md * Update _includes/sections/productivity-tools.html Co-Authored-By: Mikaela Suomalainen <[email protected]>
* Update CC Sync page to cardv2 * Update source_code.md * Add forum links
Co-authored-by: Dawid Potocki <[email protected]>
As yggdrasil has a danger badge for a "privacy warning", change the "important privacy warning" in IPFS from a warning to a danger badge
* Brand new privacy policy! * Better markdown * Clarification * Update pages/privacy.md Co-Authored-By: Mikaela Suomalainen <[email protected]> * Add revision history * Remove payment processors * Fix code block coloring in dark theme * Typo Co-Authored-By: blacklight447 <[email protected]> * Not a policy
* Fix some typos, grammar, etc. on the site Fixes some issues with typos, capitalization, grammar, and et cetera. * Fix typo, grammar, etc. in repository * Update README.md Mention Discourse community earlier, add missing period * Update CONTRIBUTING.md i.e. is used for equivalence or clarification while e.g. is for examples. For instance, we shouldn't say that IMAP is equivalent or an explanation to all open-source software used to access email (e.g. there's POP3, open-source clients to access when there isn't IMAP such as Tutanota, etc.). We also shouldn't call IMAP open-source software since it's a protocol. * Change "socially motivated * Apply suggestions from code review Co-Authored-By: Jonah Aragon <[email protected]> * Suggestion from code review with extras * 'Kill switch' to 'Killswitch" * Consistency and minor additions to details - More parallel sentence structures, following <Name> <Verb phrase> for the first sentence of cards. Related to issue #1420. - Make Njalla parallel to the others, and mention Njalla is based in Nevis with VPS in Sweden - Don't use "us" when talking about external services - Orange Website also provides domain registration - Update capitalization and add more hyphens - Mention that TOS;DR evaluations are done by the community and that they also evaluate privacy policies (see https://edit.tosdr.org/about) - "E2EE encryption" is redundant since "E2EE" already has "encryption" in it. Might as well expand it since full term is used later on. - <Name> <Verb phrase> structure for Magic Wormhole - For consistency, don't start Worth Mentioning entries with the name - https://english.stackexchange.com/questions/27707/post-hyphenation-of-split-compound-words - All the other "alert alert-warning" don't repeat the generic name and we also don't say 'a software' * instant-messenger: Remove <em>, more cleanup * voice-video-messenger: Hyphens and cleanup - We don't say "a software" so replace it with something that works * paste-services: Cleanup & change cryptography info As per CryptPad's whitepaper and FAQ: https://cryptpad.fr/faq.html#security-crypto https://blog.cryptpad.fr/images/CryptPad-Whitepaper-v1.0.pdf Fixes #1417. * encryption: "open-source" * Page descriptions and other cleanup
* cloud-storage.html: delist Least Authority S4 * assets: remove S4.png
Co-Authored-By: Jonah Aragon <[email protected]>
* vpn.html: update data Sources: https://www.ivpn.net/facts https://protonvpn.com/secure-vpn https://mullvad.net/en/servers/ * calendar-contacts-sync.html: bump price, fix typo - According to https://www.etesync.com/accounts/signup/#plan, it starts being billed yearly at $2 per month, so $24 per year. - Fix missing slash and serial comma * mullvad: 406 servers to 409 servers https://mullvad.net/en/servers/
Closes #899.
* Add sponsorship sections and information * Correct typographical error * Minor adjustments
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to issue https://github.com/privacytoolsIO/privacytools.io/issues/1106 and PR https://github.com/privacytoolsIO/privacytools.io/pull/1105.
The i18n branch has not received any merges from master since August. As there have been plenty of string changes, this PR aims to keep the i18n branch up-to-date. (GitHub says that the i18n branch is currently 101 commits behind master.) Edits from maintainers are welcome.
Merge conflicts have been resolved, mostly in favor of the strings that are currently on the website.
_i18n/en.ymlhas been edited to update it, but_i18n/pl.ymlhas not been modified.Some new keys in
_i18n/en.ymlhave been added or edited. For example, https://www.privacytools.io/index.html#resources used to list Keybase as a resource and it had corresponding keys. It was replaced by Open Wireless Movement, so the appropriate change to the corresponding key was made.The content of the site should look more or less identical to the site that is currently served via the master branch (i.e., what https://www.privacytools.io is serving right now), though there has been a few fixes for typos.