Browse Source

Merge pull request #536 from deltachat/tweak-help

tweak help, add special css rules for dark mode
bjoern 5 years ago
parent
commit
3636840cf9

+ 203 - 166
deltachat-ios/Assets/Help/de/help.html

@@ -20,6 +20,7 @@
       <li><a href="#was-ist-eine-verifizierte-gruppe-weshalb-ist-das-experimentell">Was ist eine verifizierte Gruppe? Weshalb ist das experimentell?</a></li>
       <li><a href="#ich-habe-mich-selbst-versehentlich-gelöscht">Ich habe mich selbst versehentlich gelöscht.</a></li>
       <li><a href="#ich-möchte-keine-nachrichten-einer-gruppe-mehr-empfangen">Ich möchte keine Nachrichten einer Gruppe mehr empfangen.</a></li>
+      <li><a href="#was-bedeuten-die-doppelten--häkchen-in-gruppennachrichten-haben-alle-meine-nachricht-gelesen">Was bedeuten die doppelten  Häkchen in Gruppennachrichten? Haben alle meine Nachricht gelesen?</a></li>
     </ul>
   </li>
   <li><a href="#encryption">Verschlüsselung</a>
@@ -44,26 +45,27 @@
   <li><a href="#multiclient">Mehrere Geräte verwenden</a>
     <ul>
       <li><a href="#kann-ich-delta-chat-auf-mehreren-geräten-zur-selben-zeit-verwenden">Kann ich Delta Chat auf mehreren Geräten zur selben Zeit verwenden?</a></li>
-      <li><a href="#are-there-any-plans-for-introducing-a-delta-chat-web-client">Are there any plans for introducing a Delta Chat Web Client?</a></li>
-      <li><a href="#why-can-i-choose-not-to-watch-the-inbox">Why can I choose not to watch the Inbox?</a></li>
-      <li><a href="#what-is-the-send-copy-to-self-setting-good-for">What is the “Send Copy to Self” setting good for?</a></li>
-      <li><a href="#why-can-i-choose-to-watch-the-sent-folder">Why can I choose to watch the “Sent” folder?</a></li>
-      <li><a href="#why-can-i-choose-not-to-watch-the-deltachat-folder">Why can I choose not to watch the DeltaChat folder?</a></li>
+      <li><a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung">Gibt es Pläne für eine Delta Chat Web Anwendung?</a></li>
+      <li><a href="#warum-kann-ich-ausschalten-den-posteingang-zu-beobachten">Warum kann ich ausschalten, den Posteingang zu beobachten?</a></li>
+      <li><a href="#was-macht-die-option-kopie-an-mich-selbst-senden">Was macht die Option “Kopie an mich selbst senden”?</a></li>
+      <li><a href="#warum-kann-ich-ausschalten-den-gesendet-ordner-zu-beobachten">Warum kann ich ausschalten, den Gesendet-Ordner zu beobachten?</a></li>
+      <li><a href="#warum-kann-ich-ausschalten-den-deltachat-ordner-zu-beobachten">Warum kann ich ausschalten, den DeltaChat-Ordner zu beobachten?</a></li>
     </ul>
   </li>
   <li><a href="#verschiedenes">Verschiedenes</a>
     <ul>
       <li><a href="#funktioniert-delta-chat-mit-meinem-e-mail-anbieter">Funktioniert Delta Chat mit <em>meinem</em> E-Mail-Anbieter?</a></li>
-      <li><a href="#if-delta-chat-uses-e-mail-is-it-really-an-instant-messenger">If Delta Chat uses E-Mail, is it really an <em>Instant</em> Messenger?</a></li>
+      <li><a href="#delta-chat-verwendet-e-mail---ist-es-dann-wirklich-ein-instant-messenger">Delta Chat verwendet E-Mail - ist es dann wirklich ein <em>Instant</em> Messenger?</a></li>
       <li><a href="#is-delta-chat-compatible-with-protonmail--tutanota--criptext">Is Delta Chat compatible with Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos">Ich bin an technischen Details interessiert. Gibt es hierzu weitere Infos?</a></li>
+      <li><a href="#how-are-delta-chat-developments-funded">How are Delta Chat developments funded?</a></li>
     </ul>
   </li>
 </ul>
 
 
 
-<h2 id="was-ist-delta-chat">
+<p class="back"><a href="#top">^</a></p><h2 id="was-ist-delta-chat">
         
         
           Was ist Delta Chat? <a href="#was-ist-delta-chat" class="anchor"></a>
@@ -72,11 +74,11 @@
       </h2>
 
 <p>Delta Chat ist eine neue Chat-App, die mit Autocrypt verschlüsselte E-Mails versendet. 
-<strong>Sie müssen sich nirgendwo anmelden, verwenden Sie einfach Ihr bestehendes E-Mail-Konto bei Delta Chat.</strong></p>
+<strong>Sie müssen sich nirgendwo anmelden, verwenden Sie einfach Ihr bestehendes E-Mail-Konto mit Delta Chat.</strong></p>
 
 <p><img style="float:right; width:50%; max-width:360%; margin:1em;" src="../delta-what-optim.png" /></p>
     
-      <h3 id="wie-finde-ich-leute-mit-denen-ich-chatten-kann">
+      <p class="back"><a href="#top">^</a></p><h3 id="wie-finde-ich-leute-mit-denen-ich-chatten-kann">
         
         
           Wie finde ich Leute, mit denen ich chatten kann? <a href="#wie-finde-ich-leute-mit-denen-ich-chatten-kann" class="anchor"></a>
@@ -84,12 +86,10 @@
         
       </h3>
 
-<p>Mit Delta Chat können Sie an jede existierende E-Mail Adresse schreiben -
-selbst dann, wenn der Empfänger nicht Delta Chat verwendet. Im Gegensatz
-zu anderen Instant Messengern besteht für den Empfänger keine Notwendigkeit,
-dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
+<p>Mit Delta Chat können Sie an jede existierende E-Mail Adresse schreiben. Im Gegensatz
+zu anderen Instant Messengern muss der/die Empfängerin nicht Delta Chat installieren, um mit Ihnen zu kommunizieren. Sie kann einfach ihr gewohntes Mailprogramm nutzen.</p>
     
-      <h3 id="welche-vorteile-hat-delta-chat-gegenüber-anderen-messengern">
+      <p class="back"><a href="#top">^</a></p><h3 id="welche-vorteile-hat-delta-chat-gegenüber-anderen-messengern">
         
         
           Welche Vorteile hat Delta Chat gegenüber anderen Messengern? <a href="#welche-vorteile-hat-delta-chat-gegenüber-anderen-messengern" class="anchor"></a>
@@ -102,17 +102,17 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
   <li>Ihre Daten werden <em>nicht</em> auf einem zentralen Server gespeichert; im Gegensatz zu den meisten anderen Instant Messengern schützt Delta Chat auf diese Weise sogar Ihre Metadaten (wer schreibt mit wem?)</li>
   <li>Sie übermitteln Ihr Adressbuch nicht an Dritte.</li>
   <li><em>Schnell</em> durch die Verwendung von Push-IMAP.</li>
-  <li><em>Größte Nutzerbasis</em> - Empfänger, die Delta Chat <em>nicht</em> nutzen, können ebenfalls erreicht werden.</li>
+  <li><em>Größte Nutzerbasis</em> - EmpfängerInnen, die Delta Chat <em>nicht</em> nutzen, können ebenfalls erreicht werden.</li>
   <li><em>Kompatibel</em> - nicht nur zu sich selbst.</li>
   <li><em>Elegante</em> und <em>einfache</em> Benutzeroberfläche.</li>
   <li><em>Verteiltes</em> System.</li>
-  <li><em>Kein Spam</em> - standardmäßig werden nur Nachrichten bekannter Benutzer angezeigt.</li>
+  <li><em>Kein Spam</em> - standardmäßig werden nur Nachrichten bekannter BenutzerInnen angezeigt.</li>
   <li><em>Zuverlässig</em> - sicher für den professionellen Einsatz.</li>
   <li><em>Vertrauenswürdig</em> - kann sogar für geschäftliche Nachrichten verwendet werden.</li>
   <li>Auf <em>Copyleft</em> und <em>Standards</em> basierende freie Software.</li>
 </ul>
     
-      <h3 id="welche-nachrichten-erscheinen-in-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="welche-nachrichten-erscheinen-in-delta-chat">
         
         
           Welche Nachrichten erscheinen in Delta Chat? <a href="#welche-nachrichten-erscheinen-in-delta-chat" class="anchor"></a>
@@ -130,7 +130,7 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
 
 <p>Andere Nachrichten werden nicht automatisch angezeigt, diese sind im <em>Hauptmenü</em> unter <strong>Kontaktanfragen</strong> zu finden. Wenn gewünscht, kann ein neuer Chat von dort gestartet werden.</p>
     
-      <h3 id="was-ist-mit-spam">
+      <p class="back"><a href="#top">^</a></p><h3 id="was-ist-mit-spam">
         
         
           Was ist mit Spam? <a href="#was-ist-mit-spam" class="anchor"></a>
@@ -144,7 +144,7 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
   <li>Sie können jedoch bei Bedarf jeden Kontakt <strong>sperren</strong>.</li>
 </ul>
     
-      <h3 id="unterstützt-delta-chat-bilder-videos-und-dateianhänge">
+      <p class="back"><a href="#top">^</a></p><h3 id="unterstützt-delta-chat-bilder-videos-und-dateianhänge">
         
         
           Unterstützt Delta Chat Bilder, Videos und Dateianhänge? <a href="#unterstützt-delta-chat-bilder-videos-und-dateianhänge" class="anchor"></a>
@@ -156,7 +156,7 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
   <li>Ja. Neben Klartext werden alle E-Mail-Anhänge als separate Nachrichten angezeigt. Ausgehende Nachrichten erhalten bei Bedarf automatisch Anhänge.</li>
 </ul>
     
-      <h3 id="wer-sieht-mein-profilbild">
+      <p class="back"><a href="#top">^</a></p><h3 id="wer-sieht-mein-profilbild">
         
         
           Wer sieht mein Profilbild? <a href="#wer-sieht-mein-profilbild" class="anchor"></a>
@@ -169,17 +169,17 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
     <p>Sie können ein Profilbild in den Einstellungen hinzufügen. Wenn Sie Ihren Kontakten eine Nachricht senden oder sie über einen QR-Code hinzufügen, sehen diese automatisch Ihr Profilbild.</p>
   </li>
   <li>
-    <p>Kontakte die kein Delta Chat benutzen sehen es als E-Mail Anhang.</p>
+    <p>Kontakte, die kein Delta Chat benutzen, sehen es als E-Mail Anhang.</p>
   </li>
   <li>
     <p>Aus Datenschutzgründen sieht niemand Ihr Profilbild bevor Sie ihnen eine Nachricht senden.</p>
   </li>
   <li>
-    <p>Ihr Profilbild wird nicht mit jeder Nachricht gesendet, aber häufig genug, dass Ihre Kontakte es erhalten werden, sogar wenn diese ein neues Gerät hinzufügen.</p>
+    <p>Ihr Profilbild wird nicht mit jeder Nachricht gesendet, aber häufig genug, so dass Ihre Kontakte es auch dann erhalten, wenn sie ein neues Gerät hinzufügen.</p>
   </li>
 </ul>
     
-      <h3 id="unterstützt-delta-chat-html-e-mails">
+      <p class="back"><a href="#top">^</a></p><h3 id="unterstützt-delta-chat-html-e-mails">
         
         
           Unterstützt Delta Chat HTML E-Mails? <a href="#unterstützt-delta-chat-html-e-mails" class="anchor"></a>
@@ -191,7 +191,7 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
   <li>Ja. Fehlt bei eingehenden E-Mails der “Nur-Text”-Teil, werden HTML E-Mails in der App in Nur-Text umgewandelt. Ausgehende E-Mails verwenden immer Nur-Text.</li>
 </ul>
     
-      <h3 id="weshalb-muss-ich-mein-e-mail-kennwort-in-delta-chat-eingeben-ist-das-sicher">
+      <p class="back"><a href="#top">^</a></p><h3 id="weshalb-muss-ich-mein-e-mail-kennwort-in-delta-chat-eingeben-ist-das-sicher">
         
         
           Weshalb muss ich mein E-Mail Kennwort in Delta Chat eingeben? Ist das sicher? <a href="#weshalb-muss-ich-mein-e-mail-kennwort-in-delta-chat-eingeben-ist-das-sicher" class="anchor"></a>
@@ -201,11 +201,11 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
 
 <p>Genau wie auch bei anderen E-Mail Programmen wie Thunderbird, K9-Mail oder Outlook benötigt das Programm das Passwort, um E-Mails versenden zu können. Selbstverständlich wird das Passwort nur auf Ihrem Gerät gespeichert. Das Passwort wird nur an Ihren E-Mail Anbieter gesendet (wenn Sie sich einloggen), welcher ohnehin Zugriff auf Ihre Mails hat.</p>
 
-<p>Wenn Sie einen E-Mail-Anbieter wie gmail.com oder yandex.ru mit Unterstützung für OAuth2 nutzen, dann wird Ihr Passwort nicht gespeichert. In diesem Fall wird nur ein Zugriffstoken genutzt.</p>
+<p>Wenn Sie einen E-Mail-Anbieter wie gmail.com oder yandex.ru mit Unterstützung für OAuth2 nutzen, dann wird Ihr Passwort nicht auf Ihrem Gerät gespeichert. In diesem Fall wird nur ein Zugriffstoken genutzt.</p>
 
-<p>Da Delta Chat Open Source ist, können Sie den <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/src/login_param.rs">Quellcode</a> überprüfen, wenn Sie sich davon überzeugen möchten, dass Ihre Zugangsdaten sicher gehandhabt werden. Wir freuen uns über Feedback welches unsere App sicherer für all unsere Nutzer macht.</p>
+<p>Da Delta Chat Open Source ist, können Sie den <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/src/login_param.rs">Quellcode</a> überprüfen, wenn Sie sich davon überzeugen möchten, dass Ihre Zugangsdaten sicher gehandhabt werden. Wir freuen uns über Feedback, welches unsere App sicherer für all unsere NutzerInnen macht.</p>
     
-      <h3 id="welche-android-app-berechtigungen-benötigt-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="welche-android-app-berechtigungen-benötigt-delta-chat">
         
         
           Welche Android App-Berechtigungen benötigt Delta Chat? <a href="#welche-android-app-berechtigungen-benötigt-delta-chat" class="anchor"></a>
@@ -215,7 +215,10 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
 
 <ul>
   <li>Kamera <em>(kann verweigert werden)</em>
-  - Bilder und Videos aufnehmen: Um Fotos zu senden</li>
+    <ul>
+      <li>Bilder und Videos aufnehmen: Um Fotos zu senden</li>
+    </ul>
+  </li>
   <li>Kontakte <em>(kann verweigert werden)</em>
     <ul>
       <li>Kontakte lesen: Um Kontakte zum Chatten zu finden</li>
@@ -252,7 +255,7 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
   </li>
 </ul>
     
-      <h2 id="gruppen">
+      <p class="back"><a href="#top">^</a></p><h2 id="gruppen">
         
         
           Gruppen <a href="#gruppen" class="anchor"></a>
@@ -260,7 +263,7 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
         
       </h2>
     
-      <h3 id="eine-gruppe-anlegen">
+      <p class="back"><a href="#top">^</a></p><h3 id="eine-gruppe-anlegen">
         
         
           Eine Gruppe anlegen <a href="#eine-gruppe-anlegen" class="anchor"></a>
@@ -274,7 +277,7 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
   <li>Sobald Sie die <strong>erste Nachricht</strong> in die Gruppe schreiben, werden alle Mitglieder über die neue Gruppe informiert und können in der Gruppe antworten (solange Sie keine Nachricht in die Gruppe schreiben, ist die Gruppe für die Gruppenmitglieder nicht sichtbar).</li>
 </ul>
     
-      <h3 id="mitglieder-zu-einer-gruppe-hinzufügen">
+      <p class="back"><a href="#top">^</a></p><h3 id="mitglieder-zu-einer-gruppe-hinzufügen">
         
         
           Mitglieder zu einer Gruppe hinzufügen <a href="#mitglieder-zu-einer-gruppe-hinzufügen" class="anchor"></a>
@@ -283,11 +286,11 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
       </h3>
 
 <ul>
-  <li>Jedes Gruppenmitglied hat <strong>dieselben Rechte</strong> wie jedes andere. Jeder kann daher jeden löschen oder weitere Mitglieder hinzufügen.</li>
+  <li>Alle Gruppenmitglieder haben <strong>die gleichen Rechte</strong>. Jede/r kann daher Mitglieder löschen oder weitere hinzufügen.</li>
   <li>Um die Mitglieder zu verwalten, einfach in der Gruppe auf den Gruppennamen klicken.</li>
 </ul>
     
-      <h3 id="was-ist-eine-verifizierte-gruppe-weshalb-ist-das-experimentell">
+      <p class="back"><a href="#top">^</a></p><h3 id="was-ist-eine-verifizierte-gruppe-weshalb-ist-das-experimentell">
         
         
           Was ist eine verifizierte Gruppe? Weshalb ist das experimentell? <a href="#was-ist-eine-verifizierte-gruppe-weshalb-ist-das-experimentell" class="anchor"></a>
@@ -297,16 +300,16 @@ dieselbe Anwendung zu installieren, die Sie auch verwenden.</p>
 
 <ul>
   <li>
-    <p>Eine verifizierte Gruppe ist ein Chat, welcher Sicherheit gegen einen aktiven Angreifer garantiert. Alle Nachrichten in einer verifizierten Gruppe sind Ende-zu-Ende verschlüsselt und Gruppenmitglieder können durch Scannen eines “QR-Einladungscodes” beitreten. Alle Gruppenmitglieder sind deshalb durch eine Kette von Einladungen miteinander verbunden, welche kryptografische Konsistenz gegen aktive Netzwerk- oder Anbieterangriffe garantiert.
-Siehe <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermitm.readthedocs.io</a> für die Forschung und Entwicklung hinter dieser Funktion.</p>
+    <p>Eine verifizierte Gruppe ist ein Chat, der Sicherheit vor einem aktiven Angreifer garantiert. Alle Nachrichten in einer verifizierten Gruppe sind Ende-zu-Ende verschlüsselt und Gruppenmitglieder können durch Scannen eines “QR-Einladungscodes” beitreten. Alle Gruppenmitglieder sind deshalb durch eine Kette von Einladungen miteinander verbunden, welche kryptografische Konsistenz gegen aktive Netzwerk- oder Anbieterangriffe garantiert.
+Siehe <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermitm.readthedocs.io</a> für  Forschung und Entwicklung hinter dieser Funktion.</p>
   </li>
   <li>
-    <p>Im Dezember 2019 bleibt eine “verifizierte Gruppe” eine experimentelle Funktion.
- Sie wird kontinuierlich verbessert und viele Fehler wurden seit der ursprünglichen Einführung in 2018 behoben. Allerdings gibt es immernoch Fälle, besonders in großen Gruppen, in denen es zu inkonsistenzen kommen kann oder Nachrichten unleserlich werden. Anfang 2020 wird es eine Sicherheitsüberprüfung geben und es finden einige neue Entwicklungen rund um QR-Beitrittsprotokolle statt. Die Chancen, dass wir das Etikett “Experimentell” in nicht all zu ferner Zukunft entfernen, stehen gut.</p>
+    <p>Seit Dezember 2019 gibt es “verifizierte Gruppe” als experimentelles Feature.
+ Sie wird kontinuierlich verbessert und viele Fehler wurden seit der ursprünglichen Einführung in 2018 behoben. Allerdings gibt es immer noch Fälle, besonders in großen Gruppen, bei denen es zu Inkonsistenzen kommen kann oder Nachrichten unleserlich werden. Anfang 2020 wird es eine Sicherheitsüberprüfung geben und es finden einige neue Entwicklungen rund um QR-Beitrittsprotokolle statt. Die Chancen, dass wir das Etikett “experimentell” in nicht all zu ferner Zukunft entfernen können, stehen gut.</p>
   </li>
 </ul>
     
-      <h3 id="ich-habe-mich-selbst-versehentlich-gelöscht">
+      <p class="back"><a href="#top">^</a></p><h3 id="ich-habe-mich-selbst-versehentlich-gelöscht">
         
         
           Ich habe mich selbst versehentlich gelöscht. <a href="#ich-habe-mich-selbst-versehentlich-gelöscht" class="anchor"></a>
@@ -319,7 +322,7 @@ Siehe <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermit
 Kein Problem, bitten Sie einfach ein anderes Gruppenmitglied in einem normalen Chat, Sie erneut hinzuzufügen.</li>
 </ul>
     
-      <h3 id="ich-möchte-keine-nachrichten-einer-gruppe-mehr-empfangen">
+      <p class="back"><a href="#top">^</a></p><h3 id="ich-möchte-keine-nachrichten-einer-gruppe-mehr-empfangen">
         
         
           Ich möchte keine Nachrichten einer Gruppe mehr empfangen. <a href="#ich-möchte-keine-nachrichten-einer-gruppe-mehr-empfangen" class="anchor"></a>
@@ -337,7 +340,21 @@ Wenn Sie der Gruppe später erneut beitreten möchten, bitten Sie ein anderes Gr
   </li>
 </ul>
     
-      <h2 id="encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="was-bedeuten-die-doppelten--häkchen-in-gruppennachrichten-haben-alle-meine-nachricht-gelesen">
+        
+        
+          Was bedeuten die doppelten  Häkchen in Gruppennachrichten? Haben alle meine Nachricht gelesen? <a href="#was-bedeuten-die-doppelten--häkchen-in-gruppennachrichten-haben-alle-meine-nachricht-gelesen" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>Neben einer Nachricht werden zwei Häkchen angezeigt, wenn sie von mehr als die Hälfte der EmpfängerInnen geöffnet wurde</li>
+  <li>EmpfängerInnen können diese Lesebestätigungen ausschalten</li>
+  <li>Wenn mehr als 50% der EmpfängerInnen einer Gruppe die Lesebestätigungen ausgeschaltet haben, werden zwei Häkchen niemals angezeigt werden - weitere Informationen in <a href="https://delta.chat/en/2017-07-06-read-receipts-and-social-pressure">diesem Blogbeitrag</a>.</li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h2 id="encryption">
         
         
           Verschlüsselung <a href="#encryption" class="anchor"></a>
@@ -345,7 +362,7 @@ Wenn Sie der Gruppe später erneut beitreten möchten, bitten Sie ein anderes Gr
         
       </h2>
     
-      <h3 id="unterstützt-delta-chat-eine-ende-zu-ende-verschlüsselung">
+      <p class="back"><a href="#top">^</a></p><h3 id="unterstützt-delta-chat-eine-ende-zu-ende-verschlüsselung">
         
         
           Unterstützt Delta Chat eine Ende-zu-Ende-Verschlüsselung? <a href="#unterstützt-delta-chat-eine-ende-zu-ende-verschlüsselung" class="anchor"></a>
@@ -354,11 +371,16 @@ Wenn Sie der Gruppe später erneut beitreten möchten, bitten Sie ein anderes Gr
       </h3>
 
 <ul>
-  <li>Ja. Delta Chat implementiert den Autocrypt Level 1-Standard und kann 
-daher Ende-zu-Ende-verschlüsselte Nachrichten mit anderen Autocrypt-fähigen Anwendungen austauschen.</li>
+  <li>
+    <p>Ja. Delta Chat implementiert den Autocrypt Level 1-Standard und kann 
+daher Ende-zu-Ende-verschlüsselte Nachrichten mit anderen Autocrypt-fähigen Anwendungen austauschen.</p>
+  </li>
+  <li>
+    <p>Darüber hinaus unterstützt Delta Chat eine weitere From der Ende-zu-Ende-Verschlüsselung, die sogar gegen aktive Angriffe schützt, siehe “Verifizierte Gruppen” unten.</p>
+  </li>
 </ul>
     
-      <h3 id="was-muss-ich-tun-um-die-ende-zu-ende-verschlüsselung-zu-aktivieren">
+      <p class="back"><a href="#top">^</a></p><h3 id="was-muss-ich-tun-um-die-ende-zu-ende-verschlüsselung-zu-aktivieren">
         
         
           Was muss ich tun, um die Ende-zu-Ende-Verschlüsselung zu aktivieren? <a href="#was-muss-ich-tun-um-die-ende-zu-ende-verschlüsselung-zu-aktivieren" class="anchor"></a>
@@ -373,15 +395,14 @@ daher Ende-zu-Ende-verschlüsselte Nachrichten mit anderen Autocrypt-fähigen An
   <li>
     <p>Delta Chat (und andere <a href="https://autocrypt.org">Autocrypt</a>-kompatible
 E-Mail Anwendungen) tauschen die für eine Ende-zu-Ende-Verschlüsselung benötigten Schlüssel automatisch mit der ersten versendeten Nachricht aus. Danach werden alle folgenden Nachrichten automatisch Ende-zu-Ende verschlüsselt.
-Wenn einer der Chat-Partner eine E-Mail-Anwendung verwendet, die nicht Autocrypt-kompatibel ist, werden Nachrichten solange unverschlüsselt gesendet, bis wieder eine Autocrypt-kompatible Anwendung verfügbar ist.</p>
+Wenn einer der Chat-Kontakte eine E-Mail-Anwendung verwendet, die nicht Autocrypt-kompatibel ist, werden Nachrichten so lange unverschlüsselt gesendet, bis wieder eine Autocrypt-kompatible Anwendung verfügbar ist.</p>
   </li>
   <li>
-    <p>Falls Sie die Ende-zu-Ende-Verschlüsselung <em>abschalten</em> möchten, 
-deaktivieren Sie die entsprechende Einstellungen unter “Einstellungen / Erweitert”.</p>
+    <p>Wenn Sie als Standardeinstellung keine die Ende-zu-Ende-Verschüsselung verwenden möchten, können Sie dies in den Einstellungen festlegen.</p>
   </li>
 </ul>
     
-      <h3 id="wird-ohne-ende-zu-ende-verschlüsselung-gar-nicht-verschlüsselt">
+      <p class="back"><a href="#top">^</a></p><h3 id="wird-ohne-ende-zu-ende-verschlüsselung-gar-nicht-verschlüsselt">
         
         
           Wird ohne Ende-zu-Ende-Verschlüsselung gar nicht verschlüsselt? <a href="#wird-ohne-ende-zu-ende-verschlüsselung-gar-nicht-verschlüsselt" class="anchor"></a>
