1
0
mirror of https://github.com/privacyguides/i18n.git synced 2026-03-17 12:20:41 +00:00

New Crowdin translations by GitHub Action

This commit is contained in:
Crowdin Bot
2024-04-02 11:33:03 +00:00
parent 6cd6fc69f2
commit 1ae35f41e6
696 changed files with 3255 additions and 2907 deletions

View File

@@ -49,12 +49,12 @@ So far in 2023 we've launched international translations of our website in [Fren
<!-- markdownlint-disable MD030 -->
<div class="grid cards" markdown>
<!-- Every team member should have a unique emoji.
Team member cards should include ONLY the following links:
- Discourse Profile
- ONE Link of team member's choice
- Email if applicable
This is to keep it fair and not spammy, especially as we grow.
<!-- Every team member should have a unique emoji.
Team member cards should include ONLY the following links:
- Discourse Profile
- ONE Link of team member's choice
- Email if applicable
This is to keep it fair and not spammy, especially as we grow.
-->
- :robot:{ .lg .middle } **@jonah**

View File

@@ -2,8 +2,6 @@
title: "隐私工具常见问题"
---
# 我们为什么从隐私工具转向隐私指南
2021年9月每个活跃的贡献者都一致同意从隐私工具转到这个网站工作隐私指南。 之所以做出此决定是因为PrivacyTools的创始人和域名控制者已消失很长一段时间无法与之联系。
在PrivacyTools.io上构建了一个信誉良好的网站和服务这对隐私工具的未来造成了严重打击因为任何未来的意外都可能在没有恢复方法的情况下毁灭整个组织。 这种转变在几个月前通过包括博客、Twitter、Reddit和Mastodon在内的各种渠道传达给隐私工具社区以确保整个过程尽可能顺利进行。 我们这样做是为了确保没有人被蒙在鼓里,这也是我们团队成立以来的工作方式,同时也是为了确保隐私指南被公认为与转型前的隐私工具一样的可靠组织。
@@ -50,11 +48,11 @@ Reddit要求子版块有活跃的版主。 如果主版主长时间不活动(
On September 14th, 2021, we [announced](https://blog.privacyguides.org/2021/09/14/welcome-to-privacy-guides) the beginning of our migration to this new domain:
> [...] 我们发现有必要尽早进行这一转换,以确保人们尽快发现这一过渡。 这给了我们足够的时间来过渡域名目前正在重定向到www.privacyguides.org并希望给每个人足够的时间来注意这一变化更新书签和网站等。
> [...] 我们发现有必要尽早进行这一转换,以确保人们尽快发现这一过渡。 This gives us adequate time to transition the domain name, which is currently redirecting to `www.privacyguides.org`, and it hopefully gives everyone enough time to notice the change, update bookmarks and websites, etc.
This change [entailed:](https://reddit.com/comments/pnhn4a)
- 重定向 www.privacytools.io [www.privacyguides.org](https://www.privacyguides.org)
- Redirecting `www.privacytools.io` to [www.privacyguides.org](https://www.privacyguides.org).
- 在GitHub上存档源代码以保存我们过去的工作和问题跟踪器我们继续使用该网站未来几个月的开发。
- 在我们的subreddit和其他各种社区发布公告告知人们官方的变化。
- 正式关闭privacytools.io服务如Matrix和Mastodon并鼓励现有用户尽快迁移。
@@ -65,7 +63,7 @@ This change [entailed:](https://reddit.com/comments/pnhn4a)
在过渡期后的大约一周BurungHantu在近一年来首次回到了网上然而我们团队中没有人愿意回到PrivacyTools因为他历来不可靠。 他没有为自己的长期缺席道歉,而是立即展开攻势,将向隐私指南的过渡定位为对他和他的项目的攻击。 He subsequently [deleted](https://reddit.com/comments/pp9yie/comment/hd49wbn) many of these posts when it was pointed out by the community that he had been absent and abandoned the project.
此时BurungHantu声称他想继续自己的privacytools.io的工作并要求我们删除从www.privacytools.io [www.privacyguides.org](https://www.privacyguides.org)的重定向。 我们答应了他的请求并要求他保持Matrix、Mastodon和PeerTube的子域名的活跃性以便我们作为一项公共服务在社区内运行至少几个月以便让这些平台上的用户能够轻松地迁移到其他账户。 由于我们所提供的服务的联合性质,它们与特定的域名联系在一起,使得迁移非常困难(在某些情况下不可能迁移)。
At this point, BurungHantu claimed he wanted to continue working on privacytools.io on his own and requested that we remove the redirect from `www.privacytools.io` to [www.privacyguides.org](https://www.privacyguides.org). 我们答应了他的请求并要求他保持Matrix、Mastodon和PeerTube的子域名的活跃性以便我们作为一项公共服务在社区内运行至少几个月以便让这些平台上的用户能够轻松地迁移到其他账户。 由于我们所提供的服务的联合性质,它们与特定的域名联系在一起,使得迁移非常困难(在某些情况下不可能迁移)。
Unfortunately, because control of the r/privacytoolsIO subreddit was not returned to BurungHantu at his demand (further information below), those subdomains were [cut off](https://reddit.com/comments/pymthv/comment/hexwrps) at the beginning of October, ending any migration possibilities to any users still using those services.
@@ -85,7 +83,7 @@ After the launch of [r/PrivacyGuides](https://reddit.com/r/privacyguides), it wa
> [...] 该小组的成长是PrivacyGuides.org团队数年来努力的结果。 还有你们每一个人。
>
> 一个Subreddit需要大量的工作来管理和调节。 就像一个花园一样,它需要耐心的照料和日常护理。 这不是一个适合放荡不羁的人或有承诺问题的人的任务。 它不可能在一个抛弃了它好几年的园丁手下茁壮成长,然后出现在那里要求今年的收获作为他们的贡品。 这对多年前组建的团队是不公平的。 这对你不公平。 [...]
> 一个Subreddit需要大量的工作来管理和调节。 就像一个花园一样,它需要耐心的照料和日常护理。 It's not a task for dilettantes or commitment-challenged people. 它不可能在一个抛弃了它好几年的园丁手下茁壮成长,然后出现在那里要求今年的收获作为他们的贡品。 It's unfair to the team formed years ago. 这对你不公平。 [...]
子版块不属于任何人,尤其不属于品牌持有人。 他们属于自己的社区而社区及其版主做出了支持移至r/PrivacyGuides的决定。
@@ -104,7 +102,7 @@ In the months since, BurungHantu has threatened and begged for returning subredd
> 如果任何赞助商或支持者不同意或觉得被最近的这些事件误导,并希望在这些极不寻常的情况下要求退款,请通过电子邮件与我们的项目管理员联系,jonah@triplebit.net
> If any sponsors or backers disagree with or feel misled by these recent events and would like to request a refund given these highly unusual circumstances, please get in touch with our project admin by emailing `jonah@triplebit.net`.

View File

@@ -13,15 +13,13 @@
## Gitea
- 域名: [code.privacyguides.dev](https://code.privacyguides.dev)
- 可用性。仅限邀请
,任何从事 *《隐私指南》*相关开发或内容的团队可应要求获得访问权。
- Availability: Invite-Only Access may be granted upon request to any team working on *Privacy Guides*-related development or content.
- 来源: [snapcraft.io/gitea](https://snapcraft.io/gitea)
## Matrix
- 域名: [matrix.privacyguides.org](https://matrix.privacyguides.org)
- 可用性。仅限邀请
可根据要求将访问权授予Privacy Guides团队成员、Matrix版主、第三方Matrix社区管理员、Matrix机器人操作员以及其他需要可靠Matrix存在的个人。
- Availability: Invite-Only Access may be granted upon request to Privacy Guides team members, Matrix moderators, third-party Matrix community administrators, Matrix bot operators, and other individuals in need of a reliable Matrix presence.
- 来源: [github.com/spantaleev/matrix-docker-ansible-deploy](https://github.com/spantaleev/matrix-docker-ansible-deploy)
## SearXNG
@@ -33,6 +31,5 @@
## Invidious
- Domain: [invidious.privacyguides.net](https://invidious.privacyguides.net)
- Availability: Semi-Public
We host Invidious primarily to serve embedded YouTube videos on our website, this instance is not intended for general-purpose use and may be limited at any time.
- Availability: Semi-Public We host Invidious primarily to serve embedded YouTube videos on our website, this instance is not intended for general-purpose use and may be limited at any time.
- Source: [github.com/iv-org/invidious](https://github.com/iv-org/invidious)

View File

@@ -353,8 +353,8 @@ dig +nocmd @9.9.9.11 -t txt o-o.myaddr.l.google.com +nocomments +noall +answer +
If the results include a second edns0-client-subnet TXT record (like shown below), then your DNS server is passing along EDNS information. The IP or network shown after is the precise information which was shared with Google by your DNS provider.
```text
o-o.myaddr.l.google.com. 60 IN TXT "198.51.100.32"
o-o.myaddr.l.google.com. 60 IN TXT "edns0-client-subnet 198.51.100.0/24"
o-o.myaddr.l.google.com. 60 IN TXT "198.51.100.32"
o-o.myaddr.l.google.com. 60 IN TXT "edns0-client-subnet 198.51.100.0/24"
;; Query time: 64 msec
;; SERVER: 9.9.9.11#53(9.9.9.11)
;; WHEN: Wed Mar 13 10:23:08 CDT 2024

View File

@@ -77,21 +77,21 @@ schema:
1. **Known identity** - A known identity is used for things where you must declare your name. There are many legal documents and contracts where a legal identity is required. This could range from opening a bank account, signing a property lease, obtaining a passport, customs declarations when importing items, or otherwise dealing with your government. These things will usually lead to credentials such as credit cards, credit rating checks, account numbers, and possibly physical addresses.
We don't suggest using a VPN or Tor for any of these things, as your identity is already known through other means.
We don't suggest using a VPN or Tor for any of these things, as your identity is already known through other means.
<div class="admonition tip" markdown>
<p class="admonition-title">Tip</p>
<div class="admonition tip" markdown>
<p class="admonition-title">Tip</p>
网购时,使用[快递柜](https://en.wikipedia.org/wiki/Parcel_locker)可以帮助你保持实际住址的隐私。
When shopping online, the use of a [parcel locker](https://en.wikipedia.org/wiki/Parcel_locker) can help keep your physical address private.
</div>
</div>
2. **未知身份** -未知身份可能是您经常使用的稳定化名。 它不是匿名的,因为它没有变化。 如果你是一个网络社区的一部分,你可能希望保留一个别人知道的角色。 这个化名不是匿名的,因为如果监测的时间足够长,关于主人的细节可以揭示进一步的信息,如他们的写作方式,他们对感兴趣的话题的一般知识,等等。
2. **Unknown identity** - An unknown identity could be a stable pseudonym that you regularly use. It is not anonymous because it doesn't change. If you're part of an online community, you may wish to retain a persona that others know. This pseudonym isn't anonymous because—if monitored for long enough—details about the owner can reveal further information, such as the way they write, their general knowledge about topics of interest, etc.
你可能希望为此使用VPN以掩盖你的IP地址。 Financial transactions are more difficult to mask: You could consider using anonymous cryptocurrencies, such as [Monero](https://getmonero.org). 采用altcoin转移也可能有助于掩盖你的货币来源。 通常情况下交易所需要完成KYC了解你的客户然后才允许你将法币兑换成任何种类的加密货币。 当地见面会选项也可能是一种解决方案;然而,这些往往更昂贵,有时也需要KYC
You may wish to use a VPN for this, to mask your IP address. Financial transactions are more difficult to mask: You could consider using anonymous cryptocurrencies, such as [Monero](https://getmonero.org). Employing altcoin shifting may also help to disguise where your currency originated. Typically, exchanges require KYC (know your customer) to be completed before they'll allow you to exchange fiat currency into any kind of cryptocurrency. Local meet-up options may also be a solution; however, those are often more expensive and sometimes also require KYC.
3. **匿名身份** - 即使有经验,匿名身份也很难长期维持。 它们应该是短期和短命的身份,定期轮换。
3. **Anonymous identity** - Even with experience, anonymous identities are difficult to maintain over long periods of time. They should be short-term and short-lived identities which are rotated regularly.
使用Tor可以帮助解决这个问题。 还值得注意的是,通过异步通信可以实现更大的匿名性。实时通信容易受到打字模式的分析(即超过一段文字,在论坛上分发,通过电子邮件等)。
Using Tor can help with this. It is also worth noting that greater anonymity is possible through asynchronous communication: Real-time communication is vulnerable to analysis of typing patterns (i.e. more than a paragraph of text, distributed on a forum, via email, etc.)
[^1]: 其中一个明显的例子是 [2021年明尼苏达大学的研究人员将三个漏洞引入了Linux内核开发项目的事件](https://cse.umn.edu/cs/linux-incident)
[^1]: One notable example of this is the [2021 incident in which University of Minnesota researchers introduced three vulnerabilities into the Linux kernel development project](https://cse.umn.edu/cs/linux-incident).

View File

@@ -159,7 +159,7 @@ Qubes OS支持使用YubiKeys进行质询-响应身份验证。 If you have a Yub
可以用多种不同的流行的硬件安全密钥验证方法来设置SSH MFA。 We recommend that you check out Yubico's [documentation](https://developers.yubico.com/SSH) on how to set this up.
#### 基于时间的一次性密码(TOTP)。
#### TOTP
SSH MFA也可以使用TOTP进行设置。 DigitalOcean has provided a tutorial [How To Set Up Multi-Factor Authentication for SSH on Ubuntu 20.04](https://digitalocean.com/community/tutorials/how-to-set-up-multi-factor-authentication-for-ssh-on-ubuntu-20-04). 无论哪个发行版,大多数东西都应该是一样的,但是软件包管理器命令--例如 `apt-get`--和软件包名称可能不同。

View File

@@ -11,11 +11,13 @@ icon: 'material/shield-account'
许多人会混淆 **隐私****安全**和 **匿名** 的概念。 例如,你会看到有人批评各种产品 "不私密",但他们的意思其实是这些产品不提供匿名性。 在本网站上,我们这三个主题都会介绍,但重要的是,你要了解它们之间的区别,以及每一个主题何时发挥作用。
<!-- markdownlint-disable-next-line -->
**隐私**
:
==隐私是您的数据只会被您想要查看这些数据的当事人看到的保证。== 举个即时通讯软件的例子,端到端加密让只有您本人和收件人才能看到您的消息,从而提供隐私。
<!-- markdownlint-disable-next-line -->
**安全性**
:
@@ -24,7 +26,8 @@ icon: 'material/shield-account'
证书可以证明你是在直接与正在访问的网站对话,并防止网络攻击者读取或修改发送到网站或来自网站的数据。
**匿名性**
<!-- markdownlint-disable-next-line -->
**Anonymity**
:
匿名性是在没有持久标识符的情况下采取行动的能力。 在浏览时,您可以通过 [Tor](../tor.md) 实现这一目标,它允许您使用随机 IP 地址和网络连接而不是自己的 IP 地址和网络连接来浏览互联网。

View File

@@ -46,7 +46,7 @@ The Proton Drive web application has been independently audited by Securitum in
> Auditors identified two low-severity vulnerabilities. Additionally, five general recommendations were reported. At the same time, we confirm that no important security issues were identified during the pentest.
Proton Drive's brand new mobile clients have not yet been publicly audited by a third-party.
Proton Drive's brand new mobile clients have not yet been publicly audited by a third party.
## Tresorit

View File

@@ -140,7 +140,7 @@ Firefox includes a unique [download token](https://bugzilla.mozilla.org/show_bug
</div>
### 推荐配置
### Recommended Firefox Configuration
这些选项可以在 :material-menu: → **设置**中找到。
@@ -269,7 +269,7 @@ Brave adds a "[referral code](https://github.com/brave/brave-browser/wiki/Brave%
</div>
### 推荐配置
### Recommended Brave Configuration
这些选项可以在 :material-menu: → **设置**中找到。
@@ -364,7 +364,7 @@ Brave 的 Web3 功能可能会增加浏览器指纹和攻击面。 如果您不
#### 同步
#### Brave 同步
[Brave Sync](https://support.brave.com/hc/articles/360059793111-Understanding-Brave-Sync) allows your browsing data (history, bookmarks, etc.) to be accessible on all your devices without requiring an account and protects it with E2EE.

View File

@@ -6,6 +6,7 @@ description: 这些电子邮件提供商提供了一个很好的场所来安全
cover: email.webp
---
<!-- markdownlint-disable MD024 -->
电子邮件实际上是使用任何在线服务的必需品,但我们不建议使用它进行人与人之间的对话。 与其使用电子邮件与他人联系,不如考虑使用支持前向保密的即时通讯媒介。
[推荐的即时通讯工具](real-time-communication.md ""){.md-button}
@@ -71,7 +72,7 @@ These providers natively support OpenPGP encryption/decryption and the [Web Key
免费账户有一些限制,如不能搜索正文,不能访问 [Proton Mail Bridge](https://proton.me/mail/bridge),这是使用 [推荐的桌面电子邮件客户端](email-clients.md) 如Thunderbird所需要的。 付费帐户包括Proton Mail Bridge等功能额外的存储空间和自定义域支持。 2021年11月9日 [Securitum](https://research.securitum.com)为Proton Mail的应用程序提供了一份 [的证明信](https://proton.me/blog/security-audit-all-proton-apps)。
如果你有 "Proton Unlimited"、" Business "或 "Visionary "计划,你还可以免费获得 [SimpleLogin](#simplelogin) Premium
If you have the Proton Unlimited, Business, or Visionary Plan, you also get [SimpleLogin](email-aliasing.md#simplelogin) Premium for free.
</strong> Proton Mail有内部碰撞报告他们 **,不与第三方分享。 这可以在以下方面禁用。 **设置** > **转到设置** > **帐户** > **安全和隐私** > **发送崩溃报告**。</p>

View File

@@ -127,28 +127,32 @@ BitLocker is [only supported](https://support.microsoft.com/windows/turn-on-devi
To enable BitLocker on "Home" editions of Windows, you must have partitions formatted with a [GUID Partition Table](https://en.wikipedia.org/wiki/GUID_Partition_Table) and have a dedicated TPM (v1.2, 2.0+) module. You may need to [disable the non-Bitlocker "Device encryption" functionality](https://discuss.privacyguides.net/t/enabling-bitlocker-on-the-windows-11-home-edition/13303/5) (which is inferior because it sends your recovery key to Microsoft's servers) if it is enabled on your device already before following this guide.
1. Open a command prompt and check your drive's partition table format with the following command. You should see "**GPT**" listed under "Partition Style":
```powershell
powershell Get-Disk
```
```powershell
powershell Get-Disk
```
2. Run this command (in an admin command prompt) to check your TPM version. You should see `2.0` or `1.2` listed next to `SpecVersion`:
```powershell
powershell Get-WmiObject -Namespace "root/cimv2/security/microsofttpm" -Class WIN32_tpm
```
```powershell
powershell Get-WmiObject -Namespace "root/cimv2/security/microsofttpm" -Class WIN32_tpm
```
3. Access [Advanced Startup Options](https://support.microsoft.com/windows/advanced-startup-options-including-safe-mode-b90e7808-80b5-a291-d4b8-1a1af602b617). You need to reboot while pressing the F8 key before Windows starts and go into the *command prompt* in **Troubleshoot** → **Advanced Options** → **Command Prompt**.
4. Login with your admin account and type this in the command prompt to start encryption:
```powershell
manage-bde -on c: -used
```
```powershell
manage-bde -on c: -used
```
5. Close the command prompt and continue booting to regular Windows.
6. Open an admin command prompt and run the following commands:
```powershell
manage-bde c: -protectors -add -rp -tpm
manage-bde -protectors -enable c:
manage-bde -protectors -get c: > %UserProfile%\Desktop\BitLocker-Recovery-Key.txt
```
```powershell
manage-bde c: -protectors -add -rp -tpm
manage-bde -protectors -enable c:
manage-bde -protectors -get c: > %UserProfile%\Desktop\BitLocker-Recovery-Key.txt
```
<div class="admonition tip" markdown>
<p class="admonition-title">Tip</p>

View File

@@ -15,7 +15,7 @@ Discover how to privately share your files between your devices, with your frien
![Send logo](assets/img/file-sharing-sync/send.svg){ align=right }
**Send** is a fork of Mozillas discontinued Firefox Send service which allows you to send files to others with a link. Files are encrypted on your device so that they cannot be read by the server, and they can be optionally password-protected as well. The maintainer of Send hosts a [public instance](https://send.vis.ee). You can use other public instances, or you can host Send yourself.
**Send** is a fork of Mozilla's discontinued Firefox Send service which allows you to send files to others with a link. Files are encrypted on your device so that they cannot be read by the server, and they can be optionally password-protected as well. The maintainer of Send hosts a [public instance](https://send.vis.ee). You can use other public instances, or you can host Send yourself.
[:octicons-home-16: Homepage](https://send.vis.ee){ .md-button .md-button--primary }
[:octicons-server-16:](https://github.com/timvisee/send-instances){ .card-link title="Public Instances"}
@@ -145,6 +145,7 @@ We don't recommend using the [E2EE App](https://apps.nextcloud.com/apps/end_to_e
</div>
<!-- markdownlint-disable-next-line -->
### Criteria
**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.

View File

@@ -84,6 +84,7 @@ These services allow you to purchase gift cards for a variety of merchants onlin
</div>
<!-- markdownlint-disable-next-line -->
### Criteria
**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.

View File

@@ -37,7 +37,7 @@ schema:
query-input: required name=search_term_string
---
<!-- markdownlint-disable-next-line -->
<!-- markdownlint-disable -->
## Why should I care?
##### “I have nothing to hide. Why should I care about my privacy?”

View File

@@ -4,8 +4,6 @@ icon: material/archive
description: Some pages that used to be in our knowledge base can now be found on our blog.
---
# Pages Moved to Blog
Some pages that used to be in our knowledge base can now be found on our blog:
- [GrapheneOS vs. CalyxOS](https://blog.privacyguides.org/2022/04/21/grapheneos-or-calyxos)

View File

@@ -19,4 +19,4 @@ Additional branding guidelines can be found at [github.com/privacyguides/brand](
"Privacy Guides" and the shield logo are trademarks owned by Jonah Aragon, unlimited usage is granted to the Privacy Guides project.
Without waiving any of its rights, Privacy Guides does not advise others on the scope of its intellectual property rights. Privacy Guides does not permit or consent to any use of its trademarks in any manner that is likely to cause confusion by implying association with or sponsorship by Privacy Guides. If you are aware of any such use, please contact Jonah Aragon at jonah@privacyguides.org. Consult your legal counsel if you have questions.
Without waiving any of its rights, Privacy Guides does not advise others on the scope of its intellectual property rights. Privacy Guides does not permit or consent to any use of its trademarks in any manner that is likely to cause confusion by implying association with or sponsorship by Privacy Guides. If you are aware of any such use, please contact Jonah Aragon at `jonah@privacyguides.org`. Consult your legal counsel if you have questions.

View File

@@ -9,15 +9,18 @@ If you make changes to this website on GitHub.com's web editor directly, you sho
You can use an existing SSH key for signing, or [create a new one](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent).
1. Configure your Git client to sign commits and tags by default (remove `--global` to only sign by default for this repo):
```
git config --global commit.gpgsign true
git config --global gpg.format ssh
git config --global tag.gpgSign true
```
```bash
git config --global commit.gpgsign true
git config --global gpg.format ssh
git config --global tag.gpgSign true
```
2. Set your SSH key for signing in Git with the following command, substituting `/PATH/TO/.SSH/KEY.PUB` with the path to the public key you'd like to use, e.g. `/home/user/.ssh/id_ed25519.pub`:
```
git config --global user.signingkey /PATH/TO/.SSH/KEY.PUB
```
```bash
git config --global user.signingkey /PATH/TO/.SSH/KEY.PUB
```
Ensure you [add your SSH key to your GitHub account](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account#adding-a-new-ssh-key-to-your-account) **as a Signing Key** (as opposed to or in addition to as an Authentication Key).
@@ -27,7 +30,7 @@ Use `git pull --rebase` instead of `git pull` when pulling in changes from GitHu
You can set this to be the default behavior:
```
```bash
git config --global pull.rebase true
```
@@ -35,7 +38,7 @@ git config --global pull.rebase true
If you are working on your own branch, run these commands before submitting a PR:
```
```bash
git fetch origin
git rebase origin/main
```

View File

@@ -69,7 +69,7 @@ Brave是建立在Chromium网络浏览器项目之上的所以它应该有熟
</div>
#### 推荐配置
#### Recommended Brave Configuration
Tor浏览器是匿名浏览互联网的唯一途径。 当您使用Brave时我们建议您更改以下设置以保护您的隐私不受某些方的侵害但除了 [Tor浏览器](tor.md#tor-browser) 之外的所有浏览器都可以在某些方面被 *个人* 追踪。
@@ -151,7 +151,7 @@ On iOS, any app that can browse the web is [restricted](https://developer.apple.
</div>
#### 推荐配置
#### Recommended Firefox Configuration
These options can be found in :gear: **Settings****Safari**

View File

@@ -152,6 +152,7 @@ We highly recommend that you use mobile TOTP apps instead of desktop alternative
</div>
<!-- markdownlint-disable-next-line -->
### Criteria
**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.

View File

@@ -366,6 +366,7 @@ These products are minimal password managers that can be used within scripting a
</div>
<!-- markdownlint-disable-next-line -->
### Criteria
**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.

View File

@@ -5,6 +5,7 @@ description: Most online office suites do not support E2EE, meaning the cloud pr
cover: productivity.webp
---
<!-- markdownlint-disable MD024 -->
Most online office suites do not support E2EE, meaning the cloud provider has access to everything you do. The privacy policy may legally protect your rights, but it does not provide technical access constraints.
## Collaboration Platforms

View File

@@ -61,6 +61,7 @@ If you want assistance figuring out the best privacy tools and alternative progr
[了解更多 :hero-arrow-circle-right-fill:](mobile-browsers.md)
<!-- markdownlint-disable-next-line -->
### 其它资源
<div class="grid cards annotate" markdown>

View File

@@ -6,6 +6,8 @@ description: These are the best VPN services for protecting your privacy and sec
cover: vpn.webp
---
<!-- markdownlint-disable MD024 -->
If you're looking for additional **privacy** from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand the risks involved. We think these providers are a cut above the rest:
<div class="grid cards" markdown>