docs: add eng version

content/en/docs/FAQ/_index.md

@@ -15,25 +15,27 @@ When we use centralised services, such as popular social networks, we trust the
 
 Self-hosted is the term for keeping an online service in-house. The key to this approach is that you have an independent copy of the software on your server, without a third party running the service. To be an administrator, you don't need to be a programmer and understand all the intricacies of the inner workings of the server application, i.e. the service. Typically, application developers who are not beholden to the head office and its ad trackers will try to make the service as clear and simple to use as possible.
 
-Popular examples include self-hosted email servers, messengers such as XMPP or Matrix, and VPN solutions. If you've worked in a large organisation, you've probably seen a standalone email service on the company domain, and you've probably also come across corporate messengers. These are all self-hosted, but not by you, but by the company you worked for. Why does a company need its own email and messenger? The answer is simple: to keep employee communications and company secrets in their own hands, under their own control.
+Popular examples include self-hosted email servers, messengers such as XMPP or Matrix, and VPN solutions. If you've worked in a large organisation, you've probably seen a standalone email service on the company domain, and you've probably also come across corporate messengers. These are all self-hosted, but not by you, but by the company you worked for. 
 
-If you think you don't trust companies, want to keep your data under your own control, or simply don't want to strengthen the monopolistic position of the IT market, self-hosting will suit your needs.
+Why does a company need its own email and messenger? The answer is simple: to keep employee communications and company secrets in their own hands, under their own control.
+
+If you want flexible self-host tools that you can customise, or you just don't trust big companies and want to keep your data under your own control, self-hosting is for you.
 
 
 ## Can I trust my hosting provider?
 
 We have all experienced being disconnected from the Internet due to overdue payments, or having our home power cut off due to technical problems somewhere in the house or city. Therefore, in order to provide a stable online service, they turn to hosting providers - special companies that provide computer facilities for rent and undertake to do everything possible for their stable operation: backup power supply schemes of equipment in case of emergency, backup highways to connect to the Internet, as well as protection against earthquakes, fires and floods according to the latest science and technology.
 
-A reasonable question: can you trust these services, since all the data stored on your leased server is, after all, the data stored on the disc provider's discs. There is no clear answer to this question, because at the request of law enforcement agencies from the provider's jurisdiction, your data will surely be handed over without too many questions. But... do you often have problems with the law? And the law of foreign territories? On a more paranoid note, your server is the last weak link in the infrastructure. It is much more frightening to use a smartphone, smart speakers and other electronic devices whose content is terra incognita, and in which all trust is based solely on the marketing of vendors and our ingrained habits.
+A reasonable question: can you trust these services, since all the data stored on your leased server is, after all, the data stored on the disc provider's discs.
 
-Hosting providers have hundreds, thousands and sometimes millions of virtual machines. One of them will be yours. Is it worth the trouble? Probably not.
+There is no clear answer to this question, because at the request of law enforcement agencies from the provider's jurisdiction, your data will surely be handed over without too many questions. But... do you often have problems with the foreign law? 
 
 
 ## The hoster is asking for my passport, what should I do?
 
