B. Petersen 3 жил өмнө
parent
commit
517bed558c

+ 52 - 32
deltachat-ios/Assets/Help/cs/help.html

@@ -813,15 +813,16 @@ problem for many legitimate apps. For more information, see
       </h3>
 
 <ul>
-  <li>Ano a Ne.</li>
-  <li>Nelze používat účty na Protonmail, Tutanota, či Criptext z aplikace Delta
-Chat; protože neposkytují příjem e-mailů pomocí IMAPu.</li>
-  <li>Každopádně ale lze Delta Chat použít k posílání zpráv lidem užívající
-Protonmail, Tutanota, či Criptext. Tyto zprávy však nebudou šifrované end-to-end.
-End-to-end šifrování nabízené těmito poskytovateli funguje pouze na jejich platformě, 
-a není slučitelné s chodem běžných E-mail serverů.</li>
-  <li>Delta Chat je schopen výměny end-to-end šifrovaných zpráv s jakýmkoli poskytovatelem 
-e-mailu s podporou <a href="https://autocrypt.org/dev-status.html">Autocryptu</a>.</li>
+  <li>Yes and No.</li>
+  <li>No, you can not use your Protonmail, Tutanota, or Criptext account with Delta
+Chat; they do not offer receiving mails via IMAP.</li>
+  <li>In any case you can use Delta Chat to send Messages to people who use
+Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
+  <li>Delta Chat can e2e-encrypt through any e-mail provider with any
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="mám-zájem-o-technické-podrobnosti-kde-najdu-víc">
@@ -844,30 +845,53 @@ e-mailu s podporou <a href="https://autocrypt.org/dev-status.html">Autocryptu</a
         
       </h3>
 
-<p>Delta Chat nepobírá žádný podnikatelský kapitál, není zadlužen, 
-není nucen vykazovat vysoký zisk a prodávat zážitky uživatelů a jejich 
-blízkých reklamě (nebo horším subjektům či záměrům).</p>
+<p>Delta Chat does not receive any Venture Capital and
+is not indebted, and under no pressure to produce huge profits, or to 
+sell users and their friends and family to advertisers (or worse). 
+We rather use public funding sources, so far from EU and US origins, to help
+our efforts in instigating a decentralized and diverse chat messaging eco-system
+based on Free and Open-Source community developments.</p>
 
-<p>Vývoj Delta Chatu byl doposud financován ze čtyř hlavních zdrojů:</p>
+<p>Concretely, Delta Chat developments have so far been funded from these sources:</p>
 
 <ul>
   <li>
