소스 검색

update local help

B. Petersen 2 년 전
부모
커밋
2298accc0a

+ 69 - 1
deltachat-ios/Assets/Help/cs/help.html

@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Více klientů najednou</a>
     <ul>
       <li><a href="#lze-delta-chat-používat-souběžně-na-více-zařízeních">Lze Delta Chat používat souběžně na více zařízeních?</a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#je-v-plánu-vytvořit-webovou-verzi-delta-chatu">Je v plánu vytvořit webovou verzi Delta Chatu?</a></li>
       <li><a href="#k-čemu-je-dobré-nastavení-posílat-si-kopii">K čemu je dobré nastavení “Posílat si kopii”?</a></li>
       <li><a href="#proč-můžu-nastavit-sledování-složky-odeslané">Proč můžu nastavit sledování složky Odeslané?</a></li>
@@ -824,7 +826,73 @@ ohledně Autocryptu a pEp je na
         
       </h3>
 
-<p>Ano. K souběžnému používání <strong>stejného účtu</strong> na různých zařízeních proveď zálohu na původním zařízení a nahraj ji na ndruhém.</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your

+ 78 - 10
deltachat-ios/Assets/Help/de/help.html

@@ -34,7 +34,7 @@
       <li><a href="#wird-ohne-ende-zu-ende-verschlüsselung-gar-nicht-verschlüsselt">Wird ohne Ende-zu-Ende-Verschlüsselung gar nicht verschlüsselt?</a></li>
       <li><a href="#wie-kann-ich-den-kryptografischen-zustand-mit-einem-kontakt-überprüfen">Wie kann ich den kryptografischen Zustand mit einem Kontakt überprüfen?</a></li>
       <li><a href="#wie-kann-ich-die-verschlüsselung-der-nachrichten-überprüfen">Wie kann ich die Verschlüsselung der Nachrichten überprüfen?</a></li>
-      <li><a href="#how-can-i-ensure-message-encryption-and-deletion">How can I ensure message encryption and deletion?</a></li>
+      <li><a href="#wie-kann-ich-verschlüsselung-und-löschen-von-nachrichten-sicherstellen">Wie kann ich Verschlüsselung und Löschen von Nachrichten sicherstellen?</a></li>
       <li><a href="#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></li>
       <li><a href="#was-ist-der-unterschied-zwischen-verifizierten-gruppen-und-11-chats-mit-verifizierten-kontakten">Was ist der Unterschied zwischen verifizierten Gruppen und 1:1 Chats mit verifizierten Kontakten?</a></li>
       <li><a href="#unterstützt-delta-chat-perfect-forward-secrecy">Unterstützt Delta Chat Perfect Forward Secrecy?</a></li>
@@ -47,6 +47,8 @@
   <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="#fehlersuche">Fehlersuche</a></li>
+      <li><a href="#manueller-transfer">Manueller Transfer</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="#was-macht-die-option-kopie-an-mich-selbst-senden">Was macht die Option “Kopie an mich selbst senden”?</a></li>
       <li><a href="#warum-gibt-es-die-funktion-gesendet-ordner-beobachten">Warum gibt es die Funktion “Gesendet-Ordner beobachten”?</a></li>
@@ -74,11 +76,11 @@
   <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="#i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend">I want to manage my own e-mail server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#ich-möchte-meinen-eigenen-e-mail-server-für-delta-chat-verwalten-gibt-es-empfehlungen">Ich möchte meinen eigenen E-Mail-Server für Delta Chat verwalten. Gibt es Empfehlungen?</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="#ist-delta-chat-kompatibel-mit-protonmail--tutanota--criptext">Ist Delta Chat kompatibel mit 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="#was-delta-chat-independently-audited-for-security-vulnerabilities">Was Delta Chat independently audited for security vulnerabilities?</a></li>
+      <li><a href="#wurde-delta-chat-unabhängig-auf-sicherheitslücken-geprüft">Wurde Delta Chat unabhängig auf Sicherheitslücken geprüft?</a></li>
       <li><a href="#wie-wird-delta-chat-finanziert">Wie wird Delta Chat finanziert?</a></li>
     </ul>
   </li>
@@ -560,10 +562,10 @@ wird (falls er noch nicht existiert) ein Chat-Kanal eingerichtet und die Schlüs
   </li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="how-can-i-ensure-message-encryption-and-deletion">
+      <p class="back"><a href="#top">^</a></p><h3 id="wie-kann-ich-verschlüsselung-und-löschen-von-nachrichten-sicherstellen">
         
         
-          How can I ensure message encryption and deletion? <a href="#how-can-i-ensure-message-encryption-and-deletion" class="anchor"></a>
+          Wie kann ich Verschlüsselung und Löschen von Nachrichten sicherstellen? <a href="#wie-kann-ich-verschlüsselung-und-löschen-von-nachrichten-sicherstellen" class="anchor"></a>
         
         
       </h3>
@@ -744,7 +746,73 @@ Für andere Programme können Sie online eine Lösung finden.</p>
         
       </h3>
 
-<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 Gerät importieren:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="fehlersuche">
+        
+        
+          Fehlersuche <a href="#fehlersuche" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manueller-transfer">
+        
+        
+          Manueller Transfer <a href="#manueller-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>Auf dem alten Gerät gehen Sie zu “Einstellungen -&gt; Chats und Medien -&gt; Chats auf externem Speicher speichern”. Geben Sie Ihre PIN, Ihr Muster oder Ihr Passwort zum Entsperren des Bildschirms ein. Anschließend können Sie auf “Backup starten” klicken. Dadurch wird die Backup-Datei auf Ihrem Gerät gespeichert. Jetzt müssen Sie sie irgendwie auf das andere Gerät übertragen.</li>
@@ -1008,10 +1076,10 @@ Siehe <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermit
 Allerdings benötigen einige Anbieter besondere Einstellungen, um ordnungsgemäß zu funktionieren; eine von NutzerInnen erstellte Sammlung zu einigen Optionen findet sich unter <a href="https://providers.delta.chat">Provider Overview</a>.</li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend">
+      <p class="back"><a href="#top">^</a></p><h3 id="ich-möchte-meinen-eigenen-e-mail-server-für-delta-chat-verwalten-gibt-es-empfehlungen">
         
         
-          I want to manage my own e-mail server for Delta Chat. What do you recommend? <a href="#i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend" class="anchor"></a>
+          Ich möchte meinen eigenen E-Mail-Server für Delta Chat verwalten. Gibt es Empfehlungen? <a href="#ich-möchte-meinen-eigenen-e-mail-server-für-delta-chat-verwalten-gibt-es-empfehlungen" class="anchor"></a>
         
         
       </h3>
@@ -1064,10 +1132,10 @@ blogpost</a>.</li>
   <li>Siehe hierzu <a href="https://github.com/deltachat/deltachat-core-rust/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="was-delta-chat-independently-audited-for-security-vulnerabilities">
+      <p class="back"><a href="#top">^</a></p><h3 id="wurde-delta-chat-unabhängig-auf-sicherheitslücken-geprüft">
         
         
-          Was Delta Chat independently audited for security vulnerabilities? <a href="#was-delta-chat-independently-audited-for-security-vulnerabilities" class="anchor"></a>
+          Wurde Delta Chat unabhängig auf Sicherheitslücken geprüft? <a href="#wurde-delta-chat-unabhängig-auf-sicherheitslücken-geprüft" class="anchor"></a>
         
         
       </h3>

+ 69 - 2
deltachat-ios/Assets/Help/en/help.html

@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Multi-client</a>
     <ul>
       <li><a href="#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></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</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="#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>
@@ -838,8 +840,73 @@ FAQ</a>.</li>
         
       </h3>
 
-<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>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your

+ 69 - 2
deltachat-ios/Assets/Help/es/help.html

@@ -44,6 +44,8 @@
   <li><a href="#multiclient">Múltiples dispositivos</a>
     <ul>
       <li><a href="#puedo-usar-delta-chat-en-varios-dispositivos-al-mismo-tiempo">¿Puedo usar Delta Chat en varios dispositivos al mismo tiempo?</a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#tienen-planeado-crear-un-cliente-web-de-delta-chat">¿Tienen planeado crear un cliente web de Delta Chat?</a></li>
       <li><a href="#para-qué-sirve-la-configuración-enviar-autocopia">¿Para qué sirve la configuración “Enviar autocopia”?</a></li>
       <li><a href="#por-qué-puedo-elegir-monitorear-la-carpeta-enviados">¿Por qué puedo elegir monitorear la carpeta “Enviados”?</a></li>