@@ -391,10 +412,10 @@ deaktivieren Sie die entsprechende Einstellungen unter “Einstellungen / Erweit
 
 <ul>
   <li>Mit den meisten E-Mail-Servern stellt Delta Chat eine <em>transportverschlüsselte</em> Verbindung her (<a href="https://de.wikipedia.org/wiki/Transport_Layer_Security">TLS</a>).
- Dies schützt nur die Verbindung zwischen Ihrem Gerät und Ihrem E-Mail-Server. Wohingegen Ende-zu-Ende-Verschlüsselung die gesamte Kommunikation zwischen Ihrem Gerät und dem Gerät eines Freundes schützt.</li>
+ Dies schützt nur die Verbindung zwischen Ihrem Gerät und Ihrem E-Mail-Server. Wohingegen Ende-zu-Ende-Verschlüsselung die gesamte Kommunikation zwischen Ihrem Gerät und dem Empfangsgerät  schützt.</li>
 </ul>
     
-      <h3 id="wie-kann-ich-den-kryptografischen-zustand-mit-einem-absender-überprüfen">
+      <p class="back"><a href="#top">^</a></p><h3 id="wie-kann-ich-den-kryptografischen-zustand-mit-einem-absender-überprüfen">
         
         
           Wie kann ich den kryptografischen Zustand mit einem Absender überprüfen? <a href="#wie-kann-ich-den-kryptografischen-zustand-mit-einem-absender-überprüfen" class="anchor"></a>
@@ -402,24 +423,22 @@ deaktivieren Sie die entsprechende Einstellungen unter “Einstellungen / Erweit
         
       </h3>
 
-<p>Das Benutzerprofil zeigt einige zusätzliche Informationen:</p>
+<p>Das Userprofil zeigt einige zusätzliche Informationen:</p>
+
+<p>-Tippen Sie auf “QR Einladungscode” in Android und dann auf einem anderen Gerät die Schaltfläche “QR-Code scannen”, um den Code zu scannen. Wenn beide Geräte online sind, 
+wird (falls er noch nicht existiert) ein Chat-Kanal  eingerichtet und die Schlüssel für die Verschlüsselung werden überprüft. Beide Kontakte erhalten eine “Absender verifiziert” Systemnachricht in ihrem 1:1 Chat.</p>
 
 <ul>
-  <li>
-    <p>Sie können auf “QR Einladungscode” in Android tippen und dann auf einem anderen Gerät die Schaltfläche “QR-Code scannen” 
-verwenden, um diesen Code zu scannen. Wenn beide Geräte online sind, 
-werden sie (falls er noch nicht existiert) einen Chat-Kanal miteinander einrichten und auch die Schlüssel für die Verschlüsselung werden überprüft. Beide werden eine “Absender verifiziert” Systemnachricht in ihrem 1:1 Chat sehen.</p>
-  </li>
   <li>
     <p>Für die Ende-zu-Ende-Verschlüsselung zeigt Delta Chat dort zwei Fingerabdrücke an. 
-Wenn auf dem Gerät Ihres Chatpartners dieselben Fingerabdrücke angezeigt werden, ist die Verbindung sicher.</p>
+Wenn auf dem Gerät Ihres Chatkontakts dieselben Fingerabdrücke angezeigt werden, ist die Verbindung sicher.</p>
   </li>
   <li>
     <p>Bei der Transportverschlüsselung wird dieser Zustand dort nur angezeigt.</p>
   </li>
 </ul>
     
-      <h2 id="wie-kann-ich-die-verschlüsselung-der-nachrichten-überprüfen">
+      <p class="back"><a href="#top">^</a></p><h2 id="wie-kann-ich-die-verschlüsselung-der-nachrichten-überprüfen">
         
         
           Wie kann ich die Verschlüsselung der Nachrichten überprüfen? <a href="#wie-kann-ich-die-verschlüsselung-der-nachrichten-überprüfen" class="anchor"></a>
@@ -436,7 +455,7 @@ Wenn auf dem Gerät Ihres Chatpartners dieselben Fingerabdrücke angezeigt werde
   </li>
 </ul>
     
-      <h3 id="welches-verfahren-wird-für-die-ende-zu-ende-verschlüsselung-verwendet">
+      <p class="back"><a href="#top">^</a></p><h3 id="welches-verfahren-wird-für-die-ende-zu-ende-verschlüsselung-verwendet">
         
         
           Welches Verfahren wird für die Ende-zu-Ende-Verschlüsselung verwendet? <a href="#welches-verfahren-wird-für-die-ende-zu-ende-verschlüsselung-verwendet" class="anchor"></a>
@@ -445,12 +464,16 @@ Wenn auf dem Gerät Ihres Chatpartners dieselben Fingerabdrücke angezeigt werde
       </h3>
 
 <ul>
-  <li><a href="https://autocrypt.org">Autocrypt</a> wird verwendet um Ende-zu-Ende-Verschlüsselung mit anderen Delta Chat und anderen Autocrypt-fähigen E-Mail Apps herzustellen. 
-Autocrypt verwendet einen Teil der OpenPGP-Funktionalität.
-Außerdem implementiert Delta Chat “Anti-MITM”-Protokolle, welche über den opportunistischen Basisschutz von Autocrypt hinausgehen, um Schutz vor aktiven Netzwerkangriffen zu erreichen. Lesen Sie dazu die Fragen über “verifizierte Gruppen”.</li>
+  <li>
+    <p><a href="https://autocrypt.org">Autocrypt</a> wird verwendet um eine Ende-zu-Ende-Verschüsselung mit anderen Delta Chats oder anderen Autocrypt-kompatiblen Apps aufzubauen.
+Autocrypt verwendet eine begrenzte Teilmenge des OpenPGP-Standards.</p>
+  </li>
+  <li>
+    <p>Um vor aktivien Netzwekangriffen zu schützen, implementiert Delta Chat <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermitm Kontakt-Setup- und Verifizierte-Gruppen-Protokolle</a>. Dies geht über den Basisschutz der opportunistischen Verschlüsselung von Autocrypt Level 1 hinaus - behält aber dessen Einfachheit bei.</p>
+  </li>
 </ul>
     
-      <h3 id="was-ist-der-unterschied-zwischen-verifizerten-gruppen-und-11-chats-mit-verifizierten-kontakten">
+      <p class="back"><a href="#top">^</a></p><h3 id="was-ist-der-unterschied-zwischen-verifizerten-gruppen-und-11-chats-mit-verifizierten-kontakten">
         
         
           Was ist der Unterschied zwischen verifizerten Gruppen und 1:1 Chats mit verifizierten Kontakten? <a href="#was-ist-der-unterschied-zwischen-verifizerten-gruppen-und-11-chats-mit-verifizierten-kontakten" class="anchor"></a>
@@ -467,11 +490,11 @@ Außerdem implementiert Delta Chat “Anti-MITM”-Protokolle, welche über den
 Sie können darauf vertrauen, dass alle Nachrichten in diesem verifizierten Chat nicht von Dritten verändert oder gelesen wurden.</p>
   </li>
   <li>
-    <p>1:1 Chats sind opportunistisch, damit die Nutzer immer miteinander kommunizieren können, egal ob sie E-Mail-Programme oder Geräte wechseln. Deshalb sehen Sie manchmal kein Verifikationshäkchen, sogar nicht, wenn Sie den Kontakt verifiziert haben.</p>
+    <p>In 1:1 Chats können NutzerInnen auch dann miteinander kommunizieren, wenn sie ihre E-Mail-Programme, Einstellungen oder Geräte gewechselt haben. Deshalb sehen Sie in diesen Chats kein Verifikationshäkchen, auch wenn Sie den Kontakt verifiziert haben.</p>
   </li>
 </ul>
     
-      <h3 id="unterstützt-delta-chat-perfect-forward-secrecy">
+      <p class="back"><a href="#top">^</a></p><h3 id="unterstützt-delta-chat-perfect-forward-secrecy">
         
         
           Unterstützt Delta Chat Perfect Forward Secrecy? <a href="#unterstützt-delta-chat-perfect-forward-secrecy" class="anchor"></a>
@@ -482,19 +505,19 @@ Sie können darauf vertrauen, dass alle Nachrichten in diesem verifizierten Chat
 <ul>
   <li>
     <p>Nein, OpenPGP unterstützt Perfect Forward Secrecy nicht. Perfect Forward Secrecy
-arbeitet Sitzungsorientiert, aber E-Mail ist von Natur aus asynchron und wird meist unabhängig von verschiedenen Geräten aus verwendet.
-Das bedeutet, dass wenn Ihr geheimer Schlüssel aus Delta Chat bekannt wird und jemand eine Aufzeichnung Ihrer versendeten und empfangenen verschlüsselten Nachrichten besitzt, dieser in der Lage ist die Nachrichten zu lesen.</p>
+arbeitet sitzungsorientiert, aber E-Mail ist von Natur aus asynchron und wird oft von verschiedenen Geräten aus verwendet.
+Wenn Ihr geheimer Schlüssel aus Delta Chat Dritten bekannt wird und jemand eine Aufzeichnung Ihrer versendeten und empfangenen verschlüsselten Nachrichten besitzt, ist dieser in der Lage, die Nachrichten zu lesen.</p>
   </li>
   <li>
-    <p>Jemand der ihr Telefon beschlagnahmt oder hackt, kann typischerweise alle Nachrichten lesen - unabhängig davon ob Perfect Forward Secrecy verwendet wird oder nicht.
-Der Zugriff auf ein einzelnes Gerät eines Gruppenmitglieds verrät viel über den sozialen Graphen. Verwendet man E-Mail-Adressen, welche sich nicht einfach zu Personen zurückverfolgen lassen, hilft das Gruppenmitgliedern besser, sich vor der den Folgen der Beschlagnahmung eines Geräts zu schützen.</p>
+    <p>Wird Ihr Telefon beschlagnahmt oder gehackt, können alle Nachrichten gelesen werden- unabhängig davon, ob Perfect Forward Secrecy verwendet wird oder nicht.
+Der Zugriff auf ein einzelnes Gerät eines Gruppenmitglieds verrät viel über den sozialen Graphen. Verwendet man E-Mail-Adressen, die sich nicht einfach auf Personen zurückverfolgen lassen, hilft das den Gruppenmitgliedern, sich vor der den Folgen der Beschlagnahmung eines Geräts zu schützen.</p>
   </li>
   <li>
-    <p>Wir zeichnen Wege auf, um Kommunikation besser vor dem Fall eines beschlagnahmten Geräts zu schützen.</p>
+    <p>Wir zeigen Wege auf, wie man im Falle einer Beschlagnahme eines Gerätes die Kommunikationen besser schützen kann.</p>
   </li>
 </ul>
     
-      <h3 id="wie-schützt-delta-chat-meine-metadaten">
+      <p class="back"><a href="#top">^</a></p><h3 id="wie-schützt-delta-chat-meine-metadaten">
         
         
           Wie schützt Delta Chat meine Metadaten? <a href="#wie-schützt-delta-chat-meine-metadaten" class="anchor"></a>
@@ -504,18 +527,18 @@ Der Zugriff auf ein einzelnes Gerät eines Gruppenmitglieds verrät viel über d
 
 <ul>
   <li>
-    <p>Da Delta Chat ein dezentralisierter Messenger ist, werden Metadaten der Delta Chat Nutzer nicht auf einem zentralen Server gespeichert. Allerdings werden diese auf den Mailservern des Absenders und des Empfängers einer Nachricht gespeichert.</p>
+    <p>Da Delta Chat ein dezentraler Messenger ist, werden Metadaten nicht auf einem zentralen Server gespeichert. Allerdings werden diese auf den Mailservern des Absenders und des Empfängers einer Nachricht gespeichert.</p>
   </li>
   <li>
-    <p>Jeder Mailserver kann derzeit durch inspizieren der unverschlüsselten An- und CC-Felder sehen, wer eine Nachricht an wen gesendet hat und welche E-Mail-Adressen teil einer Gruppe sind. Delta Chat selbst könnte unverschlüsselte An- und CC-Felder vollständig vermeiden und diese immer nur in den verschlüsselten  Teil einer Nachricht schreiben. Lesen Sie dazu auch  <a href="https://github.com/deltachat/deltachat-core-rust/issues/1032">Avoid sending To/CC headers for verified groups</a>.
-Die Hauptsorge bei opportunistischen Chats ist wie andere Mail Apps, welche an einem Chat teilnehmen könnten, damit umgehen.</p>
+    <p>Jeder Mailserver kann derzeit über die unverschlüsselten An- und CC-Feldern herausfinden, wer eine Nachricht an wen gesendet hat und welche E-Mail-Adressen Teil einer Gruppe sind. Delta Chat selbst kann unverschlüsselte An- und CC-Felder vollständig vermeiden und diese immer nur in den verschlüsselten  Teil einer Nachricht schreiben. Lesen Sie dazu auch  <a href="https://github.com/deltachat/deltachat-core-rust/issues/1032">Avoid sending To/CC headers for verified groups</a>.
+Bei normalen 1:1 Chats ist das Hauptproblem, wie andere Mail-Programme, die womöglich Teil der Chatkommunikation sind, damit umgehen</p>
   </li>
   <li>
-    <p>Viele weitere E-Mail-Header, insbesondere der “Subject” Header, sind Ende-zu-Ende verschlüsselt. Lese dazu auch den kommenden <a href="https://datatracker.ietf.org/doc/draft-autocrypt-lamps-protected-headers/">IETF RFC</a>.</p>
+    <p>Viele weitere E-Mail-Header, insbesondere der “Betreff” Header, sind Ende-zu-Ende verschlüsselt. Lesen Sie dazu auch  <a href="https://datatracker.ietf.org/doc/draft-autocrypt-lamps-protected-headers/">IETF RFC</a>.</p>
   </li>
 </ul>
     
-      <h3 id="kann-ich-meinen-existierenden-privaten-schlüssel-weiter-verwenden">
+      <p class="back"><a href="#top">^</a></p><h3 id="kann-ich-meinen-existierenden-privaten-schlüssel-weiter-verwenden">
         
         
           Kann ich meinen existierenden privaten Schlüssel weiter verwenden? <a href="#kann-ich-meinen-existierenden-privaten-schlüssel-weiter-verwenden" class="anchor"></a>
@@ -529,13 +552,13 @@ Die Hauptsorge bei opportunistischen Chats ist wie andere Mail Apps, welche an e
   </li>
   <li>
     <p>Alternativ können Sie den Schlüssel manuell unter “Einstellungen / Erweitert / Schlüssel verwalten” importieren. 
-Achtung: Der private Schlüssel darf <em>nicht</em> mit einem Passwort geschützt sein bzw. muss dieses zuvor entfernt werden.</p>
+Achtung: Der private Schlüssel darf <em>nicht</em> mit einem Passwort geschützt sein bzw. dieses muss zuvor entfernt werden.</p>
   </li>
 </ul>
 
-<p>Wenn Sie keinen Schlüssel besitzen oder nicht einmal wissen, dass Sie einen benötigen - keine Sorge: Delta Chat erstellt einen Schlüssel, wenn er benötigt wird.</p>
+<p>Wenn Sie keinen Schlüssel besitzen oder nicht einmal wissen, dass Sie einen benötigen - keine Sorge: Delta Chat erstellt einen Schlüssel, wenn er benötigt wird. Sie müssen nichts weiter tun.</p>
     
-      <h3 id="ich-kann-meinen-existierenden-pgp-schlüssel-nicht-in-delta-chat-importieren">
+      <p class="back"><a href="#top">^</a></p><h3 id="ich-kann-meinen-existierenden-pgp-schlüssel-nicht-in-delta-chat-importieren">
         
         
           Ich kann meinen existierenden PGP-Schlüssel nicht in Delta Chat importieren. <a href="#ich-kann-meinen-existierenden-pgp-schlüssel-nicht-in-delta-chat-importieren" class="anchor"></a>
@@ -543,13 +566,13 @@ Achtung: Der private Schlüssel darf <em>nicht</em> mit einem Passwort geschütz
         
       </h3>
 
-<p>Mit sehr großer Wahrscheinlichkeit besteht das Problem darin, dass Ihr Schlüssel verschlüsselt ist und/oder ein Passwort verwendet. Solche Schlüssel werden von Delta Chat nicht unterstützt. Bitte entfernen Sie die Verschlüsselung und das Passwort und versuchen Sie den Import danach erneut.
+<p>Wahrscheinlich ist Ihr Schlüssel verschlüsselt und/oder mit einem Passwort geschützt. Solche Schlüssel werden von Delta Chat nicht unterstützt. Bitte entfernen Sie die Verschlüsselung und das Passwort und versuchen Sie den Import danach erneut.
 Wenn Sie das Passwort nicht entfernen möchten, dann müssen Sie einen E-Mail-Alias zur Nutzung mit Delta Chat anlegen, sodass der Schlüssel von Delta Chat mit diesem E-Mail-Alias verknüpft ist.</p>
 
 <p>Grundsätzlich sollte Delta Chat “gängige” private Schlüsselformate unterstützen, allerdings
 ist es unwahrscheinlich, dass wir 100% aller privaten Schlüssel aus sämtlichen Quellen unterstützen. 
 Dies ist auch nicht das Hauptaugenmerk von Delta Chat (tatsächlich besitzt die große Mehrheit der Delta
- Chat Benutzer keinen Schlüssel, bevor sie Delta Chat verwenden). 
+ Chat Benutzer keinen Schlüssel, bevor sie Delta Chat verwendet). 
 Wir versuchen jedoch, private Schlüssel aus anderen Quellen so gut wie möglich zu unterstützen.</p>
 
 <p>Das Entfernen des Passworts vom privaten Schlüssel ist abhängig von der Software, mit der Sie Ihre PGP-Schlüssel verwalten. 
@@ -557,7 +580,7 @@ Bei Enigmail können Sie Ihr Passwort im Fenster Schlüsselverwaltung auf einen
 Bei GnuPG können Sie es über die <a href="https://github.com/deltachat/deltachat-android/issues/98#issuecomment-378383429">Kommandozeile einstellen</a>.
 Für andere Programme können Sie online eine Lösung finden.</p>
     
-      <h3 id="warum-verwendet-delta-chat-kein-pep-pretty-easy-privacy">
+      <p class="back"><a href="#top">^</a></p><h3 id="warum-verwendet-delta-chat-kein-pep-pretty-easy-privacy">
         
         
           Warum verwendet Delta Chat kein pEp (pretty easy privacy)? <a href="#warum-verwendet-delta-chat-kein-pep-pretty-easy-privacy" class="anchor"></a>
@@ -566,11 +589,11 @@ Für andere Programme können Sie online eine Lösung finden.</p>
       </h3>
 
 <ul>
-  <li>Delta Chat verwendet den Autocrypt Ende-zu-Ende-Verschlüsselungsstandard. Lese die <a href="https://autocrypt.org/faq.html#how-does-autocrypt-differ-from-pep">Autocrypt
+  <li>Delta Chat verwendet den Autocrypt Ende-zu-Ende-Verschlüsselungsstandard. Lesen Sie die <a href="https://autocrypt.org/faq.html#how-does-autocrypt-differ-from-pep">Autocrypt
 FAQ</a> für eine Unterscheidung zwischen Autocrypt und pEp.</li>
 </ul>
     
-      <h2 id="multiclient">
+      <p class="back"><a href="#top">^</a></p><h2 id="multiclient">
         
         
           Mehrere Geräte verwenden <a href="#multiclient" class="anchor"></a>
@@ -578,7 +601,7 @@ FAQ</a> für eine Unterscheidung zwischen Autocrypt und pEp.</li>
         
       </h2>
     
-      <h3 id="kann-ich-delta-chat-auf-mehreren-geräten-zur-selben-zeit-verwenden">
+      <p class="back"><a href="#top">^</a></p><h3 id="kann-ich-delta-chat-auf-mehreren-geräten-zur-selben-zeit-verwenden">
         
         
           Kann ich Delta Chat auf mehreren Geräten zur selben Zeit verwenden? <a href="#kann-ich-delta-chat-auf-mehreren-geräten-zur-selben-zeit-verwenden" class="anchor"></a>
@@ -586,115 +609,84 @@ FAQ</a> für eine Unterscheidung zwischen Autocrypt und pEp.</li>
         
       </h3>
 
-<p>Wenn Sie <strong>dasselbe Konto</strong> auf unterschiedlichen (Autocrypt-fähigen) Geräten verwenden möchten, muss die Verschlüsselungsfunktion synchronisiert werden:</p>
+<p>Möchten Sie einen Account auf verschiedenen Geräten nutzen, müssen Sie in Delta Chat auf dem “alten” Gerät ein Backup erstellen und dieses auf dem neuen importieren:</p>
 
 <ul>
-  <li>
-    <p>Wählen Sie auf dem ersten Gerät “Weitere Einstellungen / Autocrypt-Setup-Nachricht versenden”
-und klicken Sie, bis ein “Setup-Code” angezeigt wird.</p>
-  </li>
-  <li>
-    <p>Warten Sie auf dem anderen Gerät, bis die “Autocrypt Setup Nachricht” ankommt
-und klicken Sie diese an. Eine Abfrage des Sicherheitscodes sollte nun erscheinen.</p>
-  </li>
-  <li>
-    <p>Die Synchronisation ist nun erfolgreich und Sie können beiden Geräte
-zum Senden und Empfangen von Ende-zu-Ende-verschlüsselten Nachrichten an Ihre Kommunikationspartner verwenden.</p>
-  </li>
+  <li>Wählen Sie auf dem alten Devise “Einstellungen / Chats und Medien / Backup”. Geben Sie Ihre Entsperrungs-PIN, -Muster oder -Passwort ein. Klicken Sie dann auf “Start Backup”. Die Backup-Datei wird auf Ihrem Gerät gespeichert. Nun übertragen Sie die Datei auf Ihr neues Gerät.</li>
+  <li>Rufen Sie auf Ihrem neuen Gerät Delta Chat auf und wählen Sie nun auf dem Startbildschirm “Importiere Backup” - anstatt sich mit Ihrer E-Mail-Adresse einzuloggen. Ihre Chatkonversationen, Schlüssel und Medien werden nun auf das neue Gerät kopiert.</li>
+  <li>Die Geräte sind nun synchronisiert und Sie können beide für das Senden und Empfangen von Ende-zu-Ende-verschlüsselten Nachrichten mit Ihren Chat-Kontakten nutzen.</li>
 </ul>
     
-      <h3 id="are-there-any-plans-for-introducing-a-delta-chat-web-client">
+      <p class="back"><a href="#top">^</a></p><h3 id="gibt-es-pläne-für-eine-delta-chat-web-anwendung">
         
         
-          Are there any plans for introducing a Delta Chat Web Client? <a href="#are-there-any-plans-for-introducing-a-delta-chat-web-client" class="anchor"></a>
+          Gibt es Pläne für eine Delta Chat Web Anwendung? <a href="#gibt-es-pläne-für-eine-delta-chat-web-anwendung" class="anchor"></a>
         
         
       </h3>
 
 <ul>
-  <li>There are no immediate plans but some preliminary thoughts.</li>
-  <li>There are 2-3 avenues for introducing a Delta Chat Web Client, but all are
-significant work. For now, we focus on getting stable releases into all
-appstores (Google Play/iOS/Windows/macOS/Linux repositories) as native apps.</li>
-  <li>If you need a Web Client, because you are not allowed to install software on
-the computer you work with, you can use the portable Windows Desktop Client,
-or the AppImage for Linux. You can find them on
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+  <li>Es gibt keine direkten Pläne, aber einige vorläufige Gedanken.</li>
+  <li>Es gibt 2-3 Möglichkeiten, einen Delta Chat Web Client einzuführen, aber sie bedeuten alle immense Arbeit. Im Moment fokussieren wir uns darauf, stabile native Apps in den Appstores (Google Play/iOS/Windows/macOS/Linux repositories) anzubieten.</li>
+  <li>Sollten Sie einen Web-Client benötigen, weil Sie auf Ihrem Arbeitsrechner keine Software installieren dürfen, können Sie den Windows Desktop Client bzw. Applmage für Linux nutzen. Sie finden diese unter  <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
     
-      <h3 id="why-can-i-choose-not-to-watch-the-inbox">
+      <p class="back"><a href="#top">^</a></p><h3 id="warum-kann-ich-ausschalten-den-posteingang-zu-beobachten">
         
         
-          Why can I choose not to watch the Inbox? <a href="#why-can-i-choose-not-to-watch-the-inbox" class="anchor"></a>
+          Warum kann ich ausschalten, den Posteingang zu beobachten? <a href="#warum-kann-ich-ausschalten-den-posteingang-zu-beobachten" class="anchor"></a>
         
         
       </h3>
 
-<p>This is an experimental setting for some people who are experimenting with
-server-side rules. Not all providers support this, but with some you can move
-all mails with a “Chat-Version” header to the DeltaChat folder. Normally, this
-would be done by the Delta Chat app.</p>
+<p>Dies ist eine experimentelle Einstellung für BenutzerInnen, die  serverseitigen Regeln verwenden möchten. Dies wird nicht von allen Providern unterstützt, aber bei einigen können Sie Nachrichten mit einem “Chat-Version” Header vom Server in den DeltaChat-Ordner verschieben - normalerweise wird dies von der Delta Chat App erledigt.</p>
 
-<p>Watching the Inbox makes sense to turn off, if you have both:</p>
+<p>“Posteingang beobachten” auszuschalten ist sinnvoll, wenn die folgenden Punkte erfüllt sind:</p>
 
 <ul>
-  <li>enabled a server-side rule to move all messages with Chat-Version header to the DeltaChat folder, and</li>
-  <li>have set the “Show classic emails” setting to “no, chats only”.</li>
+  <li>es existiert eine serverseitige Regel, Nachrichten mit einem Chat-Version-Header in den DeltaChat-Ordner zu kopieren</li>
+  <li>“Normale E-Mails anzeigen” ist auf “Nein, nur Chats” gesetzt</li>
 </ul>
 
-<p>In this case, Delta Chat doesn’t need to watch the Inbox.</p>
+<p>In diesem Fall muss Delta Chat nicht den Posteingang beobachten.</p>
     
-      <h3 id="what-is-the-send-copy-to-self-setting-good-for">
+      <p class="back"><a href="#top">^</a></p><h3 id="was-macht-die-option-kopie-an-mich-selbst-senden">
         
         
-          What is the “Send Copy to Self” setting good for? <a href="#what-is-the-send-copy-to-self-setting-good-for" class="anchor"></a>
+          Was macht die Option “Kopie an mich selbst senden”? <a href="#was-macht-die-option-kopie-an-mich-selbst-senden" class="anchor"></a>
         
         
       </h3>
 
