update translations and local help

assets/help/cs/help.html

@@ -401,7 +401,7 @@ message them or write to a group they’re in as well.</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1110,10 +1110,13 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
       </h3>
 
 <p>Nejpravděpodobnější příčinou jsou zašifrované klíče, nebo klíče s heslem. 
-Takové klíče Delta Chat nepodporuje.  Můžeš odstranit šifrování nebo heslo a 
+Takové klíče Delta Chat nepodporuje.  Můžeš odstranit šifrování nebo heslo a 
 zkusit to znovu. Pokud je potřeba použít zaheslovaný klíč vytvoř / použij zástupnou 
 adresua a pak přidej nový Delta Chat účet s tímto klíčem.</p>
 
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
+
 <p>Delta Chat podporuje běžné formáty OpenPGP klíčů, nicméně neočekáváme, 
 že soukromé klíče ze všech aplikací budou fungovat. To není cíl, a 
 ve skutečnosti věttšina nových uživatelů Delta Chatu nemá žádný stávající klíč.

assets/help/de/help.html

@@ -367,7 +367,7 @@ zu anderen Instant-Messengern muss der/die EmpfängerIn nicht Delta Chat install
 <p>Sie schalten “Verschwindende Nachrichten”
 oben rechts im Chatfenster,
 durch Auswahl einer Zeitspanne
-zwischen 30 Sekunden und 5 Wochen ein.</p>
+zwischen 1 Minute und 5 Wochen ein.</p>
 
 <p>Bis die Einstellung wieder ausgeschaltet wird,
 kümmern sich die Delta-Chat-Apps der Chat-Teilnehmer
@@ -1039,11 +1039,12 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
         
       </h3>
 
+<p>Mit sehr großer Wahrscheinlichkeit besteht das Problem darin, dass Ihr Schlüssel verschlüsselt ist und/oder ein Passwort verwendet. Solche Schlüssel werden von Delta Chat nicht unterstützt. Bitte entfernen Sie die Verschlüsselung und das Passwort und versuchen Sie den Import danach erneut.</p>
+
+<p>Ein weiterer häufiger Fehler ist die falsche Dateiendung.
+Verwenden Sie das ASCII-Armored-Format die Dateiendung <code class="language-plaintext highlighter-rouge">.asc</code>.</p>
+
 <ul>
-  <li>
-    <p>Wahrscheinlich ist Ihr Schlüssel verschlüsselt und/oder mit einem Passwort geschützt. Solche Schlüssel werden von Delta Chat nicht unterstützt. Bitte entfernen Sie die Verschlüsselung und das Passwort und versuchen Sie den Import danach erneut.
-Wenn Sie das Passwort nicht entfernen möchten, müssen Sie einen E-Mail-Alias zur Nutzung mit Delta Chat anlegen, sodass der Schlüssel von Delta Chat mit diesem E-Mail-Alias verknüpft ist.</p>
-  </li>
   <li>
     <p>Delta Chat unterstützt “gängige” private Schlüsselformate, allerdings ist es unwahrscheinlich, dass wir 100% aller privaten Schlüssel aus sämtlichen Quellen unterstützen.
 Dies ist auch nicht das Hauptaugenmerk von Delta Chat. Tatsächlich besitzt die große Mehrheit der Delta-Chat-NutzerInnen keinen Schlüssel, bevor sie Delta Chat verwendet.

assets/help/en/help.html

@@ -406,7 +406,7 @@ message them or write to a group they’re in as well.</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1114,11 +1114,12 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
         
       </h3>
 
-<p>The most likely cause is that your key is encrypted and/or uses
+<p>The most likely cause is that your key is encrypted and/or uses a password.
-a password. Such keys are not supported by Delta Chat.  You could remove the
+Such keys are not supported by Delta Chat.
-passphrase encryption and the password and try the import again.  If you want
+You could remove the passphrase encryption and the password and try the import again.</p>
-to keep your passphrase you’ll have to create an e-mail alias for use
+
-with Delta Chat such that Delta Chat’s key is tied to this e-mail alias.</p>
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Delta Chat supports common OpenPGP private key formats, however, it
 is unlikely that private keys from all sources will be fully supported. This

assets/help/es/help.html

@@ -397,7 +397,7 @@ message them or write to a group they’re in as well.</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1067,11 +1067,12 @@ which has been <a href="https://delta.chat/assets/blog/2019-first-security-revie
         
       </h3>
 