@@ -825,8 +827,73 @@ FAQ</a>.</li>
         
       </h3>
 
-<p>Si quieres usar la <strong>misma cuenta</strong> en diferentes dispositivos, deberias exportar
-una copia de seguridad del dispositivo antiguo e importarla al nuevo dispositivo:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your

+ 69 - 2
deltachat-ios/Assets/Help/fr/help.html

@@ -53,6 +53,8 @@
   <li><a href="#multiclient">Multi-client</a>
     <ul>
       <li><a href="#puis-je-utiliser-delta-chat-sur-plusieurs-appareils-en-même-temps">Puis-je utiliser Delta Chat sur plusieurs appareils en même temps? </a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#le-lancement-dun-client-web-delta-chat-est-il-prévu-">Le lancement d’un client Web Delta Chat est-il prévu ?</a></li>
       <li><a href="#quel-est-lintérêt-du-paramètre-menvoyer-une-copie">Quel est l’intérêt du paramètre “M’envoyer une copie”?</a></li>
       <li><a href="#pourquoi-puis-je-choisir-de-regarder-le-dossier-envoyés">Pourquoi puis-je choisir de regarder le dossier “Envoyés”?</a></li>
@@ -757,8 +759,73 @@ Pour les autres programmes, vous devriez pouvoir trouver la solution en ligne.</
         
       </h3>
 
-<p>Si vous voulez utiliser le <strong>même compte</strong> sur d’autres appareils, exportez
- une sauvegarde depuis l’ancien appareil puis importez-la dans le nouveau :</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>Sur l’ancien appareil, allez dans “Paramètres -&gt; Discussions et fichiers multimédia -&gt; Exporter une sauvegarde”. Entrez votre PIN, schéma ou mot de passe de déverrouillage, puis cliquez sur “Commencer la sauvegarde” pour enregistrer le fichier de sauvegarde sur votre appareil.

+ 69 - 2
deltachat-ios/Assets/Help/id/help.html

@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Multi-client</a>
     <ul>
       <li><a href="#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></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</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="#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>
@@ -820,8 +822,73 @@ FAQ</a>.</li>
         
       </h3>
 
-<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>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your

+ 156 - 89
deltachat-ios/Assets/Help/it/help.html

@@ -7,7 +7,7 @@
       <li><a href="#quali-messaggi-vengono-mostrati-in-delta-chat">Quali messaggi vengono mostrati in Delta Chat?</a></li>
       <li><a href="#cosa-succede-se-aspetto-un-messaggio-da-qualcuno-a-cui-non-ho-scritto-in-passato">Cosa succede se aspetto un messaggio da qualcuno a cui non ho scritto in passato?</a></li>
       <li><a href="#delta-chat-supporta-immagini-video-e-altri-allegati">Delta Chat supporta immagini, video e altri allegati?</a></li>
-      <li><a href="#multiple-accounts">How can I add or switch between multiple accounts?</a></li>
+      <li><a href="#multiple-accounts">Come posso aggiungere o passare da un account all’altro?</a></li>
       <li><a href="#chi-vede-la-mia-immagine-del-profilo">Chi vede la mia immagine del profilo?</a></li>
       <li><a href="#delta-chat-supporta-le-e-mail-html">Delta Chat supporta le e-mail HTML?</a></li>
       <li><a href="#perché-devo-inserire-la-mia-password-e-mail-in-delta-chat-è-sicuro">Perché devo inserire la mia password E-Mail in Delta Chat? È sicuro?</a></li>
@@ -34,7 +34,7 @@
       <li><a href="#se-la-crittografia-end-to-end-non-è-disponibile-la-connessione-non-è-affatto-crittografata">Se la crittografia end-to-end non è disponibile, la connessione non è affatto crittografata?</a></li>
       <li><a href="#come-posso-verificare-lo-stato-crittografico-con-un-mittente">Come posso verificare lo stato crittografico con un mittente?</a></li>
       <li><a href="#come-posso-controllare-la-crittografia-dei-messaggi">Come posso controllare la crittografia dei messaggi?</a></li>
-      <li><a href="#how-can-i-ensure-message-encryption-and-deletion">How can I ensure message encryption and deletion?</a></li>
+      <li><a href="#come-posso-garantire-la-crittografia-e-leliminazione-dei-messaggi">Come posso garantire la crittografia e l’eliminazione dei messaggi?</a></li>
       <li><a href="#quali-standard-vengono-utilizzati-per-la-crittografia-end-to-end">Quali standard vengono utilizzati per la crittografia end-to-end?</a></li>
       <li><a href="#qual-è-la-differenza-tra-i-gruppi-verificati-e-le-chat-11-con-contatti-verificati">Qual è la differenza tra i gruppi verificati e le chat 1:1 con contatti verificati?</a></li>
       <li><a href="#delta-chat-supporta-perfect-forward-secrecy">Delta Chat supporta Perfect Forward Secrecy?</a></li>
@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Multi-client</a>
     <ul>
       <li><a href="#posso-utilizzare-delta-chat-su-più-dispositivi-contemporaneamente">Posso utilizzare Delta Chat su più dispositivi contemporaneamente?</a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#sono-previsti-piani-per-lintroduzione-di-un-client-web-delta-chat">Sono previsti piani per l’introduzione di un client Web Delta Chat?</a></li>
       <li><a href="#a-cosa-serve-limpostazione-invia-copia-a-se-stessi">A cosa serve l’impostazione “Invia copia a se stessi”?</a></li>
       <li><a href="#perché-posso-scegliere-di-guardare-la-cartella-inviata">Perché posso scegliere di guardare la cartella “Inviata”?</a></li>
@@ -74,11 +76,11 @@
   <li><a href="#varie">Varie</a>
     <ul>
       <li><a href="#delta-chat-funziona-con-il-mio-fornitore-e-mail">Delta Chat funziona con il <em>mio</em> fornitore e-mail?</a></li>
-      <li><a href="#i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend">I want to manage my own e-mail server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#voglio-gestire-il-mio-server-di-posta-elettronica-per-delta-chat-che-cosa-mi-consigliate">Voglio gestire il mio server di posta elettronica per Delta Chat. Che cosa mi consigliate?</a></li>
       <li><a href="#se-delta-chat-utilizza-l-e-mail-è-davvero-una-messaggistica-istantanea">Se Delta Chat utilizza l’ E-Mail, è davvero una 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-mi-puoi-dire-di-più">Sono interessato ai dettagli tecnici. Mi puoi dire di più?</a></li>
-      <li><a href="#was-delta-chat-independently-audited-for-security-vulnerabilities">Was Delta Chat independently audited for security vulnerabilities?</a></li>
+      <li><a href="#delta-chat-è-stata-verificata-in-modo-indipendente-per-le-vulnerabilità-di-sicurezza">Delta Chat è stata verificata in modo indipendente per le vulnerabilità di sicurezza?</a></li>
       <li><a href="#come-viene-finanziato-lo-sviluppo-di-delta-chat">Come viene finanziato lo sviluppo di Delta Chat?</a></li>
     </ul>
   </li>
@@ -120,16 +122,16 @@ destinatario di installare la tua stessa app, come con altri messenger.</p>
       </h3>
 
 <ul>
-  <li><em>Independent</em> of any company or services. <em>You</em> own your data.</li>
-  <li>Your data is not saved on a central server unless all users are using
-the same e-mail servers</li>
-  <li>You do not distribute your address book to anyone.</li>
-  <li><em>Fast</em> by the use of Push-IMAP.</li>
-  <li><em>Largest userbase</em> - recipients <em>not</em> using Delta Chat can be reached as well.</li>
-  <li><em>No Spam</em> - only messages of known users are shown by default.</li>
-  <li><em>End-to-end-encryption</em> via Autocrypt.</li>
-  <li><em>Copyleft</em> and <em>Standards</em> based libre software.</li>
-  <li><em>Flexible identity</em> with built-in support for <a href="#multiple-accounts">multiple accounts</a></li>
+  <li><em>Indipendente</em> da qualsiasi azienda o servizio. <em>Tu</em> possiedi i tuoi dati.</li>
+  <li>I tuoi dati non vengono salvati su un server centrale a meno che non siano utilizzati da tutti gli utenti
+gli stessi server di posta elettronica</li>
+  <li>Non distribuisci la tua rubrica a nessuno.</li>
+  <li><em>Veloce</em> mediante l’uso di Push-IMAP.</li>
+  <li><em>Base di utenti ampia</em> - è possibile raggiungere anche i destinatari che <em>non</em> utilizzano Delta Chat.</li>
+  <li><em>No Spam</em> - per impostazione predefinita vengono visualizzati solo i messaggi degli utenti conosciuti.</li>
+  <li><em>Crittografia end-to-end</em> tramite Autocrypt.</li>
+  <li>Software libero basato su <em>Copyleft</em> e <em>Standards</em>.</li>
+  <li><em>Identità flessibile</em> con supporto integrato per <a href="#account-multipli">più account</a></li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="quali-messaggi-vengono-mostrati-in-delta-chat">
@@ -140,22 +142,22 @@ the same e-mail servers</li>
         
       </h3>
 