-<p>Sending a copy of your messages to yourself ensures that you receive your own
-messages on all devices. If you have multiple devices and don’t turn it on, you
-see only the messages from other people, and the messages you send from the
-current device.</p>
+<p>Das Senden einer Kopie an Sie selbst stellt sicher, dass Sie Ihre eigenen Nachrichten auf all Ihren Geräten sehen. Wenn Sie mehrere Geräte haben, aber die Option nicht eingeschaltet ist, sehen Sie nur die Nachrichten, die andere Ihnen geschickt haben und die ausgehenden Nachrichten, die auf dem Gerät selbst verschickt wurden.</p>
 
-<p>The copy is send to the Inbox, and then moved to the DeltaChat folder; it’s not
-put into the “Sent” folder. Delta Chat <em>never</em> uploads anything to the Sent
-folder because this would mean uploading a message twice (once through SMTP,
-and once through IMAP to Sent folder).</p>
+<p>Die Kopie wird dabei an den Posteingang verschickt und wird von dort in den DeltaChat-Ordner verschoben. Delta Chat lädt <em>niemals</em> etwas in den Gesendet-Ordner hoch, weil dies bedeuten würde, dass eine Nachricht zweimal hochgeladen werden müsste (einmal SMTP und dann IMAP in den Gesendet-Ordner)</p>
 
-<p>The default setting for copy-to-self is “no”.</p>
+<p>Die Standardeinstellung für “Kopie an mich selbst senden” ist “Aus”.</p>
     
-      <h3 id="why-can-i-choose-to-watch-the-sent-folder">
+      <p class="back"><a href="#top">^</a></p><h3 id="warum-kann-ich-ausschalten-den-gesendet-ordner-zu-beobachten">
         
         
-          Why can I choose to watch the “Sent” folder? <a href="#why-can-i-choose-to-watch-the-sent-folder" class="anchor"></a>
+          Warum kann ich ausschalten, den Gesendet-Ordner zu beobachten? <a href="#warum-kann-ich-ausschalten-den-gesendet-ordner-zu-beobachten" class="anchor"></a>
         
         
       </h3>
 
-<p>The only reason one wants to watch the Sent folder is if you are using another
-mail program (like Thunderbird) next to your Delta Chat app, and want your MUA
-to participate in chat conversations.</p>
+<p>Der einzige Grund, den Gesendet-Ordner zu beobachten, ist, wenn Sie ein weiteres E-Mail-Programm (wie Thunderbird) mit dem selben E-Mail-Account verwenden und dieses an den Chats teilhaben soll.</p>
 
-<p>However, we recommend to use the Delta Chat Desktop Client; you can download it
-on <a href="https://get.delta.chat">get.delta.chat</a>. The option to watch the “Sent”
-folder might go away in the future. It was introduced at a time where there was
-no Delta Chat Desktop client available on all platforms.</p>
+<p>Wir empfehlen für diesen Zweck aber “Delta Chat Desktop” - Sie können die App unter <a href="https://get.delta.chat">get.delta.chat</a> herunterladen. Möglicherweise wird die Option “Gesendet-Ordner beobachten” zukünftig wegfallen; sie kommt aus einer Zeit, als Delta Chat Desktop noch nicht auf allen Plattformen zur Verfügung stand.</p>
     
-      <h3 id="why-can-i-choose-not-to-watch-the-deltachat-folder">
+      <p class="back"><a href="#top">^</a></p><h3 id="warum-kann-ich-ausschalten-den-deltachat-ordner-zu-beobachten">
         
         
-          Why can I choose not to watch the DeltaChat folder? <a href="#why-can-i-choose-not-to-watch-the-deltachat-folder" class="anchor"></a>
+          Warum kann ich ausschalten, den DeltaChat-Ordner zu beobachten? <a href="#warum-kann-ich-ausschalten-den-deltachat-ordner-zu-beobachten" class="anchor"></a>
         
         
       </h3>
 
-<p>Some people use Delta Chat as a regular email client, and want to use the Inbox
-folder for their mail, instead of the DeltaChat folder. If you disable “Watch
-DeltaChat folder”, you should also disable “move chat messages to DeltaChat”.
-Otherwise, deleting messages or multi-device setups might not work properly.</p>
+<p>Einige BenutzerInnen verwenden Delta Chat als reguläres E-Mail-Programm und möchten lieber den Posteingang anstatt des DeltaChat-Ordners verwenden. Wenn Sie “DeltaChat-Ordner beobachten” ausschalten, sollten Sie auch “Autom. Verschieben in den DeltaChat-Ordner” ausschalten - andernfalls funktioniert die Verwendung auf mehreren Geräten möglicherweise nicht wie erwartet.</p>
     
-      <h2 id="verschiedenes">
+      <p class="back"><a href="#top">^</a></p><h2 id="verschiedenes">
         
         
           Verschiedenes <a href="#verschiedenes" class="anchor"></a>
@@ -702,7 +694,7 @@ Otherwise, deleting messages or multi-device setups might not work properly.</p>
         
       </h2>
     
-      <h3 id="funktioniert-delta-chat-mit-meinem-e-mail-anbieter">
+      <p class="back"><a href="#top">^</a></p><h3 id="funktioniert-delta-chat-mit-meinem-e-mail-anbieter">
         
         
           Funktioniert Delta Chat mit <em>meinem</em> E-Mail-Anbieter? <a href="#funktioniert-delta-chat-mit-meinem-e-mail-anbieter" class="anchor"></a>
@@ -715,32 +707,23 @@ Otherwise, deleting messages or multi-device setups might not work properly.</p>
   <li>Allerdings benötigen einige Anbieter besondere Optionen, um ordnungsgemäß zu funktionieren; eine von Nutzern erstellte Sammlung zu einigen Optionen findet sich unter <a href="https://providers.delta.chat">Provider Overview</a>.</li>
 </ul>
     
-      <h3 id="if-delta-chat-uses-e-mail-is-it-really-an-instant-messenger">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-verwendet-e-mail---ist-es-dann-wirklich-ein-instant-messenger">
         
         
-          If Delta Chat uses E-Mail, is it really an <em>Instant</em> Messenger? <a href="#if-delta-chat-uses-e-mail-is-it-really-an-instant-messenger" class="anchor"></a>
+          Delta Chat verwendet E-Mail - ist es dann wirklich ein <em>Instant</em> Messenger? <a href="#delta-chat-verwendet-e-mail---ist-es-dann-wirklich-ein-instant-messenger" class="anchor"></a>
         
         
       </h3>
 
 <ul>
-  <li>Sending and receiving messages takes a few seconds, typically. Sometimes
-there are cases where it takes longer but that is arguably true as well for
-any other messenger.</li>
-  <li>Instant chatting works fast if both parties are actively using the app. It’s
-sometimes slower if the app is running in background.</li>
-  <li>Receiving messages then can take minutes because both Android and iOS often
-stop Delta Chat from running in the background, and only wake it up
-occassionally. This artifical delay is usually worse on iOS than on Android.</li>
-  <li>Note that Delta Chat doesn’t use Google Cloud Messaging (GCM) or the Apple
-Push Notification Service (APNS), because this leads to user tracking and
-central control which Delta Chat aims to avoid as much as feasible.</li>
-  <li>However, that Android and iOS kill apps running in the background is a
-problem for many legitimate apps. For more information, see
-<a href="https://dontkillmyapp.com/">dontkillmyapp.com</a>.</li>
+  <li>Typischerweise benötigt das Senden und Empfangen von Nachchten nur wenige Sekunden. Es gibt Fälle, in dnen es länger Dauert - aber das trifft auch auf andere Messenger zu.</li>
+  <li>Das Chatten geht schnell, wenn beide Seiten die App direkt verwenden. Wenn die App im Hintergrund läuft, kann es manchmal etwas langsamer sein.</li>
+  <li>Das Empfangen von Nachrichten im Hintergrund kann Minuten dauern, da Android und iOS Apps häufig daran hindern, im Hintergrund zu laufen und Apps so nur gelegentlich aktiv sind.</li>
+  <li>Delta Chat verwendet nicht die Push-Dienst Google Cloud Messaging (GCM) oder die Apple Push Notification Services (APNS), da dies zu Überwachung und Kontrolle führt, die Delta Chat so gut wie möglich zu verhindern versucht</li>
+  <li>Das Problem, dass Android und iOS Apps unaufgefordert beendet ist übrigens ein Problem, dass viele legitime Apps haben, siehe <a href="https://dontkillmyapp.com/">dontkillmyapp.com</a>.</li>
 </ul>
     
-      <h3 id="is-delta-chat-compatible-with-protonmail--tutanota--criptext">
+      <p class="back"><a href="#top">^</a></p><h3 id="is-delta-chat-compatible-with-protonmail--tutanota--criptext">
         
         
           Is Delta Chat compatible with Protonmail / Tutanota / Criptext? <a href="#is-delta-chat-compatible-with-protonmail--tutanota--criptext" class="anchor"></a>
@@ -757,10 +740,10 @@ 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>
   <li>Delta Chat can e2e-encrypt through any e-mail provider with any
-<a href="Autocrypt-enabled e-mail app">https://autocrypt.org/dev-status.html</a>.</li>
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos">
+      <p class="back"><a href="#top">^</a></p><h3 id="ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos">
         
         
           Ich bin an technischen Details interessiert. Gibt es hierzu weitere Infos? <a href="#ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos" class="anchor"></a>
@@ -771,9 +754,63 @@ working inside their platforms, and not compatible with anyone outside.</li>
 <ul>
   <li>Siehe hierzu <a href="https://github.com/deltachat/deltachat-android/blob/master/standards.md#standards-used-in-delta-chat">in Delta Chat genutzte Standards</a>.</li>
 </ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="how-are-delta-chat-developments-funded">
+        
+        
+          How are Delta Chat developments funded? <a href="#how-are-delta-chat-developments-funded" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>First of all, 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>
+
+<p>Delta Chat developments have so far been funded from four major 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>
+  </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 
+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 
+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>
+  </li>
+  <li>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>Last but by far not least, several pro-bono experts and enthusiasts contributed 
+and contribute to Delta Chat developments without receiving money, or only 
+small amounts. Without them, Delta Chat would not be where it is today, not
+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>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>
 
 
 
 
 
-</body></html>
+</body></html><p class="back"><a href="#top">^</a></p>

+ 146 - 66
deltachat-ios/Assets/Help/en/help.html

@@ -20,6 +20,7 @@
       <li><a href="#what-is-a-verified-group-why-is-it-experimental">What is a verified group? Why is it experimental?</a></li>
       <li><a href="#i-have-deleted-myself-by-accident">I have deleted myself by accident.</a></li>
       <li><a href="#i-do-not-want-to-receive-the-messages-of-a-group-any-longer">I do not want to receive the messages of a group any longer.</a></li>
+      <li><a href="#what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now">What do double ticks mean in group messages? Has everyone read my message now?</a></li>
     </ul>
   </li>
   <li><a href="#encryption">Encryption</a>
@@ -54,13 +55,14 @@
       <li><a href="#if-delta-chat-uses-e-mail-is-it-really-an-instant-messenger">If Delta Chat uses E-Mail, is it really an <em>Instant</em> Messenger?</a></li>
       <li><a href="#is-delta-chat-compatible-with-protonmail--tutanota--criptext">Is Delta Chat compatible with Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#im-interested-in-the-technical-details-can-you-tell-me-more">I’m interested in the technical details. Can you tell me more?</a></li>
+      <li><a href="#how-are-delta-chat-developments-funded">How are Delta Chat developments funded?</a></li>
     </ul>
   </li>
 </ul>
 
 
 
-<h2 id="what-is-delta-chat">
+<p class="back"><a href="#top">^</a></p><h2 id="what-is-delta-chat">
         
         
           What is Delta Chat? <a href="#what-is-delta-chat" class="anchor"></a>
@@ -73,7 +75,7 @@
 
 <p><img style="float:right; width:50%; max-width:360%; margin:1em;" src="../delta-what-optim.png" /></p>
     
-      <h3 id="how-can-i-find-people-to-chat-with">
+      <p class="back"><a href="#top">^</a></p><h3 id="how-can-i-find-people-to-chat-with">
         
         
           How can I find people to chat with? <a href="#how-can-i-find-people-to-chat-with" class="anchor"></a>
@@ -85,7 +87,7 @@
 if the recipient is not using the Delta Chat app. No need for the
 recipient to install the same app as yours, as with other messengers.</p>
     
-      <h3 id="what-are-the-advantages-of-delta-chat-compared-to-other-messengers">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-are-the-advantages-of-delta-chat-compared-to-other-messengers">
         
         
           What are the advantages of Delta Chat compared to other messengers? <a href="#what-are-the-advantages-of-delta-chat-compared-to-other-messengers" class="anchor"></a>
@@ -109,7 +111,7 @@ the same e-mail servers</li>
   <li><em>Copyleft</em> and <em>Standards</em> based libre software.</li>
 </ul>
     
-      <h3 id="which-messages-do-appear-in-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="which-messages-do-appear-in-delta-chat">
         
         
           Which messages do appear in Delta Chat? <a href="#which-messages-do-appear-in-delta-chat" class="anchor"></a>
@@ -127,7 +129,7 @@ the same e-mail servers</li>
 
 <p>Other messages do not appear automatically, and are to be found in the main menu at <strong>Contact requests</strong>. If desired a chat can be started from there.</p>
     
-      <h3 id="what-about-spam">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-about-spam">
         
         
           What about spam? <a href="#what-about-spam" class="anchor"></a>
@@ -141,7 +143,7 @@ the same e-mail servers</li>
   <li>However, if needed, you can <strong>block</strong> any contact.</li>
 </ul>
     
-      <h3 id="does-delta-chat-support-images-videos-and-other-attachments">
+      <p class="back"><a href="#top">^</a></p><h3 id="does-delta-chat-support-images-videos-and-other-attachments">
         
         
           Does Delta Chat support images, videos and other attachments? <a href="#does-delta-chat-support-images-videos-and-other-attachments" class="anchor"></a>
@@ -153,7 +155,7 @@ the same e-mail servers</li>
   <li>Yes. Beside the plain text, all e-mail attachments are displayed as separate messages. Outgoing messages get attachments as needed automatically.</li>
 </ul>
     
-      <h3 id="who-sees-my-profile-picture">
+      <p class="back"><a href="#top">^</a></p><h3 id="who-sees-my-profile-picture">
         
         
           Who sees my profile picture? <a href="#who-sees-my-profile-picture" class="anchor"></a>
@@ -180,7 +182,7 @@ device.</p>
   </li>
 </ul>
     
-      <h3 id="does-delta-chat-support-html-e-mails">
+      <p class="back"><a href="#top">^</a></p><h3 id="does-delta-chat-support-html-e-mails">
         
         
           Does Delta Chat support HTML e-mails? <a href="#does-delta-chat-support-html-e-mails" class="anchor"></a>
@@ -192,7 +194,7 @@ device.</p>
   <li>Yes. If incoming e-mail lacks a plain text part, HTML-emails is converted to plain text in the app. Outgoing e-mails always use plain text.</li>
 </ul>
     
-      <h3 id="why-do-i-have-to-enter-my-e-mail-password-into-delta-chat-is-this-secure">
+      <p class="back"><a href="#top">^</a></p><h3 id="why-do-i-have-to-enter-my-e-mail-password-into-delta-chat-is-this-secure">
         
         
           Why do I have to enter my E-Mail password into Delta Chat? Is this secure? <a href="#why-do-i-have-to-enter-my-e-mail-password-into-delta-chat-is-this-secure" class="anchor"></a>
@@ -214,7 +216,7 @@ Code</a>
 if you want to verify that your credentials are handled securely. We are happy
 about feedback which makes the app more secure for all of our users.</p>
     
-      <h3 id="which-android-permissions-does-delta-chat-need">
+      <p class="back"><a href="#top">^</a></p><h3 id="which-android-permissions-does-delta-chat-need">
         
         
           Which Android permissions does Delta Chat need? <a href="#which-android-permissions-does-delta-chat-need" class="anchor"></a>
@@ -264,7 +266,7 @@ about feedback which makes the app more secure for all of our users.</p>
   </li>
 </ul>
     
-      <h2 id="groups">
+      <p class="back"><a href="#top">^</a></p><h2 id="groups">
         
         
           Groups <a href="#groups" class="anchor"></a>
@@ -272,7 +274,7 @@ about feedback which makes the app more secure for all of our users.</p>
         
       </h2>
     
-      <h3 id="creation-of-a-group">
+      <p class="back"><a href="#top">^</a></p><h3 id="creation-of-a-group">
         
         
           Creation of a group <a href="#creation-of-a-group" class="anchor"></a>
@@ -286,7 +288,7 @@ about feedback which makes the app more secure for all of our users.</p>
   <li>As soon as you write the <strong>first message</strong> in the group, all members are informed about the new group and can answer in the group (as long as you do not write a message in the group the group is invisible to the members).</li>
 </ul>
     
-      <h3 id="add-members-to-a-group">
+      <p class="back"><a href="#top">^</a></p><h3 id="add-members-to-a-group">
         
         
           Add members to a group <a href="#add-members-to-a-group" class="anchor"></a>
@@ -299,7 +301,7 @@ about feedback which makes the app more secure for all of our users.</p>
   <li>To add or delete members, click on the group name in the chat.</li>
 </ul>
     
-      <h3 id="what-is-a-verified-group-why-is-it-experimental">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-is-a-verified-group-why-is-it-experimental">
         
         
           What is a verified group? Why is it experimental? <a href="#what-is-a-verified-group-why-is-it-experimental" class="anchor"></a>
@@ -328,7 +330,7 @@ are we remove the “experimental” label not too far in the future.</p>
   </li>
 </ul>
     
-      <h3 id="i-have-deleted-myself-by-accident">
+      <p class="back"><a href="#top">^</a></p><h3 id="i-have-deleted-myself-by-accident">
         
         
           I have deleted myself by accident. <a href="#i-have-deleted-myself-by-accident" class="anchor"></a>
@@ -341,7 +343,7 @@ are we remove the “experimental” label not too far in the future.</p>
 However, no problem, just ask any other group member in a normal chat to re-add you.</li>
 </ul>
     
-      <h3 id="i-do-not-want-to-receive-the-messages-of-a-group-any-longer">
+      <p class="back"><a href="#top">^</a></p><h3 id="i-do-not-want-to-receive-the-messages-of-a-group-any-longer">
         
         
           I do not want to receive the messages of a group any longer. <a href="#i-do-not-want-to-receive-the-messages-of-a-group-any-longer" class="anchor"></a>
@@ -360,7 +362,25 @@ can still write, but are no longer notified of any new messages.</p>
   </li>
 </ul>
     
-      <h2 id="encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now">
+        
+        
+          What do double ticks mean in group messages? Has everyone read my message now? <a href="#what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>A message shows double ticks after more than half the the recipients have
+seen the message on their display.</li>
+  <li>Note that some recipients might have disabled read-receipts for
+privacy-reasons.</li>
+  <li>If more than 50% in a group disabled read receipts, the double ticks will
+never show up. For more detailed information, see
+<a href="https://delta.chat/en/2017-07-06-read-receipts-and-social-pressure">this blogpost</a>.</li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h2 id="encryption">
         
         
           Encryption <a href="#encryption" class="anchor"></a>
@@ -368,7 +388,7 @@ can still write, but are no longer notified of any new messages.</p>
         
       </h2>
     
-      <h3 id="does-delta-chat-support-end-to-end-encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="does-delta-chat-support-end-to-end-encryption">
         
         
           Does Delta Chat support end-to-end-encryption? <a href="#does-delta-chat-support-end-to-end-encryption" class="anchor"></a>
@@ -377,11 +397,17 @@ can still write, but are no longer notified of any new messages.</p>
       </h3>
 
 <ul>
-  <li>Yes. Delta Chat implements the Autocrypt Level 1 standard and can 
-thus E2E-encrypt messages with other Autocrypt-capable apps.</li>
+  <li>
+    <p>Yes. Delta Chat implements the Autocrypt Level 1 standard and can 
+thus E2E-encrypt messages with other Autocrypt-capable apps.</p>
+  </li>
+  <li>
+    <p>Delta Chat also supports a strong form of end-to-end encryption that is 
+even safe against active attacks, see “verified groups” further below.</p>
+  </li>
 </ul>
     
-      <h3 id="what-do-i-have-to-do-to-activate-the-end-to-end-encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-do-i-have-to-do-to-activate-the-end-to-end-encryption">
         
         
           What do I have to do to activate the end-to-end-encryption? <a href="#what-do-i-have-to-do-to-activate-the-end-to-end-encryption" class="anchor"></a>
@@ -402,12 +428,12 @@ If one of the chat partners uses a non-Autocrypt e-mail app, subsequent
 messages are not encrypted until an Autocrypt-compliant app is available again.</p>
   </li>
   <li>
-    <p>If you want to <em>turn off</em> the end-to-end-encryption, 
-use the corresponding setting in “Settings / Advanced settings”.</p>
+    <p>If you want to rather avoid end-to-end-encrypted e-mails by default, 
+use the corresponding Autocrypt setting in “Settings / Advanced settings”.</p>
   </li>
 </ul>
     
-      <h3 id="if-end-to-end-encryption-is-not-available-is-the-connection-not-encrypted-at-all">
+      <p class="back"><a href="#top">^</a></p><h3 id="if-end-to-end-encryption-is-not-available-is-the-connection-not-encrypted-at-all">
         
         
           If end-to-end-encryption is not available, is the connection not encrypted at all? <a href="#if-end-to-end-encryption-is-not-available-is-the-connection-not-encrypted-at-all" class="anchor"></a>
@@ -423,7 +449,7 @@ server. Whereas e2e-encryption provides safety between
 your device and a friend’s device.</li>
 </ul>
     
-      <h3 id="how-can-i-verify-cryptographic-status-with-a-sender">
+      <p class="back"><a href="#top">^</a></p><h3 id="how-can-i-verify-cryptographic-status-with-a-sender">
         
         
           How can I verify cryptographic status with a sender? <a href="#how-can-i-verify-cryptographic-status-with-a-sender" class="anchor"></a>
@@ -451,7 +477,7 @@ the connection is safe.</p>
   </li>
 </ul>
     
-      <h3 id="how-can-i-check-the-encryption-of-messages">
+      <p class="back"><a href="#top">^</a></p><h3 id="how-can-i-check-the-encryption-of-messages">
         
         
           How can I check the encryption of messages? <a href="#how-can-i-check-the-encryption-of-messages" class="anchor"></a>
@@ -468,7 +494,7 @@ the connection is safe.</p>
   </li>
 </ul>
     
-      <h3 id="which-standards-are-used-for-end-to-end-encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="which-standards-are-used-for-end-to-end-encryption">
         
         
           Which standards are used for end-to-end-encryption? <a href="#which-standards-are-used-for-end-to-end-encryption" class="anchor"></a>
@@ -477,15 +503,18 @@ the connection is safe.</p>
       </h3>
 
 <ul>
-  <li><a href="https://autocrypt.org">Autocrypt</a> is used for establishing
+  <li>
+    <p><a href="https://autocrypt.org">Autocrypt</a> is used for establishing
 e2e-encryption with other Delta Chat and other Autocrypt-capable mail apps. 
-Autocrypt uses a limited subset of OpenPGP functionality. Moreover, 
-Delta Chat implements the “countermitm” protocols to achieve
-protection against active network attacks, going beyond the opportunistic
-base protection of Autocrypt, see questions about “Verified Groups”.</li>
+Autocrypt uses a limited subset of OpenPGP functionality.</p>
+  </li>
+  <li>
+    <p>Delta Chat implements <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermitm setup-contact and verified-group protocols</a> to achieve protection against active network attacks.  This goes beyond the opportunistic
+base protection of Autocrypt Level 1, while maintaining its ease of use.</p>
+  </li>
 </ul>
     
-      <h3 id="what-is-the-difference-between-verified-groups-and-11-chats-with-verified-contacts">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-is-the-difference-between-verified-groups-and-11-chats-with-verified-contacts">
         
         
           What is the difference between verified groups and 1:1 chats with verified contacts? <a href="#what-is-the-difference-between-verified-groups-and-11-chats-with-verified-contacts" class="anchor"></a>
@@ -513,7 +542,7 @@ is no verification checkmark, even if you have verified the contact.</p>
   </li>
 </ul>
     
-      <h3 id="does-delta-chat-support-perfect-forward-secrecy">
+      <p class="back"><a href="#top">^</a></p><h3 id="does-delta-chat-support-perfect-forward-secrecy">
         
         
           Does Delta Chat support Perfect Forward Secrecy? <a href="#does-delta-chat-support-perfect-forward-secrecy" class="anchor"></a>
@@ -543,7 +572,7 @@ of device seizure.</p>
   </li>
 </ul>
     
-      <h3 id="how-does-delta-chat-protect-my-metadata">
+      <p class="back"><a href="#top">^</a></p><h3 id="how-does-delta-chat-protect-my-metadata">
         
         
           How does Delta Chat protect my Metadata? <a href="#how-does-delta-chat-protect-my-metadata" class="anchor"></a>
@@ -573,7 +602,7 @@ RFC</a>.</p>
   </li>
 </ul>
     
-      <h3 id="can-i-re-use-my-existing-private-key">
+      <p class="back"><a href="#top">^</a></p><h3 id="can-i-re-use-my-existing-private-key">
         
         
           Can I re-use my existing private key? <a href="#can-i-re-use-my-existing-private-key" class="anchor"></a>
@@ -592,7 +621,7 @@ RFC</a>.</p>
 
 <p>If you don’t have a key or don’t even know you would need one - don’t worry: Delta Chat generates one as needed, you don’t have to hit a button for it.</p>
     
-      <h3 id="i-cant-import-my-existing-pgp-key-into-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="i-cant-import-my-existing-pgp-key-into-delta-chat">
         
         
           I can’t import my existing PGP key into Delta Chat. <a href="#i-cant-import-my-existing-pgp-key-into-delta-chat" class="anchor"></a>
@@ -619,7 +648,7 @@ it <a href="https://github.com/deltachat/deltachat-android/issues/98#issuecommen
 line</a>.
 For other programs, you can find a solution online.</p>
     
-      <h3 id="why-dont-you-use-pep-pretty-easy-privacy">
+      <p class="back"><a href="#top">^</a></p><h3 id="why-dont-you-use-pep-pretty-easy-privacy">
         
         
           Why don’t you use pEp (pretty easy privacy)? <a href="#why-dont-you-use-pep-pretty-easy-privacy" class="anchor"></a>
@@ -633,7 +662,7 @@ a discussion of Autocrypt and pEp, see the <a href="https://autocrypt.org/faq.ht
 FAQ</a>.</li>
 </ul>
     