-<p>The most likely cause is that your key is encrypted and/or uses
+<p>The most likely cause is that your key is encrypted and/or uses a password.
-a password. Such keys are not supported by Delta Chat.  You could remove the
+Such keys are not supported by Delta Chat.
-passphrase encryption and the password and try the import again.  If you want
+You could remove the passphrase encryption and the password and try the import again.</p>
-to keep your passphrase you’ll have to create an e-mail alias for use
+
-with Delta Chat such that Delta Chat’s key is tied to this e-mail alias.</p>
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Delta Chat supports common OpenPGP private key formats, however, it
 is unlikely that private keys from all sources will be fully supported. This

assets/help/fr/help.html

@@ -376,7 +376,7 @@ pour mettre une discussion en sourdine, ouvrez le menu de la conversation (Andro
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1068,7 +1068,10 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
         
       </h3>
 
-<p>L’origine la plus probable de ce problème est que votre clé est chiffrée ou requiert un mot de passe, ou les deux. Ce type de clés n’est pas géré par Delta Chat. Vous pouvez tenter de retirer le chiffrement et le mot de passe puis réessayer l’importation. Si vous voulez garder votre mot de passe, vous devez créer un alias de courriel que vous utiliserez avec Delta Chat, de sorte que la clé de Delta Chat soit liée à cet alias.</p>
+<p>L’origine la plus probable de ce problème est que votre clé est chiffrée ou requiert un mot de passe, ou les deux. Ce type de clés n’est pas géré par Delta Chat. Vous pouvez tenter de retirer le chiffrement et le mot de passe puis réessayer l’importation.</p>
+
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Delta Chat gère les formats de clé privée OpenPGP les plus communs, néanmoins il
  est peu probable que les clés privées générées par toutes les sources soient prises en charge. Mais l’objectif principal de Delta Chat n’est pas là. En pratique, la majorité des nouveaux utilisateurs ne possèdent pas de clés de chiffrement avant d’utiliser Delta Chat.

assets/help/id/help.html

@@ -388,7 +388,7 @@ message them or write to a group they’re in as well.</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1096,11 +1096,12 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
         
       </h3>
 
-<p>The most likely cause is that your key is encrypted and/or uses
+<p>The most likely cause is that your key is encrypted and/or uses a password.
-a password. Such keys are not supported by Delta Chat.  You could remove the
+Such keys are not supported by Delta Chat.
-passphrase encryption and the password and try the import again.  If you want
+You could remove the passphrase encryption and the password and try the import again.</p>
-to keep your passphrase you’ll have to create an e-mail alias for use
+
-with Delta Chat such that Delta Chat’s key is tied to this e-mail alias.</p>
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Delta Chat supports common OpenPGP private key formats, however, it
 is unlikely that private keys from all sources will be fully supported. This

assets/help/it/help.html

@@ -14,7 +14,7 @@
       <li><a href="#di-quali-autorizzazioni-ha-bisogno-delta-chat">Di quali autorizzazioni ha bisogno Delta Chat?</a></li>
       <li><a href="#cosa-significa-fissare-silenziare-archiviare">Cosa significa Fissare, Silenziare, Archiviare?</a></li>
       <li><a href="#cosa-significa-il-punto-verde">Cosa significa il punto verde?</a></li>
-      <li><a href="#ephemeralmsgs">How do disappearing messages work?</a></li>
+      <li><a href="#ephemeralmsgs">Come funzionano i messaggi a scomparsa?</a></li>
       <li><a href="#come-posso-eliminare-il-mio-account">Come posso eliminare il mio account?</a></li>
     </ul>
   </li>
@@ -374,37 +374,37 @@ invia loro un messaggio o scrivi anche a un gruppo a cui appartengono.</li>
       <h3 id="ephemeralmsgs">
         
         
-          How do disappearing messages work? <a href="#ephemeralmsgs" class="anchor"></a>
+          Come funzionano i messaggi a scomparsa? <a href="#ephemeralmsgs" class="anchor"></a>
         
         
       </h3>
 
-<p>You can turn on “disappearing messages”
+<p>Puoi attivare i “messaggi che scompaiono”
-in the settings of a chat,
+nelle impostazioni di una chat,
-at the top right of the chat window,
+in alto a destra nella finestra della chat,
-by selecting a time span
+selezionando un intervallo di tempo
-between 30 seconds and 5 weeks.</p>
+tra 1 minuto e 5 settimane.</p>
 
-<p>Until the setting is turned off again,
+<p>Fino a quando l’impostazione non viene nuovamente disattivata,
-each chat member’s Delta Chat app takes care
+l’app Delta Chat di ogni membro della chat si prende cura
-of deleting the messages
+di eliminare i messaggi
-after the selected time span.
+dopo l’intervallo di tempo selezionato.
-The time span begins
+Inizia il lasso di tempo
-when the receiver first sees the message in Delta Chat.
+quando il destinatario vede per la prima volta il messaggio in Delta Chat.
-The messages are deleted
+I messaggi vengono eliminati
-both in each email account on the server,
+entrambi in ciascun account di posta elettronica sul server,
-and in the app itself.</p>
+e nell’app stessa.</p>
 
-<p>Note that you can rely on disappearing messages
+<p>Tieni presente che puoi fare affidamento sui messaggi che scompaiono
-only as long as you trust your chat partners;
+solo finché ti fidi dei tuoi partner di chat;
-malicious chat partners can take photos,
+i partner di chat dannosi possono scattare foto,
-or otherwise save, copy or forward messages before deletion.</p>
+o altrimenti salvare, copiare o inoltrare messaggi prima della cancellazione.</p>
 
-<p>Apart from that,
+<p>A parte quello,
-if one chat partner uninstalls Delta Chat,
+se un partner di chat disinstalla Delta Chat,
-the messages will not get deleted from their email account.
+i messaggi non verranno eliminati dal loro account di posta elettronica.
-They will most likely also not be decryptable anymore
+Molto probabilmente non saranno più decifrabili
-(as long as they were encrypted in the first place).</p>
+(a patto che siano stati crittografati in primo luogo).</p>
     
       <h3 id="come-posso-eliminare-il-mio-account">
         
@@ -1082,11 +1082,12 @@ Attenzione: assicurarsi che la chiave non sia protetta da password oppure rimuov
         
       </h3>
 
-<p>La causa più probabile è che la tua chiave sia crittografata e/o utilizzi
+<p>Con molta probabilità, il problema sta nel fatto che la tua chiave è cifata e/o usa
-una password. Tali chiavi non sono supportate da Delta Chat. Potresti rimuovere la
+una password. Queste chiavi non sono supportate da Delta Chat. Rimuovi la
-crittografia della passphrase e la password e riprovare l’importazione. Se vuoi
+cifratura e la password e prova ad importarla nuovamente.</p>
-per mantenere la tua passphrase dovrai creare un alias e-mail per l’uso
+
-con Delta Chat in modo che la chiave di Delta Chat sia collegata a questo alias e-mail.</p>
+<p>Un altro errore comune è avere la fine del file sbagliata.
+Utilizza il formato corazzato ASCII e l’estensione del file “.asc”.</p>
 
 <p>Delta Chat supporta i formati di chiave privata OpenPGP comuni, tuttavia,
 è improbabile che le chiavi private di tutte le fonti siano completamente supportate. Questo

assets/help/nl/help.html

@@ -397,7 +397,7 @@ iemand benaderd of iets in een groep plaatst..</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1104,9 +1104,10 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
 
 <p>Het is goed mogelijk dat je sleutel versleuteld is en/of een wachtwoord
 vereist. Zulke sleutels worden niet ondersteund. Verwijder de versleuteling
-en het wachtwoord en probeer het opnieuw. Als je je wachtwoord
+en het wachtwoord en probeer het opnieuw.</p>
-  koste wat kost wilt behouden, maak dan een e-mailalias aan
+
-  die je alleen in Delta Chat gebruikt. Zo is de sleutel niet gekoppeld aan je hoofdadres.</p>
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Delta Chat heeft ondersteuning voor alle veelvoorkomende OpenPGP-privésleutelformaten. Echter,
 het in onmogelijk om álle soorten sleutels te ondersteunen. Onze

assets/help/pl/help.html

@@ -352,7 +352,7 @@ aby wyciszyć czat, użyj menu czatu (Android/Desktop) lub profilu czatu (iOS).<
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1040,7 +1040,10 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
         
       </h3>
 
-<p>Jest wielce prawdopodobne, że problemem jest klucz, który jest zaszyfrowany i/lub używa hasła. Takie klucze nie są obsługiwane przez Delta Chat. Możesz usunąć frazę szyfrującą i hasło i spróbować ponownie zaimportować klucz. Jeśli chcesz zachować hasło, musisz utworzyć alias e-mail do użytku z Delta Chat, tak aby klucz Delta Chat był powiązany z tym aliasem e-mail.</p>
+<p>Jest wielce prawdopodobne, że problemem jest klucz, który jest zaszyfrowany i/lub używa hasła. Takie klucze nie są obsługiwane przez Delta Chat. Usuń szyfrowanie i hasło i spróbować ponownie zaimportować klucz.</p>
+
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Rozsądny format, Delta Chat obsługuje popularne formaty kluczy prywatnych OpenPGP, jednak jest mało prawdopodobne, że będziemy obsługiwać 100% wszystkich kluczy prywatnych z dowolnych źródeł. To również nie jest głównym celem Delta Chat (w rzeczywistości, znaczna większość użytkowników Delta Chat nie będzie miała żadnego klucza przed rozpoczęciem korzystania z Delta). Jednak staramy się wspierać klucze prywatne z innych źródeł tak dobrze jak to tylko możliwe.</p>
 

assets/help/pt/help.html

@@ -393,7 +393,7 @@ message them or write to a group they’re in as well.</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1101,9 +1101,10 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
 
 <p>A causa mais provável é que sua chave está criptografada e/ou usa
 uma senha. Tais chaves não são suportadas pelo Delta Chat. Você poderia remover a
-criptografia por senha e a senha e tentar a importação novamente. Se você quiser
+criptografia por senha e a senha e tentar a importação novamente.</p>
-para manter sua senha, você terá que criar um e-mail para uso
+
-com o Delta Chat de tal forma que a chave do Delta Chat está vinculada a este e-mail.</p>
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>O Delta Chat apoia formatos comuns de chave privada OpenPGP, porém, 
 é improvável que chaves privadas de todas as fontes sejam totalmente suportadas. Isso

assets/help/ru/help.html

@@ -408,7 +408,7 @@ message them or write to a group they’re in as well.</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1115,11 +1115,10 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
         
       </h3>
 
-<p>Вероятная причина заключается в том, что ваш ключ зашифрован и/или использует
+<p>С очень большой вероятностью проблема заключается в том, что ваш ключ зашифрован и/или использует пароль. Такие ключи не поддерживаются Delta Chat. Пожалуйста, удалите шифрование и пароль, после чего повторите попытку импорта.</p>
-пароль. Такие ключи не поддерживаются Delta Chat. Вы можете удалить
+
-шифрование парольной фразы и пароль, а затем повторить попытку импорта. Если вы хотите
+<p>Another common error is having the wrong file ending.
-сохранить свою парольную фразу, вам придется создать псевдоним электронной почты для использования
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
- Delta Chat, чтобы ключ Delta Chat был привязан к этому псевдониму электронной почты.</p>
 
 <p>Delta Chat поддерживает расспространённые форматы закрытых ключей OpenPGP, однако
 маловероятно, что мы будем поддерживать все закрытые ключи из любых источников. Это

assets/help/sk/help.html

@@ -405,7 +405,7 @@ message them or write to a group they’re in as well.</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1115,9 +1115,10 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
 
 <p>Najpravdepodobnejšou príčinou je, že váš kľúč je zašifrovaný a/alebo používa
 heslo. Delta Chat takéto kľúče nepodporuje. Mohli by ste odstrániť
-zašifrovanie prístupovej frázy a heslo a skúsiť import znova. Ak chcete
+zašifrovanie prístupovej frázy a heslo a skúsiť import znova.</p>
-aby ste si zachovali svoju prístupovú frázu, budete si musieť vytvoriť e-mailový alias
+
-s Delta Chatom tak, že kľúč Delta Chat je zviazaný s týmto e-mailovým aliasom.</p>
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Delta Chat podporuje bežné formáty súkromných kľúčov OpenPGP
 avšak je nepravdepodobné, že budú plne podporované súkromné kľúče zo všetkých zdrojov. Toto

assets/help/sq/help.html

@@ -410,7 +410,7 @@ t’u dërgoni një mesazh, ose të shkruani te një grup ku bëjnë pjesë edhe
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1119,11 +1119,12 @@ Kujdes: Sigurohuni se kyçi s’është i mbrojtur me fjalëkalim, ose hiqeni fj
         
       </h3>
 
-<p>Ka një mundësi të mirë që problemi të jetë se kyçi juaj është fshehtëzuar
+<p>Ka shumë mundësi që problemi të jetë se kyçi juaj është i fshehtëzuar dhe/ose
-dhe/ose përdor një fjalëkalim. Kyçe të tillë nuk mbulohen nga Delta Chat-i. Mund
+përdor një fjalëkalim. Kyçe të tillë nuk mbulohen nga Delta Chat. Ju lutemi,
-të hiqni fshehtëzimin me frazëkalim dhe fjalëkalimin dhe të riprovoni. Nëse doni
+hiqeni fshehtëzimin dhe fjalëkalimin dhe riprovoni importimin.</p>
-të mbani frazëkalimin tuaj, do t’ju duhet të krijoni një alias email-i për ta përdorur
+
-me Delta Chat-in, që kyçi i Delta Chat-it të jetë i lidhur me këtë alias email-i.</p>
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Për sa u takon formateve, Delta Chat-i mbulon formate të rëndomtë OpenPGP
 kyçesh private, megjithatë, ka pak gjasa që të mbulojmë 100% të krejt kyçeve

assets/help/uk/help.html

@@ -366,7 +366,7 @@ Outgoing messages always use plain text.</p>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1051,7 +1051,10 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
         
       </h3>
 
-<p>Найімовірнішою причиною є те, що ваш ключ зашифрований та/або використовується пароль. Такі ключі не підтримуються Delta Chat. Ви можете видалити шифрування парольної фрази та пароль і спробувати імпорт знову. Якщо ви хочете зберегти свою парольну фразу, вам доведеться створити псевдонім електронної пошти для використання з Delta Chat, щоб ключ Delta Chat був прив’язаний до цього псевдоніма електронної пошти.</p>
+<p>Найімовірнішою причиною є те, що ваш ключ зашифрований та/або використовується пароль. Такі ключі не підтримуються Delta Chat. Ви можете видалити шифрування парольної фрази та пароль і спробувати імпорт знову.</p>
+
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Delta Chat підтримує поширені формати приватних ключів OpenPGP, однак навряд чи приватні ключі з усіх джерел будуть повністю підтримуватися. Це не головна мета Delta Chat. Фактично, більшість нових користувачів не матимуть жодного ключа до використання Delta Chat. Однак ми намагаємось підтримувати приватні ключі з якомога більшої кількості джерел.</p>
 

assets/help/zh_CN/help.html

@@ -375,7 +375,7 @@ message them or write to a group they’re in as well.</li>
 in the settings of a chat,
 at the top right of the chat window,
 by selecting a time span
-between 30 seconds and 5 weeks.</p>
+between 1 minute and 5 weeks.</p>
 
 <p>Until the setting is turned off again,
 each chat member’s Delta Chat app takes care
@@ -1067,7 +1067,11 @@ Caution: Make sure the key is not protected by a password, or remove the passwor
         
       </h3>
 
-<p>最可能的原因是您的密钥被加密了和/或使用了密码。Delta Chat 不支持这样的密钥。您可以移除密码，之后再尝试导入。如果想保留密码，您需要创建电子邮件别名来使用 Delta Chat ，这样 Delta Chat 的密钥是绑定到这个电子邮件别名上的。</p>
+<p>最可能的原因是您的密钥被加密了和/或使用了密码。Delta Chat 不支持这样的密钥。您可以移除密码，之后再尝试导入。如果想保留密码，您
+需要创建电子邮件别名来使用 Delta Chat ，这样 Delta Chat 的密钥是绑定到这个电子邮件别名上的</p>
+
+<p>Another common error is having the wrong file ending.
+Use the ASCII armored format and an <code class="language-plaintext highlighter-rouge">.asc</code> file ending.</p>
 
 <p>Delta Chat 支持常见的 OpenPGP 私钥格式。然而，不可能使每种来源的私钥都被完整支持。这不是 Delta Chat 的主要目标。实际上，大多数新用户在使用 Delta Chat 之前根本没有密钥。不过，我们确实在尝试支持尽可能多的私钥来源。</p>
 

res/values-zh-rCN/strings.xml

@@ -910,7 +910,7 @@
     <string name="verified_by_you">由您验证</string>
     <!-- translators: "setup" is the "encryption setup" here, as in "Autocrypt Setup Message" -->
     <string name="contact_setup_changed">%1$s 的加密设置已更改。</string>
-    <string name="verified_contact_required_explain">要确保端到端加密，你只能将带有略色验证标识的联系人到此群中。\n\n你可以亲自和未验证联系人线下碰面并扫描联系人二维码来验证。</string>
+    <string name="verified_contact_required_explain">要确保端到端加密，你只能将带有绿色验证标识的联系人到此群中。\n\n你可以亲自和未验证联系人线下碰面并扫描联系人二维码来验证。</string>
     <string name="copy_qr_data_success">已复制二维码链接到剪贴板</string>
     <string name="mailto_dialog_header_select_chat">选择要发送消息的聊天</string>
     <!-- first placeholder is the name of the chat -->