-<p>By default, Delta Chat shows all e-mails.</p>
+<p>Per impostazione predefinita, Delta Chat mostra tutte le e-mails.</p>
 
-<p>At “Settings -&gt; Chats &amp;
-Media -&gt; Show Classic E-Mails”, you can change this. You have these options:</p>
+<p>In “Impostazioni -&gt; Chat e
+Media -&gt; Mostra E-mail Tradizionali”, puoi modificare questa impostazione. Hai queste opzioni:</p>
 
 <ul>
-  <li>“No, chats only”: Only messages sent by other Delta Chat users and replies to
-your Delta Chat messages are shown. This makes most sense if you use the same
-e-mail account for normal e-mails as well.</li>
-  <li>“All”: Delta Chat shows all e-mails that are sent to your email address. This
-makes sense if you want to use Delta Chat for all your e-mails, so no message
-gets lost. This is the default setting.</li>
-  <li>“For accepted contacts”: Delta Chat shows all e-mails from contacts with whom
-you already have a chat, but new chats only pop up for Delta Chat messages.
-This helps to decide on a case-by-case basis whether you want to have a
-conversation in Delta Chat or in a “normal” e-mail app.</li>
+  <li>“No, solo chat”: solo i messaggi inviati da altri utenti di Delta Chat e le “risposte a”
+vengono visualizzati i tuoi messaggi di Delta Chat. Questo ha più senso se usi lo stesso
+account di posta elettronica anche per le normali e-mail.</li>
+  <li>“Per i contatti accettati”: Delta Chat mostra tutte le e-mail dei contatti con cui
+hai già una chat, ma le nuove chat vengono visualizzate solo per i messaggi di Delta Chat.
+Questo aiuta a decidere caso per caso se si desidera avere una
+conversazione in Delta Chat o in una “normale” app di posta elettronica.</li>
+  <li>“Sì”: Delta Chat mostra tutte l’e-mail inviate al tuo indirizzo e-mail. Questo
+ha senso se vuoi usare Delta Chat per tutte le tue e-mail, quindi nessun messaggio
+si perde. Questa è l’impostazione predefinita.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="cosa-succede-se-aspetto-un-messaggio-da-qualcuno-a-cui-non-ho-scritto-in-passato">
@@ -190,25 +192,25 @@ messaggi da questa persona, prendete in considerazione la possibilità di <em>bl
     <p>Sì. Oltre al testo normale, tutti gli allegati e-mail vengono visualizzati come messaggi separati. I messaggi in uscita ricevono automaticamente gli allegati necessari.</p>
   </li>
   <li>
-    <p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+    <p>Per le prestazioni, le immagini sono ottimizzate e inviate in dimensioni inferiori per impostazione predefinita, ma è possibile inviarle come “file” per preservare l’originale.</p>
   </li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="multiple-accounts">
         
         
-          How can I add or switch between multiple accounts? <a href="#multiple-accounts" class="anchor"></a>
+          Come posso aggiungere o passare da un account all'altro? <a href="#multiple-accounts" class="anchor"></a>
         
         
       </h3>
 
-<p>You can easily work with additional accounts on Delta Chat mobile and desktop clients by clicking either:</p>
+<p>Puoi facilmente lavorare con account aggiuntivi sui client mobili e desktop di Delta Chat facendo clic su:</p>
 <ul>
-  <li>on the menu button and then ‘Switch Account’ (Android and desktop)</li>
-  <li>or the profile icon and then ‘Add Account’ (iOS)</li>
+  <li>sul pulsante del menu e poi su “Cambia Account” (Android e desktop)</li>
+  <li>o l’icona del profilo e poi ‘Aggiungi account’ (iOS)</li>
 </ul>
 
-<p>You may also wish to learn <a href="#can-i-use-delta-chat-on-multiple-devices-at-the-same-time">how to add accounts to multiple devices</a>.</p>
+<p>Potresti anche voler imparare <a href="#posso-usare-delta-chat-su-multi-dispositivi-allo-stesso-tempo">come aggiungere account a più dispositivi</a>.</p>
     
       <p class="back"><a href="#top">^</a></p><h3 id="chi-vede-la-mia-immagine-del-profilo">
         
@@ -324,8 +326,8 @@ Questo è ciò che fa Delta Chat con queste autorizzazioni:</p>
     <p><strong>Silenzia chat</strong> se non vuoi ricevere notifiche da queste. Le chat silenziate restano al loro posto e puoi anche fissare una chat silenziata.</p>
   </li>
   <li>
-    <p><strong>Archive chats</strong> if you do not want to see them in your chat list any longer.
-Archived chats remain accessible above the chat list or via search.</p>
+    <p><strong>Archivia chats</strong> se non vuoi più vederle nel tuo elenco chat.
+Le chat archiviate rimangono accessibili sopra l’elenco delle chat o tramite la ricerca.</p>
   </li>
   <li>
     <p>Quando una chat archiviata riceve un nuovo messaggio, a meno che non sia silenziata, <strong>salterà fuori dall’archivio</strong> e tornerà nell’elenco delle chat.
@@ -352,7 +354,7 @@ di un contatto. Ciò significa che è stato “visto di recente”.</li>
   <li>perché hanno scritto qualcosa a un gruppo di cui siete entrambi membri,</li>
   <li>perché vi hanno inviato una ricevuta di lettura per un messaggio che avete scritto,</li>
   <li>o perché hanno inviato dati alla vostra applicazione Delta Chat utilizzando un’applicazione
-<a href="#apps-private--webxdc">app privata</a>.</li>
+<a href="#applicazioni-private-webxdc">app privata</a>.</li>
   <li>Quindi non si tratta di uno stato online in tempo reale - e se qualcuno non risponde
 subito anche se sembra essere online, non preoccupatevi e lasciategli un po’
 di spazio ;-)</li>
@@ -602,33 +604,33 @@ la connessione è sicura.</p>
   </li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="how-can-i-ensure-message-encryption-and-deletion">
+      <p class="back"><a href="#top">^</a></p><h3 id="come-posso-garantire-la-crittografia-e-leliminazione-dei-messaggi">
         
         
-          How can I ensure message encryption and deletion? <a href="#how-can-i-ensure-message-encryption-and-deletion" class="anchor"></a>
+          Come posso garantire la crittografia e l’eliminazione dei messaggi? <a href="#come-posso-garantire-la-crittografia-e-leliminazione-dei-messaggi" class="anchor"></a>
         
         
       </h3>
 
-<p>The best way to ensure every message is encrypted,
-and metadata deleted as quickly as possible
-is creating a verified group and turning on
-self-destructing messages.</p>
+<p>Il modo migliore per garantire che ogni messaggio sia crittografato,
+e i metadati cancellati il più rapidamente possibile
+è creando un gruppo verificato e che sia attivo
+messaggi a scomparsa.</p>
 
-<p>Verified groups are always encrypted and protected against <a href="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">MITM
-attacks</a>.</p>
+<p>I gruppi verificati sono sempre crittografati e protetti dagli <a href="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">attacchi
+MITM</a>.</p>
 
-<p>Metadata can’t be encrypted, as the server needs to know where to deliver your
-messages. But turning on “self-destructing messages” deletes the messages on
-the server after they were delivered.</p>
+<p>I metadati non possono essere crittografati, poiché il server deve sapere dove consegnare i tuoi
+messaggi. Ma l’attivazione dei “messaggi a scomparsa” elimina i messaggi sul
+server dopo che sono stati consegnati.</p>
 
-<p>If you need the messages on your device, but not on the server, you can also
-agree in the group to turn on <a href="#what-happens-if-i-turn-on-delete-old-messages-from-server">“delete messages from server
-automatically”</a>.</p>
+<p>Se hai bisogno dei messaggi sul tuo dispositivo, ma non sul server, puoi farlo anche tu
+accetta nel gruppo di attivare <a href="#cosa-succede-se-si-gira-su-cancella-i-vecchi-messaggi-dal-server">“cancella i messaggi dal server
+automaticamente”</a>.</p>
 