-      <h2 id="multiclient">
+      <p class="back"><a href="#top">^</a></p><h2 id="multiclient">
         
         
           Multi-client <a href="#multiclient" class="anchor"></a>
@@ -641,7 +670,7 @@ FAQ</a>.</li>
         
       </h2>
     
-      <h3 id="can-i-use-delta-chat-on-multiple-devices-at-the-same-time">
+      <p class="back"><a href="#top">^</a></p><h3 id="can-i-use-delta-chat-on-multiple-devices-at-the-same-time">
         
         
           Can I use Delta Chat on multiple devices at the same time? <a href="#can-i-use-delta-chat-on-multiple-devices-at-the-same-time" class="anchor"></a>
@@ -649,25 +678,22 @@ FAQ</a>.</li>
         
       </h3>
 
-<p>If you want to use the <strong>same account</strong> on different (Autocrypt
-capable) devices, you have to sync their encryption capabilities:</p>
+<p>If you want to use the <strong>same account</strong> on different devices, you should export
+a backup from the old device, and import it into the new device:</p>
 
 <ul>
-  <li>
-    <p>On the first device, choose “Advanced settings / Send Autocrypt Setup message” 
-and click until a “security number” is shown.</p>
-  </li>
-  <li>
-    <p>On the other device, wait for the “Autocrypt Setup Message” to
-arrive and click on it, which should prompt you for the security number.</p>
-  </li>
-  <li>
-    <p>You are now synchronized, and can use both devices for
-sending and receiving E2E-encrypted messages with your communication partners.</p>
-  </li>
+  <li>On the old device, choose “Settings / Chats and media / Backup”. Enter your
+screen unlock PIN, pattern, or password. Then you can click on “Start
+Backup”. This saves the backup file to your device. Now you have to transfer
+it to the other device somehow.</li>
+  <li>On the new device, on the login screen, instead of logging into your email
+account, choose “Import Backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.</li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+E2E-encrypted messages with your communication partners.</li>
 </ul>
     
-      <h3 id="are-there-any-plans-for-introducing-a-delta-chat-web-client">
+      <p class="back"><a href="#top">^</a></p><h3 id="are-there-any-plans-for-introducing-a-delta-chat-web-client">
         
         
           Are there any plans for introducing a Delta Chat Web Client? <a href="#are-there-any-plans-for-introducing-a-delta-chat-web-client" class="anchor"></a>
@@ -686,7 +712,7 @@ or the AppImage for Linux. You can find them on
 <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
     
-      <h3 id="why-can-i-choose-not-to-watch-the-inbox">
+      <p class="back"><a href="#top">^</a></p><h3 id="why-can-i-choose-not-to-watch-the-inbox">
         
         
           Why can I choose not to watch the Inbox? <a href="#why-can-i-choose-not-to-watch-the-inbox" class="anchor"></a>
@@ -708,7 +734,7 @@ would be done by the Delta Chat app.</p>
 
 <p>In this case, Delta Chat doesn’t need to watch the Inbox.</p>
     
-      <h3 id="what-is-the-send-copy-to-self-setting-good-for">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-is-the-send-copy-to-self-setting-good-for">
         
         
           What is the “Send Copy to Self” setting good for? <a href="#what-is-the-send-copy-to-self-setting-good-for" class="anchor"></a>
@@ -728,7 +754,7 @@ and once through IMAP to Sent folder).</p>
 
 <p>The default setting for copy-to-self is “no”.</p>
     
-      <h3 id="why-can-i-choose-to-watch-the-sent-folder">
+      <p class="back"><a href="#top">^</a></p><h3 id="why-can-i-choose-to-watch-the-sent-folder">
         
         
           Why can I choose to watch the “Sent” folder? <a href="#why-can-i-choose-to-watch-the-sent-folder" class="anchor"></a>
@@ -745,7 +771,7 @@ on <a href="https://get.delta.chat">get.delta.chat</a>. The option to watch the
 folder might go away in the future. It was introduced at a time where there was
 no Delta Chat Desktop client available on all platforms.</p>
     
-      <h3 id="why-can-i-choose-not-to-watch-the-deltachat-folder">
+      <p class="back"><a href="#top">^</a></p><h3 id="why-can-i-choose-not-to-watch-the-deltachat-folder">
         
         
           Why can I choose not to watch the DeltaChat folder? <a href="#why-can-i-choose-not-to-watch-the-deltachat-folder" class="anchor"></a>
@@ -758,7 +784,7 @@ folder for their mail, instead of the DeltaChat folder. If you disable “Watch
 DeltaChat folder”, you should also disable “move chat messages to DeltaChat”.
 Otherwise, deleting messages or multi-device setups might not work properly.</p>
     
-      <h2 id="miscellaneous">
+      <p class="back"><a href="#top">^</a></p><h2 id="miscellaneous">
         
         
           Miscellaneous <a href="#miscellaneous" class="anchor"></a>
@@ -766,7 +792,7 @@ Otherwise, deleting messages or multi-device setups might not work properly.</p>
         
       </h2>
     
-      <h3 id="does-delta-chat-work-with-my-e-mail-provider">
+      <p class="back"><a href="#top">^</a></p><h3 id="does-delta-chat-work-with-my-e-mail-provider">
         
         
           Does Delta Chat work with <em>my</em> e-mail-provider? <a href="#does-delta-chat-work-with-my-e-mail-provider" class="anchor"></a>
@@ -780,7 +806,7 @@ However, some providers need special options to work properly,
 see <a href="https://providers.delta.chat">Provider Overview</a></li>
 </ul>
     
-      <h3 id="if-delta-chat-uses-e-mail-is-it-really-an-instant-messenger">
+      <p class="back"><a href="#top">^</a></p><h3 id="if-delta-chat-uses-e-mail-is-it-really-an-instant-messenger">
         
         
           If Delta Chat uses E-Mail, is it really an <em>Instant</em> Messenger? <a href="#if-delta-chat-uses-e-mail-is-it-really-an-instant-messenger" class="anchor"></a>
@@ -805,7 +831,7 @@ problem for many legitimate apps. For more information, see
 <a href="https://dontkillmyapp.com/">dontkillmyapp.com</a>.</li>
 </ul>
     
-      <h3 id="is-delta-chat-compatible-with-protonmail--tutanota--criptext">
+      <p class="back"><a href="#top">^</a></p><h3 id="is-delta-chat-compatible-with-protonmail--tutanota--criptext">
         
         
           Is Delta Chat compatible with Protonmail / Tutanota / Criptext? <a href="#is-delta-chat-compatible-with-protonmail--tutanota--criptext" class="anchor"></a>
@@ -822,10 +848,10 @@ 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>
   <li>Delta Chat can e2e-encrypt through any e-mail provider with any
-<a href="Autocrypt-enabled e-mail app">https://autocrypt.org/dev-status.html</a>.</li>
+<a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="im-interested-in-the-technical-details-can-you-tell-me-more">
+      <p class="back"><a href="#top">^</a></p><h3 id="im-interested-in-the-technical-details-can-you-tell-me-more">
         
         
           I’m interested in the technical details. Can you tell me more? <a href="#im-interested-in-the-technical-details-can-you-tell-me-more" class="anchor"></a>
@@ -836,9 +862,63 @@ working inside their platforms, and not compatible with anyone outside.</li>
 <ul>
   <li>See <a href="https://github.com/deltachat/deltachat-android/blob/master/standards.md#standards-used-in-delta-chat">Standards used in Delta Chat</a>.</li>
 </ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="how-are-delta-chat-developments-funded">
+        
+        
+          How are Delta Chat developments funded? <a href="#how-are-delta-chat-developments-funded" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>First of all, 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>
+
+<p>Delta Chat developments have so far been funded from four major 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>
+  </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 
+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 
+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>
+  </li>
+  <li>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>Last but by far not least, several pro-bono experts and enthusiasts contributed 
+and contribute to Delta Chat developments without receiving money, or only 
+small amounts. Without them, Delta Chat would not be where it is today, not
+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>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>
 
 
 
 
 
-</body></html>
+</body></html><p class="back"><a href="#top">^</a></p>

+ 153 - 67
deltachat-ios/Assets/Help/es/help.html

@@ -17,6 +17,7 @@
       <li><a href="#qué-es-un-grupo-verificado-por-qué-es-experimental">¿Qué es un grupo verificado? ¿Por qué es experimental?</a></li>
       <li><a href="#me-he-eliminado-por-accidente">Me he eliminado por accidente.</a></li>
       <li><a href="#no-quiero-recibir-más-los-mensajes-de-un-grupo">No quiero recibir más los mensajes de un grupo.</a></li>
+      <li><a href="#what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now">What do double ticks mean in group messages? Has everyone read my message now?</a></li>
     </ul>
   </li>
   <li><a href="#encryption">Cifrado</a>
@@ -51,13 +52,14 @@
       <li><a href="#si-delta-chat-utiliza-el-correo-electrónico-es-realmente-una-aplicación-de-mensajería-instantánea">Si Delta Chat utiliza el correo electrónico, ¿es realmente una aplicación de mensajería <em>instantánea</em>?</a></li>
       <li><a href="#delta-chat-es-compatible-con-protonmail--tutanota--criptext">¿Delta Chat es compatible con Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">Estoy interesado en los detalles técnicos. ¿Pueden decirme más?</a></li>
+      <li><a href="#how-are-delta-chat-developments-funded">How are Delta Chat developments funded?</a></li>
     </ul>
   </li>
 </ul>
 
 
 
-<h2 id="qué-es-delta-chat">
+<p class="back"><a href="#top">^</a></p><h2 id="qué-es-delta-chat">
         
         
           ¿Qué es Delta Chat? <a href="#qué-es-delta-chat" class="anchor"></a>
@@ -70,7 +72,7 @@
 
 <p><img style="float:right; width:50%; max-width:360%; margin:1em;" src="../delta-what-optim.png" /></p>
     
-      <h3 id="cómo-puedo-encontrar-personas-con-las-que-chatear">
+      <p class="back"><a href="#top">^</a></p><h3 id="cómo-puedo-encontrar-personas-con-las-que-chatear">
         
         
           ¿Cómo puedo encontrar personas con las que chatear? <a href="#cómo-puedo-encontrar-personas-con-las-que-chatear" class="anchor"></a>
@@ -82,7 +84,7 @@
 si el destinatario no está utilizando la aplicación Delta Chat. No es necesario que el
 destinatario instale la misma aplicación que usted, como ocurre con otros mensajeros.</p>
     
-      <h3 id="cuáles-son-las-ventajas-de-delta-chat-comparado-con-otras-aplicaciones-de-mensajería">
+      <p class="back"><a href="#top">^</a></p><h3 id="cuáles-son-las-ventajas-de-delta-chat-comparado-con-otras-aplicaciones-de-mensajería">
         
         
           ¿Cuáles son las ventajas de Delta Chat comparado con otras aplicaciones de mensajería? <a href="#cuáles-son-las-ventajas-de-delta-chat-comparado-con-otras-aplicaciones-de-mensajería" class="anchor"></a>
@@ -106,7 +108,7 @@ los mismos servidores de correo electrónico</li>
   <li>Software <em>libre</em> basado en <em>estándares.</em></li>
 </ul>
     
-      <h3 id="qué-mensajes-se-muestran-en-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="qué-mensajes-se-muestran-en-delta-chat">
         
         
           ¿Qué mensajes se muestran en Delta Chat? <a href="#qué-mensajes-se-muestran-en-delta-chat" class="anchor"></a>
@@ -124,7 +126,7 @@ los mismos servidores de correo electrónico</li>
 
 <p>Otros mensajes no aparecen automáticamente y se encuentran en el menú principal en <strong>Solicitudes de contacto</strong>. Si lo desea, puede iniciar un chat desde allí.</p>
     
-      <h3 id="qué-pasa-con-el-spam">
+      <p class="back"><a href="#top">^</a></p><h3 id="qué-pasa-con-el-spam">
         
         
           ¿Qué pasa con el Spam? <a href="#qué-pasa-con-el-spam" class="anchor"></a>
@@ -138,7 +140,7 @@ los mismos servidores de correo electrónico</li>
   <li>However, if needed, you can <strong>block</strong> any contact.</li>
 </ul>
     
-      <h3 id="delta-chat-soporta-envío-de-imágenes-videos-documentos-y-otros-archivos">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-soporta-envío-de-imágenes-videos-documentos-y-otros-archivos">
         
         
           ¿Delta Chat soporta envío de imágenes, videos, documentos y otros archivos? <a href="#delta-chat-soporta-envío-de-imágenes-videos-documentos-y-otros-archivos" class="anchor"></a>
@@ -150,7 +152,7 @@ los mismos servidores de correo electrónico</li>
   <li>Si. Además del texto sin formato, todos los archivos adjuntos de correo electrónico se muestran como mensajes separados. Los mensajes salientes obtienen archivos adjuntos según sea necesario automáticamente.</li>
 </ul>
     
-      <h3 id="quién-ve-mi-foto-de-perfil">
+      <p class="back"><a href="#top">^</a></p><h3 id="quién-ve-mi-foto-de-perfil">
         
         
           ¿Quién ve mi foto de perfil? <a href="#quién-ve-mi-foto-de-perfil" class="anchor"></a>
@@ -176,7 +178,7 @@ dispositivo.</p>
   </li>
 </ul>
     
-      <h3 id="delta-chat-soporta-mensajes-con-formato-html">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-soporta-mensajes-con-formato-html">
         
         
           ¿Delta Chat soporta mensajes con formato HTML? <a href="#delta-chat-soporta-mensajes-con-formato-html" class="anchor"></a>
@@ -188,7 +190,7 @@ dispositivo.</p>
   <li>Si. Si el correo electrónico entrante carece de una parte de texto sin formato, los correos electrónicos HTML se convierten en texto sin formato en la aplicación. Los correos electrónicos salientes siempre usan texto sin formato.</li>
 </ul>
     
-      <h3 id="por-qué-debo-ingresar-mi-contraseña-de-correo-electrónico-en-delta-chat-es-esto-seguro">
+      <p class="back"><a href="#top">^</a></p><h3 id="por-qué-debo-ingresar-mi-contraseña-de-correo-electrónico-en-delta-chat-es-esto-seguro">
         
         
           ¿Por qué debo ingresar mi contraseña de correo electrónico en Delta Chat? ¿Es esto seguro? <a href="#por-qué-debo-ingresar-mi-contraseña-de-correo-electrónico-en-delta-chat-es-esto-seguro" class="anchor"></a>
@@ -210,7 +212,7 @@ Code</a>
 if you want to verify that your credentials are handled securely. We are happy
 about feedback which makes the app more secure for all of our users.</p>
     
-      <h3 id="qué-permisos-de-android-necesita-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="qué-permisos-de-android-necesita-delta-chat">
         
         
           ¿Qué permisos de Android necesita Delta Chat? <a href="#qué-permisos-de-android-necesita-delta-chat" class="anchor"></a>
@@ -260,7 +262,7 @@ about feedback which makes the app more secure for all of our users.</p>
   </li>
 </ul>
     
-      <h3 id="grupos">
+      <p class="back"><a href="#top">^</a></p><h3 id="grupos">
         
         
           Grupos <a href="#grupos" class="anchor"></a>
@@ -268,7 +270,7 @@ about feedback which makes the app more secure for all of our users.</p>
         
       </h3>
     
-      <h3 id="creación-de-un-grupo">
+      <p class="back"><a href="#top">^</a></p><h3 id="creación-de-un-grupo">
         
         
           Creación de un grupo <a href="#creación-de-un-grupo" class="anchor"></a>
@@ -282,7 +284,7 @@ about feedback which makes the app more secure for all of our users.</p>
   <li>Tan pronto como escriba <strong>el primer mensaje</strong>, se le informará a todos los miembros sobre el nuevo grupo y pueden responder en el grupo (hasta que no escriba un mensaje en el grupo, este es invisible para los miembros).</li>
 </ul>
     
-      <h3 id="agregar-miembros-a-un-grupo">
+      <p class="back"><a href="#top">^</a></p><h3 id="agregar-miembros-a-un-grupo">
         
         
           Agregar miembros a un grupo <a href="#agregar-miembros-a-un-grupo" class="anchor"></a>
@@ -295,7 +297,7 @@ about feedback which makes the app more secure for all of our users.</p>
   <li>Para añadir o eliminar miembros, haga clic en el nombre del grupo en la pantalla de chat.</li>
 </ul>
     
-      <h3 id="qué-es-un-grupo-verificado-por-qué-es-experimental">
+      <p class="back"><a href="#top">^</a></p><h3 id="qué-es-un-grupo-verificado-por-qué-es-experimental">
         
         
           ¿Qué es un grupo verificado? ¿Por qué es experimental? <a href="#qué-es-un-grupo-verificado-por-qué-es-experimental" class="anchor"></a>
@@ -324,7 +326,7 @@ are we remove the “experimental” label not too far in the future.</p>
   </li>
 </ul>
     
-      <h3 id="me-he-eliminado-por-accidente">
+      <p class="back"><a href="#top">^</a></p><h3 id="me-he-eliminado-por-accidente">
         
         
           Me he eliminado por accidente. <a href="#me-he-eliminado-por-accidente" class="anchor"></a>
@@ -337,7 +339,7 @@ are we remove the “experimental” label not too far in the future.</p>
 Sin embargo, no hay problema, solo pídale a cualquier otro miembro del grupo en un chat normal que lo vuelva a agregar.</li>
 </ul>
     
-      <h3 id="no-quiero-recibir-más-los-mensajes-de-un-grupo">
+      <p class="back"><a href="#top">^</a></p><h3 id="no-quiero-recibir-más-los-mensajes-de-un-grupo">
         
         
           No quiero recibir más los mensajes de un grupo. <a href="#no-quiero-recibir-más-los-mensajes-de-un-grupo" class="anchor"></a>
@@ -356,7 +358,25 @@ aún puede escribir, pero ya no se le notifican nuevos mensajes.</p>
   </li>
 </ul>
     
-      <h2 id="encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now">
+        
+        
+          What do double ticks mean in group messages? Has everyone read my message now? <a href="#what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>A message shows double ticks after more than half the the recipients have
+seen the message on their display.</li>
+  <li>Note that some recipients might have disabled read-receipts for
+privacy-reasons.</li>
+  <li>If more than 50% in a group disabled read receipts, the double ticks will
+never show up. For more detailed information, see
+<a href="https://delta.chat/en/2017-07-06-read-receipts-and-social-pressure">this blogpost</a>.</li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h2 id="encryption">
         
         
           Cifrado <a href="#encryption" class="anchor"></a>
@@ -364,7 +384,7 @@ aún puede escribir, pero ya no se le notifican nuevos mensajes.</p>
         
       </h2>
     
-      <h3 id="delta-chat-permite-cifrado-de-extremo-a-extremo">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-permite-cifrado-de-extremo-a-extremo">
         
         
           ¿Delta Chat permite cifrado de extremo a extremo? <a href="#delta-chat-permite-cifrado-de-extremo-a-extremo" class="anchor"></a>
@@ -373,10 +393,16 @@ aún puede escribir, pero ya no se le notifican nuevos mensajes.</p>
       </h3>
 
 <ul>
-  <li>Si. Delta Chat implementa el estándar Autocrypt Nivel 1 y, por lo tanto, puede cifrar E2E mensajes con otras aplicaciones compatibles con Autocrypt.</li>
+  <li>
+    <p>Si. Delta Chat implementa el estándar Autocrypt Nivel 1 y, por lo tanto, puede cifrar E2E mensajes con otras aplicaciones compatibles con Autocrypt.</p>
+  </li>
+  <li>
+    <p>Delta Chat also supports a strong form of end-to-end encryption that is 
+even safe against active attacks, see “verified groups” further below.</p>
+  </li>
 </ul>
     
-      <h3 id="qué-debo-hacer-para-activar-el-cifrado-de-extremo-a-extremo">
+      <p class="back"><a href="#top">^</a></p><h3 id="qué-debo-hacer-para-activar-el-cifrado-de-extremo-a-extremo">
         
         
           ¿Qué debo hacer para activar el cifrado de extremo a extremo? <a href="#qué-debo-hacer-para-activar-el-cifrado-de-extremo-a-extremo" class="anchor"></a>
@@ -394,12 +420,12 @@ Después de esto, todos los mensajes subsiguientes se cifran de extremo a extrem
 Si uno de los compañeros de chat usa una aplicación de correo electrónico que no soporta Autocrypt, los mensajes no se cifrarán hasta que una aplicación compatible con Autocrypt sea utilizada.</p>
   </li>
   <li>
-    <p>Si desea <em>desactivar</em> el cifrado de extremo a extremo,
-use la configuración correspondiente en “Ajustes / Avanzado”.</p>
+    <p>If you want to rather avoid end-to-end-encrypted e-mails by default, 
+use the corresponding Autocrypt setting in “Settings / Advanced settings”.</p>
   </li>
 </ul>
     
-      <h3 id="si-el-cifrado-de-extremo-a-extremo-no-está-disponible-la-conexión-no-está-cifrada">
+      <p class="back"><a href="#top">^</a></p><h3 id="si-el-cifrado-de-extremo-a-extremo-no-está-disponible-la-conexión-no-está-cifrada">
         
         
           Si el cifrado de extremo a extremo no está disponible, ¿la conexión no está cifrada? <a href="#si-el-cifrado-de-extremo-a-extremo-no-está-disponible-la-conexión-no-está-cifrada" class="anchor"></a>
@@ -415,7 +441,7 @@ server. Whereas e2e-encryption provides safety between
 your device and a friend’s device.</li>
 </ul>
     
-      <h3 id="cómo-puedo-verificar-el-estado-criptográfico-con-un-remitente">
+      <p class="back"><a href="#top">^</a></p><h3 id="cómo-puedo-verificar-el-estado-criptográfico-con-un-remitente">
         
         
           ¿Cómo puedo verificar el estado criptográfico con un remitente? <a href="#cómo-puedo-verificar-el-estado-criptográfico-con-un-remitente" class="anchor"></a>
@@ -443,7 +469,7 @@ la conexión es segura.</p>
   </li>
 </ul>
     
-      <h3 id="cómo-puedo-verificar-el-cifrado-de-mensajes">
+      <p class="back"><a href="#top">^</a></p><h3 id="cómo-puedo-verificar-el-cifrado-de-mensajes">
         
         
           ¿Cómo puedo verificar el cifrado de mensajes? <a href="#cómo-puedo-verificar-el-cifrado-de-mensajes" class="anchor"></a>
@@ -460,7 +486,7 @@ la conexión es segura.</p>
   </li>
 </ul>
     
-      <h3 id="qué-estándares-se-utilizan-para-el-cifrado-de-extremo-a-extremo">
+      <p class="back"><a href="#top">^</a></p><h3 id="qué-estándares-se-utilizan-para-el-cifrado-de-extremo-a-extremo">
         
         
           ¿Qué estándares se utilizan para el cifrado de extremo a extremo? <a href="#qué-estándares-se-utilizan-para-el-cifrado-de-extremo-a-extremo" class="anchor"></a>
@@ -469,15 +495,18 @@ la conexión es segura.</p>
       </h3>
 
 <ul>
-  <li><a href="https://autocrypt.org">Autocrypt</a> is used for establishing
+  <li>
+    <p><a href="https://autocrypt.org">Autocrypt</a> is used for establishing
 e2e-encryption with other Delta Chat and other Autocrypt-capable mail apps. 
-Autocrypt uses a limited subset of OpenPGP functionality. Moreover, 
-Delta Chat implements the “countermitm” protocols to achieve
-protection against active network attacks, going beyond the opportunistic
-base protection of Autocrypt, see questions about “Verified Groups”.</li>
+Autocrypt uses a limited subset of OpenPGP functionality.</p>
+  </li>
+  <li>
+    <p>Delta Chat implements <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermitm setup-contact and verified-group protocols</a> to achieve protection against active network attacks.  This goes beyond the opportunistic
+base protection of Autocrypt Level 1, while maintaining its ease of use.</p>
+  </li>
 </ul>
     
-      <h3 id="cuál-es-la-diferencia-entre-grupos-verificados-y-chats-11-con-contactos-verificados">
+      <p class="back"><a href="#top">^</a></p><h3 id="cuál-es-la-diferencia-entre-grupos-verificados-y-chats-11-con-contactos-verificados">
         
         
           ¿Cuál es la diferencia entre grupos verificados y chats 1:1 con contactos verificados? <a href="#cuál-es-la-diferencia-entre-grupos-verificados-y-chats-11-con-contactos-verificados" class="anchor"></a>
@@ -505,7 +534,7 @@ is no verification checkmark, even if you have verified the contact.</p>
   </li>
 </ul>
     
-      <h3 id="delta-chat-admite-perfect-forward-secrecy">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-admite-perfect-forward-secrecy">
         
         
           ¿Delta Chat admite Perfect Forward Secrecy? <a href="#delta-chat-admite-perfect-forward-secrecy" class="anchor"></a>
@@ -535,7 +564,7 @@ de incautación del dispositivo.</p>
   </li>
 </ul>
     
-      <h3 id="cómo-protege-delta-chat-mis-metadatos">
+      <p class="back"><a href="#top">^</a></p><h3 id="cómo-protege-delta-chat-mis-metadatos">
         
         
           ¿Cómo protege Delta Chat mis metadatos? <a href="#cómo-protege-delta-chat-mis-metadatos" class="anchor"></a>
@@ -565,7 +594,7 @@ RFC</a>.</p>
   </li>
 </ul>
     
-      <h3 id="puedo-reutilizar-mi-llave-privada-existente">
+      <p class="back"><a href="#top">^</a></p><h3 id="puedo-reutilizar-mi-llave-privada-existente">
         
         
           ¿Puedo reutilizar mi llave privada existente? <a href="#puedo-reutilizar-mi-llave-privada-existente" class="anchor"></a>
@@ -584,7 +613,7 @@ RFC</a>.</p>
 
 <p>Si no tienes una llave o ni siquiera sabes para qué la necesitas, no te preocupes: Delta Chat genera una según sea necesario de forma automática, no tienes que hacer nada.</p>
     
-      <h3 id="no-puedo-importar-mi-clave-pgp-existente-en-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="no-puedo-importar-mi-clave-pgp-existente-en-delta-chat">
         
         
           No puedo importar mi clave PGP existente en Delta Chat. <a href="#no-puedo-importar-mi-clave-pgp-existente-en-delta-chat" class="anchor"></a>
@@ -611,7 +640,7 @@ it <a href="https://github.com/deltachat/deltachat-android/issues/98#issuecommen
 line</a>.
 For other programs, you can find a solution online.</p>
     