-    <p><a href="https://nextleap.eu">NEXTLEAP</a> je projekt EU z let 2017 a 2018 na
-financování výzkumu a vývoje protokolů pro ověřené skupiny a
-pro navázání spojení.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate End-to-End Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p><a href="https://opentechfund.org">Open Technology Fund</a> přispěl dvěma granty.
-První v letech 2018/2019 (~$200K) významě podpořil aplikaci pro Android, umožnil 
-vydání beta verze pro Desktop, a také ukotvil vývoj v oblasti přívětivosti užívání a 
-právního kontextu popsané v <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-Druhý z let 2019/2020 (~$300K) nám pomohl vydat verzi pro iOS, převést klíčové 
-knihovny do jazyka Rust, a poskytnout nové funkce na všech platformách. 
-Více je na <a href="https://delta.chat/en/blog">blog posts</a>.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
-    <p><a href="https://nlnet.nl/">NLnet foundation</a> poskytla grant ve výši 46k EUR k dokončení
-programovacího rozhrani Rust/Python  a podnítila vznik prostředí pro Chat-boty.</p>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-account support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+  </li>
+  <li>
+    <p>For 2021/2022 we are receiving <em>Internet Freedom</em> funding (~500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supports our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>Sometimes we receive one-time donations from private individuals for
+which we are grateful. For example, in 2021 a generous individual bank-wired us 4K EUR 
+with the subject “keep up the good developments!”. We use such money to fund
+development gatherings or to care for ad-hoc expenses that can not easily be predicted
+for or reimbursed from public funding grants.</p>
   </li>
   <li>
     <p>Velice významnou pomocí je práce expertů a nadšenců prováděná bez nároku 
@@ -877,14 +901,10 @@ stavu.</p>
   </li>
 </ul>
 
-<p>Výše uvedené financování bylo organizováno společností Merlinux GmbH 
-z Freiburgu (Německo), a následně rozloženo mezi téměř tucet přispěvovatelů.</p>
+<p>The monetary funding mentioned above is mostly organized by merlinux GmbH in
+Freiburg (Germany), and is distributed to more than a dozen contributors world-wide.</p>
 
-<p>Financování pro období 2020/2021 ještě není rozhodnuté. Usilujeme o 
-několik možností s různými organizacemi a partnery. Zvažujeme také možnosti 
-dárcovství. Na zkoušku jsme založili malý <a href="https://liberapay.com/delta.chat/">Delta Chat / Liberapay donation account</a>, 
-který jsme ale ještě nepropagovali. Bjoern (původní autor Delta Chatu) také obdržel
-dárcovské příspěvky přes PayPal a bitcoin v hodnotě 3-4k EUR.</p>
+<p>Funding for second half of 2022 and especially for 2023 is an ongoing issue of concern. Apart from applying for more public funding we want to become more independent from government-related funding sources. Please see <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> for both monetary and development related support possibilities.</p>
 
 
 

+ 52 - 12
deltachat-ios/Assets/Help/de/help.html

@@ -722,9 +722,16 @@ Allerdings benötigen einige Anbieter besondere Einstellungen, um ordnungsgemä
       </h3>
 
 <ul>
-  <li>Sie können Ihren Protonmail-, Tutanota- oder Criptext-Account nicht mit Delta Chat nutzen, da diese das Empfangen von Mails über IMAP nicht anbieten.</li>
-  <li>Sie können allerdings Nachrichten über Delta Chat an Kontakte senden, die Protonmail, Tutanota oder Criptext nutzen. Diese Nachrichten sind allerdings nicht Ende-zu-Ende verschlüsselt. Die Verschlüsselung, die diese Provider anbieten, funktioniert nur innerhalb deren Plattformen und ist nicht mit anderen Systemen kompatibel.</li>
-  <li>Die Ende-zu-Ende-Verschlüsselung mit Delta Chat funktioniert mit allen Providern und E-Mail-Programmen, die den <a href="https://autocrypt.org/dev-status.html">Autocrypt Standard</a> unterstützen.</li>
+  <li>Yes and No.</li>
+  <li>No, you can not use your Protonmail, Tutanota, or Criptext account with Delta
+Chat; they do not offer receiving mails via IMAP.</li>
+  <li>In any case you can use Delta Chat to send Messages to people who use
+Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
+  <li>Delta Chat can e2e-encrypt through any e-mail provider with any
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos">
@@ -747,30 +754,63 @@ Allerdings benötigen einige Anbieter besondere Einstellungen, um ordnungsgemä
         
       </h3>
 
-<p>Delta Chat erhält keinerlei Venture-Kapital (Risikokapital) und ist damit niemandem verpflichtet und nicht unter Druck, hohe Erträge zu generieren oder die Daten von Benutzern an Werbetreibende zu verkaufen (oder Schlimmeres).</p>
+<p>Delta Chat does not receive any Venture Capital and
+is not indebted, and under no pressure to produce huge profits, or to 
+sell users and their friends and family to advertisers (or worse). 
+We rather use public funding sources, so far from EU and US origins, to help
+our efforts in instigating a decentralized and diverse chat messaging eco-system
+based on Free and Open-Source community developments.</p>
 
-<p>Delta Chat wurde bisher hauptsächlich durch vier Stellen finanziert:</p>
+<p>Concretely, Delta Chat developments have so far been funded from these sources:</p>
 
 <ul>
   <li>
-    <p>Das EU-Projekt <a href="https://nextleap.eu">NEXTLEAP</a> finanzierte 2017 und 2018 die Entwicklung und Implementation der Verifizierten Gruppen und die Einrichtung der Kontaktprotokolle.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate End-to-End Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>Der <a href="https://opentechfund.org">Open Technology Fund</a> hat Delta Chat zweimal bezuschusst: Mit der ersten Förderung (~$200K) wurden 2018/2019 hauptsächlich die Android-App verbessert sowie das Release der Desktop-App in einer Betaversion ermöglicht. Basierend auf Nutzererfahrungen im Menschenrechtskontext wurden zudem verschiedene Funktionen entwickelt, siehe unseren Bericht <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-Die zweite Förderung 2019/2020 (~$300K) läuft derzeit noch. Durch sie werden die Veröffentlichung von Delta/iOS-Versionen, die Konvertierung unserer Core Library (Programmbibliothek) in die Programmiersprache Rust sowie weitere Funktionalitäten für alle Plattformen ermöglicht. Aktuelle Infos finden Sie auf unserem <a href="https://delta.chat/en/blog">Blog</a>.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
-    <p>Die <a href="https://nlnet.nl/">NLnet foundation</a> bewilligte 46.000 €, um den Transfer von Python in Rust zu vervollständigen und ein Chat-Bot-Ökosystem zu entwickeln.</p>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-account support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+  </li>
+  <li>
+    <p>For 2021/2022 we are receiving <em>Internet Freedom</em> funding (~500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supports our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>Sometimes we receive one-time donations from private individuals for
+which we are grateful. For example, in 2021 a generous individual bank-wired us 4K EUR 
+with the subject “keep up the good developments!”. We use such money to fund
+development gatherings or to care for ad-hoc expenses that can not easily be predicted
+for or reimbursed from public funding grants.</p>
   </li>
   <li>
     <p>Last but by far not least beteiligen sich verschiedene ExpertInnen und Engagierte pro bono an Delta Chat. Sie erhalten dafür teils nur wenig, oftmals sogar überhaupt kein Geld. Ohne sie wäre Delta Chat nicht im entferntesten das, was es heute ist!</p>
   </li>
 </ul>
 
-<p>Die oben aufgeführte finanzielle Förderung wurde von der Merlinux GmbH in Freiburg (Deutschland) organisiert und an fast ein Dutzend Mitwirkende verteilt.</p>
+<p>The monetary funding mentioned above is mostly organized by merlinux GmbH in
+Freiburg (Germany), and is distributed to more than a dozen contributors world-wide.</p>
 
-<p>Die Förderung für 2020/2021 steht noch nicht fest. Wir verfolgen mehrere
-Möglichkeiten mit verschiedenen Organisationen und PartnerInnen. Wir sind zudem am Überlegen, ob wir Spenden einwerben sollen. Wir haben bereits einen kleinen <a href="https://liberapay.com/delta.chat/">Delta Chat / Liberapay Spenden Account</a> eingerichtet, diesen aber bisher nicht groß veröffentlicht. Es sind bis jetzt zudem ungefähr 3.000-4.000 € über Björns (dem ursprünglichen Autor von Delta Chat) Paypal- und Bitcoin-Spendenkanäle eingegangen.</p>
+<p>Funding for second half of 2022 and especially for 2023 is an ongoing issue of concern. Apart from applying for more public funding we want to become more independent from government-related funding sources. Please see <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> for both monetary and development related support possibilities.</p>
 
 
 

+ 38 - 22
deltachat-ios/Assets/Help/en/help.html

@@ -836,8 +836,9 @@ problem for many legitimate apps. For more information, see
 Chat; they do not offer receiving mails via IMAP.</li>
   <li>In any case you can use Delta Chat to send Messages to people who use
 Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
-encrypted, though. The End-to-End encryption those providers offer is only
-working inside their platforms, and not compatible with anyone outside.</li>
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
   <li>Delta Chat can e2e-encrypt through any e-mail provider with any
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
@@ -862,32 +863,53 @@ working inside their platforms, and not compatible with anyone outside.</li>
         
       </h3>
 
-<p>First of all, Delta Chat does not receive any Venture Capital and
+<p>Delta Chat does not receive any Venture Capital and
 is not indebted, and under no pressure to produce huge profits, or to 
-sell users and their friends and family to advertisers (or worse).</p>
+sell users and their friends and family to advertisers (or worse). 
+We rather use public funding sources, so far from EU and US origins, to help
+our efforts in instigating a decentralized and diverse chat messaging eco-system
+based on Free and Open-Source community developments.</p>
 
-<p>Delta Chat developments have so far been funded from four major sources:</p>
+<p>Concretely, Delta Chat developments have so far been funded from these sources:</p>
 
 <ul>
   <li>
     <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
 and implementation of verified groups and setup contact protocols
-in 2017 and 2018.</p>
+in 2017 and 2018 and also helped to integrate End-to-End Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> has given two grants.
-The first 2018/2019 grant (~$200K) majorly improved the Android app 
-and allowed us to release a Desktop app beta version, and also 
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
 moored our feature developments in UX research in human rights contexts, 
 see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) is still ongoing and helps us to 
+The second 2019/2020 grant (~$300K) helped us to 
 release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.  See the 
-ongoing <a href="https://delta.chat/en/blog">blog posts</a> for more info.</p>
+to provide new features for all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted EUR 46K for
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-account support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+  </li>
+  <li>
+    <p>For 2021/2022 we are receiving <em>Internet Freedom</em> funding (~500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supports our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>Sometimes we receive one-time donations from private individuals for
+which we are grateful. For example, in 2021 a generous individual bank-wired us 4K EUR 
+with the subject “keep up the good developments!”. We use such money to fund
+development gatherings or to care for ad-hoc expenses that can not easily be predicted
+for or reimbursed from public funding grants.</p>
   </li>
   <li>
     <p>Last but by far not least, several pro-bono experts and enthusiasts contributed 
@@ -897,16 +919,10 @@ even close.</p>
   </li>
 </ul>
 
-<p>The monetary funding mentioned above was organized by merlinux GmbH in
-Freiburg (Germany), and then distributed to almost a dozen contributors.</p>
+<p>The monetary funding mentioned above is mostly organized by merlinux GmbH in
+Freiburg (Germany), and is distributed to more than a dozen contributors world-wide.</p>
 
-<p>Funding for 2020/2021 is yet to be determined. We are pursuing several
-opportunities with different organisations and partners. We also are
-considering to ask for donations. In fact, we experimentally started
-a little <a href="https://liberapay.com/delta.chat/">Delta Chat / Liberapay donation account</a>
-but have not published this yet.  There were also around 3-4K so far
-donated to Bjoern’s (the original author of Delta Chat) paypal and bitcoin
-donation channels.</p>
+<p>Funding for second half of 2022 and especially for 2023 is an ongoing issue of concern. Apart from applying for more public funding we want to become more independent from government-related funding sources. Please see <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> for both monetary and development related support possibilities.</p>
 
 
 

+ 45 - 24
deltachat-ios/Assets/Help/es/help.html

@@ -809,10 +809,16 @@ problem for many legitimate apps. For more information, see
       </h3>
 
 <ul>
-  <li>Si y no.</li>
-  <li>No, no puede usar su cuenta de Protonmail, Tutanota o Criptext con Delta Chat; esos servicios no permiten recibir correos a través de IMAP.</li>
-  <li>En cualquier caso, puede usar Delta Chat para enviar mensajes a personas que usan Protonmail, Tutanota o Criptext. Sin embargo, esos mensajes no se cifrarán de extremo a extremo. El cifrado de extremo a extremo que ofrecen esos proveedores solo funciona dentro de sus plataformas y no es compatible con nadie externo.</li>
-  <li>Delta Chat puede encriptar e2e a través de cualquier proveedor de correo electrónico con cualquier <a href="aplicación de correo electrónico compatible con Autocrypt">https://autocrypt.org/dev-status.html</a>.</li>
+  <li>Yes and No.</li>
+  <li>No, you can not use your Protonmail, Tutanota, or Criptext account with Delta
+Chat; they do not offer receiving mails via IMAP.</li>
+  <li>In any case you can use Delta Chat to send Messages to people who use
+Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
+  <li>Delta Chat can e2e-encrypt through any e-mail provider with any
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">
@@ -835,32 +841,53 @@ problem for many legitimate apps. For more information, see
         
       </h3>
 
-<p>First of all, Delta Chat does not receive any Venture Capital and
+<p>Delta Chat does not receive any Venture Capital and
 is not indebted, and under no pressure to produce huge profits, or to 
-sell users and their friends and family to advertisers (or worse).</p>
+sell users and their friends and family to advertisers (or worse). 
+We rather use public funding sources, so far from EU and US origins, to help
+our efforts in instigating a decentralized and diverse chat messaging eco-system
+based on Free and Open-Source community developments.</p>
 
-<p>Hasta ahora, el desarrollo de Delta Chat ha sido financiado por cuatro fuentes principales:</p>
+<p>Concretely, Delta Chat developments have so far been funded from these sources:</p>
 
 <ul>
   <li>
     <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
 and implementation of verified groups and setup contact protocols
-in 2017 and 2018.</p>
+in 2017 and 2018 and also helped to integrate End-to-End Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> has given two grants.
-The first 2018/2019 grant (~$200K) majorly improved the Android app 
-and allowed us to release a Desktop app beta version, and also 
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
 moored our feature developments in UX research in human rights contexts, 
 see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) is still ongoing and helps us to 
+The second 2019/2020 grant (~$300K) helped us to 
 release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.  See the 
-ongoing <a href="https://delta.chat/en/blog">blog posts</a> for more info.</p>
+to provide new features for all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted EUR 46K for
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-account support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+  </li>
+  <li>
+    <p>For 2021/2022 we are receiving <em>Internet Freedom</em> funding (~500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supports our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>Sometimes we receive one-time donations from private individuals for
+which we are grateful. For example, in 2021 a generous individual bank-wired us 4K EUR 
+with the subject “keep up the good developments!”. We use such money to fund
+development gatherings or to care for ad-hoc expenses that can not easily be predicted
+for or reimbursed from public funding grants.</p>
   </li>
   <li>
     <p>Last but by far not least, several pro-bono experts and enthusiasts contributed 
@@ -870,16 +897,10 @@ even close.</p>
   </li>
 </ul>
 
-<p>The monetary funding mentioned above was organized by merlinux GmbH in
-Freiburg (Germany), and then distributed to almost a dozen contributors.</p>
+<p>The monetary funding mentioned above is mostly organized by merlinux GmbH in
+Freiburg (Germany), and is distributed to more than a dozen contributors world-wide.</p>
 
-<p>Funding for 2020/2021 is yet to be determined. We are pursuing several
-opportunities with different organisations and partners. We also are
-considering to ask for donations. In fact, we experimentally started
-a little <a href="https://liberapay.com/delta.chat/">Delta Chat / Liberapay donation account</a>
-but have not published this yet.  There were also around 3-4K so far
-donated to Bjoern’s (the original author of Delta Chat) paypal and bitcoin
-donation channels.</p>
+<p>Funding for second half of 2022 and especially for 2023 is an ongoing issue of concern. Apart from applying for more public funding we want to become more independent from government-related funding sources. Please see <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> for both monetary and development related support possibilities.</p>
 
 
 

+ 52 - 21
deltachat-ios/Assets/Help/fr/help.html

@@ -723,12 +723,16 @@ Pour plus d’informations, voir <a href="https://dontkillmyapp.com/">dontkillmy
       </h3>
 
 <ul>
-  <li>Oui et Non</li>
-  <li>Non, vous ne pouvez pas utiliser votre compte Protonmail, Tutanota ou Criptext avec
-Delta Chat; ils n’offrent pas de recevoir les mails via IMAP.</li>
-  <li>Dans tous les cas vous pouvez utiliser Delta Chat pour envoyer des Messages à des personnes qui utilise Protonmail, Tutanota ou Criptext. Par contre, ces messages ne seront pas chiffrés de bout en bout. Le chiffrement de bout en bout que ces fournisseurs offrent fonctionne seulement à l’intérieur de leurs plateformes et n’est pas compatible avec d’autres en dehors.</li>
-  <li>Delta Chat peut chiffrer en e2ee à travers n’importe quel autre fournisseur et avec 
-<a href="https://autocrypt.org/dev-status.html">une application e-mail compatible Autocrypt</a>.</li>
+  <li>Yes and No.</li>
+  <li>No, you can not use your Protonmail, Tutanota, or Criptext account with Delta
+Chat; they do not offer receiving mails via IMAP.</li>
+  <li>In any case you can use Delta Chat to send Messages to people who use
+Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
+  <li>Delta Chat can e2e-encrypt through any e-mail provider with any
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="les-détails-techniques-mintéressent-pouvez-vous-men-dire-plus-">
@@ -751,36 +755,63 @@ Delta Chat; ils n’offrent pas de recevoir les mails via IMAP.</li>
         
       </h3>
 
-<p>Premièrement, Delta Chat ne reçoit aucun capital risque et n’est pas endetté, et n’est pas sous pression pour produire d’énormes profits ou vendre ses utilisateurs et leurs amis et familles à des publicitaires (ou pire).</p>
+<p>Delta Chat does not receive any Venture Capital and
+is not indebted, and under no pressure to produce huge profits, or to 
+sell users and their friends and family to advertisers (or worse). 
+We rather use public funding sources, so far from EU and US origins, to help
+our efforts in instigating a decentralized and diverse chat messaging eco-system
+based on Free and Open-Source community developments.</p>
 
-<p>Jusqu’ici les développements de Delta Chat ont été financées par quatre sources majeures:</p>
+<p>Concretely, Delta Chat developments have so far been funded from these sources:</p>
 
 <ul>
   <li>
-    <p>Le projet européen <a href="https://nextleap.eu">NEXTLEAP</a> a financé en 2017 et 2018 la recherche
- et l’implémentation des protocoles de groupes vérifiés et de la configuration des contacts.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate End-to-End Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>L’<a href="https://opentechfund.org">Open Technology Fund</a> a donné deux subventions.
-La première subvention (~200.000 $) de 2018/2019 a majoritairement amélioré l’application Android et nous a permis de sortir une version bêta de l’application de Bureau, et a aussi  ancré nos développements de fonctionnalités dans la recherche UX dans les contextes des droits de l’homme, consultez notre <a href="https://delta.chat/en/2019-07-19-uxreport">rapport de réponses aux besoins et UX</a> pour en savoir plus.
-La deuxième subvention (~300.000 $) de 2019/2020 est encore en cours et nous aide
- à sortir des versions Delta/iOS, à convertir notre bibliothèque moteur vers Rust, et de fournir de nouvelles fonctionnalités pour toutes les plateformes. Pour en savoir plus
-, consultez notre <a href="https://delta.chat/en/blog">blog</a>.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
-    <p>La <a href="https://nlnet.nl/">fondation NLnet</a> nous a subventionné de 46 K€ pour
- terminer les liaisons Rust/Python et encourager un écosystème de Chat-bot.</p>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
   </li>
   <li>
-    <p>En dernier mais de loin pas des moindres, quelques enthousiastes et experts bénévoles qui ont contribué et contribuent au développement de Delta Chat sans recevoir d’argent, ou seulement de petites sommes. Sans eux, Delta Chat n’en serait pas où il en est aujourd’hui, et de très loin.</p>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-account support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+  </li>
+  <li>
+    <p>For 2021/2022 we are receiving <em>Internet Freedom</em> funding (~500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supports our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
   </li>
   <li>
-    <p>Le financement mentionné ci-dessus a été organisé par merlinux GmbH à 
-Fribourg (Allemagne) puis ensuite distribué à presque une douzaine de contributeurs.</p>
+    <p>Sometimes we receive one-time donations from private individuals for
+which we are grateful. For example, in 2021 a generous individual bank-wired us 4K EUR 
+with the subject “keep up the good developments!”. We use such money to fund
+development gatherings or to care for ad-hoc expenses that can not easily be predicted
+for or reimbursed from public funding grants.</p>
+  </li>
+  <li>
+    <p>En dernier mais de loin pas des moindres, quelques enthousiastes et experts bénévoles qui ont contribué et contribuent au développement de Delta Chat sans recevoir d’argent, ou seulement de petites sommes. Sans eux, Delta Chat n’en serait pas où il en est aujourd’hui, et de très loin.</p>
   </li>
 </ul>
 
-<p>Le financement pour 2020/2021 est encore a déterminer. Nous sommes en train de poursuivre différentes opportunités avec de différentes organisations et partenaires. Nous sommes aussi en train de réfléchir au fait de demander des dons. En fait, nous avons commencé à titre d’expérimentation un <a href="https://liberapay.com/delta.chat/">petit compte de don Liberapay pour Delta Chat</a> Delta Chat mais nous ne l’avons pas encore publié. Il y a eu aussi jusqu’ici autour de 3-4K donnés à Bjoern (l’auteur original de Delta Chat) en don PayPal et canaux de dons en Bitcoin.</p>
+<p>The monetary funding mentioned above is mostly organized by merlinux GmbH in
+Freiburg (Germany), and is distributed to more than a dozen contributors world-wide.</p>
+
+<p>Funding for second half of 2022 and especially for 2023 is an ongoing issue of concern. Apart from applying for more public funding we want to become more independent from government-related funding sources. Please see <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> for both monetary and development related support possibilities.</p>
 
 
 

+ 38 - 22
deltachat-ios/Assets/Help/id/help.html

@@ -818,8 +818,9 @@ problem for many legitimate apps. For more information, see
 Chat; they do not offer receiving mails via IMAP.</li>
   <li>In any case you can use Delta Chat to send Messages to people who use
 Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
-encrypted, though. The End-to-End encryption those providers offer is only
-working inside their platforms, and not compatible with anyone outside.</li>
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
   <li>Delta Chat can e2e-encrypt through any e-mail provider with any
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
@@ -844,32 +845,53 @@ working inside their platforms, and not compatible with anyone outside.</li>
         
       </h3>
 
-<p>First of all, Delta Chat does not receive any Venture Capital and
+<p>Delta Chat does not receive any Venture Capital and
 is not indebted, and under no pressure to produce huge profits, or to 
-sell users and their friends and family to advertisers (or worse).</p>
+sell users and their friends and family to advertisers (or worse). 
+We rather use public funding sources, so far from EU and US origins, to help
+our efforts in instigating a decentralized and diverse chat messaging eco-system
+based on Free and Open-Source community developments.</p>
 
-<p>Delta Chat developments have so far been funded from four major sources:</p>
+<p>Concretely, Delta Chat developments have so far been funded from these sources:</p>
 
 <ul>
   <li>
     <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
 and implementation of verified groups and setup contact protocols
-in 2017 and 2018.</p>
+in 2017 and 2018 and also helped to integrate End-to-End Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> has given two grants.
-The first 2018/2019 grant (~$200K) majorly improved the Android app 
-and allowed us to release a Desktop app beta version, and also 
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
 moored our feature developments in UX research in human rights contexts, 
 see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-The second 2019/2020 grant (~$300K) is still ongoing and helps us to 
+The second 2019/2020 grant (~$300K) helped us to 
 release Delta/iOS versions, to convert our core library to Rust, and
-to provide new features for all platforms.  See the 
-ongoing <a href="https://delta.chat/en/blog">blog posts</a> for more info.</p>
+to provide new features for all platforms.</p>
   </li>
   <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted EUR 46K for
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
 completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-account support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+  </li>
+  <li>
+    <p>For 2021/2022 we are receiving <em>Internet Freedom</em> funding (~500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supports our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>Sometimes we receive one-time donations from private individuals for
+which we are grateful. For example, in 2021 a generous individual bank-wired us 4K EUR 
+with the subject “keep up the good developments!”. We use such money to fund
+development gatherings or to care for ad-hoc expenses that can not easily be predicted
+for or reimbursed from public funding grants.</p>
   </li>
   <li>
     <p>Last but by far not least, several pro-bono experts and enthusiasts contributed 
@@ -879,16 +901,10 @@ even close.</p>
   </li>
 </ul>
 
-<p>The monetary funding mentioned above was organized by merlinux GmbH in
-Freiburg (Germany), and then distributed to almost a dozen contributors.</p>
+<p>The monetary funding mentioned above is mostly organized by merlinux GmbH in
+Freiburg (Germany), and is distributed to more than a dozen contributors world-wide.</p>
 
-<p>Funding for 2020/2021 is yet to be determined. We are pursuing several
-opportunities with different organisations and partners. We also are
-considering to ask for donations. In fact, we experimentally started
-a little <a href="https://liberapay.com/delta.chat/">Delta Chat / Liberapay donation account</a>
-but have not published this yet.  There were also around 3-4K so far
-donated to Bjoern’s (the original author of Delta Chat) paypal and bitcoin
-donation channels.</p>
+<p>Funding for second half of 2022 and especially for 2023 is an ongoing issue of concern. Apart from applying for more public funding we want to become more independent from government-related funding sources. Please see <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> for both monetary and development related support possibilities.</p>
 
 
 

+ 51 - 35
deltachat-ios/Assets/Help/it/help.html

@@ -810,15 +810,16 @@ problema per molte app legittime. Per ulteriori informazioni, vedi
       </h3>
 
 <ul>
-  <li>Sì e no.</li>
+  <li>Sì e No.</li>
   <li>No, non puoi usare il tuo account Protonmail, Tutanota o Criptext con Delta
-Chat; non offrono la ricezione di posta tramite IMAP.</li>
-  <li>In ogni caso puoi utilizzare Delta Chat per inviare Messaggi alle persone che utilizzano
-Protonmail, Tutanota o Criptext. Questi messaggi però non saranno crittati
-End-to-End. La crittografia End-to-End offerta da questi fornitori lavorano
-solamente all’interno delle loro piattaforme e non sono compatibili con nessuno all’esterno.</li>
-  <li>Delta Chat può crittografare e2e tramite qualsiasi provider di posta elettronica con qualsiasi
-<a href="https://autocrypt.org/dev-status.html">App di posta elettronica abilitata Autocrypt</a>.</li>
+  Chat; non offrono la ricezione di messaggi via IMAP.</li>
+  <li>In ogni caso puoi usare Delta Chat per inviare messaggi a persone che usano
+  Protonmail, Tutanota o Criptext. Questi messaggi non saranno crittografati
+  End-to-End, però. La crittografia End-to-End che questi provider offrono non è
+  compatibile con <a href="https://autocrypt.org/">Autocrypt</a>, lo standard che Delta Chat
+  utilizza.</li>
+  <li>Delta Chat può criptare e2e attraverso qualsiasi provider di posta elettronica con qualsiasi
+  <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="sono-interessato-ai-dettagli-tecnici-mi-puoi-dire-di-più">
@@ -841,32 +842,53 @@ solamente all’interno delle loro piattaforme e non sono compatibili con nessun
         
       </h3>
 
-<p>Innanzitutto, Delta Chat non riceve alcun Capitale di Rischio e
-non è indebitato e non è sottoposto a pressioni per produrre enormi profitti o per
-vendere gli utenti e i loro amici e familiari agli inserzionisti (o peggio).</p>
+<p>Delta Chat non riceve alcun capitale di rischio e
+non è indebitato e non è sotto pressione per produrre enormi profitti, o per farlo
+vendere utenti e i loro amici e familiari agli inserzionisti (o peggio).
+Utilizziamo piuttosto fonti di finanziamento pubblico, così lontane dalle origini dell’UE e degli Stati Uniti, per aiutare
+i nostri sforzi nell’istigare un ecosistema di messaggistica di chat decentralizzato e diversificato
+basato sugli sviluppi della comunità Free e Open-Source.</p>
 
-<p>Finora lo sviluppo di Delta Chat sono stati finanziati da quattro fonti principali:</p>
+<p>Concretamente, gli sviluppi di Delta Chat finora sono stati finanziati da queste fonti:</p>
 
 <ul>
   <li>
-    <p>Il progetto <a href="https://nextleap.eu">NEXTLEAP</a> dell’UE ha finanziato la ricerca
-e implementazione dei gruppi verificati e l’impostazione dei protocolli di contatto
-nel 2017 e nel 2018.</p>
+    <p>Il progetto dell’UE <a href="https://nextleap.eu">NEXTLEAP</a> ha finanziato la ricerca
+e implementazione di gruppi verificati e configurazione di protocolli di contatto
+nel 2017 e nel 2018 e ha anche contribuito a integrare la crittografia end-to-end
+tramite <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p>L’<a href="https://opentechfund.org">Open Technology Fund</a> ha assegnato due sovvenzioni.
-La prima sovvenzione 2018/2019 (~$200K) ha notevolmente migliorato l’app Android
-e ci ha permesso di rilasciare una versione beta dell’app desktop e anche
-ha assicurato i nostri sviluppi nella ricerca delle funzionalità UX in contesti di diritti umani,
-vedi la nostra conclusione <a href="https://delta.chat/en/2019-07-19-uxreport">report Needfinding e UX</a>.
-La seconda sovvenzione 2019/2020 (~$300K) è ancora in corso e ci aiuta a
-rilasciare le versioni Delta/iOS, per convertire la nostra libreria principale in Rust e
-per fornire nuove funzionalità per tutte le piattaforme. Vedi il
-<a href="https://delta.chat/en/blog">post del blog</a> in corso per maggiori informazioni.</p>
+    <p>L’<a href="https://opentechfund.org">Open Technology Fund</a> ci ha dato una
+prima sovvenzione 2018/2019 (~$200K) durante la quale abbiamo notevolmente migliorato l’app Android
+e ha rilasciato una prima versione beta dell’app desktop, e che inoltre
+ancorato i nostri sviluppi delle funzionalità nella ricerca sulla UX nei contesti dei diritti umani,
+vedete il nostro [Rapporto Needfinding e UX] conclusivo (https://delta.chat/en/2019-07-19-uxreport).
+La seconda sovvenzione 2019/2020 (~$300K) ci ha aiutato a farlo
+rilasciare nelle versioni Delta/iOS, per convertire la nostra libreria principale in Rust, e
+per fornire nuove funzionalità per tutte le piattaforme.</p>
   </li>
   <li>
-    <p>La <a href="https://nlnet.nl/">Fondazione NLnet</a> ha concesso EUR 46K per
-completare i collegamenti Rust/Python e avviare un ecosistema di Chat-bot.</p>
+    <p>La <a href="https://nlnet.nl/">fondazione NLnet</a> ha concesso nel 2019/2020 46K EUR per
+completare i collegamenti Rust/Python e avviare un ecosistema Chat-bot.</p>
+  </li>
+  <li>
+    <p>Nel 2021 abbiamo ricevuto ulteriori finanziamenti dell’UE per due Next-Generation-Internet
+proposte, in particolare per <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - directory di portabilità del provider di posta elettronica</a> (~97K EUR) e <a href="https: //nlnet.nl/project/EmailPorting/">AEAP - portabilità dell’indirizzo e-mail</a> (~90K EUR) che ha portato a un migliore supporto multi-account, contatti QR-code migliorati e configurazioni di gruppo e molti miglioramenti della rete su tutte le piattaforme.</p>
+  </li>
+  <li>
+    <p>Per il 2021/2022 stiamo ricevendo un finanziamento <em>Internet Freedom</em> (~500K USD) dal
+U.S. Bureau of Democracy, Human Rights and Labor (DRL).
+Questo finanziamento supporta i nostri obiettivi a lungo termine per rendere Delta Chat più utilizzabile
+e compatibile con un’ampia gamma di server di posta elettronica in tutto il mondo, e più resiliente e sicuro
+in luoghi spesso colpiti dalla censura e dalle chiusure di Internet.</p>
+  </li>
+  <li>
+    <p>A volte riceviamo donazioni una tantum da privati per
+di cui siamo grati. Ad esempio, nel 2021 una persona generosa ci ha trasferito in banca 4K EUR
+con il soggetto “keep up the good developments!”. Usiamo questi soldi per finanziare
+incontri di sviluppo o per prenderci cura di spese ad hoc che non possono essere facilmente previste
+per o rimborso da sovvenzioni di finanziamento pubblico.</p>
   </li>
   <li>
     <p>Ultimo ma non meno importante, hanno contribuito diversi esperti e appassionati pro-bono
@@ -876,16 +898,10 @@ vicino.</p>
   </li>
 </ul>
 
-<p>Il finanziamento monetario sopra menzionato è stato organizzato da merlinux GmbH in
-Friburgo (Germania), e poi distribuito a quasi una dozzina di contributori.</p>
+<p>Il finanziamento monetario di cui sopra è per lo più organizzato da merlinux GmbH in
+Friburgo (Germania) ed è distribuito a più di una dozzina di contributori in tutto il mondo.</p>
 
-<p>Il finanziamento per il 2020/2021 è ancora da definire. Stiamo perseguendo diversi
-opportunità con diverse organizzazioni e partner. Anche noi stiamo
-considerando di chiedere donazioni. In effetti, abbiamo iniziato sperimentalmente
-un po’ <a href="https://liberapay.com/delta.chat/">Delta Chat / Conto donazioni Liberapay</a>
-ma non lo abbiamo ancora pubblicato. C’erano anche circa 3-4K finora
-donati a Bjoern (l’autore originale di Delta Chat) paypal e bitcoin
-canali di donazione.</p>
+<p>I finanziamenti per la seconda metà del 2022 e in particolare per il 2023 sono un problema continuo fonte di preoccupazione. Oltre a richiedere maggiori finanziamenti pubblici, vogliamo diventare più indipendenti dalle fonti di finanziamento legate al governo. Si prega di consultare <a href="https://delta.chat/en/contribute">Canali di contributo Delta Chat</a> per le possibilità di supporto sia monetario che relativo allo sviluppo.</p>
 
 
 

+ 31 - 15
deltachat-ios/Assets/Help/nl/help.html

@@ -855,15 +855,20 @@ binnen de platformen zelf en is dus daarbuiten niet compatibel.</li>
         
       </h3>
 
-<p>Delta Chat ontvangt geen risicokapitaal, heeft geen schulden en staat niet onder druk om grote winst te moeten maken. Ook is er geen enkele druk om gegevens van gebruikers, hun vrienden en familie te verkopen aan adverteerders (of erger).</p>
+<p>Delta Chat ontvangt geen risicokapitalen,
+staat niet onder bewindvoering en ervaart geen enkele druk om winst te maken of om 
+gebruikers en hun vrienden door te verkopen aan adverteerders (of erger). 
+We maken gebruik van publieke financieringsprocessen, zoals EU- en VS-financiering, om ons doel,
+het opzetten van een gedecentraliseerd en divers gesprekssysteem, te verwezenlijken,
+op basis van vrije en opensource-gemeenschapsontwikkelingen.</p>
 
-<p>De Delta Chat-ontwikkeling wordt tot op heden gefinancierd door vier grote spelers:</p>
+<p>De Delta Chat-ontwikkeling wordt tot op heden gefinancierd door deze grote spelers:</p>
 
 <ul>
   <li>
     <p>Het <a href="https://nextleap.eu">NEXTLEAP</a>-EU-project heeft het onderzoek
-naar en de implementatie van goedgekeurde groepen en setup-contact-protocollen in 2017 en 2018
-gefinancierd.</p>
+naar en de implementatie van goedgekeurde groepen en setup-contact-protocollen in 2017 en 2018 gefinancierd,
+evenals eind-tot-eindversleuteling via <a href="https://autocrypt.org">Autocrypt</a>..</p>
   </li>
   <li>
     <p><a href="https://opentechfund.org">Open Technology Fund</a> heeft twee subsidies toegekend.
@@ -873,12 +878,28 @@ Verder hebben we onderzoek kunnen doen naar het uiterlijk in relatie tot mensenr
 bekijk onze conclusie hier: <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
 De tweede subsidie, voor 2019/2020, ter waarde van ong. $300,000, loopt nog en ondersteunt ons bij het 
 vrijgeven van de iOS-client, het overzetten van de code van de kernbibliotheek naar Rust en
-het implementeren van nieuwe functies op alle platformen. Bekijk ons 
-<a href="https://delta.chat/en/blog">blog</a> voor meer informatie.</p>
+het implementeren van nieuwe functies op alle platformen.</p>
   </li>
   <li>
-    <p>De <a href="https://nlnet.nl/">NLnet foundation</a> heeft Delta Chat €46.000 toegekend
+    <p>De <a href="https://nlnet.nl/">NLnet foundation</a> heeft in 2019 en 2020 €46.000 toegekend
 voor het voltooiien van de Rust- en Python-bindings en het opzetten van het Chatbot-ecosysteem.</p>
+  </li>
+  <li>
+    <p>In 2021 ontvingen we aanvullende EU-financiering voor twee toekomstige internet-
+voorstellen, te weten <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - ‘e-mail provider portability directory’</a> (~€97.000) en <a href="https://nlnet.nl/project/EmailPorting/">AEAP - ‘email address porting’</a> (~€90.000), wat geleid heeft tot betere ondersteuning voor meerdere accounts, een verbeterd QR-codesysteem en vele netwerk-gerelateerde verbeteringen op alle besturingssystemen.</p>
+  </li>
+  <li>
+    <p>In 2021 en 2022 ontvingen we <em>Internetvrijheid</em>sfinanciering (~$500,000) van de
+‘U.S. Bureau of Democracy, Human Rights and Labor’ (DRL). 
+Met deze financiering kunnen we Delta Chat eindelijk stabieler maken, 
+evenals compatibeler met meer e-mailservers wereldwijd. Ook kunnen we extra beveiliging toevoegen
+voor geheim communiceren vanaf locaties met internetcensuur of waar het internet is afgesloten.</p>
+  </li>
+  <li>
+    <p>Soms ontvangen we eenmalige donaties van privépersonen, waar we
+uiteraard zeer dankbaar voor zijn. Zo ontvingen we in 2021 een zeer royaal bedrag op onze rekening, te weten €4000, 
+met als bijschrift “Ga zo door met dit goede project!”. We gebruiken dit soort bedragen om
+ontmoetingen tussen ontwikkelaars te organiseren of voor ad-hoc-uitgaven die niet voorzien waren.</p>
   </li>
   <li>
     <p>Ook hebben verschillende experts en enthousiastelingen op vrijwillige basis bijgedragen
@@ -889,14 +910,9 @@ de dag is.</p>
 </ul>
 
 <p>Bovenstaande fiancieringen zijn opgezet door merlinux GmbH in
-Freiburg (Duitsland) en daarna toegekend aan bijna 12 vrijwilligers.</p>
-
-<p>De financiering voor 2020/2021 moet nog worden opgezet. We nemen verschillende
-mogelijkheden door met organisaties en partners. Daarnaast overwegen
-we een donatiesysteem op te zetten. Sterker nog: daar zijn we al een beetje mee begonnen
-(<a href="https://liberapay.com/delta.chat/">Delta Chat / Liberapay-donatieaccount</a>),
-maar we hebben dit nog niet openbaargemaakt.  Tevens is er tot dusver €3000-€4000
-gedoneerd aan Bjoern’s (de oorspronkelijke ontwikkelaar van Delta Chat) PayPal en Bitcoin.</p>
+Freiburg (Duitsland) en daarna toegekend aan meer dan 12 vrijwilligers wereldwijd.</p>
+
+<p>Financiering voor de tweede helft van 2022 en vooral 2023 is een actieve kwestie en baart ons zorgen. We willen in elk geval niet meer zoveel afhankelijk zijn van overheidsfinanciering. Zie onze <a href="https://delta.chat/en/contribute">bijdragekanalen</a> om te zien welke ondersteuning we precies zoeken.</p>
 
 
 

+ 23 - 11
deltachat-ios/Assets/Help/pl/help.html

@@ -694,8 +694,8 @@ Jednak niektórzy dostawcy potrzebują specjalnych opcji, aby działać poprawni
 <ul>
   <li>I tak i nie.</li>
   <li>Nie, nie możesz używać swojego konta Protonmail, Tutanota lub Criptext z Delta Chat; nie oferują one odbierania poczty przez IMAP.</li>
-  <li>W każdym przypadku możesz użyć Delta Chat do wysyłania wiadomości do osób, które używają Protonmail, Tutanota lub Criptext. Te wiadomości nie będą jednak szyfrowane metodą end-to-end. Szyfrowanie typu end-to-end, które oferują ci dostawcy, działa tylko na ich platformach i nie jest kompatybilne z nikim spoza nich.</li>
-  <li>Delta Chat może zaszyfrować metodą end-to-end dowolnego dostawcę poczty e-mail z dowolną <a href="https://autocrypt.org/dev-status.html">aplikacją e-mail obsługującą Autocrypt</a>.</li>
+  <li>W każdym przypadku możesz użyć Delta Chat do wysyłania wiadomości do osób, które używają Protonmail, Tutanota lub Criptext. Te wiadomości nie będą jednak szyfrowane metodą end-to-end. Szyfrowanie typu end-to-end, które oferują ci dostawcy, nie jest kompatybilne z <a href="https://autocrypt.org/">Autocrypt</a> stosowanym standardowo w Delta Chat.</li>
+  <li>Delta Chat może zaszyfrować metodą end-to-end za pośrednictwem dowolnego dostawcy poczty e-mail z dowolną <a href="https://autocrypt.org/dev-status.html">aplikacją e-mail z włączoną funkcją Autocrypt</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="interesują-mnie-szczegóły-techniczne-możesz-powiedzieć-mi-coś-więcej">
@@ -718,28 +718,40 @@ Jednak niektórzy dostawcy potrzebują specjalnych opcji, aby działać poprawni
         
       </h3>
 
-<p>Przede wszystkim Delta Chat nie otrzymuje żadnego kapitału podwyższonego ryzyka, nie jest zadłużony i nie jest pod presją, aby generować ogromne zyski lub sprzedawać reklamodawcom użytkowników i ich przyjaciół i rodzinę (lub gorzej).</p>
+<p>Delta Chat nie otrzymuje żadnego kapitału wysokiego ryzyka, nie jest zadłużony i nie jest pod presją generowania ogromnych zysków lub sprzedawania reklamodawcom użytkowników i ich przyjaciół oraz rodziny (lub gorzej).
+Raczej korzystamy z publicznych źródeł finansowania, jak dotąd pochodzących z UE i USA, aby wspomóc nasze wysiłki w inicjowaniu zdecentralizowanego i zróżnicowanego ekosystemu komunikatora, opartego na rozwoju społeczności Free i Open-Source.</p>
 
-<p>Rozwój Delta Chat był dotychczas finansowany z czterech głównych źródeł:</p>
-
-<p>W 2017 i 2018 roku w ramach projektu <a href="https://nextleap.eu">NEXTLEAP</a> UE sfinansowała badania i wdrażanie zweryfikowanych grup oraz ustanawianie protokołów kontaktowych.</p>
+<p>Konkretnie, rozwój Delta Chat był dotychczas finansowany z tych źródeł:</p>
 
 <ul>
   <li>
-    <p><a href="https://opentechfund.org">Open Technology Fund</a> przyznał dwa granty. Pierwszy grant 2018/2019 (~200 000 $) znacznie ulepszył aplikację na Androida i pozwolił nam wydać wersję beta aplikacji na komputery stacjonarne, a także ugruntował rozwój naszych funkcji w badaniach UX w kontekście praw człowieka, zobacz nasz końcowy raport <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX</a>.
-Drugi grant 2019/2020 (~300 000 $) jest nadal w toku i pomaga nam wydać wersje Delta/iOS, przekonwertować naszą podstawową bibliotekę na Rust i zapewnić nowe funkcje dla wszystkich platform. Zobacz bieżące <a href="https://delta.chat/en/blog">wpisy na blogu</a>, aby uzyskać więcej informacji.</p>
+    <p>W 2017 i 2018 roku w ramach projektu <a href="https://nextleap.eu">NEXTLEAP</a> UE sfinansowała badania i wdrażanie zweryfikowanych grup oraz ustanawianie protokołów kontaktowych, a także pomogła zintegrować szyfrowanie End-to-End za pomocą <a href="https://autocrypt.org">Autocrypt</a>.</p>
+  </li>
+  <li>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> przyznał nam pierwszy grant w 2018/2019 (~200 000 $), dzięki któremu znacznie ulepszyliśmy aplikację na Androida i wydaliśmy pierwszą wersję beta aplikacji na komputery stacjonarne, a także ugruntował rozwój naszych funkcji w badaniach UX w kontekście praw człowieka, zobacz nasz końcowy raport <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX</a>.
+Druga dotacja w 2019/2020 (~300 000 4) pomogła nam wydać wersje Delta/iOS, przekonwertować naszą podstawową bibliotekę na Rust i zapewnić nowe funkcje dla wszystkich platform.</p>
+  </li>
+  <li>
+    <p>Fundacja <a href="https://nlnet.nl/">NLnet</a> przyznała w 2019/2020 46 000 EUR na ukończenie powiązań Rust/Python i zainicjowanie ekosystemu Czat-botów.</p>
+  </li>
+  <li>
+    <p>W 2021 r. otrzymaliśmy kolejne dofinansowanie z UE na dwie propozycje dotyczące Internetu nowej generacji, a mianowicie na <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD – katalog przenośności dostawcy poczty e-mail</a> ( ~97 tys. EUR) i <a href="https://nlnet.nl/project/EmailPorting/">AEAP – przenoszenie adresu e-mail</a> (~90 tys. EUR), co zaowocowało lepszą obsługą wielu kont, ulepszonymi kontaktami i ustawieniami grup za pomocą kodów QR oraz wieloma ulepszeniami sieciowymi na wszystkich platformach.</p>
+  </li>
+  <li>
+    <p>Na lata 2021/2022 otrzymujemy dofinansowanie <em>Wolności Internetu</em> (~500 tys. $) z amerykańskiego Biura Demokracji, Praw Człowieka i Pracy (DRL).
+Fundusze te wspierają nasze długofalowe cele, aby uczynić Delta Chat bardziej użytecznym i kompatybilnym z szeroką gamą serwerów e-mail na całym świecie, a także bardziej odpornym i bezpiecznym w miejscach często dotkniętych cenzurą i wyłączeniami Internetu.</p>
   </li>
   <li>
-    <p>Fundacja <a href="https://nlnet.nl/">NLnet</a> przyznała 46 000 EUR na ukończenie powiązań Rust/Python i zainicjowanie ekosystemu Czat-botów.</p>
+    <p>Czasami otrzymujemy jednorazowe darowizny od osób prywatnych, za które jesteśmy wdzięczni. Na przykład w 2021 roku pewna hojna osoba przekazała nam 4K EUR w formie przelewu bankowego tytułem “kontynuujcie dobry rozwój!”. Takie pieniądze przeznaczamy na finansowanie spotkań rozwojowych lub na doraźne wydatki, których nie da się łatwo przewidzieć lub zrefundować z publicznych dotacji.</p>
   </li>
   <li>
     <p>Wreszcie, ale zdecydowanie nie najmniej ważne, kilku ekspertów i entuzjastów pro-bono wniosło wkład i przyczyniło się do rozwoju Delta Chat bez otrzymywania pieniędzy lub tylko niewielkich kwot. Bez nich Delta Chat nie byłby tam, gdzie jest dzisiaj, nawet w pobliżu.</p>
   </li>
 </ul>
 
-<p>Wspomniane powyżej finansowanie pieniężne zostało zorganizowane przez merlinux GmbH we Freiburgu (Niemcy), a następnie przekazane do prawie tuzina darczyńców.</p>
+<p>Wspomniane powyżej finansowanie pieniężne jest w większości organizowane przez merlinux GmbH we Freiburgu (Niemcy) i jest dystrybuowane do kilkunastu podmiotów na całym świecie.</p>
 
-<p>Finansowanie na rok 2020/2021 nie zostało jeszcze określone. Korzystamy z kilku możliwości, współpracując z różnymi organizacjami i partnerami. Rozważamy również zwrócenie się o darowizny. W rzeczywistości eksperymentalnie założyliśmy małe konto <a href="https://liberapay.com/delta.chat/">darowizn Delta Chat / Liberapay</a>, ale jeszcze tego nie opublikowaliśmy. Do tej pory przekazano również około 3-4 tys. $ kanałem darowizn paypal i bitcoin dla Bjoern’a (pierwotny autor Delta Chat).</p>
+<p>Finansowanie na drugą połowę 2022 r., a zwłaszcza na 2023 r., wciąż budzi niepokój. Oprócz ubiegania się o więcej środków publicznych chcemy uniezależnić się od rządowych źródeł finansowania. Zapoznaj się z <a href="https://delta.chat/en/contribute">możliwościami wsparcia Delta Chat</a>, zarówno finansowego jak i związanego z rozwojem.</p>
 
 
 

+ 70 - 54
deltachat-ios/Assets/Help/ru/help.html

@@ -42,10 +42,10 @@
     <ul>
       <li><a href="#можно-ли-использовать-delta-chat-на-нескольких-устройствах-одновременно">Можно ли использовать Delta Chat на нескольких устройствах одновременно?</a></li>
       <li><a href="#есть-ли-какие-либо-планы-по-внедрению-веб-клиента-delta-chat">Есть ли какие-либо планы по внедрению веб-клиента Delta Chat?</a></li>
-      <li><a href="#почему-я-могу-включить-не-смотреть-входящие">Почему я могу включить “не смотреть Входящие”?</a></li>
-      <li><a href="#для-чего-полезна-настройка-отправить-копию-себе">Для чего полезна настройка “Отправить копию себе”?</a></li>
-      <li><a href="#почему-я-могу-выбрать-смотреть-папку-отправлено">Почему я могу выбрать “смотреть папку Отправлено”?</a></li>
-      <li><a href="#почему-я-могу-включить-не-смотреть-в-папку-delta-chat">Почему я могу включить “не смотреть в папку Delta Chat”?</a></li>
+      <li><a href="#почему-я-могу-отключить-следить-за-папкой-входящие">Почему я могу отключить “следить за папкой Входящие”?</a></li>
+      <li><a href="#для-чего-нужен-параметр-отправить-копию-себе">Для чего нужен параметр “Отправить копию себе”?</a></li>
+      <li><a href="#для-чего-нужен-параметр-следить-за-папкой-отправлено">Для чего нужен параметр “следить за папкой Отправлено”?</a></li>
+      <li><a href="#почему-я-могу-отключить-следить-за-папкой-delta-chat">Почему я могу отключить “следить за папкой Delta Chat”?</a></li>
     </ul>
   </li>
   <li><a href="#другое">Другое</a>
@@ -365,8 +365,8 @@
 сообщило о получении сообщения.</li>
   <li>Получатели могут отключить функцию чтения сообщений,
 поэтому даже если вы видите только одну галочку, сообщение может быть прочитано.</li>
-  <li>И наоборот, две галочки не означают.
-что человек прочитал или понял сообщение ;)</li>
+  <li>И наоборот, две галочки не означают,
+ что человек прочитал или понял сообщение ;)</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h2 id="encryption">
@@ -702,10 +702,10 @@ RFC</a>.</p>
 <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="почему-я-могу-включить-не-смотреть-входящие">
+      <p class="back"><a href="#top">^</a></p><h3 id="почему-я-могу-отключить-следить-за-папкой-входящие">
         
         
-          Почему я могу включить “не смотреть Входящие”? <a href="#почему-я-могу-включить-не-смотреть-входящие" class="anchor"></a>
+          Почему я могу отключить “следить за папкой Входящие”? <a href="#почему-я-могу-отключить-следить-за-папкой-входящие" class="anchor"></a>
         
         
       </h3>
@@ -724,10 +724,10 @@ RFC</a>.</p>
 
 <p>В данном случае, Delta Chat не нужно смотреть входящие.</p>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="для-чего-полезна-настройка-отправить-копию-себе">
+      <p class="back"><a href="#top">^</a></p><h3 id="для-чего-нужен-параметр-отправить-копию-себе">
         
         
-          Для чего полезна настройка “Отправить копию себе”? <a href="#для-чего-полезна-настройка-отправить-копию-себе" class="anchor"></a>
+          Для чего нужен параметр “Отправить копию себе”? <a href="#для-чего-нужен-параметр-отправить-копию-себе" class="anchor"></a>
         
         
       </h3>
@@ -744,34 +744,33 @@ RFC</a>.</p>
 
 <p>Значение для “Отправить копию себе” по умолчанию - нет.</p>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="почему-я-могу-выбрать-смотреть-папку-отправлено">
+      <p class="back"><a href="#top">^</a></p><h3 id="для-чего-нужен-параметр-следить-за-папкой-отправлено">
         
         
-          Почему я могу выбрать “смотреть папку Отправлено”? <a href="#почему-я-могу-выбрать-смотреть-папку-отправлено" class="anchor"></a>
+          Для чего нужен параметр “следить за папкой Отправлено”? <a href="#для-чего-нужен-параметр-следить-за-папкой-отправлено" class="anchor"></a>
         
         
       </h3>
 
-<p>Единственной причиной, является то, что вы используете другую
-почтовую программу (например, Thunderbird) вместе с вашим приложением Delta Chat и хотите, чтобы ваш почтовый агент
-участвовал.</p>
+<p>Этот параметр, важен для тех, кто использует другую
+почтовую программу (например, Thunderbird) вместе с приложением Delta Chat.</p>
 
 <p>Однако мы рекомендуем использовать настольный клиент Delta Chat; вы можете скачать его
-на <a href="https://get.delta.chat">get.delta.chat</a>. Возможность “просмотра папки Отправлено”
+на <a href="https://get.delta.chat">get.delta.chat</a>. Возможность “слежения за папкой Отправлено”
 может быть убрана в будущем. Эта функция была представлена в то время, когда не было
  настольного клиента Delta Chat доступного на всех платформах.</p>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="почему-я-могу-включить-не-смотреть-в-папку-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="почему-я-могу-отключить-следить-за-папкой-delta-chat">
         
         
-          Почему я могу включить “не смотреть в папку Delta Chat”? <a href="#почему-я-могу-включить-не-смотреть-в-папку-delta-chat" class="anchor"></a>
+          Почему я могу отключить “следить за папкой Delta Chat”? <a href="#почему-я-могу-отключить-следить-за-папкой-delta-chat" class="anchor"></a>
         
         
       </h3>
 
 <p>Некоторые люди используют Delta Chat в качестве обычного почтового клиента и хотят использовать папку “Входящие”
-для своей почты вместо папки DeltaChat. Если вы отключите функцию “смотреть
-папку DeltaChat”, вы также должны отключить “переместить сообщения чата в DeltaChat”.
+для своей почты вместо папки DeltaChat. Если вы отключите функцию “следить за
+папкой DeltaChat”, вы также должны отключить “переместить сообщения чата в DeltaChat”.
 В противном случае удаление сообщений или настройки могут работать неправильно.</p>
     
       <p class="back"><a href="#top">^</a></p><h2 id="другое">
@@ -828,15 +827,16 @@ RFC</a>.</p>
       </h3>
 
 <ul>
-  <li>И да, и нет.</li>
-  <li>Нет, вы не можете использовать свой аккаунт Protonmail, Tutanota или Criptext с Delta
-Chat; они не предлагают возможность получения почты через IMAP.</li>
-  <li>В любом случае вы можете использовать Delta Chat для отправки сообщений людям, которые используют
-Protonmail, Tutanota, или Criptext. Однако эти сообщения не будут полностью зашифрованы. 
-Сквозное шифрование, предлагаемое этими провайдерами,
- работает только внутри их платформ и не совместимо ни с кем извне.</li>
-  <li>Delta Chat может использовать сквозное шифрование с любым провайдером электронной почты, которые 
-<a href="https://autocrypt.org/dev-status.html">совместимы с Autocrypt</a>.</li>
+  <li>Yes and No.</li>
+  <li>No, you can not use your Protonmail, Tutanota, or Criptext account with Delta
+Chat; they do not offer receiving mails via IMAP.</li>
+  <li>In any case you can use Delta Chat to send Messages to people who use
+Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
+  <li>Delta Chat can e2e-encrypt through any e-mail provider with any
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="меня-интересуют-технические-детали-можете-рассказать-больше">
@@ -859,32 +859,53 @@ Protonmail, Tutanota, или Criptext. Однако эти сообщения н
         
       </h3>
 
-<p>Во-первых, Delta Chat не получает никакого венчурного капитала и
-не имеет долгов, а также не ставит цель заработать огромную прибыль или
-продавать пользователей, их друзей и семью - рекламодателям (или еще хуже).</p>
+<p>Delta Chat не получает никакого венчурного капитала,
+не имеет долгов, и не ставит целью заработать огромную прибыль или 
+продавать пользователей, их друзей и семью рекламодателям (или ещё кому-либо). 
+Мы предпочитаем использовать государственные источники финансирования далёкие от Евросоюза и США, чтобы
+продолжить создавать децентрализованную экосистему обмена сообщениями,
+основанную на Свободном и Открытом исходном коде.</p>
 
-<p>Разработки Delta Chat до сих пор финансировались из четырех основных источников:</p>
+<p>Конкретно до этого момента, разработки Delta Chat финансировались из этих источников:</p>
 
 <ul>
   <li>
     <p>Проект <a href="https://nextleap.eu">NEXTLEAP</a> финансировал исследование
- и внедрение проверенных групп, а также настройку контактных протоколов
-в 2017 и 2018 годах.</p>
+и внедрение проверенных групп, а также настройку контактных протоколов
+в 2017 и 2018 году, а ещё помог внедрить сквозное шифрование
+через <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p><a href="https://opentechfund.org">Фонд открытых технологий</a> предоставил да гранта.
-Первый грант 2018/2019 года (~$200 тыс.) значительно улучшил Android-приложение
-и позволил нам выпустить бета-версию настольного приложения, а также
-закрепил наши разработки в области исследований UX в контексте прав человека,
-смотрите наш отчет <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-Второй грант 2019/2020 (~$300 тыс.) все ещё используется и помогает нам
-выпускать версии Delta/iOS, преобразовать нашу основную библиотеку в Rust и
-предоставить новые функции для всех платформ. Смотрите
-текущие <a href="https://delta.chat/en/blog">сообщения в блоге</a> для получения дополнительной информации.</p>
+    <p><a href="https://opentechfund.org">Фонд открытых технологий</a> предоставил нам 
+два гранта. Первый грант 2018/2019 года (~$200 тыс.) помог значительно улучшить Android приложение 
+и выпустить бета-версию настольного клиента, кроме того 
+закрепил наши разработки в области исследований UX в контексте прав человека, 
+смотрите наш отчёт <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+Второй грант 2019/2020 года (~$300 тыс.) помог нам 
+выпустить Delta/iOS версии, преобразовать нашу основную библиотеку Rust, а также
+предоставить новые функции для всех платформ.</p>
   </li>
   <li>
-    <p>Фонд <a href="https://nlnet.nl/">NLnet foundation</a> выделил 46 тысяч евро на
-завершение привязки Rust/Python и создание экосистемы чат-ботов.</p>
+    <p>Фонд <a href="https://nlnet.nl/">NLnet</a> в 2019/2020 году выделил 46 тысяч евро на
+завершение привязки Rust/Python и создание экосистемы ботов.</p>
+  </li>
+  <li>
+    <p>В 2021 мы получили дополнительное финансирование из ЕС для двух Next-Generation-Internet
+целей, а именно для <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97 тыс. евро) и <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90 тыс. евро). Это привело к улучшению поддержки мультиклиентности, QR-кодов, настройки контактов и групп, и множеству улучшений в работе сети для всех платформ.</p>
+  </li>
+  <li>
+    <p>На 2021/2022 год мы получаем финансирование <em>Интернет Свобода</em> (~$500 тыс.) от
+Бюро демократии, прав человека и труда США (DRL). 
+Это финансирование поддерживает наши долгосрочные цели сделать Delta Chat более удобным
+и совместимым с большим количеством почтовых серверов по всему миру, а также более устойчивым и безопасным
+в местах, часто подверженных интернет цензуре и шатдаунам.</p>
+  </li>
+  <li>
+    <p>Иногда мы получаем разовые пожертвования от частных лиц, за
+что мы им благодарны. Например, в 2021 был сделан щедрый банковский перевод на сумму 4 тысячи евро 
+с заголовком “продолжайте разработку в том же духе!”. Мы используем данные деньги, для
+того чтобы покрывать непредвиденные расходы, которые нелегко спрогнозировать
+или возместить за счёт государственных грантов.</p>
   </li>
   <li>
     <p>И последнее, но далеко не менее важное: несколько экспертов и энтузиастов на общественных началах внесли
@@ -894,15 +915,10 @@ Protonmail, Tutanota, или Criptext. Однако эти сообщения н
   </li>
 </ul>
 
-<p>Упомянутое выше денежное финансирование было организовано компанией merlinux GmbH в городе 
- Фрайбург (Германия), а затем был распределён среди почти дюжины участников.</p>
+<p>Упомянутые выше денежные сборы было организованы компанией merlinux GmbH в городе
+Фрайбург (Германия), и распределяются среди более чем дюжины участников по всему миру.</p>
 
-<p>Финансирование на 2020/2021 годы еще предстоит определить. Мы ищем несколько
- организаций и партнеров. Мы также
-задумываемся о том, чтобы просить о пожертвованиях. Мы экспериментально создали аккаунт
-  <a href="https://liberapay.com/delta.chat/">Delta Chat / Liberapay для этих целей</a>,
-но еще не публиковали этого ранее. Также было около 3-4К 
-пожертвований Bjoern’у (официальному автору и создателю Delta Chat) на счет PayPal и bitcoin.</p>
+<p>Финансирование на вторую половину 2022 года, а особенно на 2023 год являются текущей проблемой. Помимо подачи заявок, на увеличение финансирования, мы хотим стать более независимыми от государственных источников. Пожалуйста, ознакомьтесь с <a href="https://delta.chat/ru/contribute">разделом Содействие</a>, как для внесения денежной поддержки, так и для того, чтобы помочь в дальнейшей разработки своими силами.</p>
 
 
 

+ 52 - 35
deltachat-ios/Assets/Help/sk/help.html

@@ -826,15 +826,16 @@ problém mnohých legitímnych aplikácií. Ďalšie informácie nájdete v čas
       </h3>
 
 <ul>
-  <li>Áno a nie.</li>
-  <li>Nie, nemôžete používať svoj účet Protonmail, Tutanota alebo Criptext s Delta
-Chat; neponúkajú prijímanie pošty cez IMAP.</li>
-  <li>V každom prípade môžete použiť Delta Chat na odosielanie správ ľuďom, ktorí to používajú
-Protonmail, Tutanota alebo Criptext. Avšak tieto správy nebudú End-to-End
-zašifrované. Šifrovanie typu End-to-End, ktoré títo poskytovatelia                                ponúkajú, funguje iba <br />
-na ich platformách a nie sú kompatibilné s nikým mimo.</li>
-  <li>Delta Chat môže e2e šifrovať prostredníctvom akéhokoľvek poskytovateľa e-mailu s ktoroukoľvek
-<a href="https://autocrypt.org/dev-status.html">E-mailovou aplikáciou s povoleným automatickým šifrovaním</a>.</li>
+  <li>Yes and No.</li>
+  <li>No, you can not use your Protonmail, Tutanota, or Criptext account with Delta
+Chat; they do not offer receiving mails via IMAP.</li>
+  <li>In any case you can use Delta Chat to send Messages to people who use
+Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
+  <li>Delta Chat can e2e-encrypt through any e-mail provider with any
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="zaujímajú-ma-technické-detaily-môžete-mi-povedať-viac">
@@ -857,32 +858,53 @@ na ich platformách a nie sú kompatibilné s nikým mimo.</li>
         
       </h3>
 
-<p>Po prvé, Delta Chat nedostáva žiadny rizikový kapitál a
-nie je zadlžená a nie je pod tlakom, aby produkovala obrovské zisky, resp
-predávať používateľov a ich priateľov a rodinu inzerentom (alebo ešte horšie).</p>
+<p>Delta Chat does not receive any Venture Capital and
+is not indebted, and under no pressure to produce huge profits, or to 
+sell users and their friends and family to advertisers (or worse). 
+We rather use public funding sources, so far from EU and US origins, to help
+our efforts in instigating a decentralized and diverse chat messaging eco-system
+based on Free and Open-Source community developments.</p>
 
-<p>Vývoj Delta Chatu bol doteraz financovaný zo štyroch hlavných zdrojov:</p>
+<p>Concretely, Delta Chat developments have so far been funded from these sources:</p>
 
 <ul>
   <li>
-    <p>Výskum financoval projekt EÚ <a href="https://nextleap.eu">NEXTLEAP</a>.
- a implementáciu overených skupín a nastavenie kontaktných protokolov
- v rokoch 2017 a 2018.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate End-to-End Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p><a href="https://opentechfund.org">Otvorený technologický fond</a> udelil dva granty.
-Prvý grant 2018/2019 (~ 200 000 $) výrazne zlepšil aplikáciu pre Android
-a umožnili nám vydať beta verziu aplikácie pre Desktop
-a taktiež zakotvila náš vývoj funkcií vo výskume UX v kontexte ľudských práv,
-pozrite si našu záverečnú správu <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
-Druhý grant 2019/2020 (~ 300 000 $) stále prebieha a pomáha nám
-uvoľniť verzie Delta/iOS, aby sme previedli našu základnú knižnicu na Rust a
-poskytovali nové funkcie pre všetky platformy. Pozrite si
-prebiehajúce <a href="https://delta.chat/en/blog">príspevky na blogu</a>, kde nájdete ďalšie informácie.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
-    <p><a href="https://nlnet.nl/">nadácia NLnet</a> poskytla 46 000 EUR na
-dokončenie väzieb Rust/Python a podnietenie ekosystému Chat-botov.</p>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-account support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+  </li>
+  <li>
+    <p>For 2021/2022 we are receiving <em>Internet Freedom</em> funding (~500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supports our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>Sometimes we receive one-time donations from private individuals for
+which we are grateful. For example, in 2021 a generous individual bank-wired us 4K EUR 
+with the subject “keep up the good developments!”. We use such money to fund
+development gatherings or to care for ad-hoc expenses that can not easily be predicted
+for or reimbursed from public funding grants.</p>
   </li>
   <li>
     <p>V neposlednom rade k vývoju Delta Chat prispelo a prispieva viacero pro-bono odborníkov a nadšencov
@@ -892,15 +914,10 @@ dokončenie väzieb Rust/Python a podnietenie ekosystému Chat-botov.</p>
   </li>
 </ul>
 
-<p>Vyššie uvedené peňažné financovanie organizovala spoločnosť merlinux GmbH v
-Freiburg (Nemecko) a následne distribuované takmer tuctu prispievateľov.</p>
+<p>The monetary funding mentioned above is mostly organized by merlinux GmbH in
+Freiburg (Germany), and is distributed to more than a dozen contributors world-wide.</p>
 
-<p>Financovanie na roky 2020/2021 ešte nie je určené. Sledujeme niekoľko
-šancí s rôznymi organizáciami a partnermi. My tiež
-zvažujeme požiadať o dary. V skutočnosti sme už trochu experimentálne
-začali <a href="https://liberapay.com/delta.chat/">Delta Chat / Darcovský účet Liberapay</a>
-ale toto sme ešte nezverejnili. Doposiaľ bolo tiež okolo 3-4K EUR
-darované Bjoernovi (pôvodnému autorovi Delta Chatu) na paypalové a bitcoinové účty.</p>
+<p>Funding for second half of 2022 and especially for 2023 is an ongoing issue of concern. Apart from applying for more public funding we want to become more independent from government-related funding sources. Please see <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> for both monetary and development related support possibilities.</p>
 
 
 

+ 58 - 40
deltachat-ios/Assets/Help/sq/help.html

@@ -802,8 +802,8 @@ shumë pajisje mund të mos punojë si duhet.</p>
 
 <ul>
   <li>Ka shanse të mira që: Po :)<br />
-  Sidoqoftë, disa furnizues shërbimesh kanë nevojë për mundësi speciale, që
-  të funksionojnë si duhet, shihni <a href="https://providers.delta.chat">Provider Overview</a></li>
+Sidoqoftë, disa furnizues shërbimesh kanë nevojë për mundësi speciale, që
+të funksionojnë si duhet, shihni <a href="https://providers.delta.chat">Provider Overview</a></li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="sa-kohë-që-delta-chat-i-përdor-email-a-është-vërtet-një-shkëmbyes-mesazhesh-të-atypëratyshme">
@@ -840,15 +840,15 @@ të dhëna, shihni <a href="https://dontkillmyapp.com/">dontkillmyapp.com</a>.</
 
 <ul>
   <li>Po dhe Jo.</li>
-  <li>Jo, s’mund të përdorni llogarinë tuaj Protonmail, Tutanota, ose Criptext me
-Delta Chat-in; këta nuk ofrojnë marrje email-esh përmes IMAP-it.</li>
-  <li>Sidoqoftë, mund të përdorni Delta Chat-in të dërgoni Mesazhe te persona që
-përdorin Protonmail-in, Tutanota-n, ose Criptext-in. Por këto mesazhe s’do
-të jenë të fshehtëzuara Skaj-Më-Skaj. Fshehtëzimi Skaj-Më-Skaj që ofrojnë këto
-shërbime funksionon vetëm brenda platformave përkatëse, pa qenë i përputhshëm
-me gjë tjetër jashtë tyre.</li>
-  <li>Delta Chat-i mund të kryejë fshehtëzim skaj-më-skaj përmes cilitdo shërbimi
-email me çfarëdo <a href="aplikacion email që mbulon Autocrypt-in">https://autocrypt.org/dev-status.html</a>.</li>
+  <li>Jo, me Delta Chat-in s’mund të përdorni llogarinë tuaj Protonmail, Tutanota,
+ose Criptext; ato nuk ofrojnë marrje email-esh përmes IMAP-it.</li>
+  <li>Sidoqoftë, mund të përdorni Delta Chat-in të dërgoni Mesazhe për persona që
+përdorin Protonmail, Tutanota, ose Criptext. Këto mesazhe ama s’do të jenë
+të fshehtëzuara Skaj-më-Skaj. Fshehtëzimi Skaj-më-Skaj që japin këto shërbime
+s’është i përputhshëm me <a href="https://autocrypt.org/">Autocrypt-in</a>, standardin që
+përdor Delta Chat-i.</li>
+  <li>Delta Chat-i mund të kryejë fshehtëzim skaj-më-skaj përmes cilitdo shërbim
+email-i me çfarëdo <a href="https://autocrypt.org/dev-status.html">aplikacioni email që punon me Autocrypt</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">
@@ -871,34 +871,58 @@ email me çfarëdo <a href="aplikacion email që mbulon Autocrypt-in">https://au
         
       </h3>
 
-<p>Pikësëpari, Delta Chat s’merr financime të llojit Venture Capital dhe
-s’është në borxhe, dhe nën trysni për të prodhuar përfitime të mëdha, apo 
-të shesë përdoruesit bashkë me miqtë dhe familjet te reklamues (apo më keq).</p>
+<p>Delta Chat nuk përfiton ndonjë financim të llojit Venture Capital dhe s’ka
+borxhe, as gjendet nën trysni për të prodhuar fitime të mëdha, apo për të
+shitur përdoruesit, shokët dhe familjen e tyre reklamuesve (apo më keq). 
+Në vend të kësaj, përdorim burime financimi publik, deri sot me origjinë nga
+BE dhe ShBA, si ndihmë të përpjekjeve tona për lulëzimin e një ekosistemi të
+decentralizuar dhe të larmishëm shkëmbimi mesazhesh bazuar në zhvillime
+bashkësie të Lirë dhe Me Burim të Hapët.</p>
 
-<p>Deri këtu, zhvillimi i Delta Chat-it është financuar nga katër burime kryesore:</p>
+<p>Konkretisht, zhvillimet e Delta Chat-it deri sot janë financuar nga këto burime:</p>
 
 <ul>
   <li>
-    <p>Projekti <a href="https://nextleap.eu">NEXTLEAP</a> i BE-së financoi kërkimin dhe
-sendërtimin e grupeve të verifikuar dhe protokolle ujdisje kontaktesh
-më 2017 dhe 2018.</p>
+    <p>Projekti <a href="https://nextleap.eu">NEXTLEAP</a> i BE-së financoi kërkimin
+për dhe sendërtimin e grupeve të verifikuara dhe protokolleve të
+ujdisjes së kontakteve më 2017-n dhe 2018-n dhe ndihmoi gjithashtu
+të integrohet Fshehtëzim Skaj-më-Skaj përmes <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p><a href="https://opentechfund.org">Fondacioni për Teknologji të Hapur</a> ka dhënë dy
-grante.
-Granti i parë më 2018/2019 (~200 mijë dollarë) më së shumti përmirësoi
-aplikacionin  Android dhe na lejoi të hedhim në qarkullim një version beta
-për dekstop, dhe hodhi gjithashtu bazat për zhvillim veçorish në kërkime UX
-në kontekste të drejtash të njeriut, shihni <a href="https://delta.chat/en/2019-07-19-uxreport">raportin tonë përmbledhës
-“Needfinding and UX”</a>.
-Granti i dytë 2019/2020 (~$300K) po përdoret ende dhe na ndihmon të hedhim
-në qarkullim versione Delta/iOS, për shndërrimin e librarisë sonë bazë në
-Rust, and dhe sjellim veçori të reja për krejt platformat.  Për më tepër
-të dhëna, shihni <a href="https://delta.chat/en/blog">postimet që bëhen në blog</a>.</p>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> na dha grantin e parë 
+për 2018/2019 (~200 mijë dollarë) me të cilin përmirësuam ndjeshëm aplikacionin
+për Android dhe hodhëm në qarkullim një version të parë beta aplikacioni për Desktop,
+si dhe i afroi më tepër zhvillimet tona për veçori me kërkime UX në kontekste të drejtash të njeriut, 
+shihni <a href="https://delta.chat/en/2019-07-19-uxreport">raportin tonë përfundimtar “Needfinding and UX”</a>.
+Granti i dytë për 2019/2020 (~$300K) na ndihmoi të hedhim në qarkullim 
+versione Delta/iOS, për të shndërruar bibliotekën tonë bazë në Rust, si dhe
+për të sjellë veçori të reja për krejt platformat.</p>
   </li>
   <li>
-    <p><a href="https://nlnet.nl/">Fondacioni NLnet</a> dha një grant prej 46 mijë eurosh për
-të plotësuar <em>Rust/Python bindings</em> për t’i dhënë udhë një ekosistemi <em>Chat-bot</em>.</p>
+    <p><a href="https://nlnet.nl/">Fondacioni NLnet</a> dhuroi 46K euro gjatë 2019/2020 për
+plotësimin e <em>Rust/Python bindings</em> dhe për t’i dhënë udhë një ekosistemi
+Chat-bot.</p>
+  </li>
+  <li>
+    <p>Më 2021-n morëm financime të mëtejshme nga BE për dy propozime që shtrihen në
+“Internetin e Brezit Tjetër”, konkretisht për <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K euro) dhe <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K euro) që sollën mbulim më të mirë për përdorues me shumë
+llogari, përmirësim të gjërave për kontakte me kod QR dhe grupe, si dhe mjaft
+përmirësime në punën në rrjet për krejt platformat.</p>
+  </li>
+  <li>
+    <p>Për 2021/2022 po marrim financimin <em>Internet Freedom</em> (~500 mijë dollarë amerikanë)
+nga Zyra për Demokraci, të Drejta të Njeriut dhe Punë e ShBA-sand Labor (DRL). 
+Ky financim përbën mbështetje për synimet tona afatgjata për ta bërë Delta Chat-in më
+të përdorshëm dhe të përputhshëm me një gamë të gjerë shërbimesh email anembanë
+botës, si dhe më të qëndrueshëm dhe më të siguruar në vende që shpesh preken nga
+censurim dhe bllokim interneti.</p>
+  </li>
+  <li>
+    <p>Ndonjëherë marrim ndonjë dhurim njësh prej individë privatë, për çka jemi
+borxhlinj. Për shembull, më 2021-shin një individ bujar na dërgoi një mandatarkëtimi
+prej 4 mijë eurosh, me subjektin “vazhdoni punën e mbarë!”. Para të tilla i përdorim
+[ër të financuar takime zhvillimi, ose për të mbuluar shpenzime <em>ad-hoc</em>
+që s’mund të parashikohen kollaj, apo që s’mbulohen nga fonde financimi publik.</p>
   </li>
   <li>
     <p>E fundit, por aspak për nga rëndësia, disa ekspertë dhe entuziastë kanë dhënë
@@ -908,16 +932,10 @@ madje as afër asaj.</p>
   </li>
 </ul>
 
-<p>Financimi monetar i përmendur më sipër u organizua nga merlinux GmbH në
-Frajburg (Gjermany), dhe shpërndarë më pas thuajse një duzine kontribuesish.</p>
+<p>Financimi monetar i përmendur më sipër është kryesisht i organizuar nga GmbH në
+Frajburg (Gjermani) dhe u shpërndahet më tepër se një duzine kontribuesish nga e gjithë bota.</p>
 
-<p>Financimi për 2020/2021 s’është përcaktuar ende. Po ndjekim një dorë mundësish
-me ente dhe partnerë të ndryshëm. Po shohim gjithashtu mundësinë të kërkojmë
-dhurime. Në fakt, kemi filluar paksa, eksperimentalisht <a href="https://liberapay.com/delta.chat/">llogari dhurimesh
-Delta Chat / Liberapay</a>, por s’e kemi bërë
-ende publike këtë.  Pati gjithashtu rreth 3-4 mijë euro dhuruar deri sot për
-Bjornin (autorin fillestar të Delta Chat-it) nga kanalet e dhurimit në Paypal
-dhe në bitkoin.</p>
+<p>Financimi për gjysmën e dytë të 2022-shit dhe veçanërisht për 2023 është një çështje e vazhdueshme shqetësimi. Veç aplikimit për më tepër financime, duam të bëhemi më të pavarur nga burime financimi të lidhura me qeverinë. Ju lutemi, shihni <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> qoftë për mundësi përkrahjeje monetare, qoftë për ato të lidhura me zhvillimin.</p>
 
 
 

+ 52 - 13
deltachat-ios/Assets/Help/uk/help.html

@@ -697,10 +697,16 @@
       </h3>
 
 <ul>
-  <li>І так і ні.</li>
-  <li>Ні, ви не можете використовувати свій акаунт Protonmail, Tutanota або Criptext у програмі Delta Chat; вони не пропонують отримання пошти через IMAP.</li>
-  <li>У будь-якому випадку ви можете використовувати Delta Chat, щоб надсилати повідомлення людям, які використовують Protonmail, Tutanota або Criptext. Однак ці повідомлення не будуть зашифровані наскрізним способом. Наскрізне шифрування, яке пропонують ці постачальники, працює лише на їхніх платформах і не сумісне з іншими.</li>
-  <li>Delta Chat може використовувати наскрізне шифрування через будь-якого постачальника послуг електронної пошти за допомогою будь-якого <a href="https://autocrypt.org/dev-status.html">додатка електронної пошти з підтримкою Autocrypt</a>.</li>
+  <li>Yes and No.</li>
+  <li>No, you can not use your Protonmail, Tutanota, or Criptext account with Delta
+Chat; they do not offer receiving mails via IMAP.</li>
+  <li>In any case you can use Delta Chat to send Messages to people who use
+Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
+  <li>Delta Chat can e2e-encrypt through any e-mail provider with any
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="мене-цікавлять-технічні-деталі-можете-розповісти-більше">
@@ -723,30 +729,63 @@
         
       </h3>
 
-<p>Поперше, Delta Chat не отримує жодного венчурного капіталу, не має заборгованості і не зазнає жодного тиску ні для отримання величезних прибутків, ні для продажу користувачів та їхніх друзів та сім’ї рекламодавцям (або гірше).</p>
+<p>Delta Chat does not receive any Venture Capital and
+is not indebted, and under no pressure to produce huge profits, or to 
+sell users and their friends and family to advertisers (or worse). 
+We rather use public funding sources, so far from EU and US origins, to help
+our efforts in instigating a decentralized and diverse chat messaging eco-system
+based on Free and Open-Source community developments.</p>
 
-<p>Наразі розробка Delta Chat фінансувалася з чотирьох основних джерел:</p>
+<p>Concretely, Delta Chat developments have so far been funded from these sources:</p>
 
 <ul>
   <li>
-    <p>Проект <a href="https://nextleap.eu">NEXTLEAP</a> фінансував дослідження і впровадження верифікованих груп та протоколів встановлення контактів у 2017 та 2018 роках.</p>
+    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
+and implementation of verified groups and setup contact protocols
+in 2017 and 2018 and also helped to integrate End-to-End Encryption
+through <a href="https://autocrypt.org">Autocrypt</a>.</p>
   </li>
   <li>
-    <p><a href="https://opentechfund.org">Фонд відкритих технологій</a> надав два гранти.
-Перший грант 2018/2019 (приблизно 200 тис. доларів США) значно покращив додаток для Android і дозволив нам випустити бета-версію додатка для настільних ПК, а також пришвидшив наші розробки UX у контексті прав людини, див. наш підсумковий <a href="https://delta.chat/en/2019-07-19-uxreport">Звіт про необхідність пошуку та UX</a>.
-Другий грант 2019/2020 (приблизно 300 тис. доларів США) все ще триває і допомагає нам випустити версії Delta/iOS, перевести нашу основну бібліотеку на Rust та надати нові функції для всіх платформ. Докладнішу інформацію дізнайтесь у <a href="https://delta.chat/en/blog">публікаціях блогу</a>.</p>
+    <p>The <a href="https://opentechfund.org">Open Technology Fund</a> gave us a 
+first 2018/2019 grant (~$200K) during which we majorly improved the Android app 
+and released a first Desktop app beta version, and which moreover 
+moored our feature developments in UX research in human rights contexts, 
+see our concluding <a href="https://delta.chat/en/2019-07-19-uxreport">Needfinding and UX report</a>.
+The second 2019/2020 grant (~$300K) helped us to 
+release Delta/iOS versions, to convert our core library to Rust, and
+to provide new features for all platforms.</p>
   </li>
   <li>
-    <p><a href="https://nlnet.nl/">Фонд NLnet</a> надав 46 тис. євро на завершення Rust/Python-прив’язок та збурення екосистеми чат-бота.</p>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>In 2021 we received further EU funding for two Next-Generation-Internet
+proposals, namely for <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - e-mail provider portability directory</a> (~97K EUR) and <a href="https://nlnet.nl/project/EmailPorting/">AEAP - email address porting</a> (~90K EUR) which resulted in better multi-account support, improved QR-code contact and group setups and many networking improvements on all platforms.</p>
+  </li>
+  <li>
+    <p>For 2021/2022 we are receiving <em>Internet Freedom</em> funding (~500K USD) from the
+U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
+This funding supports our long-running goals to make Delta Chat more usable 
+and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
+in places often affected by internet censorship and shutdowns.</p>
+  </li>
+  <li>
+    <p>Sometimes we receive one-time donations from private individuals for
+which we are grateful. For example, in 2021 a generous individual bank-wired us 4K EUR 
+with the subject “keep up the good developments!”. We use such money to fund
+development gatherings or to care for ad-hoc expenses that can not easily be predicted
+for or reimbursed from public funding grants.</p>
   </li>
   <li>
     <p>Кілька експертів та ентузіастів, які працюють на громадських засадах, сприяли розробці програми Delta Chat, не отримуючи грошей або лише невеликі суми. Без них Delta Chat не був би там, де є сьогодні, навіть близько.</p>
   </li>
 </ul>
 
-<p>Зазначене вище грошове фінансування було організовано компанією merlinux GmbH у Фрайбурзі (Німеччина), а потім розподілено між майже дюжиною розробниками.</p>
+<p>The monetary funding mentioned above is mostly organized by merlinux GmbH in
+Freiburg (Germany), and is distributed to more than a dozen contributors world-wide.</p>
 
-<p>Фінансування на 2020/2021 роки ще не визначено. Ми використовуємо кілька можливостей із різними організаціями та партнерами. Ми також розглядаємо можливість попросити пожертви. Насправді ми експериментально запустили <a href="https://liberapay.com/delta.chat/">рахунок пожертвування Delta Chat / Liberapay</a>, але поки що цього не публікували. Наразі було близько 3-4 тис. пожертв на канали пожертв Paypal і біткойн Bjoern’а (оригінальний автор Delta Chat).</p>
+<p>Funding for second half of 2022 and especially for 2023 is an ongoing issue of concern. Apart from applying for more public funding we want to become more independent from government-related funding sources. Please see <a href="https://delta.chat/en/contribute">Delta Chat Contribution channels</a> for both monetary and development related support possibilities.</p>
 
 
 

+ 26 - 11
deltachat-ios/Assets/Help/zh-Hant/help.html

@@ -694,10 +694,16 @@
       </h3>
 
 <ul>
-  <li>兼容,也不兼容。</li>
-  <li>您不能用 Protonmail、Tutanota 或 Criptext 账户来使用 Delta Chat;它们不支持使用 IMAP 接收邮件。</li>
-  <li>无论如何,您都可以使用 Delta Chat 将消息发送给使用 Protonmail、Tutanota 或 Criptext 的人。然而,这些消息不会被端到端加密。这些提供商提供的端到端加密仅能在其平台内部使用,不能用于平台外的任何人。</li>
-  <li>Delta Chat 可以通过任何电子邮件提供商与<a href="https://autocrypt.org/dev-status.html">使用了 Autocrypt 的电子邮件应用</a>进行端到端加密。</li>
+  <li>Yes and No.</li>
+  <li>No, you can not use your Protonmail, Tutanota, or Criptext account with Delta
+Chat; they do not offer receiving mails via IMAP.</li>
+  <li>In any case you can use Delta Chat to send Messages to people who use
+Protonmail, Tutanota, or Criptext. Those messages will not be End-to-End
+encrypted, though. The End-to-End encryption those providers offer is not 
+compatible with <a href="https://autocrypt.org/">Autocrypt</a>, the standard Delta Chat
+uses.</li>
+  <li>Delta Chat can e2e-encrypt through any e-mail provider with any
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="我对技术细节很感兴趣能告诉我更多吗">
@@ -720,28 +726,37 @@
         
       </h3>
 
-<p>首先,Delta Chat 没有接受风险投资,也没有负债累累,更没有承受产生巨额利润或将用户及其朋友和家人卖给广告商(或更糟)的压力。</p>
+<p>Delta Chat 没有接受风险投资,也没有负债累累,更没有承受产生巨额利润或将用户及其朋友和家人卖给广告商(或更糟)的压力。我们宁愿使用(目前来自欧盟和美国的)公共资金,来帮助我们努力建立一个基于自由开源社区开发的、去中心化的、多样化的聊天消息(软件)生态系统。</p>
 
-<p>到目前为止,对 Delta Chat 开发的资助有四个主要来源:</p>
+<p>具体来说,到目前为止,对 Delta Chat 开发的资助有这些来源:</p>
 
 <ul>
   <li>
-    <p>在 2017 年和 2018 年,<a href="https://nextleap.eu">NEXTLEAP</a> 欧洲计划资助了已验证群组和设置联系人协议的研究与实现。</p>
+    <p>在 2017 年和 2018 年,<a href="https://nextleap.eu">NEXTLEAP</a> EU 项目资助了已验证群组和联系人设置协议的研究与实现。他们还通过 <a href="https://autocrypt.org">Autocrypt</a> 帮助集成了端到端加密。</p>
   </li>
   <li>
-    <p><a href="https://opentechfund.org">开放技术基金</a>提供了两笔赠款。2018/2019 年的第一笔赠款(约 20 万美元)显著改善了安卓应用,允许我们发布一个桌面测试版,同时还使我们根据人权方面的用户体验研究进行了功能开发,请参阅我们的结论<a href="https://delta.chat/en/2019-07-19-uxreport">《需求发现与用户体验报告》</a>。2019/2020 年的第二笔赠款(约 30 万美元)仍在进行中。这笔赠款帮助我们发布 Delta/iOS 版本,将核心库转换到 Rust,以及为所有平台提供新功能。您可以在我们的<a href="https://delta.chat/en/blog">博客</a>上找到最新信息。</p>
+    <p><a href="https://opentechfund.org">开放技术基金</a> 2018/2019 年提供的第一笔赠款(约 20 万美元)期间,我们显著改善了安卓应用,发布了第一个桌面测试版,并根据人权方面的用户体验研究进行了功能开发,请参阅我们的结论<a href="https://delta.chat/en/2019-07-19-uxreport">《需求发现与用户体验报告》</a>。2019/2020 年的第二笔赠款(约 30 万美元)对发布 Delta/iOS 版本,将核心库转换到 Rust ,以及为所有平台开发新功能提供了帮助。</p>
   </li>
   <li>
-    <p><a href="https://nlnet.nl/">NLnet 基金会</a>捐赠了 4.6 万欧元,用于完成 Rust/Python 绑定和建立聊天机器人生态系统。</p>
+    <p><a href="https://nlnet.nl/">NLnet 基金会</a>在 2019/2020 年捐赠了 4.6 万欧元,用于完成 Rust/Python 绑定和建立聊天机器人生态系统。</p>
+  </li>
+  <li>
+    <p>在 2021 年,我们从两项下一代互联网提案收到了欧盟的进一步资助,即 <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - 电子邮件提供商可移植性目录</a>(约 9.7 万欧元)和 <a href="https://nlnet.nl/project/EmailPorting/">AEAP - 电子邮件地址移植</a>(约 9 万欧元)。这带来了更好的多账户支持,改进的二维码联系人和群组设置,和所有平台上的多处网络改进。</p>
+  </li>
+  <li>
+    <p>在 2021/2022 年,我们从美国民主、人权和劳工局(DRL)获得 <em>互联网自由</em> 资助(约 50 万美元)。这笔资金资助我们的长期目标是使 Delta Chat 更易于使用,兼容世界上各类电子邮件服务器,以及在经常遭受互联网审查与互联网关闭的地方更具适应力和安全性。</p>
+  </li>
+  <li>
+    <p>有时我们会收到来自个人的一次性捐款,对此我们心存感激。例如在2021 年,一位慷慨的个人向我们银行电汇了四千欧元,主题为“保持良好发展!”。我们使用这些钱款来资助开发聚会,以及应对难以预测或无法从公共资金赠款中报销的临时费用。</p>
   </li>
   <li>
     <p>最后但并非最不重要的是,数位专家与热心人在没有收到或仅收到少量金钱的情况下为 Delta Chat 的开发做出了贡献。没有他们,Delta Chat 不会发展到、甚至无法接近目前的状况。</p>
   </li>
 </ul>
 
-<p>上面提到的钱款资助是由在弗赖堡(德国)的 merlinux GmbH 组织的,然后分发给了十来个贡献者。</p>
+<p>上面提到的钱款资助主要是由在弗赖堡(德国)的 merlinux GmbH 组织的,分发给了来自世界各地的十多个贡献者。</p>
 
-<p>2020/2021 年的资助尚未确定。我们正在与各种组织和合作伙伴一起寻求一些机会。我们也在考虑请求捐款。实际上,我们实验性地开设了一个 <a href="https://liberapay.com/delta.chat/">Delta Chat / Liberapay 捐款账户</a>,但是还未发布。到目前为止,我们还通过 Bjoern(Delta Chat 的原作者)的 PayPal 和比特币捐款渠道收到了 3-4 千欧元。</p>
+<p>2022 年下半年,特别是 2023 年的资助是一个正在被关注的问题。除了申请更多的公共资金外,我们希望能更加独立于政府相关的资金来源。请查看 <a href="https://delta.chat/en/contribute">Delta Chat 贡献渠道</a>来了解钱款和开发相关的支持可能性。</p>