-<p>If you want to protect a 1:1 conversation like this, you should create a
-verified group with only 2 people. If the other person loses their device but
-not their account, you can still communicate in the 1:1 chat. (<a href="#what-is-the-difference-between-verified-groups-and-11-chats-with-verified-contacts">Read more</a>)</p>
+<p>Se vuoi proteggere una conversazione 1:1 come questa, dovresti creare un
+gruppo verificato con solo 2 persone. Se l’altra persona perde il proprio dispositivo ma
+non il suo account, puoi comunque comunicare nella chat 1:1. (<a href="#Qual-è-la-differenza-tra-gruppi-verificati-e-11-chat-con-contatti-verificati">Per saperne di più</a>)</p>
     
       <p class="back"><a href="#top">^</a></p><h3 id="quali-standard-vengono-utilizzati-per-la-crittografia-end-to-end">
         
@@ -813,8 +815,73 @@ FAQ</a>.</li>
         
       </h3>
 
-<p>Se desideri utilizzare lo <strong>stesso account</strong> su dispositivi diversi, devi esportare
-un backup dal vecchio dispositivo e importarlo nel nuovo dispositivo:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>Sul vecchio dispositivo, andare su “Impostazioni -&gt; Chat e Media -&gt; Backup Chats su Memoria Esterna”. Immettere il PIN, il tracciato o la password di
@@ -1162,19 +1229,19 @@ Tuttavia, alcuni provider necessitano di opzioni speciali per funzionare corrett
 vedi <a href="https://providers.delta.chat">Panoramica fornitore</a></li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend">
+      <p class="back"><a href="#top">^</a></p><h3 id="voglio-gestire-il-mio-server-di-posta-elettronica-per-delta-chat-che-cosa-mi-consigliate">
         
         
-          I want to manage my own e-mail server for Delta Chat. What do you recommend? <a href="#i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend" class="anchor"></a>
+          Voglio gestire il mio server di posta elettronica per Delta Chat. Che cosa mi consigliate? <a href="#voglio-gestire-il-mio-server-di-posta-elettronica-per-delta-chat-che-cosa-mi-consigliate" class="anchor"></a>
         
         
       </h3>
 
 <ul>
-  <li>Most mail servers will work well. But what we personally recommend is a
-combination of mailcow and mailadm, as described <a href="2023-01-26-upcoming-mail-server-workshops">in this
+  <li>La maggior parte dei server di posta funzionerà bene. Ma quello che raccomandiamo personalmente è una
+combinazione di mailcow e mailadm, come descritto <a href="2023-01-26-prossimi-workshop-server-di-posta">in questo
 blogpost</a>.</li>
-  <li>You can find an <a href="serverguide">installation guide on our website</a>.</li>
+  <li>È possibile trovare una <a href="serverguide">guida all’installazione sul nostro sito Web</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="se-delta-chat-utilizza-l-e-mail-è-davvero-una-messaggistica-istantanea">
@@ -1232,50 +1299,50 @@ problema per molte app legittime. Per ulteriori informazioni, vedi
   <li>Vedi <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Standard usati in Delta Chat</a>.</li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="was-delta-chat-independently-audited-for-security-vulnerabilities">
+      <p class="back"><a href="#top">^</a></p><h3 id="delta-chat-è-stata-verificata-in-modo-indipendente-per-le-vulnerabilità-di-sicurezza">
         
         
-          Was Delta Chat independently audited for security vulnerabilities? <a href="#was-delta-chat-independently-audited-for-security-vulnerabilities" class="anchor"></a>
+          Delta Chat è stata verificata in modo indipendente per le vulnerabilità di sicurezza? <a href="#delta-chat-è-stata-verificata-in-modo-indipendente-per-le-vulnerabilità-di-sicurezza" class="anchor"></a>
         
         
       </h3>
 
-<p>The Delta Chat project underwent three independent security audits in the last
-years:</p>
+<p>Il progetto Delta Chat è stato sottoposto a tre audit di sicurezza indipendenti negli ultimi
+anni:</p>
 
 <ul>
   <li>
-    <p>In 2019, <a href="https://includesecurity.com">Include Security</a> analyzed Delta
-Chat’s <a href="https://github.com/rpgp/rpgp">PGP</a> and
-<a href="https://github.com/RustCrypto/RSA">RSA</a> libraries.
-It found no critical issues,
-but two high-severity issues that we subsequently fixed.
-It also revealed one medium-severity and some less severe issues,
-but there was no way to exploit these vulnerabilities in the Delta Chat implementation.
-Some of them we nevertheless fixed since the audit was concluded.
-You can read the <a href="../assets/blog/2019-first-security-review.pdf">full report here</a>.</p>
+    <p>Nel 2019, <a href="https://includesecurity.com">Include Security</a> ha analizzato le librerie
+<a href="https://github.com/rpgp/rpgp">PGP</a> e
+<a href="https://github.com/RustCrypto/RSA">RSA</a> di Delta Chat.
+Non ha riscontrato criticità,
+ma due problemi di elevata gravità che abbiamo successivamente risolto.
+Ne sono emersi anche uno di media gravità e alcuni problemi meno gravi,
+ma non c’era modo di sfruttare queste vulnerabilità nell’implementazione di Delta Chat.
+Alcuni di essi sono stati comunque corretti dopo la conclusione dell’audit.
+Puoi leggere il <a href="../assets/blog/2019-first-security-review.pdf">rapporto completo qui</a>.</p>
   </li>
   <li>
-    <p>In 2020, <a href="https://includesecurity.com">Include Security</a> analyzed Delta
+    <p>Nel 2020, <a href="https://includesecurity.com">Include Security</a> ha analizzato il Delta
 Chat’s Rust <a href="https://github.com/deltachat/deltachat-core-rust/">core</a>,
 <a href="https://github.com/async-email/async-imap">IMAP</a>,
-<a href="https://github.com/async-email/async-smtp">SMTP</a>, and
-<a href="https://github.com/async-email/async-native-tls">TLS</a> libraries.
-It did not find any critical or high-severity issues.
-The report raised a few medium-severity weaknesses -
-they are no threat to Delta Chat users on their own
-because they depend on the environment in which Delta Chat is used.
-For usability and compatibility reasons,
-we can not mitigate all of them
-and decided to provide security recommendations to threatened users.
-You can read the <a href="../assets/blog/2020-second-security-review.pdf">full report here</a>.</p>
+<a href="https://github.com/async-email/async-smtp">SMTP</a> e
+<a href="https://github.com/async-email/async-native-tls">TLS</a> librerie.
+Non ha rilevato problemi critici o di elevata gravità.
+Il rapporto ha sollevato alcuni punti deboli di media gravità:
+da soli non rappresentano una minaccia per gli utenti di Delta Chat
+perché dipendono dall’ambiente in cui viene utilizzato Delta Chat.
+Per motivi di usabilità e compatibilità,
+non possiamo mitigarli tutti
+e ha deciso di fornire consigli sulla sicurezza agli utenti minacciati.
+Puoi leggere il <a href="../assets/blog/2020-second-security-review.pdf">rapporto completo qui</a>.</p>
   </li>
   <li>
-    <p>Beginning 2023, <a href="https://cure53.de">Cure53</a> analyzed both the transport encryption of
-Delta Chat’s network connections and a reproducible mail server setup as
-<a href="serverguide">recommended on this site</a>.
-You can read more about the audit <a href="2023-03-23-third-independent-security-audit">on our blog</a>
-or read the <a href="../assets/blog/MER-01-report.pdf">full report here</a>.</p>
+    <p>A partire dal 2023, <a href="https://cure53.de">Cure53</a> ha analizzato sia la crittografia del trasporto delle
+Connessioni di rete di Delta Chat e una configurazione del server di posta riproducibile come
+<a href="serverguide">consigliato su questo sito</a>.
+Puoi leggere ulteriori informazioni sull’audit <a href="2023-03-23-hird-independent-security-audit">sul nostro blog</a>
+o leggere il <a href="../assets/blog/MER-01-report.pdf">rapporto completo qui</a>.</p>
   </li>
 </ul>
     

+ 69 - 3
deltachat-ios/Assets/Help/nl/help.html

@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Multi-client</a>
     <ul>
       <li><a href="#kan-ik-delta-chat-op-meerdere-apparaten-tegelijk-gebruiken">Kan ik Delta Chat op meerdere apparaten tegelijk gebruiken?</a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#bestaan-er-plannen-om-een-delta-chat-webclient-te-maken">Bestaan er plannen om een Delta Chat-webclient te maken?</a></li>
       <li><a href="#waarvoor-dient-de-optie-kopie-versturen-aan-mijzelf">Waarvoor dient de optie ‘Kopie versturen aan mijzelf’?</a></li>
       <li><a href="#waarom-kan-ik-kiezen-om-de-map-verzonden-te-controleren">Waarom kan ik kiezen om de map ‘Verzonden’ te controleren?</a></li>