-      <h3 id="por-qué-no-usan-pep-pretty-easy-privacy">
+      <p class="back"><a href="#top">^</a></p><h3 id="por-qué-no-usan-pep-pretty-easy-privacy">
         
         
           ¿Por qué no usan pEp (pretty easy privacy)? <a href="#por-qué-no-usan-pep-pretty-easy-privacy" class="anchor"></a>
@@ -625,7 +654,7 @@ a discussion of Autocrypt and pEp, see the <a href="https://autocrypt.org/faq.ht
 FAQ</a>.</li>
 </ul>
     
-      <h2 id="multiclient">
+      <p class="back"><a href="#top">^</a></p><h2 id="multiclient">
         
         
           Múltiples dispositivos <a href="#multiclient" class="anchor"></a>
@@ -633,7 +662,7 @@ FAQ</a>.</li>
         
       </h2>
     
-      <h3 id="puedo-usar-delta-chat-en-varios-dispositivos-al-mismo-tiempo">
+      <p class="back"><a href="#top">^</a></p><h3 id="puedo-usar-delta-chat-en-varios-dispositivos-al-mismo-tiempo">
         
         
           ¿Puedo usar Delta Chat en varios dispositivos al mismo tiempo? <a href="#puedo-usar-delta-chat-en-varios-dispositivos-al-mismo-tiempo" class="anchor"></a>
@@ -641,24 +670,22 @@ FAQ</a>.</li>
         
       </h3>
 
-<p>If you want to use the <strong>same account</strong> on different (Autocrypt
-capable) devices, you have to sync their encryption capabilities:</p>
+<p>If you want to use the <strong>same account</strong> on different devices, you should export
+a backup from the old device, and import it into the new device:</p>
 
 <ul>
-  <li>
-    <p>En el primer dispositivo, elija “Configuración avanzada / Enviar mensaje de configuración de Autocrypt” y haga clic hasta que aparezca un “número de seguridad”.</p>
-  </li>
-  <li>
-    <p>En el otro dispositivo, espere la llega del “Mensaje de Configuración de Autocrypt”
-y haga clic en él, lo cual debe solicitarle el número de seguridad.</p>
-  </li>
-  <li>
-    <p>Ahora está sincronizado y puede usar ambos dispositivos para
-enviar y recibir mensajes cifrados E2E con tus compañeros.</p>
-  </li>
+  <li>On the old device, choose “Settings / Chats and media / Backup”. Enter your
+screen unlock PIN, pattern, or password. Then you can click on “Start
+Backup”. This saves the backup file to your device. Now you have to transfer
+it to the other device somehow.</li>
+  <li>On the new device, on the login screen, instead of logging into your email
+account, choose “Import Backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.</li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+E2E-encrypted messages with your communication partners.</li>
 </ul>
     
-      <h3 id="tienen-planeado-crear-un-cliente-web-de-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="tienen-planeado-crear-un-cliente-web-de-delta-chat">
         
         
           ¿Tienen planeado crear un cliente web de Delta Chat? <a href="#tienen-planeado-crear-un-cliente-web-de-delta-chat" class="anchor"></a>
@@ -677,7 +704,7 @@ or the AppImage for Linux. You can find them on
 <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
     
-      <h3 id="por-qué-puedo-elegir-no-monitorear-la-bandeja-de-entrada">
+      <p class="back"><a href="#top">^</a></p><h3 id="por-qué-puedo-elegir-no-monitorear-la-bandeja-de-entrada">
         
         
           ¿Por qué puedo elegir no monitorear la Bandeja de Entrada? <a href="#por-qué-puedo-elegir-no-monitorear-la-bandeja-de-entrada" class="anchor"></a>
@@ -696,7 +723,7 @@ or the AppImage for Linux. You can find them on
 
 <p>En este caso, Delta Chat no necesita monitorear la Bandeja de Entrada.</p>
     
-      <h3 id="para-qué-sirve-la-configuración-enviar-autocopia">
+      <p class="back"><a href="#top">^</a></p><h3 id="para-qué-sirve-la-configuración-enviar-autocopia">
         
         
           ¿Para qué sirve la configuración “Enviar autocopia”? <a href="#para-qué-sirve-la-configuración-enviar-autocopia" class="anchor"></a>
@@ -710,7 +737,7 @@ or the AppImage for Linux. You can find them on
 
 <p>La configuración predeterminada para “Enviar autocopia” es “no”.</p>
     
-      <h3 id="por-qué-puedo-elegir-monitorear-la-carpeta-enviados">
+      <p class="back"><a href="#top">^</a></p><h3 id="por-qué-puedo-elegir-monitorear-la-carpeta-enviados">
         
         
           ¿Por qué puedo elegir monitorear la carpeta “Enviados”? <a href="#por-qué-puedo-elegir-monitorear-la-carpeta-enviados" class="anchor"></a>
@@ -727,7 +754,7 @@ on <a href="https://get.delta.chat">get.delta.chat</a>. The option to watch the
 folder might go away in the future. It was introduced at a time where there was
 no Delta Chat Desktop client available on all platforms.</p>
     
-      <h3 id="por-qué-puedo-elegir-no-monitorear-la-carpeta-deltachat">
+      <p class="back"><a href="#top">^</a></p><h3 id="por-qué-puedo-elegir-no-monitorear-la-carpeta-deltachat">
         
         
           ¿Por qué puedo elegir no monitorear la carpeta DeltaChat? <a href="#por-qué-puedo-elegir-no-monitorear-la-carpeta-deltachat" class="anchor"></a>
@@ -738,7 +765,7 @@ no Delta Chat Desktop client available on all platforms.</p>
 <p>Algunas personas usan Delta Chat como un cliente de correo electrónico normal y desean mantener los correos en la bandeja de entrada, en lugar de la carpeta DeltaChat. Si deshabilita “Monitorear carpeta DeltaChat”, también debe deshabilitar “mover automáticamente a la carpeta DeltaChat”.
 De lo contrario, eliminar mensajes o configuraciones de dispositivos múltiples podría no funcionar correctamente.</p>
     
-      <h2 id="miscelaneo">
+      <p class="back"><a href="#top">^</a></p><h2 id="miscelaneo">
         
         
           Miscelaneo <a href="#miscelaneo" class="anchor"></a>
@@ -746,7 +773,7 @@ De lo contrario, eliminar mensajes o configuraciones de dispositivos múltiples
         
       </h2>
     
-      <h3 id="delta-chat-funciona-con-mi-proveedor-de-correo-electrónico">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-funciona-con-mi-proveedor-de-correo-electrónico">
         
         
           ¿Delta Chat funciona con <em>mi</em> proveedor de correo electrónico? <a href="#delta-chat-funciona-con-mi-proveedor-de-correo-electrónico" class="anchor"></a>
@@ -759,7 +786,7 @@ De lo contrario, eliminar mensajes o configuraciones de dispositivos múltiples
 Sin embargo, algunos proveedores necesitan opciones especiales para funcionar correctamente, ver <a href="https://providers.delta.chat">Descripción de proveedores</a></li>
 </ul>
     
-      <h3 id="si-delta-chat-utiliza-el-correo-electrónico-es-realmente-una-aplicación-de-mensajería-instantánea">
+      <p class="back"><a href="#top">^</a></p><h3 id="si-delta-chat-utiliza-el-correo-electrónico-es-realmente-una-aplicación-de-mensajería-instantánea">
         
         
           Si Delta Chat utiliza el correo electrónico, ¿es realmente una aplicación de mensajería <em>instantánea</em>? <a href="#si-delta-chat-utiliza-el-correo-electrónico-es-realmente-una-aplicación-de-mensajería-instantánea" class="anchor"></a>
@@ -784,7 +811,7 @@ problem for many legitimate apps. For more information, see
 <a href="https://dontkillmyapp.com/">dontkillmyapp.com</a>.</li>
 </ul>
     
-      <h3 id="delta-chat-es-compatible-con-protonmail--tutanota--criptext">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-es-compatible-con-protonmail--tutanota--criptext">
         
         
           ¿Delta Chat es compatible con Protonmail / Tutanota / Criptext? <a href="#delta-chat-es-compatible-con-protonmail--tutanota--criptext" class="anchor"></a>
@@ -793,13 +820,18 @@ 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 only
+working inside their platforms, and not compatible with anyone outside.</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>
     
-      <h3 id="estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">
+      <p class="back"><a href="#top">^</a></p><h3 id="estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">
         
         
           Estoy interesado en los detalles técnicos. ¿Pueden decirme más? <a href="#estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más" class="anchor"></a>
@@ -810,9 +842,63 @@ problem for many legitimate apps. For more information, see
 <ul>
   <li>Visita la página <a href="https://github.com/deltachat/deltachat-android/blob/master/standards.md#standards-used-in-delta-chat">Estándares usados en Delta Chat</a>.</li>
 </ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="how-are-delta-chat-developments-funded">
+        
+        
+          How are Delta Chat developments funded? <a href="#how-are-delta-chat-developments-funded" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>First of all, 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>
+
+<p>Delta Chat developments have so far been funded from four major 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>
+  </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 
+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 
+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>
+  </li>
+  <li>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>Last but by far not least, several pro-bono experts and enthusiasts contributed 
+and contribute to Delta Chat developments without receiving money, or only 
+small amounts. Without them, Delta Chat would not be where it is today, not
+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>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>
 
 
 
 
 
-</body></html>
+</body></html><p class="back"><a href="#top">^</a></p>

+ 28 - 3
deltachat-ios/Assets/Help/help.css

@@ -1,6 +1,7 @@
 body {
-    font-family: serif;
+    font-family: sans-serif;
     font-size: 300%;
+	padding: 2rem;
 }
 
 a {
@@ -22,7 +23,31 @@ ul#top > li {
 }
 
 ul#top li {
-  margin-top: .7rem;
-  margin-bottom: .7rem;
+  margin-top: 1.7rem;
+  margin-bottom: 1.7rem;
   font-weight: normal;
 }
+
+p.back {
+  font-size: 3rem;
+  padding: 0 1rem 0 0;
+}
+
+
+/* ---------- colors, dark mode ---------- */
+
+a {
+  color: #0984ff;
+}
+
+@media (prefers-color-scheme: dark) {
+  body {
+    background-color: black !important;
+	color: #eee;
+  }
+
+  img {
+    filter: invert(100%);
+  }
+}
+

+ 154 - 74
deltachat-ios/Assets/Help/it/help.html

@@ -20,6 +20,7 @@
       <li><a href="#cosè-un-gruppo-verificato-perché-è-sperimentale">Cos’è un gruppo verificato? Perché è sperimentale?</a></li>
       <li><a href="#ho-rimosso-me-stesso-per-errore">Ho rimosso me stesso per errore.</a></li>
       <li><a href="#non-voglio-più-ricevere-messaggi-dal-gruppo">Non voglio più ricevere messaggi dal gruppo.</a></li>
+      <li><a href="#what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now">What do double ticks mean in group messages? Has everyone read my message now?</a></li>
     </ul>
   </li>
   <li><a href="#encryption">Cifratura</a>
@@ -54,13 +55,14 @@
       <li><a href="#se-delta-chat-usa-lemail-è-davvero-messaggistica-istantanea">Se Delta Chat usa l’email, è davvero messaggistica <em>istantanea</em>?</a></li>
       <li><a href="#delta-chat-è-compatibile-con-protonmail--tutanota--criptext">Delta Chat è compatibile con Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#sono-interessato-ai-dettagli-tecnici-posso-avere-ulteriori-informazioni">Sono interessato ai dettagli tecnici. Posso avere ulteriori informazioni?</a></li>
+      <li><a href="#how-are-delta-chat-developments-funded">How are Delta Chat developments funded?</a></li>
     </ul>
   </li>
 </ul>
 
 
 
-<h2 id="cosè-delta-chat">
+<p class="back"><a href="#top">^</a></p><h2 id="cosè-delta-chat">
         
         
           Cos’è Delta Chat? <a href="#cosè-delta-chat" class="anchor"></a>
@@ -73,7 +75,7 @@
 
 <p><img style="float:right; width:50%; max-width:360%; margin:1em;" src="../delta-what-optim.png" /></p>
     
-      <h3 id="come-posso-trovare-persone-con-cui-messaggiare">
+      <p class="back"><a href="#top">^</a></p><h3 id="come-posso-trovare-persone-con-cui-messaggiare">
         
         
           Come posso trovare persone con cui messaggiare? <a href="#come-posso-trovare-persone-con-cui-messaggiare" class="anchor"></a>
@@ -85,7 +87,7 @@
 se il destinatario non usa Delta Chat. Al contrario di altre app,
 non è necessario che il destinatario utilizzi la tua stessa app.</p>
     
-      <h3 id="quali-sono-i-vantaggi-di-delta-chat-rispetto-alle-altre-app-di-messaggistica">
+      <p class="back"><a href="#top">^</a></p><h3 id="quali-sono-i-vantaggi-di-delta-chat-rispetto-alle-altre-app-di-messaggistica">
         
         
           Quali sono i vantaggi di Delta Chat rispetto alle altre app di messaggistica? <a href="#quali-sono-i-vantaggi-di-delta-chat-rispetto-alle-altre-app-di-messaggistica" class="anchor"></a>
@@ -108,7 +110,7 @@ non è necessario che il destinatario utilizzi la tua stessa app.</p>
   <li>Completamente <em>Open Source</em> e basata sugli <em>standard</em></li>
 </ul>
     
-      <h3 id="quali-messaggi-vengono-mostrati-in-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="quali-messaggi-vengono-mostrati-in-delta-chat">
         
         
           Quali messaggi vengono mostrati in Delta Chat? <a href="#quali-messaggi-vengono-mostrati-in-delta-chat" class="anchor"></a>
@@ -126,7 +128,7 @@ non è necessario che il destinatario utilizzi la tua stessa app.</p>
 
 <p>Gli altri messaggi non appaiono automaticamente e devono essere cercati nella sezione <strong>Richieste di contatto</strong>. La chat può essere avviata da lì.</p>
     
-      <h3 id="come-viene-gestita-la-spam">
+      <p class="back"><a href="#top">^</a></p><h3 id="come-viene-gestita-la-spam">
         
         
           Come viene gestita la spam? <a href="#come-viene-gestita-la-spam" class="anchor"></a>
@@ -140,7 +142,7 @@ non è necessario che il destinatario utilizzi la tua stessa app.</p>
   <li>In ogni caso è possibile <em>*bloccare</em> qualsiasi contatto.</li>
 </ul>
     
-      <h3 id="delta-chat-supporta-immagini-video-e-altri-allegati">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-supporta-immagini-video-e-altri-allegati">
         
         
           Delta Chat supporta immagini, video e altri allegati? <a href="#delta-chat-supporta-immagini-video-e-altri-allegati" class="anchor"></a>
@@ -152,7 +154,7 @@ non è necessario che il destinatario utilizzi la tua stessa app.</p>
   <li>Sì. Oltre al testo semplice, tutti gli allegati alle email vengono mostrati come messaggi separati. I file saranno automaticamente legati ai messaggi in uscita quando necessario.</li>
 </ul>
     
-      <h3 id="chi-può-vedere-la-mia-immagine-del-profilo">
+      <p class="back"><a href="#top">^</a></p><h3 id="chi-può-vedere-la-mia-immagine-del-profilo">
         
         
           Chi può vedere la mia immagine del profilo? <a href="#chi-può-vedere-la-mia-immagine-del-profilo" class="anchor"></a>
@@ -178,7 +180,7 @@ spesso affinché i tuoi contatti la ricevano anche se cambiano dispositivo.</p>
   </li>
 </ul>
     
-      <h3 id="delta-chat-supporta-le-email-in-html">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-supporta-le-email-in-html">
         
         
           Delta Chat supporta le email in HTML? <a href="#delta-chat-supporta-le-email-in-html" class="anchor"></a>
@@ -190,7 +192,7 @@ spesso affinché i tuoi contatti la ricevano anche se cambiano dispositivo.</p>
   <li>Si. Se le email in arrivo non dispongono di un formato testo, l’email in HTML viene convertita in testo dall’applicazione. Le email in uscita sono sempre in formato testo.</li>
 </ul>
     
-      <h3 id="perchè-devo-inserire-la-password-della-ma-email-in-delta-chat-e-sicuro">
+      <p class="back"><a href="#top">^</a></p><h3 id="perchè-devo-inserire-la-password-della-ma-email-in-delta-chat-e-sicuro">
         
         
           Perchè devo inserire la password della ma email in Delta Chat? E’ sicuro? <a href="#perchè-devo-inserire-la-password-della-ma-email-in-delta-chat-e-sicuro" class="anchor"></a>
@@ -212,7 +214,7 @@ Sorgente</a>
 per essere certo che le credenziali siano gestite in modo sicuro. Siamo felici
 di ricevere feedback che aiutino a rendere l’app più sicura per tutti gli utenti.</p>
     
-      <h3 id="quali-autorizzazioni-di-android-richiede-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="quali-autorizzazioni-di-android-richiede-delta-chat">
         
         
           Quali autorizzazioni di Android richiede Delta Chat? <a href="#quali-autorizzazioni-di-android-richiede-delta-chat" class="anchor"></a>
@@ -262,7 +264,7 @@ di ricevere feedback che aiutino a rendere l’app più sicura per tutti gli ute
   </li>
 </ul>
     
-      <h2 id="groups">
+      <p class="back"><a href="#top">^</a></p><h2 id="groups">
         
         
           Groups <a href="#groups" class="anchor"></a>
@@ -270,7 +272,7 @@ di ricevere feedback che aiutino a rendere l’app più sicura per tutti gli ute
         
       </h2>
     
-      <h3 id="creare-un-gruppo">
+      <p class="back"><a href="#top">^</a></p><h3 id="creare-un-gruppo">
         
         
           Creare un gruppo <a href="#creare-un-gruppo" class="anchor"></a>
@@ -284,7 +286,7 @@ di ricevere feedback che aiutino a rendere l’app più sicura per tutti gli ute
   <li>Appena invii il <strong>primo messaggio</strong> nel gruppo, tutto i membri verranno informati della creazione del gruppo e potranno rispondere (finchè non invii il primo messaggio il gruppo resta invisibile ai membri).</li>
 </ul>
     
-      <h3 id="aggiungere-membri-ad-un-gruppo">
+      <p class="back"><a href="#top">^</a></p><h3 id="aggiungere-membri-ad-un-gruppo">
         
         
           Aggiungere membri ad un gruppo <a href="#aggiungere-membri-ad-un-gruppo" class="anchor"></a>
@@ -297,7 +299,7 @@ di ricevere feedback che aiutino a rendere l’app più sicura per tutti gli ute
   <li>Per aggiungere o rimuovere i membri, fai clic sul nome del gruppo nella conversazione.</li>
 </ul>
     
-      <h3 id="cosè-un-gruppo-verificato-perché-è-sperimentale">
+      <p class="back"><a href="#top">^</a></p><h3 id="cosè-un-gruppo-verificato-perché-è-sperimentale">
         
         
           Cos’è un gruppo verificato? Perché è sperimentale? <a href="#cosè-un-gruppo-verificato-perché-è-sperimentale" class="anchor"></a>
@@ -326,7 +328,7 @@ così che la funzione possa uscire al più presto dallo stato sperimentale.</p>
   </li>
 </ul>
     
-      <h3 id="ho-rimosso-me-stesso-per-errore">
+      <p class="back"><a href="#top">^</a></p><h3 id="ho-rimosso-me-stesso-per-errore">
         
         
           Ho rimosso me stesso per errore. <a href="#ho-rimosso-me-stesso-per-errore" class="anchor"></a>
@@ -339,7 +341,7 @@ così che la funzione possa uscire al più presto dallo stato sperimentale.</p>
  Ad ogni modo, puoi sempre chiedere via chat a uno dei membri di aggiungerti nuovamente.</li>
 </ul>
     
-      <h3 id="non-voglio-più-ricevere-messaggi-dal-gruppo">
+      <p class="back"><a href="#top">^</a></p><h3 id="non-voglio-più-ricevere-messaggi-dal-gruppo">
         
         
           Non voglio più ricevere messaggi dal gruppo. <a href="#non-voglio-più-ricevere-messaggi-dal-gruppo" class="anchor"></a>
@@ -358,7 +360,25 @@ e potrai rispondere, ma non ti appariranno più le notifiche.</p>
   </li>
 </ul>
     
-      <h2 id="encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now">
+        
+        
+          What do double ticks mean in group messages? Has everyone read my message now? <a href="#what-do-double-ticks-mean-in-group-messages-has-everyone-read-my-message-now" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>A message shows double ticks after more than half the the recipients have
+seen the message on their display.</li>
+  <li>Note that some recipients might have disabled read-receipts for
+privacy-reasons.</li>
+  <li>If more than 50% in a group disabled read receipts, the double ticks will
+never show up. For more detailed information, see
+<a href="https://delta.chat/en/2017-07-06-read-receipts-and-social-pressure">this blogpost</a>.</li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h2 id="encryption">
         
         
           Cifratura <a href="#encryption" class="anchor"></a>
@@ -366,7 +386,7 @@ e potrai rispondere, ma non ti appariranno più le notifiche.</p>
         
       </h2>
     
-      <h3 id="delta-chat-supporta-la-cifratura-end-to-end">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-supporta-la-cifratura-end-to-end">
         
         
           Delta Chat supporta la cifratura end-to-end? <a href="#delta-chat-supporta-la-cifratura-end-to-end" class="anchor"></a>
@@ -375,11 +395,17 @@ e potrai rispondere, ma non ti appariranno più le notifiche.</p>
       </h3>
 
 <ul>
-  <li>Si. DeltaChat implementa lo standard Autocrypt Level 1 e può anche 
-cifrare e2e i messaggi da e verso altre app compatibili con Autocrypt.</li>
+  <li>
+    <p>Si. DeltaChat implementa lo standard Autocrypt Level 1 e può anche 
+cifrare e2e i messaggi da e verso altre app compatibili con Autocrypt.</p>
+  </li>
+  <li>
+    <p>Delta Chat also supports a strong form of end-to-end encryption that is 
+even safe against active attacks, see “verified groups” further below.</p>
+  </li>
 </ul>
     
-      <h3 id="cosa-devo-fare-per-attivare-la-cifratura-end-to-end">
+      <p class="back"><a href="#top">^</a></p><h3 id="cosa-devo-fare-per-attivare-la-cifratura-end-to-end">
         
         
           Cosa devo fare per attivare la cifratura end-to-end? <a href="#cosa-devo-fare-per-attivare-la-cifratura-end-to-end" class="anchor"></a>
@@ -400,12 +426,12 @@ Se un membro della chat non usa un’app compatibile con Autocrypt
 i messaggi non vengono cifrati finché non ne viene usata una compatibile.</p>
   </li>
   <li>
-    <p>Se desideri <em>disattivare</em> la cifratura end-to-end, usa 
-l’impostazione corrispondente in  “Impostazioni / Impostazioni avanzate”.</p>
+    <p>If you want to rather avoid end-to-end-encrypted e-mails by default, 
+use the corresponding Autocrypt setting in “Settings / Advanced settings”.</p>
   </li>
 </ul>
     
-      <h3 id="se-la-cifratura-end-to-end-non-è-disponibile-anche-la-connessione-non-viene-cifrata">
+      <p class="back"><a href="#top">^</a></p><h3 id="se-la-cifratura-end-to-end-non-è-disponibile-anche-la-connessione-non-viene-cifrata">
         
         
           Se la cifratura end-to-end non è disponibile, anche la connessione non viene cifrata? <a href="#se-la-cifratura-end-to-end-non-è-disponibile-anche-la-connessione-non-viene-cifrata" class="anchor"></a>
@@ -421,7 +447,7 @@ email. La cifratura e2e rende invece sicura la comunicazione
 tra il tuo dispositivo e quello del destinatario.</li>
 </ul>
     
-      <h3 id="come-posso-verificare-lo-stato-di-cifratura-con-il-mittente">
+      <p class="back"><a href="#top">^</a></p><h3 id="come-posso-verificare-lo-stato-di-cifratura-con-il-mittente">
         
         
           Come posso verificare lo stato di cifratura con il mittente? <a href="#come-posso-verificare-lo-stato-di-cifratura-con-il-mittente" class="anchor"></a>
@@ -449,7 +475,7 @@ la connessione è sicura.</p>
   </li>
 </ul>
     
-      <h3 id="come-posso-verificare-la-cifratura-dei-messaggi">
+      <p class="back"><a href="#top">^</a></p><h3 id="come-posso-verificare-la-cifratura-dei-messaggi">
         
         
           Come posso verificare la cifratura dei messaggi? <a href="#come-posso-verificare-la-cifratura-dei-messaggi" class="anchor"></a>
@@ -466,7 +492,7 @@ la connessione è sicura.</p>
   </li>
 </ul>
     
-      <h3 id="quali-standard-vengono-usati-per-la-crittografia-end-to-end">
+      <p class="back"><a href="#top">^</a></p><h3 id="quali-standard-vengono-usati-per-la-crittografia-end-to-end">
         
         
           Quali standard vengono usati per la crittografia end-to-end? <a href="#quali-standard-vengono-usati-per-la-crittografia-end-to-end" class="anchor"></a>
@@ -475,15 +501,18 @@ la connessione è sicura.</p>
       </h3>
 
 <ul>
-  <li><a href="https://autocrypt.org">Autocrypt</a> viene usato per stabilire una
-cifratura e2e tra Delta Chat e le altre app di email compatibili con Autocrypt. 
-Autocrypt usa un sottoinsieme di funzionalità di OpenGPG. In più
-Delta Chat implementa protocolli “countermitm” per fornire una
-protezione dagli attacchi di rete, andando oltre alla sola protezione di
-base di Autocrypt, vedi le domande sui “Gruppi verificati”.</li>
+  <li>
+    <p><a href="https://autocrypt.org">Autocrypt</a> is used for establishing
+e2e-encryption with other Delta Chat and other Autocrypt-capable mail apps. 
+Autocrypt uses a limited subset of OpenPGP functionality.</p>
+  </li>
+  <li>
+    <p>Delta Chat implements <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermitm setup-contact and verified-group protocols</a> to achieve protection against active network attacks.  This goes beyond the opportunistic
+base protection of Autocrypt Level 1, while maintaining its ease of use.</p>
+  </li>
 </ul>
     
-      <h3 id="qual-è-la-differenza-tra-i-gruppi-verificati-e-le-chat-11-con-i-contatti-verificati">
+      <p class="back"><a href="#top">^</a></p><h3 id="qual-è-la-differenza-tra-i-gruppi-verificati-e-le-chat-11-con-i-contatti-verificati">
         
         
           Qual è la differenza tra i gruppi verificati e le chat 1:1 con i contatti verificati? <a href="#qual-è-la-differenza-tra-i-gruppi-verificati-e-le-chat-11-con-i-contatti-verificati" class="anchor"></a>