-The SelfPrivacy infrastructure currently relies on Hetzner's hosting capabilities. During registration, the hosting provider asks for proof of identity. This protects them from spammers. In addition, the European jurisdiction requires to know your customer (KYC). We apologise for the fact that Hetzner is not involved in the collection of unnecessary data and the disclosure of information about users.
+The SelfPrivacy infrastructure currently relies on the hosting capabilities of Hetzner and DigitalOcean. Sometimes the hosting provider may ask for proof of identity when you sign up. This protects them from spammers. In addition, the European jurisdiction requires to know your customer ([KYC](https://en.wikipedia.org/wiki/Know_your_customer)). We apologise for the fact that Hetzner is not involved in the collection of unnecessary data and the disclosure of information about users.
 
-Providing photos or photocopies of documents to anyone online is a bad practice that we condemn. But thousands of users and even we vouch for Hetzner's reliability. They have been around for many years and have a good reputation. Think of it as registering with a phone number that is also linked to passport details in most countries. For our part, we are looking for alternative solutions.
+Providing photos or photocopies of documents to anyone online is a bad practice that we condemn. But thousands of users and we can vouch for the reliability of Hetzner, which is more privacy oriented. They have been around for many years and have a good reputation. For our part, however, we are looking for alternative solutions to this problem.
 
 ## Will this protect me from the FBI, FSB, Mi6, ...?
 We do our best to keep your data technically intact. But your hosting has to comply with the laws of its jurisdiction. We choose to host in as legal a jurisdiction as possible. So unless you are involved in criminal activities such as drug dealing, illegal porn, terrorism, and the like, your data is unlikely to be threatened.
@@ -48,7 +50,11 @@ No, we do not make money from users. We have no agreements with ISPs, nor do we
 
 ## What's the point of a non-profit project?
 
-In a climate of aggressive consumerism, where only stories about effective business sell like hot cakes, non-profit projects are cautious. The main motive behind SelfPrivacy that runs through our team is to make using the internet a little more comfortable, a little easier and - most importantly - a little more private. Privacy is an inalienable human right that allows us to feel like subjects, independent individuals. We're making a public project to get inspiration for new features and to look for bugs, not by a few people, but by tapping into the resources of an unlimited audience. After all, why does a musician write tunes and an artist create paintings? Moreover, developing a free solution that can take users to a new level of privacy is a matter of honour. And samurai have no goal, only a way.
+In a climate of aggressive consumerism, where only stories about effective business sell like hot cakes, non-profit projects are cautious. 
+
+The main motive behind SelfPrivacy that runs through our team is to make using the internet a little more comfortable, a little easier and - most importantly - a little more private. 
+
+Privacy is an inalienable human right that allows us to feel like subjects, independent individuals. We're making a public project to get inspiration for new features and to look for bugs, not by a few people, but by tapping into the resources of an unlimited audience. After all, why does a musician write tunes and an artist create paintings? Moreover, developing a free solution that can take users to a new level of privacy is a matter of honour. And samurai have no goal, only a way.
 
 ## Why do we choose providers?
 
@@ -72,7 +78,9 @@ On the deployed server, the following components are responsible for sending, re
 
 You can read more about using email on the [service page](https://selfprivacy.org/docs/services/email/).
 
-## Why use CloudFlare?
+## Why have we added CloudFlare to the list of available providers?
+
+After the [0.8.0](https://selfprivacy.org/ru/blog/2023/02/09/version-0.8.0-release/) update, all users can choose between [deSEC](https://desec.io/) and [CloudFlare](https://www.cloudflare.com/). We recommend to choose [deSEC](https://desec.io/), it is a privacy-oriented service.
 
 Cloudlare is reliable and free. They probably collect data, otherwise it's hard to explain why you should proxy other people's traffic for free. In our case we only use it as a DNS server and don't proxy anything. In the future we will replace it with our own DNS once we have solved the reliability problem.
 

content/ru/docs/FAQ/_index.md

@@ -72,11 +72,9 @@ Self-hosted - это термин, означающий, что онлайн-с
 - Postfix — SMTP-сервер;
 - Dovecot 2 — IMAP сервер;
 - Rspamd — SPAM-фильтр.
-<<<<<<< HEAD
-=======
 
 Подробнее про использование электронной почты, вы можете прочитать на [странице сервиса](https://selfprivacy.org/ru/docs/services/email/). 
->>>>>>> master
+
 
 
 ## Почему мы включили CloudFlare в список доступных провайдеров?
@@ -86,3 +84,13 @@ Self-hosted - это термин, означающий, что онлайн-с
 Теперь про CloudFlare. Сервис надежен и бесплатен. Вероятно, собирает данные, иначе трудно объяснить, зачем бесплатно проксировать чужой трафик. В нашем случае мы используем его только как DNS-сервер и ничего не проксируем. В будущем мы заменим его собственным DNS, как только решим проблему надежности.
 
 В настоящее время мы тестируем [Yggdrasil](https://yggdrasil-network.github.io/) + [Alfis](https://github.com/Revertron/Alfis).
+
+
+## Как получить помощь?
+Если у вас возникнут проблемы, не стесняйтесь писать в группы разработчиков SelfPrivacy ;)
+- [Telegram чат: @selfprivacy_chat](https://t.me/selfprivacy_chat)
+- [Matrix чат: #chat:selfprivacy.org](https://matrix.to/#/#chat:selfprivacy.org)
+
+Или вы можете создать issue в репозиториях проекта: 
+- [Главное приложение](https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org.app)
+- [Остальные репозитории](https://git.selfprivacy.org/SelfPrivacy)