@@ -824,9 +826,73 @@ voor een uitleg over pEp en Autocrypt.</li>
         
       </h3>
 
-<p>Als je <strong>hetzelfde account</strong> wilt gebruiken op andere
-apparaten, dan moet je
-een back-up exporteren op het oude apparaat en deze importeren op het nieuwe:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>Ga op je oude apparaat naar ‘Instellingen –&gt; Gesprekken en media –&gt; Back-up’. Voer je

+ 112 - 92
deltachat-ios/Assets/Help/pl/help.html

@@ -7,7 +7,7 @@
       <li><a href="#jakie-wiadomości-pojawiają-się-w-delta-chat">Jakie wiadomości pojawiają się w Delta Chat?</a></li>
       <li><a href="#co-zrobić-jeśli-oczekuję-wiadomości-od-osoby-do-której-nie-pisałem-w-przeszłości">Co zrobić, jeśli oczekuję wiadomości od osoby, do której nie pisałem w przeszłości?</a></li>
       <li><a href="#czy-delta-chat-obsługuje-obrazy-filmy-i-inne-załączniki">Czy Delta Chat obsługuje obrazy, filmy i inne załączniki?</a></li>
-      <li><a href="#multiple-accounts">How can I add or switch between multiple accounts?</a></li>
+      <li><a href="#multiple-accounts">Jak mogę dodawać lub przełączać się między wieloma kontami?</a></li>
       <li><a href="#kto-widzi-moje-zdjęcie-profilowe">Kto widzi moje zdjęcie profilowe?</a></li>
       <li><a href="#czy-delta-chat-obsługuje-wiadomości-e-mail-w-formacie-html">Czy Delta Chat obsługuje wiadomości e-mail w formacie HTML?</a></li>
       <li><a href="#dlaczego-muszę-wpisać-moje-hasło-e-mail-do-delta-chat-czy-to-jest-bezpieczne">Dlaczego muszę wpisać moje hasło e-mail do Delta Chat? Czy to jest bezpieczne?</a></li>
@@ -34,7 +34,7 @@
       <li><a href="#jeśli-nie-jest-dostępne-szyfrowanie-typu-end-to-end-czy-połączenie-w-ogóle-nie-jest-szyfrowane">Jeśli nie jest dostępne szyfrowanie typu „end-to-end”, czy połączenie w ogóle nie jest szyfrowane?</a></li>
       <li><a href="#jak-mogę-zweryfikować-status-kryptograficzny-z-nadawcą">Jak mogę zweryfikować status kryptograficzny z nadawcą?</a></li>
       <li><a href="#jak-mogę-sprawdzić-szyfrowanie-wiadomości">Jak mogę sprawdzić szyfrowanie wiadomości?</a></li>
-      <li><a href="#how-can-i-ensure-message-encryption-and-deletion">How can I ensure message encryption and deletion?</a></li>
+      <li><a href="#jak-mogę-zapewnić-szyfrowanie-i-usuwanie-wiadomości">Jak mogę zapewnić szyfrowanie i usuwanie wiadomości?</a></li>
       <li><a href="#jakie-standardy-są-stosowane-do-szyfrowania-end-to-end">Jakie standardy są stosowane do szyfrowania end-to-end?</a></li>
       <li><a href="#jaka-jest-różnica-między-zweryfikowanymi-grupami-a-czatami-11-ze-zweryfikowanymi-kontaktami">Jaka jest różnica między zweryfikowanymi grupami a czatami 1:1 ze zweryfikowanymi kontaktami?</a></li>
       <li><a href="#czy-delta-chat-obsługuje-perfect-forward-secrecy">Czy Delta Chat obsługuje Perfect Forward Secrecy?</a></li>
@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Multi-klient</a>
     <ul>
       <li><a href="#czy-mogę-korzystać-z-delta-chat-na-wielu-urządzeniach-w-tym-samym-czasie">Czy mogę korzystać z Delta Chat na wielu urządzeniach w tym samym czasie?</a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#czy-są-jakieś-plany-wprowadzenia-klienta-web-delta-chat">Czy są jakieś plany wprowadzenia klienta Web Delta Chat?</a></li>
       <li><a href="#do-czego-służy-ustawienie-wyślij-kopię-do-siebie">Do czego służy ustawienie „Wyślij kopię do siebie”?</a></li>
       <li><a href="#po-co-mam-wybrać-opcję-oglądania-folderu-wysłane">Po co mam wybrać opcję oglądania folderu „Wysłane”?</a></li>
@@ -77,11 +79,11 @@
   <li><a href="#różne">Różne</a>
     <ul>
       <li><a href="#czy-delta-chat-działa-z-moim-dostawcą-poczty-e-mail">Czy Delta Chat działa z <em>moim</em> dostawcą poczty e-mail?</a></li>
-      <li><a href="#i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend">I want to manage my own e-mail server for Delta Chat. What do you recommend?</a></li>
+      <li><a href="#chcę-zarządzać-własnym-serwerem-e-mail-dla-delta-chat-co-polecacie">Chcę zarządzać własnym serwerem e-mail dla Delta Chat. Co polecacie?</a></li>
       <li><a href="#jeśli-delta-chat-korzysta-z-poczty-e-mail-czy-naprawdę-jest-to-komunikator-internetowy">Jeśli Delta Chat korzysta z poczty e-mail, czy naprawdę jest to komunikator internetowy?</a></li>
       <li><a href="#czy-delta-chat-jest-kompatybilny-z-protonmail--tutanota--criptext">Czy Delta Chat jest kompatybilny z Protonmail / Tutanota / Criptext?</a></li>
       <li><a href="#interesują-mnie-szczegóły-techniczne-możesz-powiedzieć-mi-coś-więcej">Interesują mnie szczegóły techniczne. Możesz powiedzieć mi coś więcej?</a></li>
-      <li><a href="#was-delta-chat-independently-audited-for-security-vulnerabilities">Was Delta Chat independently audited for security vulnerabilities?</a></li>
+      <li><a href="#czy-delta-chat-był-niezależnie-kontrolowany-pod-kątem-luk-w-zabezpieczeniach">Czy Delta Chat był niezależnie kontrolowany pod kątem luk w zabezpieczeniach?</a></li>
       <li><a href="#w-jaki-sposób-finansowany-jest-rozwój-delta-chat">W jaki sposób finansowany jest rozwój Delta Chat?</a></li>
     </ul>
   </li>
@@ -123,16 +125,15 @@ instalować tej samej aplikacji co Twoja, tak jak w przypadku innych komunikator
       </h3>
 
 <ul>
-  <li><em>Independent</em> of any company or services. <em>You</em> own your data.</li>
-  <li>Your data is not saved on a central server unless all users are using
-the same e-mail servers</li>
-  <li>You do not distribute your address book to anyone.</li>
-  <li><em>Fast</em> by the use of Push-IMAP.</li>
-  <li><em>Largest userbase</em> - recipients <em>not</em> using Delta Chat can be reached as well.</li>
-  <li><em>No Spam</em> - only messages of known users are shown by default.</li>
-  <li><em>End-to-end-encryption</em> via Autocrypt.</li>
-  <li><em>Copyleft</em> and <em>Standards</em> based libre software.</li>
-  <li><em>Flexible identity</em> with built-in support for <a href="#multiple-accounts">multiple accounts</a></li>
+  <li><em>Niezależny</em> od jakiejkolwiek firmy lub usług. <em>Jesteś</em> właścicielem swoich danych.</li>
+  <li>Twoje dane nie są zapisywane na centralnym serwerze, chyba że wszyscy użytkownicy korzystają z tych samych serwerów pocztowych</li>
+  <li>Nie udostępniasz nikomu swojej książki adresowej</li>
+  <li><em>Szybki</em> dzięki użyciu Push-IMAP</li>
+  <li><em>Największa baza użytkowników</em> – możesz dotrzeć również do odbiorców <em>niekorzystających</em> z Delta Chat.</li>
+  <li><em>Brak spamu</em> – domyślnie wyświetlane są, tylko wiadomości znanych użytkowników</li>
+  <li><em>Szyfrowanie end-to-end</em> za pomocą Autocrypt</li>
+  <li>Wolne oprogramowanie oparte na <em>Systemie licencjonowania praw autorskich</em> i <em>Standardach</em></li>
+  <li><em>Elastyczna tożsamość</em> ze wbudowaną obsługą <a href="#multiple-accounts">wielu kont</a></li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="jakie-wiadomości-pojawiają-się-w-delta-chat">
@@ -143,22 +144,14 @@ the same e-mail servers</li>
         
       </h3>
 