@@ -511,7 +540,7 @@ il motivo per cui non c’è la spunta di contatto verificato, anche se lo è.</
   </li>
 </ul>
     
-      <h3 id="delta-chat-supporta-perfect-forward-secrecy">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-supporta-perfect-forward-secrecy">
         
         
           Delta Chat supporta Perfect Forward Secrecy? <a href="#delta-chat-supporta-perfect-forward-secrecy" class="anchor"></a>
@@ -541,7 +570,7 @@ di sequestro del dispositivo.</p>
   </li>
 </ul>
     
-      <h3 id="come-fa-delta-chat-a-proteggere-i-miei-metadata">
+      <p class="back"><a href="#top">^</a></p><h3 id="come-fa-delta-chat-a-proteggere-i-miei-metadata">
         
         
           Come fa Delta Chat a proteggere i miei metadata? <a href="#come-fa-delta-chat-a-proteggere-i-miei-metadata" class="anchor"></a>
@@ -571,7 +600,7 @@ RFC</a>.</p>
   </li>
 </ul>
     
-      <h3 id="posso-riutilizzare-le-mie-chiavi-private">
+      <p class="back"><a href="#top">^</a></p><h3 id="posso-riutilizzare-le-mie-chiavi-private">
         
         
           Posso riutilizzare le mie chiavi private? <a href="#posso-riutilizzare-le-mie-chiavi-private" class="anchor"></a>
@@ -590,7 +619,7 @@ RFC</a>.</p>
 
 <p>Se non hai una chiave o non sai perché ne dovresti aver bisogno, non preoccuparti: Delta Chat ne genera una quando necessario, non devi premere nessun tasto.</p>
     
-      <h3 id="non-riesco-ad-importare-la-mia-chiave-pgp-in-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="non-riesco-ad-importare-la-mia-chiave-pgp-in-delta-chat">
         
         
           Non riesco ad importare la mia chiave PGP in Delta Chat. <a href="#non-riesco-ad-importare-la-mia-chiave-pgp-in-delta-chat" class="anchor"></a>
@@ -616,7 +645,7 @@ valore vuoto nella finestra di gestione delle chiavi. Anche con GnuPG puoi farlo
 <a href="https://github.com/deltachat/deltachat-android/issues/98#issuecomment-378383429">tramite linea di comando</a>.
 Per gli altri programmi puoi trovare altre soluzioni online.</p>
     
-      <h3 id="perchè-non-usate-pep-pretty-easy-privacy">
+      <p class="back"><a href="#top">^</a></p><h3 id="perchè-non-usate-pep-pretty-easy-privacy">
         
         
           Perchè non usate pEp (pretty easy privacy)? <a href="#perchè-non-usate-pep-pretty-easy-privacy" class="anchor"></a>
@@ -630,7 +659,7 @@ approfondire una discussione su Autocrypt and pEp, vedi <a href="https://autocry
 FAQ</a>.</li>
 </ul>
     
-      <h2 id="multiclient">
+      <p class="back"><a href="#top">^</a></p><h2 id="multiclient">
         
         
           Multi-client <a href="#multiclient" class="anchor"></a>
@@ -638,7 +667,7 @@ FAQ</a>.</li>
         
       </h2>
     
-      <h3 id="posso-usare-delta-chat-su-più-dispositivi-contemporaneamente">
+      <p class="back"><a href="#top">^</a></p><h3 id="posso-usare-delta-chat-su-più-dispositivi-contemporaneamente">
         
         
           Posso usare Delta Chat su più dispositivi contemporaneamente? <a href="#posso-usare-delta-chat-su-più-dispositivi-contemporaneamente" class="anchor"></a>
@@ -646,25 +675,22 @@ FAQ</a>.</li>
         
       </h3>
 
-<p>Se vuoi usare lo <strong>stesso account</strong> su dispositivi (compatibili
-Autocrypt) diversi, devi sincronizzare i loro strumenti di cifratura:</p>
+<p>If you want to use the <strong>same account</strong> on different devices, you should export
+a backup from the old device, and import it into the new device:</p>
 
 <ul>
-  <li>
-    <p>Nel primo dispositivo, scegli “Impostazioni avanzate / Invia messaggio di configurazione Autocrypt” 
-e clicca finché viene mostrato un “numero di sicurezza”.</p>
-  </li>
-  <li>
-    <p>Nell’altro dispositivo attendi che arrivi il “Messaggio di configurazione Autocrypt” 
-e selezionalo, dovrebbe mostrarti un numero di sicurezza.</p>
-  </li>
-  <li>
-    <p>ora hai correttamente sincronizzato i dispositivi e puoi usarli per
-inviare e ricevere messaggi cifrati E2E con i tuoi interlocutori.</p>
-  </li>
+  <li>On the old device, choose “Settings / Chats and media / Backup”. Enter your
+screen unlock PIN, pattern, or password. Then you can click on “Start
+Backup”. This saves the backup file to your device. Now you have to transfer
+it to the other device somehow.</li>
+  <li>On the new device, on the login screen, instead of logging into your email
+account, choose “Import Backup”. After import, your conversations, encryption
+keys, and media should be copied to the new device.</li>
+  <li>You are now synchronized, and can use both devices for sending and receiving
+E2E-encrypted messages with your communication partners.</li>
 </ul>
     
-      <h3 id="e-in-previsione-la-creazione-di-un-client-web-di-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="e-in-previsione-la-creazione-di-un-client-web-di-delta-chat">
         
         
           E’ in previsione la creazione di un client web di Delta Chat? <a href="#e-in-previsione-la-creazione-di-un-client-web-di-delta-chat" class="anchor"></a>
@@ -683,7 +709,7 @@ per i sistemi Linux. Puoi trovarli su
 <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
     
-      <h3 id="perchè-posso-scegliere-di-non-controllare-la-casella-in-arrivo">
+      <p class="back"><a href="#top">^</a></p><h3 id="perchè-posso-scegliere-di-non-controllare-la-casella-in-arrivo">
         
         
           Perchè posso scegliere di non controllare la casella In Arrivo? <a href="#perchè-posso-scegliere-di-non-controllare-la-casella-in-arrivo" class="anchor"></a>
@@ -705,7 +731,7 @@ sarebbe stato fatto dall’applicazione Delta Chat.</p>
 
 <p>In questo caso Delta Chat non necessita di controllare la casella In Arrivo</p>
     
-      <h3 id="a-cosa-serve-lopzione-auto-invia-una-copia">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-cosa-serve-lopzione-auto-invia-una-copia">
         
         
           A cosa serve l’opzione “Auto-invia una copia”? <a href="#a-cosa-serve-lopzione-auto-invia-una-copia" class="anchor"></a>
@@ -725,7 +751,7 @@ e una volta attraverso l’IMAP alla cartella Inviata).</p>
 
 <p>L’impostazione predefinita per Auto-invia una copia è “no”.</p>
     
-      <h3 id="perchè-posso-scegliere-di-controllare-la-cartella-inviata">
+      <p class="back"><a href="#top">^</a></p><h3 id="perchè-posso-scegliere-di-controllare-la-cartella-inviata">
         
         
           Perchè posso scegliere di controllare la cartella “Inviata”? <a href="#perchè-posso-scegliere-di-controllare-la-cartella-inviata" class="anchor"></a>
@@ -742,7 +768,7 @@ per partecipare a conversazioni in chat.</p>
 potrebbe sparire in futuro. E’ stata introdotta in un periodo in cui non esisteva il
 client Desktop di Delta Chat su ogni piattaforma.</p>
     
-      <h3 id="perchè-posso-scegliere-di-non-controllare-la-cartella-deltachat">
+      <p class="back"><a href="#top">^</a></p><h3 id="perchè-posso-scegliere-di-non-controllare-la-cartella-deltachat">
         
         
           Perchè posso scegliere di non controllare la cartella DeltaChat? <a href="#perchè-posso-scegliere-di-non-controllare-la-cartella-deltachat" class="anchor"></a>
@@ -755,7 +781,7 @@ per la loro posta, invece della cartella DeltaChat. Se disattivi “Controlla ca
 dovresti anche disabilitare “Sposta automaticamente nella cartella DeltaChat”.
 Altrimenti l’eliminazione dei messaggi o l’impostazione di più dispositivi potrebbe non funzionare correttamente.</p>
     
-      <h2 id="varie">
+      <p class="back"><a href="#top">^</a></p><h2 id="varie">
         
         
           Varie <a href="#varie" class="anchor"></a>
@@ -763,7 +789,7 @@ Altrimenti l’eliminazione dei messaggi o l’impostazione di più dispositivi
         
       </h2>
     
-      <h3 id="delta-chat-funziona-con-il-mio-provider-email">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-funziona-con-il-mio-provider-email">
         
         
           Delta Chat funziona con il <em>mio</em> provider email? <a href="#delta-chat-funziona-con-il-mio-provider-email" class="anchor"></a>
@@ -777,7 +803,7 @@ Ad ogni modo, alcuni provider richiedono di attivare impostazioni particolari pe
 vedi <a href="https://providers.delta.chat">Provider Overview</a></li>
 </ul>
     
-      <h3 id="se-delta-chat-usa-lemail-è-davvero-messaggistica-istantanea">
+      <p class="back"><a href="#top">^</a></p><h3 id="se-delta-chat-usa-lemail-è-davvero-messaggistica-istantanea">
         
         
           Se Delta Chat usa l’email, è davvero messaggistica <em>istantanea</em>? <a href="#se-delta-chat-usa-lemail-è-davvero-messaggistica-istantanea" class="anchor"></a>
@@ -802,7 +828,7 @@ problema per molte applicazioni legittime. Per ulteriori informazioni, vedi
 <a href="https://dontkillmyapp.com/">dontkillmyapp.com</a>.</li>
 </ul>
     
-      <h3 id="delta-chat-è-compatibile-con-protonmail--tutanota--criptext">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-è-compatibile-con-protonmail--tutanota--criptext">
         
         
           Delta Chat è compatibile con Protonmail / Tutanota / Criptext? <a href="#delta-chat-è-compatibile-con-protonmail--tutanota--criptext" class="anchor"></a>
@@ -812,17 +838,17 @@ problema per molte applicazioni legittime. Per ulteriori informazioni, vedi
 
 <ul>
   <li>Sì e no.</li>
-  <li>No, non puoi usare il tuo account Protonmail, Tutanota o Criptext con Delta
-Chat; non offrono la possibilità di ricevere e-mail via IMAP.</li>
-  <li>In ogni caso puoi usare Delta Chat per inviare messaggi a persone che utilizzano
-Protonmail, Tutanota o Criptext. Questi messaggi non saranno però
-cifrati end-to-end. La crittografia end-to-end offerta da questi fornitori è fornita solo
-tramite le loro piattaforme e non sono compatibili con nessun servizio esterno.</li>
-  <li>Delta Chat è in grado di crittografare e2e attraverso qualsiasi provider di posta elettronica con qualsiasi
-https://autocrypt.org/dev-status.html](applicazione e-mail abilitata alla crittografia automatica).</li>
+  <li>No, non puoi utilizzare il tuo account Protonmail, Tutanota o Criptext con Delta
+Chat; non offrono la ricezione di posta tramite IMAP.</li>
+  <li>In ogni caso puoi usare Delta Chat per inviare messaggi alle persone che usano
+Protonmail, Tutanota o Criptext. Quei messaggi non saranno criptati end-to-end
+però. La crittografia end-to-end offerta solo da questi provider è
+lavorata all’interno delle loro piattaforme e non compatibile con nessuno all’esterno.</li>
+  <li>Delta Chat può crittografare e2e tramite qualsiasi provider di posta elettronica con qualsiasi
+[App di posta elettronica abilitata per Autocrypt] (https://autocrypt.org/dev-status.html).</li>
 </ul>
     
-      <h3 id="sono-interessato-ai-dettagli-tecnici-posso-avere-ulteriori-informazioni">
+      <p class="back"><a href="#top">^</a></p><h3 id="sono-interessato-ai-dettagli-tecnici-posso-avere-ulteriori-informazioni">
         
         
           Sono interessato ai dettagli tecnici. Posso avere ulteriori informazioni? <a href="#sono-interessato-ai-dettagli-tecnici-posso-avere-ulteriori-informazioni" class="anchor"></a>
@@ -833,9 +859,63 @@ https://autocrypt.org/dev-status.html](applicazione e-mail abilitata alla critto
 <ul>
   <li>Consulta la pagina <a href="https://github.com/deltachat/deltachat-android/blob/master/standards.md#standards-used-in-delta-chat">Standard utilizzati in Delta Chat</a>.</li>
 </ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="how-are-delta-chat-developments-funded">
+        
+        
+          How are Delta Chat developments funded? <a href="#how-are-delta-chat-developments-funded" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>First of all, 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>
+
+<p>Delta Chat developments have so far been funded from four major 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>
+  </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 
+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 
+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>
+  </li>
+  <li>
+    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted EUR 46K for
+completing Rust/Python bindings and instigating a Chat-bot ecosystem.</p>
+  </li>
+  <li>
+    <p>Last but by far not least, several pro-bono experts and enthusiasts contributed 
+and contribute to Delta Chat developments without receiving money, or only 
+small amounts. Without them, Delta Chat would not be where it is today, not
+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>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>
 
 
 
 
 
-</body></html>
+</body></html><p class="back"><a href="#top">^</a></p>

+ 143 - 64
deltachat-ios/Assets/Help/nl/help.html

@@ -20,6 +20,7 @@
       <li><a href="#wat-is-een-goedgekeurde-groep-en-waarom-is-dit-een-experimentele-functie">Wat is een ‘goedgekeurde groep’, en waarom is dit een experimentele functie?</a></li>
       <li><a href="#ik-heb-mezelf-per-ongeluk-verwijderd">Ik heb mezelf per ongeluk verwijderd</a></li>
       <li><a href="#ik-wil-geen-groepsberichten-meer-ontvangen">Ik wil geen groepsberichten meer ontvangen</a></li>
+      <li><a href="#wat-betekenen-de-twee-vinkjes-in-groepsberichten-heeft-iedereen-mijn-bericht-gelezen">Wat betekenen de twee vinkjes in groepsberichten? Heeft iedereen mijn bericht gelezen?</a></li>
     </ul>
   </li>
   <li><a href="#encryption">Versleuteling</a>
@@ -55,12 +56,16 @@
       <li><a href="#is-delta-chat-compatibel-met-protonmailtutanotacriptext">Is Delta Chat compatibel met Protonmail/Tutanota/Criptext?</a></li>
     </ul>
   </li>
-  <li><a href="#ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">Ik wil graag meer weten over de gebruikte technieken. Waar kan ik meer informatie vinden?</a></li>
+  <li><a href="#ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">Ik wil graag meer weten over de gebruikte technieken. Waar kan ik meer informatie vinden?</a>
+    <ul>
+      <li><a href="#hoe-wordt-de-ontwikkeling-van-delta-chat-gefinancierd">Hoe wordt de ontwikkeling van Delta Chat gefinancierd?</a></li>
+    </ul>
+  </li>
 </ul>
 
 
 
-<h2 id="wat-is-delta-chat">
+<p class="back"><a href="#top">^</a></p><h2 id="wat-is-delta-chat">
         
         
           Wat is Delta Chat? <a href="#wat-is-delta-chat" class="anchor"></a>
@@ -73,7 +78,7 @@
 
 <p><img style="float:right; width:50%; max-width:360%; margin:1em;" src="../delta-what-optim.png" /></p>
     
-      <h3 id="hoe-kan-ik-gesprekspartners-vinden">
+      <p class="back"><a href="#top">^</a></p><h3 id="hoe-kan-ik-gesprekspartners-vinden">
         
         
           Hoe kan ik gesprekspartners vinden? <a href="#hoe-kan-ik-gesprekspartners-vinden" class="anchor"></a>
@@ -85,7 +90,7 @@
 als de ontvanger (nog) geen gebruik maakt van de Delta Chat-app. De ontvanger hoeft dus niet
 per se dezelfde app te gebruiken als jij zoals bij andere chatapps.</p>
     
-      <h3 id="wat-zijn-de-voordelen-van-delta-chat-tov-andere-gespreksapps">
+      <p class="back"><a href="#top">^</a></p><h3 id="wat-zijn-de-voordelen-van-delta-chat-tov-andere-gespreksapps">
         
         
           Wat zijn de voordelen van Delta Chat t.o.v. andere gespreksapps? <a href="#wat-zijn-de-voordelen-van-delta-chat-tov-andere-gespreksapps" class="anchor"></a>
@@ -108,7 +113,7 @@ per se dezelfde app te gebruiken als jij zoals bij andere chatapps.</p>
   <li>Volledig <em>open source</em> en gebaseerd op <em>standaarden</em>.</li>
 </ul>
     
-      <h3 id="welke-berichten-vind-ik-terug-in-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="welke-berichten-vind-ik-terug-in-delta-chat">
         
         
           Welke berichten vind ik terug in Delta Chat? <a href="#welke-berichten-vind-ik-terug-in-delta-chat" class="anchor"></a>
@@ -126,7 +131,7 @@ per se dezelfde app te gebruiken als jij zoals bij andere chatapps.</p>
 
 <p>Overige berichten verschijnen niet automatisch; je vindt deze terug in het hoofdmenu onder <strong>Contactpersoonverzoeken</strong>. Van daaruit kun je, desgewenst, een gesprek beginnen.</p>
     
-      <h3 id="hoe-zit-het-met-ongewenste-berichten">
+      <p class="back"><a href="#top">^</a></p><h3 id="hoe-zit-het-met-ongewenste-berichten">
         
         
           Hoe zit het met ongewenste berichten? <a href="#hoe-zit-het-met-ongewenste-berichten" class="anchor"></a>
@@ -140,7 +145,7 @@ per se dezelfde app te gebruiken als jij zoals bij andere chatapps.</p>
   <li>Je kunt contactpersonen ten allen tijde blokkeren.</li>
 </ul>
     
-      <h3 id="ondersteunt-delta-chat-afbeeldingen-videos-en-ander-soort-bijlagen">
+      <p class="back"><a href="#top">^</a></p><h3 id="ondersteunt-delta-chat-afbeeldingen-videos-en-ander-soort-bijlagen">
         
         
           Ondersteunt Delta Chat afbeeldingen, video’s en ander soort bijlagen? <a href="#ondersteunt-delta-chat-afbeeldingen-videos-en-ander-soort-bijlagen" class="anchor"></a>
@@ -152,7 +157,7 @@ per se dezelfde app te gebruiken als jij zoals bij andere chatapps.</p>
   <li>Ja. Plattetekstberichten en e-mailbijlagen worden apart getoond. Uitgaande berichten worden, indien nodig, automatisch voorzien van bijlagen.</li>
 </ul>
     
-      <h3 id="wie-kan-mijn-profielfoto-zien">
+      <p class="back"><a href="#top">^</a></p><h3 id="wie-kan-mijn-profielfoto-zien">
         
         
           Wie kan mijn profielfoto zien? <a href="#wie-kan-mijn-profielfoto-zien" class="anchor"></a>
@@ -178,7 +183,7 @@ Je contactpersonen ontvangen hem dan opnieuw, zelfs als ze een nieuw apparaat to
   </li>
 </ul>
     
-      <h3 id="ondersteunt-delta-chat-html-e-mails">
+      <p class="back"><a href="#top">^</a></p><h3 id="ondersteunt-delta-chat-html-e-mails">
         
         
           Ondersteunt Delta Chat HTML-e-mails? <a href="#ondersteunt-delta-chat-html-e-mails" class="anchor"></a>
@@ -190,7 +195,7 @@ Je contactpersonen ontvangen hem dan opnieuw, zelfs als ze een nieuw apparaat to
   <li>Ja. Als een inkomende e-mail niet bestempeld is als platte tekst, dan zetten we de HTML-e-mail handmatig om in platte tekst. Uitgaande e-mails zijn altijd platte tekst.</li>
 </ul>
     
-      <h3 id="waarom-moet-ik-mijn-e-mailwachtwoord-invoeren-in-delta-chat-is-dat-wel-veilig">
+      <p class="back"><a href="#top">^</a></p><h3 id="waarom-moet-ik-mijn-e-mailwachtwoord-invoeren-in-delta-chat-is-dat-wel-veilig">
         
         
           Waarom moet ik mijn e-mailwachtwoord invoeren in Delta Chat? Is dat wel veilig? <a href="#waarom-moet-ik-mijn-e-mailwachtwoord-invoeren-in-delta-chat-is-dat-wel-veilig" class="anchor"></a>
@@ -206,7 +211,7 @@ Je contactpersonen ontvangen hem dan opnieuw, zelfs als ze een nieuw apparaat to
 code</a>
 kunt bekijken om er zeker van te zijn dat er veilig wordt omgegaan met je inloggegevens. We ontvangen graag feedback hierover.</p>
     
-      <h3 id="welke-android-machtigingen-heeft-delta-chat-nodig">
+      <p class="back"><a href="#top">^</a></p><h3 id="welke-android-machtigingen-heeft-delta-chat-nodig">
         
         
           Welke Android-machtigingen heeft Delta Chat nodig? <a href="#welke-android-machtigingen-heeft-delta-chat-nodig" class="anchor"></a>
@@ -256,7 +261,7 @@ kunt bekijken om er zeker van te zijn dat er veilig wordt omgegaan met je inlogg
   </li>
 </ul>
     
-      <h2 id="groepen">
+      <p class="back"><a href="#top">^</a></p><h2 id="groepen">
         
         
           Groepen <a href="#groepen" class="anchor"></a>
@@ -264,7 +269,7 @@ kunt bekijken om er zeker van te zijn dat er veilig wordt omgegaan met je inlogg
         
       </h2>
     
-      <h3 id="groepen-aanmaken">
+      <p class="back"><a href="#top">^</a></p><h3 id="groepen-aanmaken">
         
         
           Groepen aanmaken <a href="#groepen-aanmaken" class="anchor"></a>
@@ -278,7 +283,7 @@ kunt bekijken om er zeker van te zijn dat er veilig wordt omgegaan met je inlogg
   <li>Zodra je het <strong>eerste groepsbericht</strong> hebt verstuurd, worden alle deelnemers op de hoogte gebracht en kunnen zij antwoorden versturen (de groep blijft onzichtbaar voor anderen zolang jij geen bericht verstuurt).</li>
 </ul>
     
-      <h3 id="deelnemers-toevoegen-aan-een-groep">
+      <p class="back"><a href="#top">^</a></p><h3 id="deelnemers-toevoegen-aan-een-groep">
         
         
           Deelnemers toevoegen aan een groep <a href="#deelnemers-toevoegen-aan-een-groep" class="anchor"></a>
@@ -291,7 +296,7 @@ kunt bekijken om er zeker van te zijn dat er veilig wordt omgegaan met je inlogg
   <li>Open het gesprek en druk op de groepsnaam om deelnemers toe te voegen of te verwijderen.</li>
 </ul>
     
-      <h3 id="wat-is-een-goedgekeurde-groep-en-waarom-is-dit-een-experimentele-functie">
+      <p class="back"><a href="#top">^</a></p><h3 id="wat-is-een-goedgekeurde-groep-en-waarom-is-dit-een-experimentele-functie">
         
         
           Wat is een ‘goedgekeurde groep’, en waarom is dit een experimentele functie? <a href="#wat-is-een-goedgekeurde-groep-en-waarom-is-dit-een-experimentele-functie" class="anchor"></a>
@@ -320,7 +325,7 @@ verschillende ontwikkelingen gedaan omtrent de qr-join-protocollen. Het label
   </li>
 </ul>
     
-      <h3 id="ik-heb-mezelf-per-ongeluk-verwijderd">
+      <p class="back"><a href="#top">^</a></p><h3 id="ik-heb-mezelf-per-ongeluk-verwijderd">
         
         
           Ik heb mezelf per ongeluk verwijderd <a href="#ik-heb-mezelf-per-ongeluk-verwijderd" class="anchor"></a>
@@ -333,7 +338,7 @@ verschillende ontwikkelingen gedaan omtrent de qr-join-protocollen. Het label
 Vraag iemand via een één-op-ééngesprek of hij/zij je weer wilt toevoegen.</li>
 </ul>
     
-      <h3 id="ik-wil-geen-groepsberichten-meer-ontvangen">
+      <p class="back"><a href="#top">^</a></p><h3 id="ik-wil-geen-groepsberichten-meer-ontvangen">
         
         
           Ik wil geen groepsberichten meer ontvangen <a href="#ik-wil-geen-groepsberichten-meer-ontvangen" class="anchor"></a>
@@ -352,7 +357,24 @@ geen meldingen meer als er nieuwe berichten zijn.</p>
   </li>
 </ul>
     
-      <h2 id="encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="wat-betekenen-de-twee-vinkjes-in-groepsberichten-heeft-iedereen-mijn-bericht-gelezen">
+        
+        
+          Wat betekenen de twee vinkjes in groepsberichten? Heeft iedereen mijn bericht gelezen? <a href="#wat-betekenen-de-twee-vinkjes-in-groepsberichten-heeft-iedereen-mijn-bericht-gelezen" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>Een bericht bevat twee vinkjes als meer dan de helft van de ontvangers
+het bericht heeft bekeken (niet per se gelezen).</li>
+  <li>Sommige ontvangers hebben leesbevestigingen uitgeschakeld omwille van hun privacy.</li>
+  <li>Als meer dan de helft van de ontvangers in een groep ze heeft uitgeschakeld, dan worden de twee vinkjes
+nooit getoond. Meer informatie hierover vind je in
+<a href="https://delta.chat/en/2017-07-06-read-receipts-and-social-pressure">dit blogbericht</a>.</li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h2 id="encryption">
         
         
           Versleuteling <a href="#encryption" class="anchor"></a>
@@ -360,7 +382,7 @@ geen meldingen meer als er nieuwe berichten zijn.</p>
         
       </h2>
     
-      <h3 id="ondersteunt-delta-chat-end-to-end-versleuteling">
+      <p class="back"><a href="#top">^</a></p><h3 id="ondersteunt-delta-chat-end-to-end-versleuteling">
         
         
           Ondersteunt Delta Chat end-to-end-versleuteling? <a href="#ondersteunt-delta-chat-end-to-end-versleuteling" class="anchor"></a>
@@ -369,11 +391,17 @@ geen meldingen meer als er nieuwe berichten zijn.</p>
       </h3>
 
 <ul>
-  <li>Ja. Delta Chat heeft de standaard Autocrypt niveau 1 ingebouwd
-en kan dus e2e-berichten versleutelen d.m.v. Autocrypt-achtige apps.</li>
+  <li>
+    <p>Ja. Delta Chat heeft de standaard Autocrypt niveau 1 ingebouwd
+en kan dus e2e-berichten versleutelen d.m.v. Autocrypt-achtige apps.</p>
+  </li>
+  <li>
+    <p>Delta Chat ondersteunt een sterke variant van end-to-end-versleuteling die zélfs
+beschermt tegen actieve aanvallen. Zie ‘goedgekeurde groepen’ verderop.</p>
+  </li>
 </ul>
     
-      <h3 id="moet-ik-iets-doen-om-end-to-end-versleuteling-in-te-schakelen">
+      <p class="back"><a href="#top">^</a></p><h3 id="moet-ik-iets-doen-om-end-to-end-versleuteling-in-te-schakelen">
         
         
           Moet ik iets doen om end-to-end-versleuteling in te schakelen? <a href="#moet-ik-iets-doen-om-end-to-end-versleuteling-in-te-schakelen" class="anchor"></a>
@@ -394,12 +422,12 @@ Als één van de gesprekspartners een niet met Autocrypt compatibele e-mailapp g
 dan zijn die berichten onversleuteld.</p>
   </li>
   <li>
-    <p>Als je end-to-end-versleuteling wilt <em>uitschakelen</em>, 
-ga dan naar ‘Instellingen –&gt; Geavanceerd’.</p>
+    <p>Als je end-to-end-versleuteling standaard wilt <em>uitschakelen</em>, 
+zoek dan de Autocrypt-optie in ‘Instellingen –&gt; Geavanceerd’.</p>
   </li>
 </ul>
     
-      <h3 id="als-end-to-end-versleuteling-niet-beschikbaar-is-is-de-verbinding-dan-onbeveilgd">
+      <p class="back"><a href="#top">^</a></p><h3 id="als-end-to-end-versleuteling-niet-beschikbaar-is-is-de-verbinding-dan-onbeveilgd">
         
         
           Als end-to-end-versleuteling niet beschikbaar is, is de verbinding dan onbeveilgd? <a href="#als-end-to-end-versleuteling-niet-beschikbaar-is-is-de-verbinding-dan-onbeveilgd" class="anchor"></a>
@@ -415,7 +443,7 @@ e2e-versleuteling biedt die bescherming tussen
 jouw apparaat en dat van je gesprekspartner.</li>
 </ul>
     
-      <h3 id="hoe-kan-ik-de-cryptografische-status-met-een-afzender-verifiëren">
+      <p class="back"><a href="#top">^</a></p><h3 id="hoe-kan-ik-de-cryptografische-status-met-een-afzender-verifiëren">
         
         
           Hoe kan ik de cryptografische status met een afzender verifiëren? <a href="#hoe-kan-ik-de-cryptografische-status-met-een-afzender-verifiëren" class="anchor"></a>
@@ -443,7 +471,7 @@ Als deze dezelfde zijn als die op het apparaat van je gesprekspartner, dan is de
   </li>
 </ul>
     
-      <h3 id="hoe-kan-ik-de-versleuteling-controleren">
+      <p class="back"><a href="#top">^</a></p><h3 id="hoe-kan-ik-de-versleuteling-controleren">
         
         
           Hoe kan ik de versleuteling controleren? <a href="#hoe-kan-ik-de-versleuteling-controleren" class="anchor"></a>
@@ -460,7 +488,7 @@ Als deze dezelfde zijn als die op het apparaat van je gesprekspartner, dan is de
   </li>
 </ul>
     
-      <h3 id="welke-standaarden-worden-gebruikt-bij-end-to-end-beveiliging">
+      <p class="back"><a href="#top">^</a></p><h3 id="welke-standaarden-worden-gebruikt-bij-end-to-end-beveiliging">
         
         
           Welke standaarden worden gebruikt bij end-to-end-beveiliging? <a href="#welke-standaarden-worden-gebruikt-bij-end-to-end-beveiliging" class="anchor"></a>
@@ -469,15 +497,19 @@ Als deze dezelfde zijn als die op het apparaat van je gesprekspartner, dan is de
       </h3>
 
 <ul>
-  <li><a href="https://autocrypt.org">Autocrypt</a> wordt gebruikt voor het opzetten
+  <li>
+    <p><a href="https://autocrypt.org">Autocrypt</a> wordt gebruikt voor het opzetten
 van een e2e-versleuteling met andere Delta Chat-apps, alsmede andere apps die Autocrypt ondersteunen.
-Autocrypt gebruikt een beperkte set OpenPGP-functionaliteit.
-Delta Chat gebruikt de ‘countermitm’-protocollen om bescherming
+Autocrypt gebruikt een beperkte set OpenPGP-functionaliteit.</p>
+  </li>
+  <li>
+    <p>Delta Chat gebruikt de <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermitm setup-contact- en verified-group-protocollen</a> om bescherming
 te bieden tegen actieve netwerkaanvallen. Hierdoor gaat Delta Chat
-verder dan de basisbescherming van Autocrypt. Zie ook de vraag over goedgekeurde groepen.</li>
+verder dan de basisbescherming van Autocrypt niveau 1.</p>
+  </li>
 </ul>
     
-      <h3 id="wat-is-het-verschil-tussen-goedgekeurde-groepen-en-1-op-1-gesprekken-met-goedgekeurde-contactpersonen">
+      <p class="back"><a href="#top">^</a></p><h3 id="wat-is-het-verschil-tussen-goedgekeurde-groepen-en-1-op-1-gesprekken-met-goedgekeurde-contactpersonen">
         
         
           Wat is het verschil tussen goedgekeurde groepen en 1-op-1-gesprekken met goedgekeurde contactpersonen? <a href="#wat-is-het-verschil-tussen-goedgekeurde-groepen-en-1-op-1-gesprekken-met-goedgekeurde-contactpersonen" class="anchor"></a>
@@ -505,7 +537,7 @@ vinkje, zelfs als de contactpersoon is goedgekeurd.</p>
   </li>
 </ul>
     
-      <h3 id="ondersteunt-delta-chat-perfect-forward-secrecy">
+      <p class="back"><a href="#top">^</a></p><h3 id="ondersteunt-delta-chat-perfect-forward-secrecy">
         
         
           Ondersteunt Delta Chat Perfect Forward Secrecy? <a href="#ondersteunt-delta-chat-perfect-forward-secrecy" class="anchor"></a>
@@ -535,7 +567,7 @@ van een apparaat.</p>
   </li>
 </ul>
     
-      <h3 id="hoe-beschermt-delta-chat-mijn-metagegevens">
+      <p class="back"><a href="#top">^</a></p><h3 id="hoe-beschermt-delta-chat-mijn-metagegevens">
         
         
           Hoe beschermt Delta Chat mijn metagegevens? <a href="#hoe-beschermt-delta-chat-mijn-metagegevens" class="anchor"></a>
@@ -563,7 +595,7 @@ RFC</a>.</p>
   </li>
 </ul>
     
-      <h3 id="kan-ik-mijn-bestaande-privésleutel-hergebruiken">
+      <p class="back"><a href="#top">^</a></p><h3 id="kan-ik-mijn-bestaande-privésleutel-hergebruiken">
         
         
           Kan ik mijn bestaande privésleutel hergebruiken? <a href="#kan-ik-mijn-bestaande-privésleutel-hergebruiken" class="anchor"></a>
@@ -582,7 +614,7 @@ RFC</a>.</p>
 
 <p>Als je geen sleutel hebt of niet wist dat je er één nodig had, geen paniek: Delta Chat genereert, indien nodig, automatisch een sleutel.</p>
     
-      <h3 id="ik-kan-mijn-bestaande-pgp-sleutel-niet-importeren">
+      <p class="back"><a href="#top">^</a></p><h3 id="ik-kan-mijn-bestaande-pgp-sleutel-niet-importeren">
         
         
           Ik kan mijn bestaande PGP-sleutel niet importeren <a href="#ik-kan-mijn-bestaande-pgp-sleutel-niet-importeren" class="anchor"></a>
@@ -608,7 +640,7 @@ instellen <a href="https://github.com/deltachat/deltachat-android/issues/98#issu
 regel</a>.
 Voor andere programma’s kun je zélf een oplossing zoeken op internet.</p>
     
-      <h3 id="waarom-wordt-pep-pretty-easy-privacy-niet-gebruikt">
+      <p class="back"><a href="#top">^</a></p><h3 id="waarom-wordt-pep-pretty-easy-privacy-niet-gebruikt">
         
         
           Waarom wordt pEp (pretty easy privacy) niet gebruikt? <a href="#waarom-wordt-pep-pretty-easy-privacy-niet-gebruikt" class="anchor"></a>
@@ -622,7 +654,7 @@ Voor andere programma’s kun je zélf een oplossing zoeken op internet.</p>
 voor een uitleg over pEp en Autocrypt.</li>
 </ul>
     
-      <h2 id="multiclient">
+      <p class="back"><a href="#top">^</a></p><h2 id="multiclient">
         
         
           Multi-client <a href="#multiclient" class="anchor"></a>
@@ -630,7 +662,7 @@ voor een uitleg over pEp en Autocrypt.</li>
         
       </h2>
     
-      <h3 id="kan-ik-delta-chat-op-meerdere-apparaten-tegelijk-gebruiken">
+      <p class="back"><a href="#top">^</a></p><h3 id="kan-ik-delta-chat-op-meerdere-apparaten-tegelijk-gebruiken">
         
         
           Kan ik Delta Chat op meerdere apparaten tegelijk gebruiken? <a href="#kan-ik-delta-chat-op-meerdere-apparaten-tegelijk-gebruiken" class="anchor"></a>
@@ -639,24 +671,20 @@ voor een uitleg over pEp en Autocrypt.</li>
       </h3>
 
 <p>Als je <strong>hetzelfde account</strong> wilt gebruiken op andere
-(Autocrypt-compatibele) apparaten, dan moet je de sleutels uitwisselen:</p>
+apparaten, dan moet je
+een back-up exporteren op het oude apparaat en deze importeren op het nieuwe:</p>
 
 <ul>
-  <li>
-    <p>Ga, op het eerste apparaat, naar ‘Instellingen –&gt; Geavanceerd –&gt; Autocrypt-instelbericht versturen’
-en druk net zolang tot er een beveiligingscode wordt getoond.</p>
-  </li>
-  <li>
-    <p>Pak het andere apparaat en wacht tot je het ‘Autocrypt-instelbericht’
-ontvangt. Druk op het bericht en voer de beveiligingscode in.</p>
-  </li>
-  <li>
-    <p>De sleutels zijn nu uitgewisseld en je kunt beide apparaten
-gebruiken om E2E-versleutelde berichten te versturen en ontvangen aan/van je gesprekspartners.</p>
-  </li>
+  <li>Ga op je oude apparaat naar ‘Instellingen –&gt; Gesprekken en media –&gt; Back-up’. Voer je
+ontgrendelpincode, -patroon of -wachtwoord in. Druk vervolgens op ‘Nu back-uppen’. Er wordt een back-up opgeslagen op je apparaat. Zet deze over
+naar je nieuwe apparaat.</li>
+  <li>Pak het nieuwe apparaat. Druk op het inlogscherm op ‘Back-up importeren’ (log dus niet in op je account). Na het importeren zijn je gesprekken, privésleutels
+en media overgezet op je nieuwe apparaat.</li>
+  <li>Je kunt nu beide apparaten gebruiken voor het ontvangen en versturen van
+E2E-versleutelde berichten van/naar je gesprekspartners.</li>
 </ul>
     
-      <h3 id="bestaan-er-plannen-om-een-delta-chat-webclient-te-maken">
+      <p class="back"><a href="#top">^</a></p><h3 id="bestaan-er-plannen-om-een-delta-chat-webclient-te-maken">
         
         
           Bestaan er plannen om een Delta Chat-webclient te maken? <a href="#bestaan-er-plannen-om-een-delta-chat-webclient-te-maken" class="anchor"></a>
@@ -675,7 +703,7 @@ of de AppImage van de Linux-client. Deze kun je downloaden op
  <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
     
-      <h3 id="waarom-kan-ik-kiezen-om-postvak-in-te-negeren">
+      <p class="back"><a href="#top">^</a></p><h3 id="waarom-kan-ik-kiezen-om-postvak-in-te-negeren">
         
         
           Waarom kan ik kiezen om Postvak IN te negeren? <a href="#waarom-kan-ik-kiezen-om-postvak-in-te-negeren" class="anchor"></a>
@@ -697,7 +725,7 @@ Normaal doet de Delta Chat-app dit uit zichzelf.</p>
 
 <p>In dat geval hoeft Delta Chat Postvak IN niet te controleren.</p>
     
-      <h3 id="waarvoor-dient-de-optie-kopie-versturen-aan-mijzelf">
+      <p class="back"><a href="#top">^</a></p><h3 id="waarvoor-dient-de-optie-kopie-versturen-aan-mijzelf">
         
         
           Waarvoor dient de optie ‘Kopie versturen aan mijzelf’? <a href="#waarvoor-dient-de-optie-kopie-versturen-aan-mijzelf" class="anchor"></a>
@@ -717,7 +745,7 @@ en eenmaal middels IMAP naar de map ‘Verzonden’).</p>
 
 <p>Standaard is deze optie uitgeschakeld.</p>
     