-<p>By default, Delta Chat shows all e-mails.</p>
+<p>Domyślnie Delta Chat pokazuje wszystkie e-maile.</p>
 
-<p>At “Settings -&gt; Chats &amp;
-Media -&gt; Show Classic E-Mails”, you can change this. You have these options:</p>
+<p>Możesz to zmienić w „Ustawienia » Czaty i media » Pokaż klasyczne e-maile”. Masz następujące opcje:</p>
 
 <ul>
-  <li>“No, chats only”: Only messages sent by other Delta Chat users and replies to
-your Delta Chat messages are shown. This makes most sense if you use the same
-e-mail account for normal e-mails as well.</li>
-  <li>“All”: Delta Chat shows all e-mails that are sent to your email address. This
-makes sense if you want to use Delta Chat for all your e-mails, so no message
-gets lost. This is the default setting.</li>
-  <li>“For accepted contacts”: Delta Chat shows all e-mails from contacts with whom
-you already have a chat, but new chats only pop up for Delta Chat messages.
-This helps to decide on a case-by-case basis whether you want to have a
-conversation in Delta Chat or in a “normal” e-mail app.</li>
+  <li>„Nie, tylko czaty”: Wyświetlane są tylko wiadomości wysłane przez innych użytkowników Delta Chat i odpowiedzi na Twoje wiadomości Delta Chat. Ma to największy sens, jeśli używasz tego samego konta e-mail również do wysyłania zwykłych wiadomości e-mail. To jest ustawienie domyślne.</li>
+  <li>„Wszystkie”: Delta Chat pokazuje wszystkie e-maile, które są wysyłane na Twój adres e-mail. Ma to sens, jeśli chcesz używać Delta Chat do wszystkich swoich e-maili, więc żadna wiadomość nie zostanie utracona. To jest ustawienie domyślne.</li>
+  <li>„Dla zaakceptowanych kontaktów”: Delta Chat pokazuje wszystkie e-maile od kontaktów, z którymi już prowadzisz czat, ale nowe czaty pojawiają się tylko dla wiadomości Delta Chat. Pomaga to zdecydować indywidualnie dla każdego przypadku, czy chcesz prowadzić rozmowę w Delta Chat, czy w „normalnej” aplikacji e-mail.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="co-zrobić-jeśli-oczekuję-wiadomości-od-osoby-do-której-nie-pisałem-w-przeszłości">
@@ -188,25 +181,25 @@ conversation in Delta Chat or in a “normal” e-mail app.</li>
     <p>Tak. Oprócz zwykłego tekstu wszystkie załączniki wiadomości e-mail są wyświetlane jako oddzielne wiadomości. Wiadomości wychodzące automatycznie otrzymują załączniki w razie potrzeby.</p>
   </li>
   <li>
-    <p>For performance, images are optimized and sent at a smaller size by default, but you can send it as a “file” to preserve the original.</p>
+    <p>Ze względu na wydajność obrazy są domyślnie optymalizowane i wysyłane w mniejszym rozmiarze, ale można je wysłać jako „plik”, aby zachować oryginał.</p>
   </li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="multiple-accounts">
         
         
-          How can I add or switch between multiple accounts? <a href="#multiple-accounts" class="anchor"></a>
+          Jak mogę dodawać lub przełączać się między wieloma kontami? <a href="#multiple-accounts" class="anchor"></a>
         
         
       </h3>
 
-<p>You can easily work with additional accounts on Delta Chat mobile and desktop clients by clicking either:</p>
+<p>Możesz łatwo pracować z dodatkowymi kontami na klientach mobilnych i stacjonarnych Delta Chat, klikając:</p>
 <ul>
-  <li>on the menu button and then ‘Switch Account’ (Android and desktop)</li>
-  <li>or the profile icon and then ‘Add Account’ (iOS)</li>
+  <li>na przycisku menu, a następnie „Przełącz konto” (Android i komputer stacjonarny)</li>
+  <li>lub ikonę profilu, a następnie „Dodaj konto” (iOS)</li>
 </ul>
 
-<p>You may also wish to learn <a href="#can-i-use-delta-chat-on-multiple-devices-at-the-same-time">how to add accounts to multiple devices</a>.</p>
+<p>Możesz także dowiedzieć się, <a href="#czy-mogę-korzystać-z-delta-chat-na-wielu-urządzeniach-w-tym-samym-czasie">jak dodawać konta do wielu urządzeń</a>.</p>
     
       <p class="back"><a href="#top">^</a></p><h3 id="kto-widzi-moje-zdjęcie-profilowe">
         
@@ -312,8 +305,7 @@ Oto, co robi Delta Chat z tymi uprawnieniami:</p>
     <p><strong>Wycisz czaty</strong>, jeśli nie chcesz otrzymywać z nich powiadomień. Wyciszone czaty pozostają na swoim miejscu i możesz też przypiąć wyciszony czat.</p>
   </li>
   <li>
-    <p><strong>Archive chats</strong> if you do not want to see them in your chat list any longer.
-Archived chats remain accessible above the chat list or via search.</p>
+    <p><strong>Archiwizuj czaty</strong>, jeśli nie chcesz ich już widzieć na liście czatów. Zarchiwizowane czaty pozostają dostępne nad listą czatów lub poprzez wyszukiwanie.</p>
   </li>
   <li>
     <p>Gdy zarchiwizowany czat otrzyma nową wiadomość, o ile nie zostanie wyciszony, <strong>wyskoczy z archiwum</strong> i wróci na twoją listę czatów.
@@ -556,33 +548,23 @@ Jeśli te same odciski palców pojawią się na urządzeniu partnera czatu, poł
   </li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="how-can-i-ensure-message-encryption-and-deletion">
+      <p class="back"><a href="#top">^</a></p><h3 id="jak-mogę-zapewnić-szyfrowanie-i-usuwanie-wiadomości">
         
         
-          How can I ensure message encryption and deletion? <a href="#how-can-i-ensure-message-encryption-and-deletion" class="anchor"></a>
+          Jak mogę zapewnić szyfrowanie i usuwanie wiadomości? <a href="#jak-mogę-zapewnić-szyfrowanie-i-usuwanie-wiadomości" class="anchor"></a>
         
         
       </h3>
 
-<p>The best way to ensure every message is encrypted,
-and metadata deleted as quickly as possible
-is creating a verified group and turning on
-self-destructing messages.</p>
+<p>Najlepszym sposobem na zapewnienie szyfrowania każdej wiadomości i jak najszybszego usunięcia metadanych jest utworzenie zweryfikowanej grupy i włączenie autodestrukcji wiadomości.</p>
 
-<p>Verified groups are always encrypted and protected against <a href="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">MITM
-attacks</a>.</p>
+<p>Zweryfikowane grupy są zawsze szyfrowane i chronione przed <a href="https://pl.wikipedia.org/wiki/Atak_man_in_the_middle">atakami MITM</a>.</p>
 
-<p>Metadata can’t be encrypted, as the server needs to know where to deliver your
-messages. But turning on “self-destructing messages” deletes the messages on
-the server after they were delivered.</p>
+<p>Metadanych nie można zaszyfrować, ponieważ serwer musi wiedzieć, gdzie dostarczyć wiadomości. Ale włączenie „autodestrukcji wiadomości” usuwa wiadomości z serwera po ich dostarczeniu.</p>
 
-<p>If you need the messages on your device, but not on the server, you can also
-agree in the group to turn on <a href="#what-happens-if-i-turn-on-delete-old-messages-from-server">“delete messages from server
-automatically”</a>.</p>
+<p>Jeśli potrzebujesz wiadomości na swoim urządzeniu, ale nie na serwerze, możesz również uzgodnić w grupie włączenie  <a href="#co-się-stanie-jeśli-włączę-opcję-usuń-wiadomości-z-serwera">„automatycznego usuwania wiadomości z serwera”</a>.</p>
 
-<p>If you want to protect a 1:1 conversation like this, you should create a
-verified group with only 2 people. If the other person loses their device but
-not their account, you can still communicate in the 1:1 chat. (<a href="#what-is-the-difference-between-verified-groups-and-11-chats-with-verified-contacts">Read more</a>)</p>
+<p>Jeśli chcesz chronić taką rozmowę 1:1, powinieneś utworzyć zweryfikowaną grupę składającą się tylko z 2 osób. Jeśli druga osoba straci swoje urządzenie, ale nie konto, nadal możesz komunikować się na czacie 1:1. (<a href="#jaka-jest-różnica-między-zweryfikowanymi-grupami-a-czatami-11-ze-zweryfikowanymi-kontaktami">Czytaj więcej</a>)</p>
     
       <p class="back"><a href="#top">^</a></p><h3 id="jakie-standardy-są-stosowane-do-szyfrowania-end-to-end">
         
@@ -722,7 +704,73 @@ W przypadku innych programów można znaleźć rozwiązanie online.</p>
         
       </h3>
 
-<p>Jeśli chcesz używać tego samego konta na różnych urządzeniach, wyeksportuj kopię zapasową ze starego urządzenia i zaimportuj ją na nowe urządzenie:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>Na starym urządzeniu przejdź do „Ustawienia » Czaty i media » Eksport kopii zapasowej”. Wprowadź swój PIN odblokowania ekranu, wzór lub hasło. Następnie możesz nacisnąć „Utwórz kopię”. Spowoduje to zapisanie pliku kopii zapasowej na urządzeniu. Teraz musisz jakoś przenieść go na inne urządzenie.</li>
@@ -986,19 +1034,17 @@ Zobacz <a href="https://countermitm.readthedocs.io/en/latest/new.html">countermi
 Jednak niektórzy dostawcy potrzebują specjalnych opcji, aby działać poprawnie, zobacz <a href="https://providers.delta.chat">Przegląd dostawców</a></li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend">
+      <p class="back"><a href="#top">^</a></p><h3 id="chcę-zarządzać-własnym-serwerem-e-mail-dla-delta-chat-co-polecacie">
         
         
-          I want to manage my own e-mail server for Delta Chat. What do you recommend? <a href="#i-want-to-manage-my-own-e-mail-server-for-delta-chat-what-do-you-recommend" class="anchor"></a>
+          Chcę zarządzać własnym serwerem e-mail dla Delta Chat. Co polecacie? <a href="#chcę-zarządzać-własnym-serwerem-e-mail-dla-delta-chat-co-polecacie" class="anchor"></a>
         
         
       </h3>
 
 <ul>
-  <li>Most mail servers will work well. But what we personally recommend is a
-combination of mailcow and mailadm, as described <a href="2023-01-26-upcoming-mail-server-workshops">in this
-blogpost</a>.</li>
-  <li>You can find an <a href="serverguide">installation guide on our website</a>.</li>
+  <li>Większość serwerów pocztowych będzie działać dobrze. Ale to, co osobiście polecamy, to połączenie mailcow i mailadm, jak opisano <a href="2023-01-26-upcoming-mail-server-workshops">w tym poście na blogu</a>.</li>
+  <li>Instrukcję instalacji można znaleźć <a href="serverguide">na naszej stronie internetowej</a>.</li>
 </ul>
     
       <p class="back"><a href="#top">^</a></p><h3 id="jeśli-delta-chat-korzysta-z-poczty-e-mail-czy-naprawdę-jest-to-komunikator-internetowy">
@@ -1043,50 +1089,24 @@ blogpost</a>.</li>
   <li>Zobacz <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md#standards-used-in-delta-chat">Standardy używane w Delta Chat</a>.</li>
 </ul>
     
-      <p class="back"><a href="#top">^</a></p><h3 id="was-delta-chat-independently-audited-for-security-vulnerabilities">
+      <p class="back"><a href="#top">^</a></p><h3 id="czy-delta-chat-był-niezależnie-kontrolowany-pod-kątem-luk-w-zabezpieczeniach">
         
         
-          Was Delta Chat independently audited for security vulnerabilities? <a href="#was-delta-chat-independently-audited-for-security-vulnerabilities" class="anchor"></a>
+          Czy Delta Chat był niezależnie kontrolowany pod kątem luk w zabezpieczeniach? <a href="#czy-delta-chat-był-niezależnie-kontrolowany-pod-kątem-luk-w-zabezpieczeniach" class="anchor"></a>
         
         
       </h3>
 
-<p>The Delta Chat project underwent three independent security audits in the last
-years:</p>
+<p>Projekt Delta Chat przeszedł w ostatnich latach trzy niezależne audyty bezpieczeństwa:</p>
+
+<p>-W 2019 r. firma <a href="https://includesecurity.com">Include Security</a> przeanalizowała biblioteki <a href="https://github.com/rpgp/rpgp">PGP</a> i <a href="https://github.com/RustCrypto/RSA">RSA</a> Delta Chat. Nie znaleziono żadnych krytycznych problemów, ale dwa poważne problemy, które później naprawiliśmy. Ujawniła również jeden problem o średniej wadze i kilka mniej poważnych, ale nie było możliwości wykorzystania tych luk w implementacji Delta Chat. Niektóre z nich jednak naprawiliśmy od czasu zakończenia kontroli. Pełny raport można przeczytać <a href="../assets/blog/2019-first-security-review.pdf">tutaj</a>.</p>
 
 <ul>
   <li>
-    <p>In 2019, <a href="https://includesecurity.com">Include Security</a> analyzed Delta
-Chat’s <a href="https://github.com/rpgp/rpgp">PGP</a> and
-<a href="https://github.com/RustCrypto/RSA">RSA</a> libraries.
-It found no critical issues,
-but two high-severity issues that we subsequently fixed.
-It also revealed one medium-severity and some less severe issues,
-but there was no way to exploit these vulnerabilities in the Delta Chat implementation.
-Some of them we nevertheless fixed since the audit was concluded.
-You can read the <a href="../assets/blog/2019-first-security-review.pdf">full report here</a>.</p>
-  </li>
-  <li>
-    <p>In 2020, <a href="https://includesecurity.com">Include Security</a> analyzed Delta
-Chat’s Rust <a href="https://github.com/deltachat/deltachat-core-rust/">core</a>,
-<a href="https://github.com/async-email/async-imap">IMAP</a>,
-<a href="https://github.com/async-email/async-smtp">SMTP</a>, and
-<a href="https://github.com/async-email/async-native-tls">TLS</a> libraries.
-It did not find any critical or high-severity issues.
-The report raised a few medium-severity weaknesses -
-they are no threat to Delta Chat users on their own
-because they depend on the environment in which Delta Chat is used.
-For usability and compatibility reasons,
-we can not mitigate all of them
-and decided to provide security recommendations to threatened users.
-You can read the <a href="../assets/blog/2020-second-security-review.pdf">full report here</a>.</p>
+    <p>W 2020 r. firma <a href="https://includesecurity.com">Include Security</a> przeanalizowała biblioteki Rust <a href="https://github.com/deltachat/deltachat-core-rust/">core</a>, <a href="https://github.com/async-email/async-imap">IMAP</a>, <a href="https://github.com/async-email/async-smtp">SMTP</a> i <a href="https://github.com/async-email/async-native-tls">TLS</a> Delta Chat. Nie znalazła żadnych problemów krytycznych ani poważnych. W raporcie zwrócono uwagę na kilka słabych punktów o średniej wadze – same w sobie nie stanowią zagrożenia dla użytkowników Delta Chat, ponieważ zależą od środowiska, w którym używany jest Delta Chat. Ze względu na użyteczność i kompatybilność nie możemy złagodzić wszystkich z nich i zdecydowaliśmy się przedstawić zalecenia dotyczące bezpieczeństwa zagrożonym użytkownikom. Pełny raport można przeczytać <a href="../assets/blog/2020-second-security-review.pdf">tutaj</a>.</p>
   </li>
   <li>
-    <p>Beginning 2023, <a href="https://cure53.de">Cure53</a> analyzed both the transport encryption of
-Delta Chat’s network connections and a reproducible mail server setup as
-<a href="serverguide">recommended on this site</a>.
-You can read more about the audit <a href="2023-03-23-third-independent-security-audit">on our blog</a>
-or read the <a href="../assets/blog/MER-01-report.pdf">full report here</a>.</p>
+    <p>Początkiem 2023 r. firma <a href="https://cure53.de">Cure53</a> przeanalizował zarówno szyfrowanie transportu połączeń sieciowych Delta Chat, jak i powtarzalną konfigurację serwera pocztowego zgodnie z <a href="serverguide">zaleceniami na tej stronie</a>. Możesz przeczytać więcej o audycie <a href="2023-03-23-third-independent-security-audit">na naszym blogu</a> lub przeczytać pełny raport <a href="../assets/blog/MER-01-report.pdf">tutaj</a>.</p>
   </li>
 </ul>
     