-      <h3 id="waarom-kan-ik-kiezen-om-de-map-verzonden-te-controleren">
+      <p class="back"><a href="#top">^</a></p><h3 id="waarom-kan-ik-kiezen-om-de-map-verzonden-te-controleren">
         
         
           Waarom kan ik kiezen om de map ‘Verzonden’ te controleren? <a href="#waarom-kan-ik-kiezen-om-de-map-verzonden-te-controleren" class="anchor"></a>
@@ -733,7 +761,7 @@ Delta Chat-app gebruikt en wilt dat je andere apparaten deel uitmaken van gespre
 wordt in de toekomst mogelijk verwijderd. De functie deed zijn intrede toen er nog niet
 op alle platformen een Delta Chat-client beschikbaar was.</p>
     
-      <h3 id="waarom-kan-ik-kiezen-om-de-deltachat-map-te-negeren">
+      <p class="back"><a href="#top">^</a></p><h3 id="waarom-kan-ik-kiezen-om-de-deltachat-map-te-negeren">
         
         
           Waarom kan ik kiezen om de DeltaChat-map te negeren? <a href="#waarom-kan-ik-kiezen-om-de-deltachat-map-te-negeren" class="anchor"></a>
@@ -746,7 +774,7 @@ gebruiken voor hun e-mail in plaats van de DeltaChat-map. Als je deze optie uits
 schakel dan ook de optie ‘Berichten verplaatsen naar de DeltaChat-map’ uit.
 Anders kun je mogelijk geen berichten verwijderen of problemen ervaren op andere apparaten.</p>
     
-      <h2 id="overig">
+      <p class="back"><a href="#top">^</a></p><h2 id="overig">
         
         
           Overig <a href="#overig" class="anchor"></a>
@@ -754,7 +782,7 @@ Anders kun je mogelijk geen berichten verwijderen of problemen ervaren op andere
         
       </h2>
     
-      <h3 id="wordt-mijn-e-mailprovider-ondersteund-door-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="wordt-mijn-e-mailprovider-ondersteund-door-delta-chat">
         
         
           Wordt <em>mijn</em> e-mailprovider ondersteund door Delta Chat? <a href="#wordt-mijn-e-mailprovider-ondersteund-door-delta-chat" class="anchor"></a>
@@ -767,7 +795,7 @@ Anders kun je mogelijk geen berichten verwijderen of problemen ervaren op andere
 Sommige providers verwachten echter bepaalde opties. Bekijk hiervoor het <a href="https://providers.delta.chat">provideroverzicht</a></li>
 </ul>
     
-      <h3 id="delta-chat-gebruik-e-mail-is-het-dan-wel-een-instant-messenger">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-gebruik-e-mail-is-het-dan-wel-een-instant-messenger">
         
         
           Delta Chat gebruik e-mail. Is het dan wel een <em>Instant</em> Messenger? <a href="#delta-chat-gebruik-e-mail-is-het-dan-wel-een-instant-messenger" class="anchor"></a>
@@ -792,7 +820,7 @@ algemeen probleem waar veel apps last van hebben. Lees
 <a href="https://dontkillmyapp.com/">dontkillmyapp.com</a> voor meer informatie hieromtrent.</li>
 </ul>
     
-      <h3 id="is-delta-chat-compatibel-met-protonmailtutanotacriptext">
+      <p class="back"><a href="#top">^</a></p><h3 id="is-delta-chat-compatibel-met-protonmailtutanotacriptext">
         
         
           Is Delta Chat compatibel met Protonmail/Tutanota/Criptext? <a href="#is-delta-chat-compatibel-met-protonmailtutanotacriptext" class="anchor"></a>
@@ -812,7 +840,7 @@ binnen de platformen zelf en is dus daarbuiten niet compatibel.</li>
 <a href="e-mailapp die Autocrypt gebruikt">https://autocrypt.org/dev-status.html</a>.</li>
 </ul>
     
-      <h2 id="ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">
+      <p class="back"><a href="#top">^</a></p><h2 id="ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">
         
         
           Ik wil graag meer weten over de gebruikte technieken. Waar kan ik meer informatie vinden? <a href="#ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden" class="anchor"></a>
@@ -823,9 +851,60 @@ binnen de platformen zelf en is dus daarbuiten niet compatibel.</li>
 <ul>
   <li>Bekijk de pagina <a href="https://github.com/deltachat/deltachat-android/blob/master/standards.md#standards-used-in-delta-chat">Door Delta Chat gebruikte standaarden</a>.</li>
 </ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="hoe-wordt-de-ontwikkeling-van-delta-chat-gefinancierd">
+        
+        
+          Hoe wordt de ontwikkeling van Delta Chat gefinancierd? <a href="#hoe-wordt-de-ontwikkeling-van-delta-chat-gefinancierd" class="anchor"></a>
+        
+        
+      </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>De Delta Chat-ontwikkeling wordt tot op heden gefinancierd door vier 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>
+  </li>
+  <li>
+    <p><a href="https://opentechfund.org">Open Technology Fund</a> heeft twee subsidies toegekend.
+De eerste subsidie, voor 2018/2019, ter waarde van ong. $200,000, heeft enorm geholpen om de Android-app 
+te verbeteren en een bètaversie van de computerclient vrij te geven. 
+Verder hebben we onderzoek kunnen doen naar het uiterlijk in relatie tot mensenrechten - 
+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>
+  </li>
+  <li>
+    <p>De <a href="https://nlnet.nl/">NLnet foundation</a> heeft Delta Chat €46.000 toegekend
+voor het voltooiien van de Rust- en Python-bindings en het opzetten van het Chatbot-ecosysteem.</p>
+  </li>
+  <li>
+    <p>Ook hebben verschillende experts en enthousiastelingen op vrijwillige basis bijgedragen
+aan Delta Chat, en sommige doen dat nog steeds. Zij hebben geen of bijna geen
+geld ontvangen. Zonder hen zou Delta Chat niet zo geweldig zijn als het vandaag
+de dag is.</p>
+  </li>
+</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>
 
 
 
 
 
-</body></html>
+</body></html><p class="back"><a href="#top">^</a></p>

+ 151 - 67
deltachat-ios/Assets/Help/sq/help.html

@@ -20,6 +20,7 @@
       <li><a href="#çështë-një-grup-i-verifikuar-pse-është-eksperimentale-kjo">Ç’është një grup i verifikuar? Pse është eksperimentale kjo?</a></li>
       <li><a href="#fshiva-veten-padashje">Fshiva veten padashje.</a></li>
       <li><a href="#sdua-ti-marr-më-mesazhet-e-një-grupi">S’dua t’i marr më mesazhet e një grupi.</a></li>
+      <li><a href="#çduan-të-thonë-dy-shenjat-në-mesazhe-grupi-që-gjithkush-i-ka-lexuar-tani-mesazhet-e-mi">Ç’duan të thonë dy shenjat në mesazhe grupi? Që gjithkush i ka lexuar tani mesazhet e mi?</a></li>
     </ul>
   </li>
   <li><a href="#encryption">Fshehtëzim</a>
@@ -54,13 +55,14 @@
       <li><a href="#sa-kohë-që-delta-chat-i-përdor-email-a-është-vërtet-një-shkëmbyes-mesazhesh-të-atypëratyshme">Sa kohë që Delta Chat-i përdor email, a është vërtet një Shkëmbyes Mesazhesh të <em>Atypëratyshme</em>?</a></li>
       <li><a href="#a-është-i-përputhshëm-delta-chat-i-me-protonmail-in--tutanota-n--criptext-in">A është i përputhshëm Delta Chat-i me Protonmail-in / Tutanota-n / Criptext-in?</a></li>
       <li><a href="#më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">Më interesojnë hollësitë teknike. Mund të më tregoni diçka më tepër?</a></li>
+      <li><a href="#si-financohet-zhvillimi-i-delta-chat-it">Si financohet zhvillimi i Delta Chat-it?</a></li>
     </ul>
   </li>
 </ul>
 
 
 
-<h2 id="çështë-delta-chat-i">
+<p class="back"><a href="#top">^</a></p><h2 id="çështë-delta-chat-i">
         
         
           Ç’është Delta Chat-i? <a href="#çështë-delta-chat-i" class="anchor"></a>
@@ -73,7 +75,7 @@
 
 <p><img style="float:right; width:50%; max-width:360%; margin:1em;" src="../delta-what-optim.png" /></p>
     
-      <h3 id="si-mund-të-gjej-persona-për-të-biseduar-me-ta">
+      <p class="back"><a href="#top">^</a></p><h3 id="si-mund-të-gjej-persona-për-të-biseduar-me-ta">
         
         
           Si mund të gjej persona për të biseduar me ta? <a href="#si-mund-të-gjej-persona-për-të-biseduar-me-ta" class="anchor"></a>
@@ -85,7 +87,7 @@
 edhe kur marrësi nuk përdor aplikacionin Delta Chat. Për marrësin s’është
 e nevojshme të instalojë të njëjtin aplikacion me ju, si me programe të tjera.</p>
     
-      <h3 id="cilat-janë-përparësitë-e-delta-chat-it-krahasuar-me-programe-të-tjerë-të-llojit">
+      <p class="back"><a href="#top">^</a></p><h3 id="cilat-janë-përparësitë-e-delta-chat-it-krahasuar-me-programe-të-tjerë-të-llojit">
         
         
           Cilat janë përparësitë e Delta Chat-it krahasuar me programe të tjerë të llojit? <a href="#cilat-janë-përparësitë-e-delta-chat-it-krahasuar-me-programe-të-tjerë-të-llojit" class="anchor"></a>
@@ -109,7 +111,7 @@ përdoruesit përdorin të njëjtët shërbyes email-i</li>
   <li>Software libre i bazuar në <em>Copyleft</em> dhe <em>Standarde</em>.</li>
 </ul>
     
-      <h3 id="cilat-mesazhe-shfaqen-në-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="cilat-mesazhe-shfaqen-në-delta-chat">
         
         
           Cilat mesazhe shfaqen në Delta Chat? <a href="#cilat-mesazhe-shfaqen-në-delta-chat" class="anchor"></a>
@@ -127,7 +129,7 @@ përdoruesit përdorin të njëjtët shërbyes email-i</li>
 
 <p>Mesazhet e tjera nuk shfaqen automatikisht dhe mund të gjenden te menuja kryesore, te <strong>Kërkesa kontakti</strong>. Nëse dëshirohet, një bisedë mund të fillohet që prej atje.</p>
     
-      <h3 id="po-mesazhet-e-padëshiruara">
+      <p class="back"><a href="#top">^</a></p><h3 id="po-mesazhet-e-padëshiruara">
         
         
           Po mesazhet e padëshiruara? <a href="#po-mesazhet-e-padëshiruara" class="anchor"></a>
@@ -141,7 +143,7 @@ përdoruesit përdorin të njëjtët shërbyes email-i</li>
   <li>Sido qoftë, nëse duhet vërtet, mundeni të <strong>bllokoni</strong> cilindo kontakt.</li>
 </ul>
     
-      <h3 id="a-mbulon-delta-chat-i-figura-video-dhe-bashkëngjitje-të-tjera">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-mbulon-delta-chat-i-figura-video-dhe-bashkëngjitje-të-tjera">
         
         
           A mbulon Delta Chat-i figura, video dhe bashkëngjitje të tjera? <a href="#a-mbulon-delta-chat-i-figura-video-dhe-bashkëngjitje-të-tjera" class="anchor"></a>
@@ -153,7 +155,7 @@ përdoruesit përdorin të njëjtët shërbyes email-i</li>
   <li>Po. Veç tekstit të thjeshtë, krejt bashkëngjitjet email shfaqen si mesazhe më vete. Mesazhet ikëse do të pranojnë vetvetiu bashkëngjitje sipas nevojës.</li>
 </ul>
     
-      <h3 id="kush-e-sheh-profilin-tim">
+      <p class="back"><a href="#top">^</a></p><h3 id="kush-e-sheh-profilin-tim">
         
         
           Kush e sheh profilin tim? <a href="#kush-e-sheh-profilin-tim" class="anchor"></a>
@@ -180,7 +182,7 @@ pajisje të re.</p>
   </li>
 </ul>
     
-      <h3 id="a-mbulon-delta-chat-i-email-e-html">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-mbulon-delta-chat-i-email-e-html">
         
         
           A mbulon Delta Chat-i email-e HTML? <a href="#a-mbulon-delta-chat-i-email-e-html" class="anchor"></a>
@@ -192,7 +194,7 @@ pajisje të re.</p>
   <li>Po. Nëse email-i ardhës nuk ka pjesë nën tekst të thjeshtë, email-et HTML shndërrohen në tekst të thjeshtë te aplikacioni. Email-et dërgohen përherë si tekst i thjeshtë.</li>
 </ul>
     
-      <h3 id="pse-më-duhet-të-jap-fjalëkalimin-e-email-it-tim-në-delta-chat-a-është-e-sigurt-kjo">
+      <p class="back"><a href="#top">^</a></p><h3 id="pse-më-duhet-të-jap-fjalëkalimin-e-email-it-tim-në-delta-chat-a-është-e-sigurt-kjo">
         
         
           Pse më duhet të jap fjalëkalimin e email-it tim në Delta Chat? A është e sigurt kjo? <a href="#pse-më-duhet-të-jap-fjalëkalimin-e-email-it-tim-në-delta-chat-a-është-e-sigurt-kjo" class="anchor"></a>