+ 69 - 2
deltachat-ios/Assets/Help/ru/help.html

@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Мультиклиент</a>
     <ul>
       <li><a href="#можно-ли-использовать-delta-chat-на-нескольких-устройствах-одновременно">Можно ли использовать Delta Chat на нескольких устройствах одновременно?</a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#есть-ли-какие-либо-планы-по-внедрению-веб-клиента-delta-chat">Есть ли какие-либо планы по внедрению веб-клиента Delta Chat?</a></li>
       <li><a href="#для-чего-нужен-параметр-отправить-копию-себе">Для чего нужен параметр “Отправить копию себе”?</a></li>
       <li><a href="#для-чего-нужен-параметр-следить-за-папкой-отправлено">Для чего нужен параметр “следить за папкой Отправлено”?</a></li>
@@ -836,8 +838,73 @@ RFC</a>.</p>
         
       </h3>
 
-<p>Если вы хотите использовать одну и ту же учётную запись на разных устройствах, вам следует экспортировать
-резервную копию со старого устройства и импортировать её на новое устройство:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your

+ 69 - 2
deltachat-ios/Assets/Help/sk/help.html

@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Multiklient</a>
     <ul>
       <li><a href="#môžem-používať-delta-chat-na-viacerých-zariadeniach-súčasne">Môžem používať Delta Chat na viacerých zariadeniach súčasne?</a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#máte-nejaké-plány-na-zavedenie-webového-klienta-delta-chat">Máte nejaké plány na zavedenie webového klienta Delta Chat?</a></li>
       <li><a href="#na-čo-je-dobré-nastavenie-odoslať-kópiu-sebe">Na čo je dobré nastavenie „Odoslať kópiu sebe“?</a></li>
       <li><a href="#prečo-si-môžem-vybrať-sledovanie-priečinka-odoslané">Prečo si môžem vybrať sledovanie priečinka „Odoslané“?</a></li>
@@ -837,8 +839,73 @@ FAQ</a>.</li>
         
       </h3>
 
-<p>Ak chcete používať <strong>rovnaký účet</strong> na rôznych zariadeniach, mali by ste exportovať
-zálohu zo starého zariadenia a importovať do nového zariadenia:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>On the old device, go to “Settings -&gt; Chats and media -&gt; Export Backup”. Enter your

+ 69 - 2
deltachat-ios/Assets/Help/sq/help.html

@@ -47,6 +47,8 @@
   <li><a href="#multiclient">Multi-klient</a>
     <ul>
       <li><a href="#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></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#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></li>
       <li><a href="#përse-hyn-në-punë-rregullimi-dërgojini-vetes-një-kopje">Përse hyn në punë rregullimi “Dërgojini Vetes Një Kopje”?</a></li>
       <li><a href="#pse-mund-të-zgjedh-të-vëzhgoj-dosjen-të-dërguar">Pse mund të zgjedh të vëzhgoj dosjen “Të dërguar”?</a></li>
@@ -846,8 +848,73 @@ Autocrypt-i</a>.</li>
         
       </h3>
 
-<p>Nëse doni të përdorni të <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>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>Te pajisja e vjetër, kaloni te “Rregullime -&gt; Fjalosje dhe media -&gt; Eksportoni

+ 69 - 1
deltachat-ios/Assets/Help/uk/help.html

@@ -50,6 +50,8 @@
   <li><a href="#multiclient">Мульти-клієнт</a></li>
   <li><a href="#чи-можна-використовувати-delta-chat-на-декількох-пристроях-одночасно">Чи можна використовувати Delta Chat на декількох пристроях одночасно?</a>
     <ul>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#чи-планується-впровадження-веб-клієнта-delta-chat">Чи планується впровадження веб-клієнта Delta Chat?</a></li>
       <li><a href="#для-чого-потрібне-налаштування-відправити-копію-собі">Для чого потрібне налаштування “Відправити копію собі”?</a></li>
       <li><a href="#чому-я-можу-обрати-стеження-за--папкою-надіслані">Чому я можу обрати стеження за  папкою “Надіслані”?</a></li>
@@ -727,7 +729,73 @@ not their account, you can still communicate in the 1:1 chat. (<a href="#what-is
         
       </h2>
 
-<p>Якщо ви хочете використовувати <strong>один і той же обліковий запис</strong> на різних пристроях, вам слід експортувати резервну копію із старого пристрою та імпортувати її на новий пристрій:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>На старому пристрої перейдіть у «Налаштування -&gt; Чати та медіа -&gt; Експорт резервної копії». Введіть ваш PIN-код, ключ або пароль розблокування екрана. Потім ви можете натиснути “Почати Резервне копіювання”. Це збереже файл резервної копії на вашому пристрої. Тепер вам потрібно перенести на інший пристрій якимось чином.</li>

+ 69 - 1
deltachat-ios/Assets/Help/zh-Hant/help.html

@@ -47,6 +47,8 @@
   <li><a href="#multiclient">多客户端</a>
     <ul>
       <li><a href="#我能同时在多个设备上使用-delta-chat-吗">我能同时在多个设备上使用 Delta Chat 吗?</a></li>
+      <li><a href="#troubleshooting">Troubleshooting</a></li>
+      <li><a href="#manual-transfer">Manual Transfer</a></li>
       <li><a href="#有推出-delta-chat-web-客户端的计划吗">有推出 Delta Chat Web 客户端的计划吗?</a></li>
       <li><a href="#给自己发送副本设置有什么用处">“给自己发送副本”设置有什么用处?</a></li>
       <li><a href="#为什么我可以选择监视已发送文件夹">为什么我可以选择监视“已发送”文件夹?</a></li>
@@ -728,7 +730,73 @@ not their account, you can still communicate in the 1:1 chat. (<a href="#what-is
         
       </h3>
 
-<p>要在不同设备上使用<strong>相同帐户</strong>,请从旧设备导出备份,然后将其导入新设备:</p>
+<p>Yes. Delta Chat 1.36 comes with a new, experimental function for using the same account on different devices:</p>
+
+<ul>
+  <li>
+    <p>On the first device, go to <strong>Settings → Add Second Device</strong>, unlock the screen if needed
+and wait a moment until a QR code is shown</p>
+  </li>
+  <li>
+    <p>On the second device, <a href="https://get.delta.chat">install Delta Chat</a></p>
+  </li>
+  <li>
+    <p>On the second device, start Delta Chat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
+  </li>
+  <li>
+    <p>Transfer should start after a few seconds and during transfer both devices will show the <strong>progress</strong>.
+Wait until it is finished on both devices.</p>
+  </li>
+</ul>
+
+<p>In contrast to many other messengers, after successful transfer,
+both <strong>devices are completely independent.</strong>
+One device is not needed for the other to work.</p>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="troubleshooting">
+        
+        
+          Troubleshooting <a href="#troubleshooting" class="anchor"></a>
+        
+        
+      </h3>
+
+<ul>
+  <li>
+    <p>Double-check both devices are in the <strong>same Wi-Fi or network</strong></p>
+  </li>
+  <li>
+    <p>Your system might have a “personal firewall”,
+which is known to cause problems (especially on Windows).
+<strong>Disable the personal firewall</strong> for Delta Chat on both ends and try again</p>
+  </li>
+  <li>
+    <p>Ensure there is <strong>enough storage</strong> on the destination device</p>
+  </li>
+  <li>
+    <p>If transfer started, make sure, the devices <strong>stay active</strong> and do not fall asleep.
+Do not exit Delta Chat.
+(we try hard to make the app work in background, but <a href="https://dontkillmyapp.com">systems tend to kill apps</a>, unfortunately)</p>
+  </li>
+  <li>
+    <p>Delta Chat is <strong>already logged in</strong> on the destination device?
+You can use multiple accounts per device, just <a href="#multiple-accounts">add another account</a></p>
+  </li>
+  <li>
+    <p>If you still have problems or if you <strong>cannot scan a QR code</strong>
+try the <strong>manual transfer</strong> described below</p>
+  </li>
+</ul>
+    
+      <p class="back"><a href="#top">^</a></p><h3 id="manual-transfer">
+        
+        
+          Manual Transfer <a href="#manual-transfer" class="anchor"></a>
+        
+        
+      </h3>
+
+<p>This method is only recommended if “Add Second Device” as described above does not work.</p>
 
 <ul>
   <li>在旧设备上,找到“设置-&gt;聊天与媒体-&gt;导出备份”。输入屏幕解锁 PIN 码、图案或密码,然后点击“开始备份”。这会将备份文件保存到您的设备上。现在您必须用某种方法将备份文件传输到新设备。</li>