@@ -215,7 +217,7 @@ Burim</a>,
 nëse doni të verifikoni se a trajtohen me siguri kredencialet tuaja. Na gëzojnë
 përshtypjet që e bëjn aplikacionin më të sigurt për krejt përdoruesit tanë.</p>
     
-      <h3 id="çleje-android-lyp-delta-chat-i">
+      <p class="back"><a href="#top">^</a></p><h3 id="çleje-android-lyp-delta-chat-i">
         
         
           Ç’leje Android lyp Delta Chat-i? <a href="#çleje-android-lyp-delta-chat-i" class="anchor"></a>
@@ -265,7 +267,7 @@ përshtypjet që e bëjn aplikacionin më të sigurt për krejt përdoruesit tan
   </li>
 </ul>
     
-      <h2 id="grupe">
+      <p class="back"><a href="#top">^</a></p><h2 id="grupe">
         
         
           Grupe <a href="#grupe" class="anchor"></a>
@@ -273,7 +275,7 @@ përshtypjet që e bëjn aplikacionin më të sigurt për krejt përdoruesit tan
         
       </h2>
     
-      <h3 id="krijimi-i-një-grupi">
+      <p class="back"><a href="#top">^</a></p><h3 id="krijimi-i-një-grupi">
         
         
           Krijimi i një grupi <a href="#krijimi-i-një-grupi" class="anchor"></a>
@@ -287,7 +289,7 @@ përshtypjet që e bëjn aplikacionin më të sigurt për krejt përdoruesit tan
   <li>Sapo të shkruani <strong>mesazhin tuaj të parë</strong> në grup, krejt anëtarët e mësojnë krijimin e grupit të ri dhe mund të përgjigjen te grupi (për sa kohë që nuk shkruani një mesazh te grupi, grupi është i padukshëm për anëtarët).</li>
 </ul>
     
-      <h3 id="shtoni-anëtarë-te-një-grup">
+      <p class="back"><a href="#top">^</a></p><h3 id="shtoni-anëtarë-te-një-grup">
         
         
           Shtoni anëtarë te një grup <a href="#shtoni-anëtarë-te-një-grup" class="anchor"></a>
@@ -300,7 +302,7 @@ përshtypjet që e bëjn aplikacionin më të sigurt për krejt përdoruesit tan
   <li>Për të shtuar ose fshirë anëtarë, klikoni mbi emrin e grupit te biseda.</li>
 </ul>
     
-      <h3 id="çështë-një-grup-i-verifikuar-pse-është-eksperimentale-kjo">
+      <p class="back"><a href="#top">^</a></p><h3 id="çështë-një-grup-i-verifikuar-pse-është-eksperimentale-kjo">
         
         
           Ç’është një grup i verifikuar? Pse është eksperimentale kjo? <a href="#çështë-një-grup-i-verifikuar-pse-është-eksperimentale-kjo" class="anchor"></a>
@@ -323,7 +325,7 @@ që shanset janë për ta hequr etiketën “experimentale” jo shumë larg në
   </li>
 </ul>
     
-      <h3 id="fshiva-veten-padashje">
+      <p class="back"><a href="#top">^</a></p><h3 id="fshiva-veten-padashje">
         
         
           Fshiva veten padashje. <a href="#fshiva-veten-padashje" class="anchor"></a>
@@ -336,7 +338,7 @@ që shanset janë për ta hequr etiketën “experimentale” jo shumë larg në
 Megjithatë, s’ka problem, thjesht kërkojini një anëtari tjetër të grupit në një fjalosje të zakonshme t’ju shtojë sërish.</li>
 </ul>
     
-      <h3 id="sdua-ti-marr-më-mesazhet-e-një-grupi">
+      <p class="back"><a href="#top">^</a></p><h3 id="sdua-ti-marr-më-mesazhet-e-një-grupi">
         
         
           S’dua t’i marr më mesazhet e një grupi. <a href="#sdua-ti-marr-më-mesazhet-e-një-grupi" class="anchor"></a>
@@ -356,7 +358,25 @@ për çfarëdo mesazhesh të rinj.</p>
   </li>
 </ul>
     
-      <h2 id="encryption">
+      <p class="back"><a href="#top">^</a></p><h3 id="çduan-të-thonë-dy-shenjat-në-mesazhe-grupi-që-gjithkush-i-ka-lexuar-tani-mesazhet-e-mi">
+        
+        
+          Ç’duan të thonë dy shenjat në mesazhe grupi? Që gjithkush i ka lexuar tani mesazhet e mi? <a href="#çduan-të-thonë-dy-shenjat-në-mesazhe-grupi-që-gjithkush-i-ka-lexuar-tani-mesazhet-e-mi" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>Një mesazh shfaqet me dy shenja pasi më shumë se gjysma e marrësve ta kenë
+parë mesazhin në ekranin e tyre.</li>
+  <li>Kini parasysh që disa marrës, për arsye privatësie mund të kenë
+çaktivizuar dëftesa leximi.</li>
+  <li>Nëse më shumë se 50% në një grup çaktivizojnë dëftesa leximi, dy shenjat
+s’do të shfaqen kurrë. Për të dhëna më të hollësishme, shihni
+<a href="https://delta.chat/en/2017-07-06-read-receipts-and-social-pressure">këtë postim blogu</a>.</li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h2 id="encryption">
         
         
           Fshehtëzim <a href="#encryption" class="anchor"></a>
@@ -364,7 +384,7 @@ për çfarëdo mesazhesh të rinj.</p>
         
       </h2>
     
-      <h3 id="a-ka-delta-chat-i-fshehtëzim-skaj-më-skaj">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-ka-delta-chat-i-fshehtëzim-skaj-më-skaj">
         
         
           A ka Delta Chat-i fshehtëzim skaj-më-skaj? <a href="#a-ka-delta-chat-i-fshehtëzim-skaj-më-skaj" class="anchor"></a>
@@ -373,12 +393,19 @@ për çfarëdo mesazhesh të rinj.</p>
       </h3>
 
 <ul>
-  <li>Po. DeltaChat sendërton standardin Autocrypt Level 1 
+  <li>
+    <p>Po. DeltaChat sendërton standardin Autocrypt Level 1 
 dhe është pra në gjendje të fshehtëzojë mesazhe me e2e-n 
-përmes aplikacionesh të tjera të afta të përdorin Autocrypt-in.</li>
+përmes aplikacionesh të tjera të afta të përdorin Autocrypt-in.</p>
+  </li>
+  <li>
+    <p>Delta Chat mbulon po ashtu një formë të fuqishme fshehtëzimi skaj-më-skaj
+që është edhe më e sigurt kundër sulmesh aktive, shihni më poshtë
+“grupe të verifikuar”.</p>
+  </li>
 </ul>
     
-      <h3 id="çduhet-të-bëj-që-të-aktivizohet-fshehtëzimi-skaj-më-skaj">
+      <p class="back"><a href="#top">^</a></p><h3 id="çduhet-të-bëj-që-të-aktivizohet-fshehtëzimi-skaj-më-skaj">
         
         
           Ç’duhet të bëj që të aktivizohet fshehtëzimi skaj-më-skaj? <a href="#çduhet-të-bëj-që-të-aktivizohet-fshehtëzimi-skaj-më-skaj" class="anchor"></a>
@@ -399,12 +426,12 @@ në bisedë, më pas, përdor një aplikacion email që nuk mbulon Autocrypt-in,
 mesazhet nuk fshehtëzohen, derisa të ketë sërish një aplikacion të aftë për Autocrypt-in.</p>
   </li>
   <li>
-    <p>Nëse doni të <em>çaktivizohet</em> fshehtëzimi skaj-më-skaj, 
-përdorni fushën përkatës te “Rregullime / Rregullime të mëtejshme”.</p>
+    <p>Nëse doni që email-et e fshehtëzuar të shmagen, si parazgjedhje, përdorni
+rregullimin përgjegjës Autocrypt, te “Rregullime / Rregullime të mëtejshme”.</p>
   </li>
 </ul>
     
-      <h3 id="nëse-ska-fshehtëzim-skaj-më-skaj-a-lihet-lidhja-pa-u-fshehtëzuar-fare">
+      <p class="back"><a href="#top">^</a></p><h3 id="nëse-ska-fshehtëzim-skaj-më-skaj-a-lihet-lidhja-pa-u-fshehtëzuar-fare">
         
         
           Nëse s’ka fshehtëzim skaj-më-skaj, a lihet lidhja pa u fshehtëzuar fare? <a href="#nëse-ska-fshehtëzim-skaj-më-skaj-a-lihet-lidhja-pa-u-fshehtëzuar-fare" class="anchor"></a>
@@ -420,7 +447,7 @@ fshehtëzimi skaj më skaj furnizon siguri mes pajisjes tuaj dhe pajisjes
 së një shoku.</li>
 </ul>
     
-      <h3 id="si-mund-ta-verifikoj-gjendjen-kriptografike-me-një-dërguesin">
+      <p class="back"><a href="#top">^</a></p><h3 id="si-mund-ta-verifikoj-gjendjen-kriptografike-me-një-dërguesin">
         
         
           Si mund ta verifikoj gjendjen kriptografike me një dërguesin? <a href="#si-mund-ta-verifikoj-gjendjen-kriptografike-me-një-dërguesin" class="anchor"></a>
@@ -448,7 +475,7 @@ Nëse po ata shfaqen te pajisja e partnerit tuaj në bisedë, lidhja
   </li>
 </ul>
     
-      <h3 id="si-mund-ta-kontrolloj-fshehtëzimin-e-mesazheve">
+      <p class="back"><a href="#top">^</a></p><h3 id="si-mund-ta-kontrolloj-fshehtëzimin-e-mesazheve">
         
         
           Si mund ta kontrolloj fshehtëzimin e mesazheve? <a href="#si-mund-ta-kontrolloj-fshehtëzimin-e-mesazheve" class="anchor"></a>
@@ -465,7 +492,7 @@ Nëse po ata shfaqen te pajisja e partnerit tuaj në bisedë, lidhja
   </li>
 </ul>
     
-      <h3 id="cilët-standarde-përdoren-për-fshehtëzim-skaj-më-skaj">
+      <p class="back"><a href="#top">^</a></p><h3 id="cilët-standarde-përdoren-për-fshehtëzim-skaj-më-skaj">
         
         
           Cilët standarde përdoren për fshehtëzim skaj-më-skaj? <a href="#cilët-standarde-përdoren-për-fshehtëzim-skaj-më-skaj" class="anchor"></a>
@@ -474,15 +501,20 @@ Nëse po ata shfaqen te pajisja e partnerit tuaj në bisedë, lidhja
       </h3>
 
 <ul>
-  <li><a href="https://autocrypt.org">Autocrypt</a> përdoret për të vendosur fshehtëzim skaj
-më skaj me aplikacione të tjera poste Delta Chat dhe të aftë për Autocrypt. 
-Autocrypt-i përdor një nëngrup të kufizuar të funksioneve OpenPGP. Për më tepër, 
-Delta Chat sendërton protokollin “countermitm” për të arritur mbrojtje
-kundër sulmesh aktive rrjeti, duke shkuar tej mbrojtjes elementare oportuniste
-të Autocrypt-it, shihni pyetje rreth “Grupesh të Verifikuar”.</li>
+  <li>
+    <p><a href="https://autocrypt.org">Autocrypt</a> përdoret për të vënë në punë fshehtëzim e2e
+me Delta Chat tjetër dhe aplikacione të tjera poste që janë të aftë
+të mbulojnë Autocrypt-in. 
+Autocrypt-i përdor një nëngrup të kufizuar të funksioneve OpenPGP.</p>
+  </li>
+  <li>
+    <p>Për të bërë të mundur mbrojtjen kundër sulmesh aktive rrjeti, Delta Chat-i
+sendërton <a href="https://countermitm.readthedocs.io/en/latest/new.html">protokollet countermitm, setup-contact dhe verified-group</a>.  Kjo shkon përtej mbrojtjes bazë oportuniste të
+Autocrypt Level 1, ndërkohë që ruhet lehtësia e përdorimit.</p>
+  </li>
 </ul>
     
-      <h3 id="cili-është-dallimi-mes-grupesh-të-verifikuar-dhe-fjalosjesh-11-me-kontakte-të-verifikuar">
+      <p class="back"><a href="#top">^</a></p><h3 id="cili-është-dallimi-mes-grupesh-të-verifikuar-dhe-fjalosjesh-11-me-kontakte-të-verifikuar">
         
         
           Cili është dallimi mes grupesh të verifikuar dhe fjalosjesh 1:1 me kontakte të verifikuar? <a href="#cili-është-dallimi-mes-grupesh-të-verifikuar-dhe-fjalosjesh-11-me-kontakte-të-verifikuar" class="anchor"></a>
@@ -510,7 +542,7 @@ Kjo është asyeja pse nuk ka shenjë verifikimi, edhe pse e keni verifikuar kon
   </li>
 </ul>
     
-      <h3 id="a-përdor-delta-chat-i-fshehtësi-të-përsosur-përcjelljeje">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-përdor-delta-chat-i-fshehtësi-të-përsosur-përcjelljeje">
         
         
           A përdor Delta Chat-i Fshehtësi të Përsosur Përcjelljeje? <a href="#a-përdor-delta-chat-i-fshehtësi-të-përsosur-përcjelljeje" class="anchor"></a>
@@ -542,7 +574,7 @@ marrjeje të pajisjes.</p>
   </li>
 </ul>
     
-      <h3 id="si-i-mbron-delta-chat-i-tejtëdhënat-e-mia">
+      <p class="back"><a href="#top">^</a></p><h3 id="si-i-mbron-delta-chat-i-tejtëdhënat-e-mia">
         
         
           Si i mbron Delta Chat-i Tejtëdhënat e mia? <a href="#si-i-mbron-delta-chat-i-tejtëdhënat-e-mia" class="anchor"></a>
@@ -572,7 +604,7 @@ RFC</a>.</p>
   </li>
 </ul>
     
-      <h3 id="a-mund-të-ripërdor-kyçin-tim-ekzistues-privat">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-mund-të-ripërdor-kyçin-tim-ekzistues-privat">
         
         
           A mund të ripërdor kyçin tim ekzistues privat? <a href="#a-mund-të-ripërdor-kyçin-tim-ekzistues-privat" class="anchor"></a>
@@ -591,7 +623,7 @@ RFC</a>.</p>
 
 <p>Nëse s’keni kyç ose as që e dinit se mund t’ju duhej një i tillë… mos u bëni merak: Delta Chat-i prodhon një të tillë, kur duhet, dhe s’keni gjë për të bërë.</p>
     
-      <h3 id="seksportoj-dot-kyçet-e-mi-ekzistues-pgp-në-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="seksportoj-dot-kyçet-e-mi-ekzistues-pgp-në-delta-chat">
         
         
           S’eksportoj dot kyçet e mi ekzistues PGP në Delta Chat. <a href="#seksportoj-dot-kyçet-e-mi-ekzistues-pgp-në-delta-chat" class="anchor"></a>
@@ -618,7 +650,7 @@ fjalëkalimit tuaj një vlerë të zbrazët, që nga dritarja Administrim Kyçes
 GnuPG-në mund ta bëni <a href="https://github.com/deltachat/deltachat-android/issues/98#issuecomment-378383429">përmes rreshti urdhrash</a>.
 Për programe të tjera, mund të gjeni një zgjidhje në internet.</p>
     
-      <h3 id="pse-nuk-përdorni-pep-pretty-easy-privacy">
+      <p class="back"><a href="#top">^</a></p><h3 id="pse-nuk-përdorni-pep-pretty-easy-privacy">
         
         
           Pse nuk përdorni pEp (<em>pretty easy privacy</em>)? <a href="#pse-nuk-përdorni-pep-pretty-easy-privacy" class="anchor"></a>
@@ -632,7 +664,7 @@ një diskutim të Autocrypt-it dhe pEp-së, shihni <a href="https://autocrypt.or
 Autocrypt-i</a>.</li>
 </ul>
     
-      <h2 id="multiclient">
+      <p class="back"><a href="#top">^</a></p><h2 id="multiclient">
         
         
           Multi-klient <a href="#multiclient" class="anchor"></a>
@@ -640,7 +672,7 @@ Autocrypt-i</a>.</li>
         
       </h2>
     
-      <h3 id="a-mund-ta-përdor-delta-chat-in-në-shumë-pajisje-njëherësh-në-të-njëjtën-kohë">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-mund-ta-përdor-delta-chat-in-në-shumë-pajisje-njëherësh-në-të-njëjtën-kohë">
         
         
           A mund ta përdor Delta Chat-in në shumë pajisje njëherësh në të njëjtën kohë? <a href="#a-mund-ta-përdor-delta-chat-in-në-shumë-pajisje-njëherësh-në-të-njëjtën-kohë" class="anchor"></a>
@@ -648,25 +680,23 @@ Autocrypt-i</a>.</li>
         
       </h3>
 
-<p>Nëse doni të përdorni <strong>njëjtën llogari</strong> në pajisje të ndryshme (të afta 
-për Autocrypt), lypset të njëkohësoni aftësitë e tyre për fshehtëzim:</p>
+<p>Nëse doni të përdorni <strong>njëjtën llogari</strong> në pajisje të ndryshme, duhet
+të eksportoni nga njëra pajisje një kopjeruatje dhe ta importoni te tjetra:</p>
 
 <ul>
-  <li>
-    <p>Në pajisjen e parë, zgjidhni “Rregullime të mëtejshme / Dërgo mesazh Rregullimi Autocrypt-i” 
-dhe klikoni derisa të shfaqet një “numër sigurie”.</p>
-  </li>
-  <li>
-    <p>Në pajisjen tjetër, pritni të mbërrijë “Mesazh Rregullimi Autocrypt-i” 
-dhe klikoni mbi të, çka do të duhej t’ju kërkonte numrin e sigurisë.</p>
-  </li>
-  <li>
-    <p>Tani jeni i njëkohësuar dhe mund të përdorni që të dyja pajisjet për marrje
-dhe dërgim mesazhesh, të fshehtëzuar me E2E, me partnerët tuaj në komunikim.</p>
-  </li>
+  <li>Te pajisja e parë, zgjidhni “Rregullime / Biseda dhe media / Kopjeruajtje”.
+Jepni PIN-in, rregullsinë ose fjalëkalimin tuaj për shkyçje ekrani. Mandej
+klikoni mbi “Fillo Kopjeruajtje”. Kështu te pajisja juaj do të ruhet kartela
+e kopjeruajtjes. Tani ju duhet ta shpërngulni në një farë mënyre te pajisja
+tjetër.</li>
+  <li>Te pajisja tjetër, te skena e hyrjeve, në vend se të hyni në llogarinë tuaj
+të email-eve, zgjidhni “Importo Kopjeruajtje”. Pas importimit, bisedat, kyçet
+e fshehtëzimit dhe mediat tuaja do të jenë kopjuar te pajisja e re.</li>
+  <li>Tanimë jeni i njëkohësuar dhe mund të përdorni të dyja pajisjet për dërgim dhe
+marrje mesazhesh të fshehtëzuar skaj më skaj me partnerët tuaj në komunikim.</li>
 </ul>
     
-      <h3 id="a-ka-ndonjë-plan-për-të-sjellë-një-klient-web-delta-chat">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-ka-ndonjë-plan-për-të-sjellë-një-klient-web-delta-chat">
         
         
           A ka ndonjë plan për të sjellë një Klient Web Delta Chat? <a href="#a-ka-ndonjë-plan-për-të-sjellë-një-klient-web-delta-chat" class="anchor"></a>
@@ -687,7 +717,7 @@ Windows Desktop, ose AppImage për Linux. Mund t’i gjeni te
 <a href="https://get.delta.chat">get.delta.chat</a>.</li>
 </ul>
     
-      <h3 id="pse-mund-të-zgjedh-të-mos-i-vëzhgoj-të-marrët">
+      <p class="back"><a href="#top">^</a></p><h3 id="pse-mund-të-zgjedh-të-mos-i-vëzhgoj-të-marrët">
         
         
           Pse mund të zgjedh të mos i vëzhgoj Të marrët? <a href="#pse-mund-të-zgjedh-të-mos-i-vëzhgoj-të-marrët" class="anchor"></a>
@@ -709,7 +739,7 @@ DeltaChat. Zakonisht kjo do të bëhej nga aplikacioni Delta Chat.</p>
 
 <p>Në këtë rast, Delta Chat-i s’ka nevojë të vëzhgojë Të marrët.</p>
     
-      <h3 id="përse-hyn-në-punë-rregullimi-dërgojini-vetes-një-kopje">
+      <p class="back"><a href="#top">^</a></p><h3 id="përse-hyn-në-punë-rregullimi-dërgojini-vetes-një-kopje">
         
         
           Përse hyn në punë rregullimi “Dërgojini Vetes Një Kopje”? <a href="#përse-hyn-në-punë-rregullimi-dërgojini-vetes-një-kopje" class="anchor"></a>
@@ -729,7 +759,7 @@ përmes SMTP-s, dhe një herë përmes IMAP-it në dosjen Të dërguar).</p>
 
 <p>Parazgjedhja për rregullimin dërgoja-vetes është “jo”.</p>
     
-      <h3 id="pse-mund-të-zgjedh-të-vëzhgoj-dosjen-të-dërguar">
+      <p class="back"><a href="#top">^</a></p><h3 id="pse-mund-të-zgjedh-të-vëzhgoj-dosjen-të-dërguar">
         
         
           Pse mund të zgjedh të vëzhgoj dosjen “Të dërguar”? <a href="#pse-mund-të-zgjedh-të-vëzhgoj-dosjen-të-dërguar" class="anchor"></a>
@@ -746,7 +776,7 @@ shkarkoni që nga <a href="https://get.delta.chat">get.delta.chat</a>. Mundësia
 të dosjes “Të dërguar” mund të hiqet në të ardhmen. Qe prurë në kohët kur s’kish
 klient Desktop Delta Chat për krejt platformat.</p>
     
-      <h3 id="pse-mund-të-zgjedh-të-mos-e-vëzhgoj-dosjen-deltachat">
+      <p class="back"><a href="#top">^</a></p><h3 id="pse-mund-të-zgjedh-të-mos-e-vëzhgoj-dosjen-deltachat">
         
         
           Pse mund të zgjedh të mos e vëzhgoj dosjen DeltaChat? <a href="#pse-mund-të-zgjedh-të-mos-e-vëzhgoj-dosjen-deltachat" class="anchor"></a>
@@ -760,7 +790,7 @@ Nëse çaktivizoni “Vëzhgo dosjen DeltaChat”, duhet të çaktivizoni edhe 
 mesazhe bisedash te DeltaChat”. Përndryshe, fshirja e mesazheve në instalime me
 shumë pajisje mund të mos punojë si duhet.</p>
     
-      <h2 id="të-ndryshme">
+      <p class="back"><a href="#top">^</a></p><h2 id="të-ndryshme">
         
         
           Të ndryshme <a href="#të-ndryshme" class="anchor"></a>
@@ -768,7 +798,7 @@ shumë pajisje mund të mos punojë si duhet.</p>
         
       </h2>
     
-      <h3 id="a-funksionon-delta-chat-me-shërbimin-tim-email">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-funksionon-delta-chat-me-shërbimin-tim-email">
         
         
           A funksionon Delta Chat me shërbimin <em>tim</em> email? <a href="#a-funksionon-delta-chat-me-shërbimin-tim-email" class="anchor"></a>
@@ -782,7 +812,7 @@ shumë pajisje mund të mos punojë si duhet.</p>
   të funksionojnë si duhet, shihni <a href="https://providers.delta.chat">Provider Overview</a></li>
 </ul>
     
-      <h3 id="sa-kohë-që-delta-chat-i-përdor-email-a-është-vërtet-një-shkëmbyes-mesazhesh-të-atypëratyshme">
+      <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">
         
         
           Sa kohë që Delta Chat-i përdor email, a është vërtet një Shkëmbyes Mesazhesh të <em>Atypëratyshme</em>? <a href="#sa-kohë-që-delta-chat-i-përdor-email-a-është-vërtet-një-shkëmbyes-mesazhesh-të-atypëratyshme" class="anchor"></a>
@@ -810,7 +840,7 @@ prapaskenë është një problem për mjaft aplikaicone të ligjshme. Për më t
 të dhëna, shihni <a href="https://dontkillmyapp.com/">dontkillmyapp.com</a>.</li>
 </ul>
     
-      <h3 id="a-është-i-përputhshëm-delta-chat-i-me-protonmail-in--tutanota-n--criptext-in">
+      <p class="back"><a href="#top">^</a></p><h3 id="a-është-i-përputhshëm-delta-chat-i-me-protonmail-in--tutanota-n--criptext-in">
         
         
           A është i përputhshëm Delta Chat-i me Protonmail-in / Tutanota-n / Criptext-in? <a href="#a-është-i-përputhshëm-delta-chat-i-me-protonmail-in--tutanota-n--criptext-in" class="anchor"></a>
@@ -822,7 +852,7 @@ të dhëna, shihni <a href="https://dontkillmyapp.com/">dontkillmyapp.com</a>.</
   <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ë
+  <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
@@ -831,7 +861,7 @@ me gjë tjetër jashtë tyre.</li>
 email me çfarëdo [https://autocrypt.org/dev-status.html] (aplikacion email që mbulon Autocrypt-in).</li>
 </ul>
     
-      <h3 id="më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">
+      <p class="back"><a href="#top">^</a></p><h3 id="më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">
         
         
           Më interesojnë hollësitë teknike. Mund të më tregoni diçka më tepër? <a href="#më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër" class="anchor"></a>
@@ -842,9 +872,63 @@ email me çfarëdo [https://autocrypt.org/dev-status.html] (aplikacion email që
 <ul>
   <li>Shihni <a href="https://github.com/deltachat/deltachat-android/blob/master/standards.md#standards-used-in-delta-chat">Standarde të përdorur në Delta Chat</a>.</li>
 </ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="si-financohet-zhvillimi-i-delta-chat-it">
+        
+        
+          Si financohet zhvillimi i Delta Chat-it? <a href="#si-financohet-zhvillimi-i-delta-chat-it" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>First of all, 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>
+
+<p>Deri këtu, zhvillimi i Delta Chat-it është financuar nga katër burime kryesore:</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>
+  </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 
+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 
+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>
+  </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>
+  </li>
+  <li>
+    <p>Last but by far not least, several pro-bono experts and enthusiasts contributed 
+and contribute to Delta Chat developments without receiving money, or only 
+small amounts. Without them, Delta Chat would not be where it is today, not
+even close.</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>Fincimi 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>
 
 
 
 
 
-</body></html>
+</body></html><p class="back"><a href="#top">^</a></p>