Merge remote-tracking branch 'upstream/master' into lite

AndroidManifest.xml

@@ -150,6 +150,12 @@
                 android:value="org.thoughtcrime.securesms.ConversationListActivity" />
     </activity>
 
+    <activity android:name=".ConversationListRelayingActivity"
+              android:label="@string/app_name"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
     <activity android:name=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"

CHANGELOG.md

@@ -1,28 +1,72 @@
 # Delta Chat Android Changelog
 
-## 1.27.2
+## Unreleased
+
+* add finnish translation
+
+
+## v1.28.3
+
+* faster message moving and deletion on the server
+* parse MS Exchange read receipts and mark the original message as read
+* fix a bug where messages in the Spam folder created contact requests
+* fix a bug where drafts disappeared after some days
+* fix: do not retry message sending infinitely in case of permanent SMTP failure
+* fix: set message state to failed when retry limit is exceeded
+* fix: avoid archived, fresh chats
+* update translations
+
+
+## v1.28.1
+2022-02
+
+* update translations, thanks a lot to all translators,
+  porting Delta Chat to so many languages <3
+
+
+## v1.28.0
 2022-01
 
-* improve webxdc bubble layout
-* async webxdc api and reworked webxdc properties
-* fix: do not share cached files between xdc's
-* fix: do not force dark mode for webxdc and html-messages
+* add option "Advanced / Only Fetch from DeltaChat Folder";
+  this is useful if you can configure your server to move chat messages to the DeltaChat folder
+* to safe traffic and connections, "Advanced / Watch Sent Folder" is disabled by default;
+  as all other IMAP folders, the folder is still checked on a regular base
+* fix: use Webxdc name in chatlist, quotes and drafts
+* fix splitting off text from Webxdc messages
+* fix: show correct Webxdc summary on drafts
+* fix: speed up folder scanning
+* fix: make it possible to cancel message sending by removing the message;
+  this was temporarily impossible since 1.27.0
+* fix: avoid endless reconnection loop
+* fix display of qr-group-invite code text
+* update translations
+* update provider-database
+* update to core75
 
 
-## 1.27.1
+## v1.27.2 Testrun Release
+2022-01
+
+* improve Webxdc bubble layout
+* async Webxdc API and reworked Webxdc properties
+* fix: do not share cached files between Webxdc's
+* fix: do not force dark mode for Webxdc and HTML-messages
+
+
+## v1.27.1 Testrun Release
 2022-01
 
 * fix backup import issue introduced in 1.27.0
 * update to core72
 
 
-## v1.27.0
+## v1.27.0 Testrun Release
 2022-01
 
 * add option to create encrypted database at "Add Account / Advanced",
   the database passphrase is generated automatically and is stored in the system's keychain,
   subsequent versions will probably get more options to handle passphrases
-* add initial support for Webxdc extensions
+* add experimental support for Webxdc extensions
 * add "Advanced / Developer Mode" to help on creating Webxdc extensions
 * add writing support for supported mailinglist types; other mailinglist types stay read-only
 * "Message Info" show routes

README.md

@@ -101,9 +101,16 @@ See https://wiki.archlinux.org/index.php/Podman#Rootless_Podman for more informa
 To setup build environment manually, you can read the `Dockerfile`
 and mimic what it does.
 
-First, you need to setup Android SDK and Android NDK.  Configure
+First, you need to setup Android SDK and Android NDK. Configure
 `ANDROID_NDK_ROOT` environment variable to point to the Android NDK
-installation directory.  Currently ndk20b is the minimum required version.
+installation directory e.g. by adding this to your `.bashrc`:
+
+```bash
+export ANDROID_NDK_ROOT=${HOME}/Android/Sdk/ndk/[version] # (or whereever your NDK is) Note that there is no `/` at the end!
+export PATH=${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}
+```
+
+Currently ndk20b is the minimum required version.
 Newer versions will likely work, however, are not tested and not used
 in official releases, in general, changes on the ndk-version should be
 done with care.
@@ -147,13 +154,14 @@ environment.
 6. Download Android NDK from
    [NDK Archives](https://developer.android.com/ndk/downloads)
    and extract the archive containing a single folder
-   called `android-ndk-r…`; move this folder e.g. to `~/android-ndk-r…`.
-
-7. Export the folder path to your environment as `ANDROID_NDK` and add it to `PATH`.
-   You can achieve this e.g. by adding the following lines to `.bashrc`
-   `export ANDROID_NDK=/home/USERNAME/android-ndk-r…`
-   `export PATH=$PATH:$ANDROID_NDK`.
+   called something like `android-ndk-r23b-linux`; move this folder e.g. to `~/android-ndk`.
 
+7. Export the folder path to your environment as `ANDROID_NDK_ROOT` and add it to `PATH`.
+   You can achieve this e.g. by adding this to your `.bashrc`
+   ```bash
+   export ANDROID_NDK_ROOT=${HOME}/android-ndk
+   export PATH=${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}
+   ```
 
 # Run UI Tests and Benchmarks
 

androidTest/com/b44t/messenger/uibenchmarks/EnterChatsBenchmark.java

@@ -47,35 +47,68 @@ public class EnterChatsBenchmark {
   public ActivityScenarioRule<ConversationListActivity> activityRule = TestUtils.getOfflineActivityRule();
 
   @Test
-  public void createAndEnterNChats() {
-    if (!USE_EXISTING_CHATS) {
-      createChatAndGoBack("Group #1", "Hello!", "Some links: https://testrun.org", "And a command: /help");
-      createChatAndGoBack("Group #2", "example.org, alice@example.org", "aaaaaaa", "bbbbbb");
-      createChatAndGoBack("Group #3", repeat("Some string ", 600), repeat("Another string", 200), "Hi!!!");
-      createChatAndGoBack("Group #4", "xyzabc", "Hi!!!!", "Let's meet!");
-      createChatAndGoBack("Group #5", repeat("aaaa", 40), "bbbbbbbbbbbbbbbbbb", "ccccccccccccccc");
-      createChatAndGoBack("Group #6", "aaaaaaaaaaa", repeat("Hi! ", 1000), "bbbbbbbbbb");
-      createChatAndGoBack("Group #7", repeat("abcdefg ", 500), repeat("xxxxx", 100), "yrrrrrrrrrrrrr");
-      createChatAndGoBack("Group #8", "and a number: 037362/384756", "ccccc", "Nice!");
-      createChatAndGoBack("Group #9", "ddddddddddddddddd", "zuuuuuuuuuuuuuuuu", "ccccc");
-      createChatAndGoBack("Group #10", repeat("xxxxxxyyyyy", 100), repeat("String!!", 10), "abcd");
-    }
+  public void createAndEnter10FilledChats() {
+    create10Chats(true);
 
     String[] times = new String[GO_THROUGH_ALL_CHATS_N_TIMES];
     for (int i = 0; i < GO_THROUGH_ALL_CHATS_N_TIMES; i++) {
-      times[i] = "" + timeGoToAllChats();
+      times[i] = "" + timeGoToNChats(10); // 10 group chats were created
     }
     Log.i(TAG, "MEASURED RESULTS (Benchmark) - Going thorough all 10 chats: " + String.join(",", times));
   }
 
-  private long timeGoToAllChats() {
+  @Test
+  public void createAndEnterEmptyChats() {
+    create10Chats(false);
+
+    String[] times = new String[GO_THROUGH_ALL_CHATS_N_TIMES];
+    for (int i = 0; i < GO_THROUGH_ALL_CHATS_N_TIMES; i++) {
+      times[i] = "" + timeGoToNChats(1);
+    }
+    Log.i(TAG, "MEASURED RESULTS (Benchmark) - Entering and leaving 1 empty chat: " + String.join(",", times));
+  }
+
+  @Test
+  public void enterFilledChat() {
+    createChatAndGoBack("Group #1", true, "Hello!", "Some links: https://testrun.org", "And a command: /help");
+
+    String[] times = new String[50];
+    for (int i = 0; i < times.length; i++) {
+      long start = System.currentTimeMillis();
+      onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
+      long end = System.currentTimeMillis();
+      long diff = end - start;
+      pressBack();
+      Log.i(TAG, "Measured (Benchmark) " + (i+1) + "/" + times.length + ": Entering 1 filled chat took " + diff + "ms " + "(going back took " + (System.currentTimeMillis() - end) + "ms)");
+
+      times[i] = "" + diff;
+    }
+    Log.i(TAG, "MEASURED RESULTS (Benchmark) - Entering 1 filled chat: " + String.join(",", times));
+  }
+
+  private void create10Chats(boolean fillWithMsgs) {
+    if (!USE_EXISTING_CHATS) {
+      createChatAndGoBack("Group #1", fillWithMsgs, "Hello!", "Some links: https://testrun.org", "And a command: /help");
+      createChatAndGoBack("Group #2", fillWithMsgs, "example.org, alice@example.org", "aaaaaaa", "bbbbbb");
+      createChatAndGoBack("Group #3", fillWithMsgs, repeat("Some string ", 600), repeat("Another string", 200), "Hi!!!");
+      createChatAndGoBack("Group #4", fillWithMsgs, "xyzabc", "Hi!!!!", "Let's meet!");
+      createChatAndGoBack("Group #5", fillWithMsgs, repeat("aaaa", 40), "bbbbbbbbbbbbbbbbbb", "ccccccccccccccc");
+      createChatAndGoBack("Group #6", fillWithMsgs, "aaaaaaaaaaa", repeat("Hi! ", 1000), "bbbbbbbbbb");
+      createChatAndGoBack("Group #7", fillWithMsgs, repeat("abcdefg ", 500), repeat("xxxxx", 100), "yrrrrrrrrrrrrr");
+      createChatAndGoBack("Group #8", fillWithMsgs, "and a number: 037362/384756", "ccccc", "Nice!");
+      createChatAndGoBack("Group #9", fillWithMsgs, "ddddddddddddddddd", "zuuuuuuuuuuuuuuuu", "ccccc");
+      createChatAndGoBack("Group #10", fillWithMsgs, repeat("xxxxxxyyyyy", 100), repeat("String!!", 10), "abcd");
+    }
+  }
+
+  private long timeGoToNChats(int numChats) {
     long start = System.currentTimeMillis();
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < numChats; i++) {
       onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(i, click()));
       pressBack();
     }
     long diff = System.currentTimeMillis() - start;
-    Log.i(TAG, "Measured (Benchmark): Going through all chats took " + diff + "ms");
+    Log.i(TAG, "Measured (Benchmark): Going through " + numChats + " chats took " + diff + "ms");
     return diff;
   }
 
@@ -87,17 +120,20 @@ public class EnterChatsBenchmark {
     return s.toString();
   }
 
-  private void createChatAndGoBack(String groupName, String text1, String text2, String text3) {
+  private void createChatAndGoBack(String groupName, boolean fillWithMsgs, String... texts) {
     onView(withId(R.id.fab)).perform(click());
     onView(withText(R.string.menu_new_group)).perform(click());
-    onView(withHint(R.string.group_name)).perform(replaceText(groupName));
+    onView(withHint(R.string.name_desktop)).perform(replaceText(groupName));
     onView(withContentDescription(R.string.group_create_button)).perform(click());
-    sendText(text1);
-    sendText(text2);
-    sendText(text3);
-    sendText(text1);
-    sendText(text2);
-    sendText(text3);
+
+    if (fillWithMsgs) {
+      for (String t: texts) {
+        sendText(t);
+      }
+      for (String t: texts) {
+        sendText(t);
+      }
+    }
 
     pressBack();
     pressBack();

androidTest/com/b44t/messenger/uitests/offline/ForwardingTest.java

@@ -0,0 +1,97 @@
+package com.b44t.messenger.uitests.offline;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.longClick;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import androidx.test.espresso.IdlingPolicies;
+import androidx.test.espresso.contrib.RecyclerViewActions;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+
+import com.b44t.messenger.DcContact;
+import com.b44t.messenger.DcContext;
+import com.b44t.messenger.TestUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.thoughtcrime.securesms.ConversationListActivity;
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.connect.DcHelper;
+
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ForwardingTest {
+  private static int createdGroupId;
+
+  @BeforeClass
+  public static void beforeClass() {
+    IdlingPolicies.setMasterPolicyTimeout(10, TimeUnit.SECONDS);
+    IdlingPolicies.setIdlingResourceTimeout(10, TimeUnit.SECONDS);
+  }
+
+  @Rule
+  public ActivityScenarioRule<ConversationListActivity> activityRule = TestUtils.getOfflineActivityRule();
+
+  @Before
+  public void createChats() {
+    DcContext dcContext = DcHelper.getContext(getInstrumentation().getTargetContext());
+    dcContext.createChatByContactId(DcContact.DC_CONTACT_ID_SELF);
+    // Disable bcc_self so that DC doesn't try to send messages to the server.
+    // If we didn't do this, messages would stay in DC_STATE_OUT_PENDING forever.
+    // The thing is, DC_STATE_OUT_PENDING show a rotating circle animation, and Espresso doesn't work
+    // with animations, and the tests would hang and never finish.
+    dcContext.setConfig("bcc_self", "0");
+    activityRule.getScenario().onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat(false, "group"));
+  }
+
+  @After
+  public void cleanup() {
+    TestUtils.cleanup();
+  }
+
+  @Test
+  public void testSimpleForwarding() {
+    // Open device talk
+    // The group is at position 0, self chat is at position 1, device talk is at position 2
+    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(2, click()));
+    onView(withId(R.id.title)).check(matches(withText(R.string.device_talk)));
+    onView(withId(android.R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
+    onView(withId(R.id.menu_context_forward)).perform(click());
+    // Send it to self chat (which is sorted to the top because we're forwarding)
+    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
+
+    onView(withId(R.id.title)).check(matches(withText(R.string.device_talk)));
+
+    pressBack();
+
+    onView(withId(R.id.toolbar_title)).check(matches(withText(R.string.connectivity_not_connected)));
+    // Self chat moved up because we sent a message there
+    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
+    onView(withId(R.id.title)).check(matches(withText(R.string.saved_messages)));
+    onView(withId(android.R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
+    onView(withId(R.id.menu_context_forward)).perform(click());
+    // Send it to the group
+    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click()));
+    onView(withText(android.R.string.ok)).perform(click());
+    onView(withId(R.id.title)).check(matches(withText("group")));
+
+    pressBack();
+    onView(withId(R.id.title)).check(matches(withText(R.string.saved_messages)));
+
+    pressBack();
+    onView(withId(R.id.toolbar_title)).check(matches(withText(R.string.connectivity_not_connected)));
+  }
+}

assets/help/cs/help.html

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

assets/help/de/help.html

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

assets/help/en/help.html

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

assets/help/es/help.html

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

assets/help/fr/help.html

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

assets/help/id/help.html

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

assets/help/it/help.html

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

assets/help/nl/help.html

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

assets/help/pl/help.html

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

assets/help/ru/help.html

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

assets/help/sk/help.html

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

assets/help/sq/help.html

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

assets/help/uk/help.html

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

assets/help/zh_CN/help.html

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

build.gradle

@@ -94,8 +94,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 624
-        versionName "1.27.2"
+        versionCode 628
+        versionName "1.29.0"
 
         applicationId "com.b44t.messenger"
         multiDexEnabled true

jni/dc_wrapper.c

@@ -749,9 +749,9 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_sendWebxdcStatusUpdate(JNIE
 }
 
 
-JNIEXPORT jstring Java_com_b44t_messenger_DcContext_getWebxdcStatusUpdates(JNIEnv *env, jobject obj, jint msg_id, jint status_update_id)
+JNIEXPORT jstring Java_com_b44t_messenger_DcContext_getWebxdcStatusUpdates(JNIEnv *env, jobject obj, jint msg_id, jint last_known_serial)
 {
-    char* temp = dc_get_webxdc_status_updates(get_dc_context(env, obj), msg_id, status_update_id);
+    char* temp = dc_get_webxdc_status_updates(get_dc_context(env, obj), msg_id, last_known_serial);
         jstring ret = JSTRING_NEW(temp);
     dc_str_unref(temp);
     return ret;

res/layout/conversation_list_activity.xml

@@ -38,7 +38,7 @@
                 tools:src="@drawable/ic_contact_picture"
                 android:contentDescription="@string/pref_profile_info_headline" />
 
-            <TextView style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+            <TextView style="@style/TextSecure.TitleTextStyle"
                       android:id="@+id/toolbar_title"
                       android:layout_width="0dp"
                       android:layout_height="wrap_content"

res/raw/webxdc.js

@@ -1,11 +1,13 @@
 window.webxdc = (() => {
   var update_listener = () => {};
+  var last_serial = 0;
 
-  window.__webxdcUpdate = (updateId) => {
-    var updates = JSON.parse(InternalJSApi.getStatusUpdates(updateId));
-    if (updates.length === 1) {
-      update_listener(updates[0]);
-    }
+  window.__webxdcUpdate = () => {
+    var updates = JSON.parse(InternalJSApi.getStatusUpdates(last_serial));
+    updates.forEach((update) => {
+        update_listener(update);
+        last_serial = update.serial;
+    });
   };
 
   return {
@@ -13,10 +15,16 @@ window.webxdc = (() => {
 
     selfName: InternalJSApi.selfName(),
 
-    setUpdateListener: (cb) => (update_listener = cb),
+    setUpdateListener: (cb, serial) => {
+        last_serial = typeof serial === "undefined" ? 0 : parseInt(serial);
+        update_listener = cb
+        window.__webxdcUpdate();
+    },
 
+    // deprecated 2022-02-20 all updates are returned through the callback set by setUpdateListener
     getAllUpdates: () => {
-      return Promise.resolve(JSON.parse(InternalJSApi.getStatusUpdates(0)));
+      console.error("deprecated 2022-02-20 all updates are returned through the callback set by setUpdateListener")
+      return Promise.resolve([]);
     },
 
     sendUpdate: (payload, descr) => {

res/values-bg/strings.xml

@@ -892,4 +892,4 @@ votes
     <string name="update_1_24_android">1.24 накратко:\n\n• Спестете си излишни действия: Избор на акаунт в горния ляв ъгъл на списъка на чатовете\n• Спестете си още повече излишни действия: Докоснете и задръжте за по-дълго време иконата на приложението, за да отворите скорошните чатове директно\n• Спестете от прехвърлени данни: Големите файлове се свалят, когато има нужда\n• Спестете нерви: по-бързи, неблокиращи присъединявания с QR код и нови опции за QR кодове\n\nПовече на 👉</string>
     <string name="update_1_24_ios">1.24 накратко:\n\n• Стартирайте търсене в чата от профила на чата\n• Спестете от прехвърлени данни: Големите файлове се свалят при нужда\n• Спестете нерви: по-бързи, неблокиращи присъединявания с QR код\n\nПовече на 👉</string>
     <string name="update_1_26">Усъвършенствания в 1.26 💅\n\n• След в 1.24 като QR кодовете бяха направени неблокиращи, сега вече те и изглеждат много по-добре - на всички платформи\n• Аватарите и значките изглеждат по сходен начин на различните платформи\n• Отстранени много бъгове</string>
-</resources>
+    </resources>

res/values-de/strings.xml

@@ -607,6 +607,8 @@
     <string name="pref_send_copy_to_self">Kopie an mich selbst senden</string>
     <string name="pref_auto_folder_moves">Autom. Verschieben in den DeltaChat-Ordner</string>
     <string name="pref_auto_folder_moves_explain">Konversationen verschieben für einen übersichtlichen Posteingang</string>
+    <string name="pref_only_fetch_mvbox_title">Nur aus DeltaChat-Ordner lesen</string>
+    <string name="pref_only_fetch_mvbox_explain">Andere Ordner ignorieren. Erfordert, dass Ihr Server Chat-Nachrichten in den DeltaChat-Ordner verschiebt.</string>
     <string name="pref_show_emails">Normale E-Mails anzeigen</string>
     <string name="pref_show_emails_no">Nein, nur Chats</string>
     <string name="pref_show_emails_accepted_contacts">Akzeptierte Kontakte</string>
@@ -913,4 +915,7 @@ Ihr bisheriges E-Mail-Konto wird dabei nicht gelöscht. Sie können mit der Opti
     <string name="update_1_24_android">1.24 auf einen Blick:\n\n• Kontoauswahl in der oberen linken Ecke der Chatliste\n• Lang Tippen auf das App-Symbol, um die letzten Chats direkt zu öffnen\n• Große Dateien nach Bedarf herunterladen\n• Schnellere, nicht blockierende QR-Code-Scans und neue QR-Code-Optionen\n\nMehr unter 👉</string>
     <string name="update_1_24_ios">1.24 auf einen Blick:\n\n• Starten Sie eine In-Chat-Suche aus dem Chat-Profil heraus\n• Große Dateien nach Bedarf herunterladen\n• Schnellere, nicht-blockierende QR-Code-Scans\n\nMehr unter 👉</string>
     <string name="update_1_26">1.26 aufpoliert 💅\n\n• Nachdem auf QR-Code-Scans seit 1.24 nicht mehr gewartet werden muss, sehen diese nun auch viel schöner aus - und das auf allen Plattformen\n• Gleiches gilt für Avatare und einige andere Elemente\n• Viele Bugs wurden gefixt</string>
+    <string name="update_1_28_android">1.28 Highlights:\n\n🔒 Verschlüsselung: Eine neue, experimentelle Option, die Ihre Kontakte und Textnachrichten verschlüsselt auf Ihrem Gerät speichert. Die Option ist bei der Kontoerstellung und beim Import verfügbar.\n\n📫 Auf Mailinglisten schreiben\n\n💫 Schnellere Ersteinrichtung bei mehr E-Mail-Providern und optimierte Netzwerkoptionen, die versehentliche Fehlkonfigurationen vermeiden\n\n🐜 Viele von Benutzern gemeldete Probleme wurden behoben</string>
+    <string name="update_1_28_ios_extra_line">… und unter \"Einstellungen\" können Sie nun Ihr eigenes Hintergrundbild auswählen :)</string>
+
 </resources>

res/values-es/strings.xml

@@ -379,6 +379,12 @@
     <string name="mailing_list">Lista de correo</string>
     <string name="mailing_list_profile_info">Los cambios en el nombre y la imagen de la lista de correo solo se aplican a este dispositivo.</string>
 
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">Iniciar…</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">Primero acepte la solicitud de chat.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Mostrar ubicaciones en el marco de tiempo</string>
     <string name="show_location_traces">Mostrar trazas</string>
@@ -601,12 +607,16 @@
     <string name="pref_send_copy_to_self">Enviar autocopia</string>
     <string name="pref_auto_folder_moves">Mover automáticamente a la carpeta DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Las conversaciones son movidas para evitar saturar la Bandeja de entrada</string>
+    <string name="pref_only_fetch_mvbox_title">Solo obtener de la carpeta DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Ignorar otras carpetas. Requiere que su servidor mueva los mensajes de chat a la carpeta DeltaChat.</string>
     <string name="pref_show_emails">Mostrar correos clásicos</string>
     <string name="pref_show_emails_no">No, sólo chats</string>
     <string name="pref_show_emails_accepted_contacts">Para contactos aceptados</string>
     <string name="pref_show_emails_all">Todos</string>
     <string name="pref_experimental_features">Características experimentales</string>
     <string name="pref_on_demand_location_streaming">Transmisión de ubicación bajo demanda</string>
+    <string name="pref_developer_mode">Modo desarrollador</string>
+    <string name="pref_developer_mode_explain">Activa las opciones de depuración y puede hacer que la aplicación sea menos estable. Solo para desarrolladores.</string>
     <string name="pref_background_default">Fondo por defecto</string>
     <string name="pref_background_default_color">Color por defecto</string>
     <string name="pref_background_custom_image">Imagen personalizada</string>
@@ -903,4 +913,7 @@
     <string name="update_1_24_android">1.24 de forma resumida:\n\n• Ahorre toques: Selección de cuenta en la esquina superior izquierda de la lista de chats\n• Ahorre más toques: Mantenga presionado el ícono de la aplicación para abrir los chats recientes directamente\n• Ahorre tráfico: Descargue archivos grandes según sea necesario\n• Ahorre tiempo: invitación de códigos QR más rápidas, sin bloqueo y nuevas opciones de códigos QR\n\nMás en 👉</string>
     <string name="update_1_24_ios">1.24 de forma resumida:\n\n• Inicie una búsqueda en el chat desde el perfil del chat\n• Ahorre tráfico: Descargue archivos grandes según sea necesario\n• Ahorre tiempo: invitación de códigos QR más rápidas y sin bloqueo\n\nMás en 👉</string>
     <string name="update_1_26">1.26 pulido 💅\n\n• Después de hacer que los códigos QR funcionen más rápido en 1.24, también se ven mucho mejor ahora, en todas las plataformas\n• Los avatares y las insignias tienen un aspecto similar en todas las plataformas\n• Se corrigieron muchos errores</string>
+    <string name="update_1_28_android">1.28 Aspectos destacados:\n\n🔒 Cifrado: una nueva opción experimental para mantener sus contactos, secretos de cifrado y mensajes de texto cifrados en su dispositivo. Solo disponible en la creación de cuentas e importación de archivos de copia de seguridad.\n\n📫 Escribir en listas de correo\n\n💫 Configuración inicial más rápida para más servidores de correo electrónico y opciones de red optimizadas para evitar errores de configuración accidentales\n\n🐜 Se corrigieron muuuuuchos problemas informados por los usuarios</string>
+    <string name="update_1_28_ios_extra_line">… y puedes seleccionar un fondo de pantalla en \"Configuración / Fondo\" ahora :)</string>
+
 </resources>

res/values-fa/strings.xml

@@ -350,6 +350,8 @@
         <item quantity="one">%dپیام جدید</item>
         <item quantity="other">%d پیام جدید</item>
     </plurals>
+    <!-- The placeholder will be replaced by the name of the recipient in a one-to-one chat. -->
+    <string name="chat_new_one_to_one_hint">ارسال پیام. مشکلی نیست اگر %1$s از دلتاچت استفاده نمی‌کند.</string>
     <string name="chat_new_broadcast_hint">در لیست Broadcast، دیگران پیام‌ها را در گفتگو‌های خصوصی با شما دریافت می‌کنند. 
  گیرنده‌ها از یکدیگر خبر نخواهند داشت. </string>
     <string name="chat_new_group_hint">نوشتن اولین پیام به دیگران امکان می‌دهد در این گروه پاسخ دهند. \n\n• مشکلی نیست اگر همه اعضا از دلتاچت استفاده نکنند\n\n• دریافت اولین پیام ممکن است به زمان بیشتری نیاز داشته باشد. </string>
@@ -383,6 +385,12 @@
     <string name="mailing_list">لیست ایمیل</string>
     <string name="mailing_list_profile_info">تغییرات انجام شده روی اسم و تصویر لیست ایمیل فقط در این دستگاه اعمال شود.</string>
 
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">شروع...</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">لطفا اول درخواست گفتگو را قبول کنید.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">نمایش موقعیت‌های مکانی در چارچوب زمان</string>
     <string name="show_location_traces">نمایش ردپاها</string>
@@ -611,12 +619,16 @@
     <string name="pref_send_copy_to_self">ارسال رونوشت به خودم</string>
     <string name="pref_auto_folder_moves">انتقال خودکار به پوشه دلتاچت</string>
     <string name="pref_auto_folder_moves_explain">گفتگوها برای جلوگیری از پر شدن صندوق ورودی جابجا شده‌اند</string>
+    <string name="pref_only_fetch_mvbox_title">فقط پوشه دلتاچت را بررسی کن</string>
+    <string name="pref_only_fetch_mvbox_explain">از بقیه پوشه‌ها صرف نظر کن. در صورت انتخاب این گزینه، ایمیل شما باید پیام‌ها را به پوشه دلتاچت انتقال دهد</string>
     <string name="pref_show_emails">نمایش ایمیل‌های معمولی</string>
     <string name="pref_show_emails_no">نه، فقط گفتگوها</string>
     <string name="pref_show_emails_accepted_contacts">برای مخاطبین پذیرفته شده</string>
     <string name="pref_show_emails_all">همه</string>
     <string name="pref_experimental_features">ویژگی‌های آزمایشی</string>
     <string name="pref_on_demand_location_streaming">اشتراک موقعیت مکانی در صورت نیاز</string>
+    <string name="pref_developer_mode">حالت برنامه نویسی</string>
+    <string name="pref_developer_mode_explain">تنظیمات عیب‌یابی را فعال می‌کند که موجب کاهش پایداری نرم‌افزار می‌شوند.  فقط جهت استفاده توسعه دهندگان</string>
     <string name="pref_background_default">تصویر زمینه پیش‌فرض</string>
     <string name="pref_background_default_color">رنگ پیش‌فرض</string>
     <string name="pref_background_custom_image">تصویر ترجیحی</string>
@@ -628,6 +640,7 @@
     <string name="up_to_x_most_worse_quality_images">تا سقف %1$s، بدترین کیفیت تصویر</string>
     <string name="up_to_x_most_balanced_quality_images">تا سقف %1$s، متعادل‌ترین کیفیت تصویر</string>
     <string name="no_limit">بدون محدودیت</string>
+    <string name="download_failed">بارگیری ناموفق</string>
     <!-- %1$s will be replaced by a human-readable number of bytes, eg. 32 KiB, 1 MiB. Resulting string eg. "1 MiB message" -->
     <string name="n_bytes_message">پیام %1$s </string>
     <!-- %1$s will be replaced by human-readable date and time -->
@@ -955,4 +968,10 @@ GNU GPL ورژن ۳
 </string>
     <string name="update_1_26">پرداخت جزئیات در نسخه ۱.۲۶.
 پس از غیر انسدادی کردن کدهای QR در نسخه ۱.۲۴ اکنون ظاهر آن‌ها هم در همه پلتفرم‌ها بهبود داده شده است. آواتارها و عکس‌ها در همه پلتفرم‌ها شبیه هم شده‌اند. بسیاری از اشکالات اصلاح شد. </string>
+    <string name="update_1_28_android">نکات مهم نسخه ۱.۲۸: 🔒 رمزگذاری: یک گزینه آزمایشی جدید ایجاد شده است تا بتوانید مخاطبین، کلیدهای رمزگذاری و پیام‌های آن‌ها را به صورت رمزگذاری شده روی دستگاه خود نگهداری کنید که فقط در هنگام ایجاد حساب و بازگرداندن نسخه پشتیبان قابل استفاده است.
+ارسال به لیست‌های رایانامه📫
+تنظیم اولیه سریع‌تر برای سرورهای رایانامه💫 و گزینه‌های شبکه خطی‌تر برای جلوگیری از تنظیمات اشتباه
+باگ‌ها🐜: خیییییییییلی از اشکالاتی که کاربران گزارش کرده بودند اصلاح شد. </string>
+    <string name="update_1_28_ios_extra_line">...و اکنون می‌توانید از بخش «تنظیمات/ پس‌زمینه » یک پس زمینه انتخاب کنید :)</string>
+
 </resources>

res/values-fi/strings.xml

@@ -0,0 +1,919 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- common strings without special context -->
+    <string name="app_name">Delta Chat</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Peruuta</string>
+    <string name="clear_search">Tyhjennä haku</string>
+    <string name="yes">Kyllä</string>
+    <string name="no">Ei</string>
+    <string name="select">Valitse</string>
+    <string name="on">Päällä</string>
+    <string name="off">Pois</string>
+    <string name="def">Oletus</string>
+    <string name="default_value">Oletus (%1$s)</string>
+    <string name="default_value_as_above">Oletus (sama kuin yllä)</string>
+    <string name="custom">Mukautettu</string>
+    <string name="none">Ei mitään</string>
+    <string name="automatic">Automaattinen</string>
+    <string name="strict">Tiukka</string>
+    <string name="open">Avoin</string>
+    <string name="download">Lataa</string>
+    <string name="downloading">Ladataan</string>
+    <string name="open_attachment">Avaa liite</string>
+    <string name="join">Liity</string>
+    <string name="rejoin">Liity uudelleen</string>
+    <string name="delete">Poista</string>
+    <string name="info">Lisätietoja</string>
+    <string name="update">Päivitä</string>
+    <string name="emoji">Emoji</string>
+    <string name="attachment">Liite</string>
+    <string name="back">Takaisin</string>
+    <string name="close">Sulje</string>
+    <string name="forward">Eteenpäin</string>
+    <!-- In the meaning of "To archive", "Put a chat to the archive". This string does not mean "The Archive". -->
+    <string name="archive">Arkistoi</string>
+    <!-- In the meaning of "To unarchive", "Remove a chat from the archive", opposite of the previous string -->
+    <string name="unarchive">Poista arkistosta</string>
+    <string name="mute">Mykistä</string>
+    <string name="ephemeral_messages">Katoavat viestit</string>
+    <string name="ephemeral_messages_hint">Nämä asetukset pätevät kaikkiin Delta Chat -käyttäjiin. He voivat kuitenkin kopioida, tallentaa ja välittää viestejä tai käyttää toisia sähköpostisovelluksia.</string>
+    <string name="save">Tallenna</string>
+    <string name="chat">Keskustelu</string>
+    <string name="media">Media</string>
+    <string name="profile">Profiili</string>
+    <string name="main_menu">Päävalikko</string>
+    <string name="start_chat">Aloita keskustelu</string>
+    <string name="show_full_message">Näytä koko viesti...</string>
+    <string name="show_full_message_in_browser">Näytä koko viesti selaimessa...</string>
+    <!-- this is shown as placeholder when something is loading at some places -->
+    <string name="loading">Ladataan...</string>
+    <string name="hide">Piilota</string>
+    <string name="activate">Aktivoi</string>
+    <string name="load_remote_content">Lataa etäkuvat</string>
+    <!-- possible answers to the question are: Never, Always, Once -->
+    <string name="load_remote_content_ask">Etäkuvien avulla sinua voidaan seurata.\n\nAsetus mahdollistaa myös fonttien ja muun sisällön lataamisen. Voit nähdä upotettuja kuvia, vaikka asetus olisi pois.\n\nLataa etäkuvat?</string>
+    <string name="always">Aina</string>
+    <string name="once">Kerran</string>
+    <string name="show_password">Näytä salasana</string>
+    <string name="hide_password">Piilota salasana</string>
+    <string name="not_now">Ei nyt</string>
+    <string name="never">Ei koskaan</string>
+    <string name="one_moment">Hetki...</string>
+    <string name="done">Valmis</string>
+    <string name="undo">Peru</string>
+    <string name="offline">Ei verkkoyhteyttä</string>
+    <!-- Translators: used eg. for the next view, could also be "continue" or so. as used in iOS headers, the string should be as short as possible, though. -->
+    <string name="next">Seuraava</string>
+    <string name="error">Virhe</string>
+    <string name="error_x">Virhe: %1$s</string>
+    <string name="no_app_to_handle_data">Tiedoston avaamiseen sopivaa sovellusta ei löydetty.</string>
+    <string name="no_browser_installed">Selainta ei asennettu.</string>
+    <string name="file_not_found">%1$s ei löytynyt. </string>
+    <string name="copied_to_clipboard">Kopioitu leikepöydälle</string>
+    <string name="contacts_headline">Yhteystiedot</string>
+    <string name="email_address">Sähköpostiosoite</string>
+    <string name="bad_email_address">Virheellinen sähköpostiosoite</string>
+    <string name="password">Salasana</string>
+    <string name="existing_password">Vanha salasana</string>
+    <string name="now">Heti</string>
+    <!-- Translators: used as a headline in sections with actions that cannot be undone. could also be "Caution" or "Cave" or so. -->
+    <string name="danger">Varoitus</string>
+    <string name="today">Tänään</string>
+    <string name="yesterday">Eilen</string>
+    <string name="this_week">Tällä viikolla</string>
+    <string name="this_month">Tässä kuussa</string>
+    <string name="last_week">Viime viikolla</string>
+    <string name="last_month">Viime kuussa</string>
+    <!-- the placeholder will be replaced by a date or time, resulting eg. in "Last seen at 12:13 AM" or "Last seen Nov 12" -->
+    <string name="last_seen_at">Nähty viimeksi %1$s</string>
+    <string name="last_seen_unknown">Nähty viimeksi: ei tiedossa</string>
+    <!-- Translators: show beside messages that are "N minutes old". prefer a short string, prefer abbreviations if they're well-known -->
+    <plurals name="n_minutes">
+        <item quantity="one">%d minuutti</item>
+        <item quantity="other">%d minuuttia</item>
+    </plurals>
+    <!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
+    <plurals name="n_hours">
+        <item quantity="one">%d tunti</item>
+        <item quantity="other">%d tuntia</item>
+    </plurals>
+    <plurals name="n_chats">
+        <item quantity="one">%d keskustelu</item>
+        <item quantity="other">%d keskustelua</item>
+    </plurals>
+    <plurals name="n_contacts">
+        <item quantity="one">%d yhteystieto</item>
+        <item quantity="other">%d yhteystietoa</item>
+    </plurals>
+    <plurals name="n_messages">
+        <item quantity="one">%d viesti</item>
+        <item quantity="other">%d viestiä</item>
+    </plurals>
+    <plurals name="n_members">
+        <item quantity="one">%d jäsen</item>
+        <item quantity="other">%d jäsentä</item>
+    </plurals>
+    <plurals name="n_recipients">
+        <item quantity="one">%d vastaanottaja</item>
+        <item quantity="other">%d vastaanottajaa</item>
+    </plurals>
+
+    <string name="self">Minä</string>
+    <string name="draft">Luonnos</string>
+    <string name="image">Kuva</string>
+    <!-- Translators: Used in summaries as "Draft: Reply", similar as "Draft: Image". Use a noun here, not a verb (not: "to reply") -->
+    <string name="reply_noun">Vastaus</string>
+    <string name="gif">Gif</string>
+    <!-- "Stickers" as known from other messengers, please pick up the wording from there; in some languages, "Sticker" in english is just fine. -->
+    <string name="sticker">Tarra</string>
+    <string name="images">Kuvat</string>
+    <string name="audio">Äänite</string>
+    <string name="voice_message">Ääniviesti</string>
+    <string name="forwarded">Välitetty</string>
+    <string name="forwarded_message">Välitetty viesti</string>
+    <!-- %1$s will be replaced by the name or the e-mail address of the person who has forwarded the message -->
+    <string name="forwarded_by">Välittäjä: %1$s</string>
+    <string name="video">Video</string>
+    <string name="documents">Asiakirjat</string>
+    <string name="contact">Yhteyshenkilö</string>
+    <string name="verified_contact">Varmistettu yhteyshenkilö</string>
+    <string name="camera">Kamera</string>
+    <!-- "capture" here means "start a video recording" or "take a photo"; eg. the description of the "shutter button" in the camera controls -->
+    <string name="capture">Kuvaa</string>
+    <string name="switch_camera">Vaihda kamera</string>
+    <string name="toggle_fullscreen">Kytke koko näytön tila</string>
+    <string name="location">Sijainti</string>
+    <string name="gallery">Galleria</string>
+    <string name="images_and_videos">Kuvat ja videot</string>
+    <string name="file">Tiedosto</string>
+    <string name="files">Tiedostot</string>
+    <string name="unknown">Tuntematon</string>
+
+    <string name="green">Vihreä</string>
+    <string name="red">Punainen</string>
+    <string name="blue">Sininen</string>
+    <string name="orange">Oranssi</string>
+    <string name="cyan">Sinivihreä</string>
+    <string name="purple">Violetti</string>
+    <string name="magenta">Magenta</string>
+    <string name="white">Valkoinen</string>
+
+    <string name="zoom">Suurennos</string>
+    <string name="extra_small">Erittäin pieni</string>
+    <string name="small">Pieni</string>
+    <string name="normal">Tavallinen</string>
+    <string name="large">Suuri</string>
+    <string name="extra_large">Erittäin suuri</string>
+
+    <string name="fast">Nopea</string>
+    <string name="slow">Hidas</string>
+
+    <!-- menu labels (or icon, buttons...) -->
+    <string name="menu_new_contact">Uusi yhteystieto</string>
+    <string name="menu_new_chat">Uusi keskustelu</string>
+    <string name="menu_new_group">Uusi ryhmä</string>
+    <!-- "Subject" here must be the same wording as used in the e-mail context, so. eg. "Betreff" in german (the idea is to help people coming from the e-mail context) -->
+    <string name="new_group_or_subject">Uusi ryhmä tai aihe</string>
+    <string name="menu_new_verified_group">Uusi varmistettu ryhmä</string>
+    <!-- consider keeping the term "broadcast"; check how these lists are called eg. on whatsapp in the destination language -->
+    <string name="broadcast_list">Kuulutuslista</string>
+    <string name="broadcast_lists">Kuulutuslistat</string>
+    <string name="new_broadcast_list">Uusi kuulutuslista</string>
+    <string name="add_recipients">Lisää vastaanottajia</string>
+    <string name="menu_send">Lähetä</string>
+    <string name="menu_toggle_keyboard">Näytä emoji-näppäimistö</string>
+    <string name="menu_edit_group">Muokkaa ryhmää</string>
+    <string name="menu_group_name_and_image">Ryhmän nimi ja kuva</string>
+    <string name="menu_show_map">Näytä kartta</string>
+    <string name="menu_show_global_map">Näytä kaikki sijainnit</string>
+    <string name="menu_archive_chat">Arkistoi keskustelu</string>
+    <string name="menu_unarchive_chat">Siirrä keskustelu pois arkistosta</string>
+    <string name="menu_add_attachment">Lisää liite</string>
+    <string name="menu_leave_group">Poistu ryhmästä</string>
+    <string name="menu_delete_chat">Poista keskustelu</string>
+    <string name="ask_delete_named_chat">Haluatko varmasti poistaa \"%1$s\"?</string>
+    <string name="menu_delete_messages">Poista viestit</string>
+    <string name="delete_contact">Poista yhteystieto</string>
+    <string name="menu_delete_location">Poista tämä sijainti?</string>
+    <string name="menu_message_details">Viestin tiedot</string>
+    <string name="menu_copy_to_clipboard">Kopioi leikepöydälle</string>
+    <string name="menu_copy_selection_to_clipboard">Kopioi valinta</string>
+    <string name="menu_copy_link_to_clipboard">Kopioi linkki</string>
+    <string name="menu_copy_text_to_clipboard">Kopioi teksti</string>
+    <string name="menu_copy_image_to_clipboard">Kopioi kuva</string>
+    <string name="menu_copy_email_to_clipboard">Kopioi sähköpostiosoite</string>
+    <string name="paste_from_clipboard">Liitä leikepöydältä</string>
+    <string name="menu_forward">Välitä viesti</string>
+    <string name="menu_reply">Vastaa viestiin</string>
+    <string name="menu_mute">Mykistä ilmoitukset</string>
+    <string name="menu_unmute">Poista mykistys</string>
+    <string name="menu_export_attachment">Vie liite</string>
+    <string name="menu_export_attachments">Vie liitteet</string>
+    <string name="menu_all_media">Kaikki media</string>
+    <!-- menu entry that opens eg. a gallery image or a document in the chat at the correct position -->
+    <string name="show_in_chat">Näytä keskustelussa</string>
+    <string name="menu_share">Jaa</string>
+    <!-- this is the action "to block sth." usually a mailing list or a contact. this is NOT "a large solid piece of hard material" :) -->
+    <string name="block">Estä</string>
+    <string name="menu_block_contact">Estä yhteystieto</string>
+    <string name="menu_unblock_contact">Salli yhteystieto</string>
+    <string name="accept">Hyväksy</string>
+    <string name="menu_play">Soita</string>
+    <string name="menu_pause">Tauko</string>
+    <string name="menu_scroll_to_bottom">Vieritä alas</string>
+    <string name="menu_scroll_to_top">Vieritä ylös</string>
+    <string name="menu_help">Ohje</string>
+    <string name="privacy_policy">Yksityisyyskäytäntö</string>
+    <string name="menu_select_all">Valitse kaikki</string>
+    <string name="select_more">Valitse lisää</string>
+    <string name="menu_edit_name">Muokkaa nimeä</string>
+    <string name="menu_settings">Asetukset</string>
+    <string name="menu_advanced">Edistyneet</string>
+    <string name="menu_view_profile">Näytä profiili</string>
+    <string name="menu_zoom_in">Suurenna</string>
+    <string name="menu_zoom_out">Pienennä</string>
+    <string name="menu_save_log">Tallenna loki</string>
+    <string name="menu_more_options">Lisää asetuksia</string>
+    <string name="menu_learn_spelling">Opi tavaus</string>
+    <string name="menu_chat_audit_log">Keskustelun tarkastusloki</string>
+    <string name="jump_to_message">Siirry viestiin</string>
+    <string name="copy_json">Kopioi JSON</string>
+    <string name="replace_draft">Korvaa luonnos</string>
+    <string name="title_share_location">Jaa sijainti kaikille ryhmän jäsenille</string>
+    <string name="device_talk">Laitteen viestit</string>
+    <string name="device_talk_subtitle">Paikallisesti luodut viestit</string>
+    <string name="device_talk_explain">Viestit tässä keskustelussa luodaan paikallisesti Delta Chat -sovelluksessa. Kehittäjät ilmoittavat niiden avulla sovelluksen päivityksistä ja mahdollisista ongelmista.</string>
+    <string name="device_talk_welcome_message">Tervetuloa Delta Chatiin! – Delta Chat näyttää ja tuntuu samalta kuin suositut pikaviestintäsovellukset, kuitenkin ilman keskitettyä kontrollia, seurantaa tai käyttäjien tietojen myymistä isoille yrityksille.\n\nTeknisesti Delta Chat on sähköpostisovellus nykyaikaisella pikaviestikäyttöliittymällä. Sähköposti uusissa vaatteissa, jos niin voi sanoa 👻\n\nDelta Chat toimii miljardien ihmisten kanssa: lähetä vain viesti heidän sähköpostiosoitteeseensa. Viestien vastaanottajien ei tarvitse asentaa Delta Chatia, käydä nettisivustoilla tai liittyä mihinkään - paitsi jos he haluavat. Silloin voit ohjata heidät osoitteeseen 👉 https://get.delta.chat</string>
+    <string name="edit_contact">Muokkaa yhteystietoa</string>
+    <!-- Translators: "Pin" here is the verb for pinning, making sth. sticky. this is NOT the appreviation for "pin number". -->
+    <string name="pin_chat">Kiinnitä keskustelu</string>
+    <!-- Translators: this is the opposite of "Pin chat", removing the sticky-state from a chat. -->
+    <string name="unpin_chat">Irrota keskustelu</string>
+    <!-- Translators: this is the verb for pinning, making sth. sticky. this is NOT the appreviation for "pin number". -->
+    <string name="pin">Kiinnitä</string>
+    <!-- Translators: this is the opposite of "Pin", removing the sticky-state from sth. -->
+    <string name="unpin">Irrota</string>
+    <string name="ConversationFragment_quoted_message_not_found">Alkuperäistä viestiä ei löydy</string>
+    <string name="reply_privately">Vastaa yksityisesti</string>
+
+    <string name="mute_for_one_hour">Mykistä 1 tunniksi</string>
+    <string name="mute_for_two_hours">Mykistä 2 tunniksi</string>
+    <string name="mute_for_one_day">Mykistä 1 päiväksi</string>
+    <string name="mute_for_seven_days">Mykistä 7 päiväksi</string>
+    <string name="mute_forever">Mykistä ikuisesti</string>
+
+    <string name="share_location_for_5_minutes">5 minuutiksi</string>
+    <string name="share_location_for_30_minutes">30 minuutiksi</string>
+    <string name="share_location_for_one_hour">1 tunniksi</string>
+    <string name="share_location_for_two_hours">2 tunniksi</string>
+    <string name="share_location_for_six_hours">6 tunniksi</string>
+
+    <plurals name="ask_send_following_n_files_to">
+        <item quantity="one">Lähetä seuraava tiedosto yhteystiedolle%s?</item>
+        <item quantity="other">Lähetä seuraavat %dtiedostot yhteystiedolle%s?</item>
+    </plurals>
+    <string name="file_saved_to">Tiedosto tallennettu \"%1$s\".</string>
+
+    <string name="videochat">Videokeskustelu</string>
+    <string name="videochat_invite_user_to_videochat">Kutsu %1$s videokeskusteluun?</string>
+    <string name="videochat_invite_user_hint">Tämä vaatii molemmilta yhteensopivan sovelluksen tai selaimen.</string>
+    <string name="videochat_contact_invited_hint">%1$s kutsui sinut videokeskusteluun.</string>
+    <string name="videochat_you_invited_hint">Lähetit kutsun videokeskusteluun.</string>
+    <string name="videochat_tap_to_join">Napauta liittyäksesi</string>
+    <string name="videochat_tap_to_open">Napauta avataksesi</string>
+    <string name="videochat_instance">Videokeskustelun tarjoaja</string>
+    <string name="videochat_instance_placeholder">Videokeskustelusi tarjoaja</string>
+    <string name="videochat_instance_explain">Jos videokeskustelun tarjoaja määritellään, voit aloittaa videokeskustelun mistä tahansa keskustelusta. Videokeskustelu vaatii molemmilta yhteensopivan sovelluksen tai selaimen.\n\nEsimerkkejä: https://meet.jit.si/$ROOM tai basicwebrtc:https://sinun-palvelimesi</string>
+    <string name="videochat_instance_from_qr">Käytä \"%1$s\" videokeskustelupyyntöihin?\n\nTämän jälkeen voit aloittaa videokeskustelun mistä tahansa keskustelusta. Tämä korvaa edellisen videokeskusteluasetuksen, jos sellainen on.</string>
+    <string name="videochat_invitation">Videokeskustelukutsu</string>
+    <string name="videochat_invitation_body">Sinut on kutsuttu videokeskusteluun, klikkaa %1$s liittyäksesi.</string>
+
+    <!-- get confirmations -->
+    <string name="ask_leave_group">Haluatko varmasti poistua tästä ryhmästä?</string>
+    <plurals name="ask_delete_chat">
+        <item quantity="one">Poista %d keskustelu? Se ei enää näy keskustelulistauksessa, mutta sen viestit jäävät palvelimelle.</item>
+        <item quantity="other">Poista %d keskustelua? Ne eivät enää näy keskustelulistauksessa, mutta niiden viestit jäävät palvelimelle.</item>
+    </plurals>
+    <string name="ask_delete_message">Haluatko varmasti poistaa tämän viestin?</string>
+    <plurals name="ask_delete_messages">
+        <item quantity="one">Poista %d viesti täältä ja palvelimelta?</item>
+        <item quantity="other">Poista %d viestiä täältä ja palvelimelta?</item>
+    </plurals>
+    <plurals name="ask_delete_messages_simple">
+        <item quantity="one">Poista %d viesti?</item>
+        <item quantity="other">Poista %d viestiä?</item>
+    </plurals>
+    <string name="ask_forward">Välitä viestit yhteystiedolle %1$s?</string>
+    <string name="ask_forward_multiple">Välitä viestit %1$d keskustelulle?</string>
+    <string name="ask_export_attachment">Liitteiden vieminen antaa muille laitteen sovelluksille mahdollisuuden lukea niitä.\n\nJatka?</string>
+    <string name="ask_block_contact">Estä tämä yhteystieto? Et enää saa viestejä tästä osoitteesta.</string>
+    <string name="ask_unblock_contact">Poista yhteystiedon esto? Saat taas viestejä tältä yhteystiedolta.</string>
+    <string name="ask_delete_contacts">Poista yhteystiedot?\n\nEt voi poistaa yhteystietoja, joiden kanssa sinulla on aktiivinen keskustelu tai jotka on noudettu laitteen osoitekirjasta.</string>
+    <string name="ask_delete_contact">Poista yhteystieto %1$s?\n\nEt voi poistaa yhteystietoja, joiden kanssa sinulla on aktiivinen keskustelu tai jotka on noudettu laitteen osoitekirjasta.</string>
+    <string name="cannot_delete_contacts_in_use">Aktiivisten keskustelujen yhteystietoja ei voi poistaa.</string>
+    <string name="ask_start_chat_with">Aloita keskustelu yhteystiedon %1$s kanssa?</string>
+    <string name="ask_delete_value">Poista %s?</string>
+    <!-- Translators: %1$s will be replaces by a comma separated list of names -->
+    <string name="ask_remove_members">Poista %1$s ryhmästä?</string>
+    <!-- Translators: %1$s will be replaced by a comma separated list of names -->
+    <string name="ask_remove_from_broadcast">Poista %1$s kuulutuslistalta?</string>
+    <string name="open_url_confirmation">Haluatko avata tämän linkin?</string>
+
+
+    <!-- contact list -->
+    <string name="contacts_title">Yhteystiedot</string>
+    <string name="contacts_enter_name_or_email">Anna nimi tai sähköpostiosoite</string>
+    <string name="contacts_type_email_above">Kirjoita sähköpostiosoite ylle</string>
+    <string name="contacts_empty_hint">Ei yhteystietoja</string>
+
+
+    <!-- chatlist and chat view -->
+    <plurals name="chat_archived">
+        <item quantity="one">%d keskustelu arkistoitu</item>
+        <item quantity="other">%d keskustelua arkistoitu</item>
+    </plurals>
+    <plurals name="chat_unarchived">
+        <item quantity="one">%d keskustelu siirretty pois arkistosta</item>
+        <item quantity="other">%d keskustelua siirretty pois arkistosta</item>
+    </plurals>
+    <string name="chat_archived_chats_title">Arkistoidut keskustelut</string>
+    <string name="chat_please_enter_message">Kirjoita viesti.</string>
+    <string name="chat_camera_unavailable">Kamera ei saatavilla.</string>
+    <string name="chat_unable_to_record_audio">Äänen tallentaminen ei onnistu.</string>
+    <plurals name="chat_n_new_messages">
+        <item quantity="one">%d uusi viesti</item>
+        <item quantity="other">%d uutta viestiä</item>
+    </plurals>
+    <!-- The placeholder will be replaced by the name of the recipient in a one-to-one chat. -->
+    <string name="chat_new_one_to_one_hint">Lähetä viesti. Ei haittaa, vaikka %1$s ei käyttäisi Delta Chatia.</string>
+    <string name="chat_new_broadcast_hint">Kuulutuslistalla olevat saavat viestisi yksityisviesteinä sinulta.\n\nVastaanottajat eivät tiedä toisistaan.</string>
+    <string name="chat_new_group_hint">Muut näkevät ryhmän vasta, kun lähetät ensimmäisen viestin.</string>
+    <string name="chat_record_slide_to_cancel">Pyyhkäise peruuttaaksesi</string>
+    <string name="chat_record_explain">Pidä painettuna nauhoittaaksesi ääniviestin, irrota lähettääksesi</string>
+    <string name="chat_no_chats_yet_title">Saapuneet-kansio on tyhjä\nPaina \"+\" aloittaaksesi uuden keskustelun.</string>
+    <string name="chat_no_chats_yet_hint">Voit keskustella Delta Chat -käyttäjien kanssa tai minkä tahansa sähköpostiosoitteen kanssa.</string>
+    <string name="chat_all_archived">Kaikki keskustelut arkistoitu.\nPaina \"+\" aloittaaksesi uuden keskustelun.</string>
+    <string name="chat_share_with_title">Jaa</string>
+    <string name="chat_input_placeholder">Viesti</string>
+    <string name="chat_archived_label">Arkistoitu</string>
+    <string name="chat_request_label">Pyyntö</string>
+    <string name="chat_no_messages">Ei viestejä</string>
+    <string name="chat_self_talk_subtitle">Viestit, jotka lähetin itselleni</string>
+    <string name="archive_empty_hint">Arkistoimasi keskustelut näkyvät täällä</string>
+    <string name="saved_messages">Tallennetut viestit</string>
+    <string name="saved_messages_explain">• Välitä viestejä tänne helppoa pääsyä varten\n\n• Kirjoita tai äänitä muistiinpanoja\n\n• Liitä mediaa tallentaaksesi ne</string>
+    <!-- this "Saved" should match the "Saved" from "Saved messages" -->
+    <string name="saved">Tallennettu</string>
+    <string name="retry_send">Yritä uudelleen lähettääksesi viestin</string>
+    <!-- reasons for a disabled message composer -->
+    <string name="messaging_disabled_not_in_group">Et voi kirjoittaa, koska et ole ryhmän jäsen. Liittyäksesi pyydä, että joku jäsen liittää sinut ryhmään.</string>
+    <string name="messaging_disabled_device_chat">Tämän keskustelun viestit on luotu paikallisesti. Et voi kirjoittaa viestejä tänne.</string>
+    <string name="messaging_disabled_mailing_list">Sähköpostilistoille vastaamista ei vielä tueta</string>
+    <string name="cannot_display_unsuported_file_type">Tiedostotyypin näyttäminen epäonnistui: %s</string>
+    <string name="attachment_failed_to_load">Liitteiden lataaminen epäonnistui</string>
+    <!-- For recording Voice messages: Description for the "Lock" button allowing to lift the thumb from the record button while recording continues -->
+    <string name="lock_recording">Lukitse äänitys</string>
+
+    <!-- mailing lists -->
+    <string name="mailing_list">Sähköpostilista</string>
+    <string name="mailing_list_profile_info">Muutokset sähköpostilistan nimeen ja kuvaan tallentuvat vain tähän laitteeseen.</string>
+
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">Aloita...</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">Hyväksy keskustelupyyntö ensin.</string>
+
+    <!-- map -->
+    <string name="filter_map_on_time">Näytä sijainnit aikajanalla</string>
+    <string name="show_location_traces">Näytä jäljet</string>
+    <string name="add_poi">Lähetä erikseen valittu piste</string>
+
+    <!-- chat audit log -->
+    <string name="chat_audit_log_empty_message">Keskustelun järjestelmäviestit näkyvät tässä</string>
+    <string name="chat_audit_log_title">Keskustelun tarkastusloki yhteystiedolle %1$s</string>
+    <string name="chat_audit_log_description">Tässä näytetään vain järjestelmä- ja ohjeviestit. Tämä näkymä helpottaa viimeisimpien tapahtumien löytämistä tavallisten viestien joukosta.</string>
+
+    <!-- punycode warning / labeled links -->
+    <!-- placeholder is domain/hostname that should be trusted -->
+    <string name="open_external_url_trust_domain">Älä kysy enää osoitteelle %1$s</string>
+    <string name="puny_code_warning_header">Epäilyttävä linkki havaittu</string>
+    <!-- placeholder contains the hostname converted to ascii -->
+    <string name="puny_code_warning_question">Haluatko varmasti vierailla osoitteessa %1$s?</string>
+    <!-- this message is shown whenever a link with non-latin characters is clicked. first placeholder is original hostname with special chars, second placeholder is hostname encoded in ascii -->
+    <string name="puny_code_warning_description">Seurasit linkkiä, joka saattaa näyttää toisten aakkostojen merkkejä huijaussivustolle johtamiseen. Linkin teksti %1$s johtaa osoitteeseen %2$s, mikä on tavallista ei-latinalaisille merkistöille. Jos et odottanut tätä, tämä linkki voi olla vahingollinen.</string>
+
+
+    <!-- search -->
+    <string name="search">Etsi</string>
+    <string name="search_explain">Etsi keskusteluja, yhteystietoja ja viestejä</string>
+    <string name="search_no_result_for_x">Ei tuloksia haulle \"%s\"</string>
+
+
+    <!-- create/edit groups, contact/group profile -->
+    <string name="group_name">Ryhmän nimi</string>
+    <string name="group_avatar">Ryhmän kuva</string>
+    <string name="remove_group_image">Poista ryhmän kuva</string>
+    <string name="change_group_image">Muuta ryhmän kuvaa</string>
+    <string name="group_create_button">Luo ryhmä</string>
+    <string name="group_please_enter_group_name">Anna ryhmän nimi</string>
+    <string name="group_add_members">Lisää jäseniä</string>
+    <string name="group_self_not_in_group">Sinun täytyy olla ryhmän jäsen suorittaaksesi tämän toiminnon.</string>
+    <string name="profile_encryption">Salaus</string>
+    <string name="profile_shared_chats">Jaetut keskustelut</string>
+    <string name="tab_contact">Yhteystieto</string>
+    <string name="tab_group">Ryhmä</string>
+    <string name="tab_members">Jäsenet</string>
+    <string name="tab_gallery">Galleria</string>
+    <string name="tab_docs">Asiakirjat</string>
+    <string name="tab_links">Linkit</string>
+    <string name="tab_map">Kartta</string>
+    <string name="tab_gallery_empty_hint">Tässä keskustelussa jaetut kuvat ja videot näkyvät tässä.</string>
+    <string name="tab_docs_empty_hint">Tässä keskustelussa jaetut asiakirjat, musiikki ja muut tiedostot näkyvät tässä.</string>
+    <string name="media_preview">Median esikatselu</string>
+    <string name="send_message">Lähetä viesti</string>
+
+
+    <!-- Connectivity -->
+    <!-- Used as a headline for the "Inbox" eg. in the "Connectivity" view -->
+    <string name="incoming_messages">Saapuvat viestit</string>
+    <!-- Used as a headline for the "Outbox" eg. in the "Connectivity" view -->
+    <string name="outgoing_messages">Lähtevät viestit</string>
+    <!-- Used as a headline in the "Connectivity" view. The placeholder will be replaced by the domain of the configured email-address. -->
+    <string name="storage_on_domain">Tallennustila palvelimella %1$s</string>
+    <string name="connectivity">Yhteys</string>
+    <!-- Shown eg. in the title bar if the app is "Not connected"; as there is very few room, try to be as short as possible. -->
+    <string name="connectivity_not_connected">Ei yhdistetty</string>
+    <!-- Shown eg. in the title bar if the app is "Connecting"; as there is very few room, try to be as short as possible. Note that the three dots are a single character (…), not three (...) -->
+    <string name="connectivity_connecting">Yhdistetään...</string>
+    <!-- Shown eg. in the title bar if the app is "Updating" (eg. getting new/old message, sync things); as there is very few room, try to be as short as possible. Note that the three dots are a single character (…), not three (...) -->
+    <string name="connectivity_updating">Päivitetään...</string>
+    <!-- Shown eg. in the setting if the app is "Connected" -->
+    <string name="connectivity_connected">Yhdistetty</string>
+    <string name="sending">Lähetetään</string>
+    <string name="last_msg_sent_successfully">Viimeinen viesti lähetetty onnistuneesti.</string>
+    <string name="not_supported_by_provider">Palveluntarjoajasi ei tue tätä.</string>
+    <!-- Used as a subtitle in quota context of "Connetivity" view. Should be be plural always, no number is prefixed or so. -->
+    <string name="messages">Viestit</string>
+    <!-- Used for describing resource usage, resulting string will be eg. "1.2 GiB of 3 GiB used" -->
+    <string name="part_of_total_used">%1$s / %2$s käytössä</string>
+
+
+    <!-- welcome and login -->
+    <string name="welcome_intro1_message">Viestisovellus, jolla on maailman laajin yleisö. Ilmainen ja riippumaton.</string>
+    <string name="login_title">Kirjaudu sisään</string>
+    <string name="login_header">Kirjaudu palvelimellesi</string>
+    <string name="login_explain">Kirjaudu olemassa olevalla sähköpostitilillä</string>
+    <string name="login_subheader">Tunnetuille sähköpostipalveluntarjoajille muut asetukset luodaan automaattisesti. Joskus IMAP täytyy laittaa päälle verkkoasetuksissa. Kysy apua palveluntarjoajaltasi tai ystäviltäsi.</string>
+    <string name="login_no_servers_hint">Delta Chatilla ei ole palvelimia, tietosi säilyvät sinun laitteellasi.</string>
+    <string name="login_inbox">Saapuvan postin laatikko</string>
+    <string name="login_imap_login">IMAP-kirjautumistunnus</string>
+    <string name="login_imap_server">IMAP-palvelin</string>
+    <string name="login_imap_port">IMAP-portti</string>
+    <string name="login_imap_security">IMAP-turvallisuusprotokolla</string>
+    <string name="login_outbox">Lähtevän postin laatikko</string>
+    <string name="login_smtp_login">SMTP-kirjautumistunnus</string>
+    <string name="login_smtp_password">SMTP-salasana</string>
+    <string name="login_smtp_server">SMTP-palvelin</string>
+    <string name="login_smtp_port">SMTP-portti</string>
+    <string name="login_smtp_security">SMTP-turvallisuusprotokolla</string>
+    <string name="login_auth_method">Kirjautumismenetelmä</string>
+    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <string name="login_socks5">SOCKS5</string>
+    <string name="login_socks5_use_socks5">Käytä SOCKS5</string>
+    <string name="login_socks5_host">SOCKS5-isäntä</string>
+    <string name="login_socks5_port">SOCKS5-portti</string>
+    <string name="login_socks5_user">SOCKS5-käyttäjä</string>
+    <string name="login_socks5_password">SOCKS5-salasana</string>
+    <!-- Translators: %1$s will be replaced by an e-mail address -->
+    <string name="login_oauth2_checking_addr">Tarkistetaan %1$s</string>
+    <string name="login_info_oauth2_title">Jatka yksinkertaisella asennuksella?</string>
+    <string name="login_info_oauth2_text">Annettu sähköpostiosoite tukee yksinkertaista asennusta (OAuth 2.0).\n\nSeuraavaksi sinun täytyy sallia Delta Chatin toiminta Chat over E-mail -sovelluksena.\n\nDelta Chatilla ei ole palvelimia, tietosi pysyvät laitteellasi.</string>
+    <string name="login_certificate_checks">Varmennetarkastukset</string>
+    <string name="login_error_mail">Anna kelvollinen sähköpostiosoite</string>
+    <string name="login_error_server">Anna kelvollinen palvelin tai IP-osoite</string>
+    <string name="login_error_port">Anna kelvollinen portti (1-65535)</string>
+    <string name="login_error_required_fields">Anna kelvollinen sähköpostiosoite ja salasana</string>
+    <string name="import_backup_title">Tuo varmuuskopio</string>
+    <string name="import_backup_ask">Varmuuskopio löydetty kohteesta \"%1$s\".\n\nHaluatko tuoda kaikki sen tiedot ja asetukset?</string>
+    <string name="import_backup_no_backup_found">Varmuuskopioita ei löytynyt.\n\nKopioi varmuuskopio kohteeseen \"%1$s\" ja yritä uudelleen. Vaihtoehtoisesti, paina \"Aloita viestittely\" jatkaaksesi tavallista asennusprosessia.</string>
+    <!-- Translators: %1$s will be replaced by the e-mail address -->
+    <string name="login_error_cannot_login">Kirjautuminen osoitteella \"%1$s\" epäonnistui. Tarkista, että sähköpostiosoite ja salasanat on kirjoitettu oikein.</string>
+    <!-- TLS certificate checks -->
+    <string name="accept_invalid_certificates">Hyväksy epäpätevät varmenteet</string>
+    <string name="used_settings">Käytetyt asetukset:</string>
+    <string name="switch_account">Vaihda tiliä</string>
+    <string name="add_account">Lisää tili</string>
+    <string name="delete_account">Poista tili</string>
+    <string name="delete_account_ask">Haluatko varmasti poistaa tilisi tiedot?</string>
+    <string name="delete_account_explain_with_name">Kaikki tilin \"%s\" tiedot poistetaan tältä laitteelta, mukaan lukien salausasetukset, yhteystiedot, keskustelut, viestit ja media. Tämä toiminto on peruuttamaton.</string>
+    <string name="unconfigured_account">Tilin asetuksia ei ole tehty</string>
+    <string name="unconfigured_account_hint">Avaa tili luodaksesi asetukset</string>
+    <string name="try_connect_now">Yritä yhdistää heti</string>
+    <string name="sync_all">Synkronoi kaikki</string>
+    <!-- Translations: %1$s will be replaced by a more detailed error message -->
+    <string name="configuration_failed_with_error">Asetusten luominen epäonnistui. Virhe: %1$s</string>
+
+    <!-- share and forward messages -->
+    <!-- Translators: Title shown above a chat/contact list; the user selects the recipient of the messages he wants to forward to -->
+    <string name="forward_to">Välitä yhteystiedolle...</string>
+    <string name="share_multiple_attachments">Lähetä %1$d tiedostoa valittuun keskusteluun?\n\nTiedostot lähetetään muokkaamattomina ja alkuperäisen kokoisina, kuvia tai videoita ei pakata uudelleen.</string>
+    <string name="share_multiple_attachments_multiple_chats">Lähetä %1$d tiedosto(a) %2$d keskusteluun?\n\nTiedostot lähetetään muokkaamattomina ja alkuperäisen kokoisina, kuvia ja videoita ei pakata uudelleen.</string>
+    <string name="share_text_multiple_chats">Lähetä tämä teksti %1$d keskusteluun?\n\n\"%2$s\"</string>
+    <string name="share_abort">Jakaminen keskeytetty käyttöoikeuksien puuttumisen vuoksi</string>
+
+
+    <!-- preferences -->
+    <string name="pref_using_custom">Käytetään mukautettua: %s</string>
+    <string name="pref_using_default">Käytetään oletusta: %s</string>
+    <string name="pref_profile_info_headline">Profiilisi tiedot</string>
+    <string name="pref_profile_photo">Profiilikuva</string>
+    <string name="pref_blocked_contacts">Estetyt yhteystiedot</string>
+    <string name="blocked_empty_hint">Estämäsi yhteystiedot näkyvät tässä</string>
+    <string name="pref_password_and_account_settings">Salasana ja tili</string>
+    <string name="pref_who_can_see_profile_explain">Profiilikuvasi, nimesi ja allekirjoituksesi lähetetään yhdessä viestiesi kanssa muille käyttäjille.</string>
+    <string name="pref_your_name">Nimesi</string>
+    <!-- Translators: The value entered here is visible only to recipients who DO NOT use Deltachat, so its not a "Status" but the last line in the E-Mail. -->
+    <string name="pref_default_status_label">Allekirjoitus</string>
+    <!-- Translators: The URL should not be localized, it is not clear which language the receiver prefers and the language will be detected on the server -->
+    <string name="pref_default_status_text">Lähetetty Delta Chat -sovelluksesta: https://delta.chat</string>
+    <string name="pref_enter_sends">Enter-näppäin lähettää</string>
+    <string name="pref_enter_sends_explain">Enter-näppäimen painaminen lähettää viestin</string>
+    <string name="pref_outgoing_media_quality">Lähtevän median laatu</string>
+    <string name="pref_outgoing_balanced">Tasapainotettu</string>
+    <string name="pref_outgoing_worse">Huonompi laatu, pienempi koko</string>
+    <string name="pref_vibrate">Värinä</string>
+    <string name="pref_screen_security">Näytön turvallisuus</string>
+    <!-- Translators: The wording must indicate that we can't guarantee that, its a System flag that we set. But the System in question must honor it. -->
+    <string name="pref_screen_security_explain">Pyydä järjestelmää estämään näyttökuvien tallentaminen sovelluksessa ja \"viimeiset\"-näkymässä.</string>
+    <string name="pref_screen_security_please_restart_hint">Näyttölukon käyttöönotto vaatii sovelluksen uudelleenkäynnistyksen.</string>
+    <string name="pref_notifications">Ilmoitukset</string>
+    <string name="pref_notifications_show">Näytä</string>
+    <string name="pref_notifications_priority">Tärkeys</string>
+    <string name="pref_notifications_explain">Järjestelmän ilmoitukset uusista viesteistä</string>
+    <string name="pref_show_notification_content">Näytä viestien sisältö ilmoituksissa</string>
+    <string name="pref_show_notification_content_explain">Näytä lähettäjän nimi ja viestin ensimmäiset sanat ilmoituksessa</string>
+    <string name="pref_led_color">LED-väri</string>
+    <string name="pref_sound">Ääni</string>
+    <string name="pref_silent">Äänetön</string>
+    <string name="pref_privacy">Yksityisyys</string>
+    <string name="pref_chats_and_media">Keskustelut ja media</string>
+    <string name="pref_system_default">Järjestelmän oletus</string>
+    <!-- Translators: "light" in the meaning "opposite of dark" -->
+    <string name="pref_light_theme">Vaalea</string>
+    <string name="pref_dark_theme">Tumma</string>
+    <string name="pref_appearance">Ulkonäkö</string>
+    <string name="pref_theme">Teema</string>
+    <string name="pref_language">Kieli</string>
+    <string name="pref_incognito_keyboard">Näppäimistön yksityisyys</string>
+    <!-- Translators: Keep in mind that this is a Request - it must be clear in the wording that this cannot be enforced. -->
+    <string name="pref_incognito_keyboard_explain">Pyydä näppäimistöä kytkemään yksilöity oppiminen pois päältä</string>
+    <string name="pref_read_receipts">Lukukuittaukset</string>
+    <string name="pref_read_receipts_explain">Jos lukukuittaukset kytketään pois, et näe kuittauksia myöskään muilta</string>
+    <string name="pref_manage_keys">Hallinnoi avaimia</string>
+    <string name="pref_use_system_emoji">Käytä järjestelmän emojeja</string>
+    <string name="pref_use_system_emoji_explain">Kytke pois Delta Chatin sisäänrakennettu emoji-tuki</string>
+    <string name="pref_app_access">Pääsy sovellukseen</string>
+    <string name="pref_communication">Viestintä</string>
+    <string name="pref_chats">Keskustelut</string>
+    <string name="pref_in_chat_sounds">Keskustelun äänet</string>
+    <string name="pref_message_text_size">Viestin fonttikoko</string>
+    <string name="pref_view_log">Näytä lok</string>
+    <string name="pref_saved_log">Tallenna loki Lataukset-kansioon</string>
+    <string name="pref_save_log_failed">Lokin tallennus epäonnistui</string>
+    <string name="pref_log_header">Lok</string>
+    <string name="pref_other">Mu</string>
+    <string name="pref_backup">Varmuuskopiointi</string>
+    <string name="pref_backup_explain">Varmuuskopioi keskustelut ulkoiseen tallennustilaan</string>
+    <string name="pref_backup_export_explain">Varmuuskopion avulla voit helpommin siirtää asetuksesi uuteen Delta Chat -asennukseen tällä tai toisella laitteella.\n\nVarmuuskopio sisältää kaikki viestit, yhteystiedot ja keskustelut sekä Autocrypt-asetukset. Säilytä varmuuskopiota turvallisessa paikassa ja poista se heti kun mahdollista.</string>
+    <string name="pref_backup_export_start_button">Aloita varmuuskopiointi</string>
+    <string name="pref_backup_written_to_x">Varmuuskopio kirjoitettu onnistuneesti kohteeseen \"%1$s\".</string>
+    <string name="pref_managekeys_menu_title">Hallinnoi avaimia</string>
+    <string name="pref_managekeys_export_secret_keys">Vie salaiset avaimet</string>
+    <string name="pref_managekeys_export_explain">Vie salaiset avaimet kohteeseen \"%1$s\"?</string>
+    <string name="pref_managekeys_import_secret_keys">Tuo salaiset avaimet</string>
+    <string name="pref_managekeys_import_explain">Tuo salaiset avaimet kohteesta \"%1$s\"?\n\n• Olemassa olevia salaisia avaimia ei poisteta\n\n• Viimeistä tuotua avainta käytetään oletusavaimena, paitsi jos sen tiedostonimessä on sana \"legacy\".</string>
+    <string name="pref_managekeys_secret_keys_exported_to_x">Salaiset avaimet kirjoitettu onnistuneesti kohteeseen \"%1$s\".</string>
+    <string name="pref_managekeys_secret_keys_imported_from_x">Salaiset avaimet tuotu kohteesta \"%1$s\".</string>
+    <string name="pref_background">Tausta</string>
+    <string name="pref_background_btn_default">Käytä oletuskuvaa</string>
+    <string name="pref_background_btn_gallery">Valitse galleriasta</string>
+    <string name="pref_imap_folder_handling">IMAP-kansioiden käsittely</string>
+    <string name="pref_imap_folder_warn_disable_defaults">Jos poistat tämän asetuksen käytöstä, varmista, että palvelimessasi ja muissa asiakasohjelmissasi on oikeat asetukset.\n\nMuuten ne eivät ehkä toimi ollenkaan.</string>
+    <string name="pref_watch_inbox_folder">Tarkkaile Saapuneet-kansiota</string>
+    <string name="pref_watch_sent_folder">Tarkkaile Lähetetyt-kansiota</string>
+    <string name="pref_watch_mvbox_folder">Tarkkaile DeltaChat-kansiota</string>
+    <string name="pref_send_copy_to_self">Lähetä kopio itselle</string>
+    <string name="pref_auto_folder_moves">Siirrä automaattisesti DeltaChat-kansioon</string>
+    <string name="pref_auto_folder_moves_explain">Pikaviestikeskustelut siirretään Saapuneet-kansion sotkemisen välttämiseksi</string>
+    <string name="pref_only_fetch_mvbox_title">Nouda vain DeltaChat-kansiosta</string>
+    <string name="pref_only_fetch_mvbox_explain">Jätä muut kansiot huomiotta. Palvelimen on siirrettävä pikaviestit DeltaChat-kansioon.</string>
+    <string name="pref_show_emails">Näytä perinteiset sähköpostiviestit</string>
+    <string name="pref_show_emails_no">Ei, pelkät pikaviestit</string>
+    <string name="pref_show_emails_accepted_contacts">Hyväksytyille yhteystiedoille</string>
+    <string name="pref_show_emails_all">Kaikki</string>
+    <string name="pref_experimental_features">Kokeelliset ominaisuudet</string>
+    <string name="pref_on_demand_location_streaming">Sijainnin jako pyydettäessä</string>
+    <string name="pref_developer_mode">Kehittäjätila</string>
+    <string name="pref_developer_mode_explain">Kytkee päälle testausvalinnat ja voi tehdä sovelluksesta epävakaamman. Vain kehittäjille.</string>
+    <string name="pref_background_default">Oletustausta</string>
+    <string name="pref_background_default_color">Oletusväri</string>
+    <string name="pref_background_custom_image">Mukautettu kuva</string>
+    <string name="pref_background_custom_color">Mukautettu väri</string>
+    <string name="export_aborted">Vienti keskeytetty.</string>
+    <string name="auto_download_messages">Lataa viestit automaattisesti</string>
+    <!-- %1$s will be replaced by a human-readable number of bytes, eg. 32 KiB, 1 MiB -->
+    <string name="up_to_x">Korkeintaan %1$s</string>
+    <string name="up_to_x_most_worse_quality_images">Korkeintaan %1$s, suurin osa alhaisen laadun kuvista</string>
+    <string name="up_to_x_most_balanced_quality_images">Korkeintaan %1$s, suurin osa tasapainoisen laadun kuvista</string>
+    <string name="no_limit">Ei rajaa</string>
+    <string name="download_failed">Lataus epäonnistui</string>
+    <!-- %1$s will be replaced by a human-readable number of bytes, eg. 32 KiB, 1 MiB. Resulting string eg. "1 MiB message" -->
+    <string name="n_bytes_message">%1$s viesti</string>
+    <!-- %1$s will be replaced by human-readable date and time -->
+    <string name="download_max_available_until">Latauksen yläraja ennen %1$s</string>
+    <string name="profile_image_select">Valitse profiilikuva</string>
+    <string name="select_your_new_profile_image">Valitse uusi profiilikuvasi</string>
+    <string name="profile_image_delete">Poista profiilikuva</string>
+    <string name="pref_show_tray_icon">Näytä työkalupalkin kuvake</string>
+    <string name="pref_edit_profile">Muokkaa profiilia</string>
+
+    <!-- Emoji picker and categories -->
+    <string name="emoji_search_results">Hakutulokset</string>
+    <string name="emoji_not_found">Emojia ei löytynyt</string>
+    <string name="emoji_recent">Viimeksi käytetyt</string>
+    <string name="emoji_people">Ihmiset &amp; Keho</string>
+    <string name="emoji_nature">Eläimet &amp; Luonto</string>
+    <string name="emoji_foods">Ruoka &amp; Juoma</string>
+    <string name="emoji_activity">Aktiviteetit</string>
+    <string name="emoji_places">Matkustelu &amp; Paikat</string>
+    <string name="emoji_objects">Esineet</string>
+    <string name="emoji_symbols">Symbolit</string>
+    <string name="emoji_flags">Liput</string>
+
+
+    <!-- automatically delete message -->
+    <string name="delete_old_messages">Poista vanhat viestit</string>
+    <string name="autodel_device_title">Poista viestit laitteelta</string>
+    <string name="autodel_server_title">Poista viestit palvelimelta</string>
+    <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
+    <string name="autodel_device_ask">Haluatko poistaa %1$d viestiä heti ja kaikki uudet viestit \"%2$s\" jatkossa?\n\n• Tämä sisältää kaiken median\n\n• Viestit poistetaan riippumatta siitä onko ne nähty vai ei\n\n• \"Tallennetut viestit\" jätetään paikalliselle laitteelle</string>
+    <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
+    <string name="autodel_server_ask">Haluatko poistaa %1$d viestiä heti ja kaikki uudet viestit \"%2$s\" jatkossa?\n\n⚠️ Tämä sisältää sähköpostiviestit, median ja kaikki \"Tallennetut viestit\" kaikissa palvelimen kansioissa\n\n⚠️ Älä käytä tätä toimintoa, jos haluat säilyttää tiedot palvelimella\n\n⚠️ Älä käytä tätä toimintoa, jos käytät muita sähköpostisovelluksia Delta Chatin lisäksi</string>
+    <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
+    <string name="autodel_server_enabled_hint">Tämä sisältää sähköpostit, median ja \"Tallennetut viestit\" kaikissa palvelimen kansioissa. Älä käytä tätä toimintoa, jos haluat pitää tietosi palvelimella tai jos käytät muita sähköpostisovelluksia Delta Chatin lisäksi.</string>
+    <string name="autodel_confirm">Ymmärrän, poista kaikki nämä viestit</string>
+    <string name="autodel_at_once">Heti</string>
+    <string name="after_30_seconds">30 sekunnin päästä</string>
+    <string name="after_1_minute">1 minuutin päästä</string>
+    <string name="after_5_minutes">5 minuutin päästä</string>
+    <string name="after_30_minutes">30 minuutin päästä</string>
+    <string name="autodel_after_1_hour">1 tunnin päästä</string>
+    <string name="autodel_after_1_day">1 päivän päästä</string>
+    <string name="autodel_after_1_week">1 viikon päästä</string>
+    <string name="autodel_after_4_weeks">4 viikon päästä</string>
+    <string name="after_5_weeks">5 viikon päästä</string>
+    <string name="autodel_after_1_year">1 vuoden päästä</string>
+
+    <!-- autocrypt -->
+    <string name="autocrypt">Autocrypt</string>
+    <string name="autocrypt_explain">Autocrypt on uusi ja avoin spesifikaatio sähköpostien automaattiselle päästä-päähän-salaukselle.\n\nPäästä-päähän-salauksen asetukset luodaan automaattisesti tarpeen mukaan ja ne voidaan siirtää laitteiden välillä Autocrypt-asetusviestien avulla.</string>
+    <string name="autocrypt_send_asm_title">Lähetä Autocrypt-asetusviesti</string>
+    <string name="autocrypt_send_asm_explain_before">Autocrypt-asetusviesti jakaa turvallisesti päästä-päähän-salauksen asetukset toisten Autocrypt-yhteensopivien sovellusten kanssa.\n\nAsetuksen salataan tässä näytettävällä asetuskoodilla, joka on syötettävä toiseen laitteeseen.</string>
+    <string name="autocrypt_send_asm_button">Lähetä Autocrypt-asetusviesti</string>
+    <string name="autocrypt_send_asm_explain_after">Asetusviesti on lähetetty sinulle itsellesi. Avaa viesti toisella laitteella. Sinulta pyydetään asennuskoodia. Anna seuraavat numerot:\n\n%1$s</string>
+    <string name="autocrypt_prefer_e2ee">Suosi päästä-päähän-salausta</string>
+    <string name="autocrypt_asm_subject">Autocrypt-asetusviesti</string>
+    <string name="autocrypt_asm_general_body">Tätä Autocrypt-asetusviestiä käytetään päästä-päähän-salauksen asetusten kopioimiseksi toiselle laitteelle.\n\nSalauksen purkamiseksi ja asetusten käyttöön ottamiseksi, avaa viesti toisella Autocrypt-yhteensopivalla sovelluksella ja anna asennuskoodi laitteelta, jolla koodi luotiin.</string>
+    <string name="autocrypt_asm_click_body">Tätä Autocrypt-asetusviestiä käytetään päästä-päähän-salauksen asetusten kopioimiseksi toiselle laitteelle.\n\nSalauksen purkamiseksi ja asetusten käyttöön ottamiseksi, napauta tai klikkaa tätä viestiä.</string>
+    <string name="autocrypt_continue_transfer_title">Autocrypt-asetusviesti</string>
+    <string name="autocrypt_continue_transfer_please_enter_code">Anna toisella laitteella näkyvä asennuskoodi.</string>
+    <string name="autocrypt_continue_transfer_succeeded">Päästä-päähän-salauksen asetuksen siirretty. Autocrypt toimii nyt tässä laitteessa samoilla asetuksilla kuin toisessa laitteessa.</string>
+    <string name="autocrypt_continue_transfer_retry">Uudelleen</string>
+    <string name="autocrypt_bad_setup_code">Virheellinen asennuskoodi. Yritä uudelleen.\n\nJos et muista asennuskoodia, lähetä uusi Autocrypt-asetusviesti toisella laitteella.</string>
+
+
+    <!-- system messages -->
+    <string name="systemmsg_group_name_changed">Ryhmän nimi vaihdettu: \"%1$s\" --> \"%2$s\".</string>
+    <string name="systemmsg_group_image_changed">Ryhmän kuva vaihdettu.</string>
+    <string name="systemmsg_group_image_deleted">Ryhmän kuva poistettu</string>
+    <string name="systemmsg_member_added">Jäsen %1$s lisätty</string>
+    <string name="systemmsg_member_removed">Jäsen %1$s poistettu</string>
+    <string name="systemmsg_group_left">Poistuit ryhmästä.</string>
+    <string name="systemmsg_read_receipt_subject">Viesti avattu</string>
+    <string name="systemmsg_read_receipt_body">Lähettämäsi viesti \"%1$s\" näytettiin vastaanottajan näytöllä.\n\nTämä ei takaa, että sisältö luettiin.</string>
+    <string name="systemmsg_cannot_decrypt">Viestin salausta ei voi purkaa.\n\n• Pyydä lähettäjää lähettämään viesti uudelleen.\n\n• Jos asensit Delta Chatin tai toisen sähköpostisovelluksen uudelleen tälle tai toiselle laitteelle, Autocrypt-asetusviestin lähettäminen siitä sovelluksesta voi auttaa.</string>
+    <!-- Translators: %1$s will be replaced by sth. as "member xy added" (trailing full-stop removed). -->
+    <string name="systemmsg_action_by_me">%1$s minun toimestani.</string>
+    <!-- Translators: %1$s will be replaced by sth. as "member xy added" (trailing full-stop removed). %2$s will be replaced by the name/addr of the person who did this action. -->
+    <string name="systemmsg_action_by_user">%1$s käyttäjän %2$s toimesta.</string>
+    <string name="systemmsg_unknown_sender_for_chat">Tuntematon lähettäjä. Katso \"lisätietoja\".</string>
+    <string name="systemmsg_subject_for_new_contact">Viesti lähettäjältä %1$s</string>
+    <string name="systemmsg_failed_sending_to">Viestin lähettäminen kohteeseen %1$s epäonnistui.</string>
+
+    <string name="systemmsg_ephemeral_timer_disabled">Katoavien viestien ajastin poistettiin.</string>
+    <string name="systemmsg_ephemeral_timer_enabled">Katoavien viestien ajastin asetettu %1$s sekuntiin.</string>
+    <string name="systemmsg_ephemeral_timer_minute">Katoavien viestien ajastin asetettu 1 minuuttiin.</string>
+    <string name="systemmsg_ephemeral_timer_hour">Katoavien viestien ajastin asetettu 1 tuntiin.</string>
+    <string name="systemmsg_ephemeral_timer_day">Katoavien viestien ajastin asetettu 1 päivään.</string>
+    <string name="systemmsg_ephemeral_timer_week">Katoavien viestien ajastin asetettu 1 viikkoon.</string>
+    <string name="systemmsg_ephemeral_timer_four_weeks">Katoavien viestien ajastin asetettu 4 viikkoon.</string>
+    <string name="systemmsg_ephemeral_timer_minutes">Katoavien viestien ajastin asetettu %1$s minuuttiin.</string>
+    <string name="systemmsg_ephemeral_timer_hours">Katoavien viestien ajastin asetettu %1$s tuntiin.</string>
+    <string name="systemmsg_ephemeral_timer_days">Katoavien viestien ajastin asetettu %1$s päivään.</string>
+    <string name="systemmsg_ephemeral_timer_weeks">Katoavien viestien ajastin asetettu %1$s viikkoon.</string>
+
+    <!-- Translators: Protection disabled/enabled messages may be displayed together with a "big shield" and may be suffixed by systemmsg_action_by_user or systemmsg_action_by_me -->
+    <string name="systemmsg_chat_protection_disabled">Keskustelusuojaus poistettu</string>
+    <string name="systemmsg_chat_protection_enabled">Keskustelusuojaus käytössä</string>
+
+    <string name="devicemsg_self_deleted">Poistit \"Tallennetut viestit\" -keskustelun.\n\nℹ️ Käyttääksesi \"Tallennetut viestit\" -ominaisuutta jälleen, aloita uusi keskustelu itsesi kanssa.</string>
+    <!-- %1$s will be replaced by the number of storage already used, sth. as '500 MB'. CAVE: if you want to use a simple the percent sign, type in two, so eg. %1$s %% -->
+    <string name="devicemsg_storage_exceeding">⚠️ Palveluntarjoajasi tallennuskiintiö ylitetään pian, käytössä on jo %1$s / %%.\n\nEt välttämättä enää voi vastaanottaa viestejäsi, kun 100 %% on käytössä.\n\n👉 Kokeile poistaa viestejä palveluntarjoajasi internetkäyttöliittymästä. Kannattaa myös ehkä kytkeä päälle \"Asetukset / Poista vanhat viestit\". Voit tarkistaa tämän hetkisen tallennustilan käytön \"Asetukset / Yhteys\".</string>
+    <!-- %1%s will be replaced by date and time in some human-readable format -->
+    <string name="devicemsg_bad_time">⚠️ Laitteesi päivämäärä tai aika vaikuttaa olevan väärässä (%1$s).\n\nAseta kellonaika ⏰🔧 varmistaaksesi, että viestin vastaanottaminen onnistuu.</string>
+    <string name="devicemsg_update_reminder">⚠️ Delta Chat -versio saattaa olla vanhentunut.\n\nTämä saattaa aiheuttaa ongelmia, koska muut käyttävät uudempia versioita - ja saatat jäädä paitsi uusista ominaisuuksista. 😳\nTarkista uudet päivitykset sovelluskaupastasi tai https://get.delta.chat</string>
+
+    <!-- Some options as "Manage keys" or "Backup" may require the system PIN/Fingerprint/Gesture/Etc. to be entered in a system dialog. This hint is added to the system dialog, below a title as "Manage keys" or "Backup". -->
+    <string name="enter_system_secret_to_continue">Anna järjestelmän määrittämä koodi jatkaaksesi.</string>
+
+    <!-- qr code stuff -->
+    <string name="qr_code">QR-koodi</string>
+    <string name="load_qr_code_as_image">Lataa QR-koodi kuvana</string>
+    <string name="qrscan_title">Skannaa QR-koodi</string>
+    <string name="qrscan_hint">Näytä QR-koodia kameraan</string>
+    <string name="qrscan_failed">QR-koodia ei voitu selvittää</string>
+    <string name="qrscan_ask_join_group">Haluatko liittyä ryhmään \"%1$s\"?</string>
+    <string name="qrscan_fingerprint_mismatch">Skannattu sormenjälki ei vastaa viimeksi nähtyä %1$s.</string>
+    <string name="qrscan_no_addr_found">Tämä QR-koodi sisältää sormenjäljen mutta ei sähköpostiosoitetta.\n\nOffline-varmentamista varten tulee ensin luoda salattu yhteys vastaanottajaan.</string>
+    <string name="qrscan_contains_text">Skannattu QR-koodin teksti:\n\n%1$s</string>
+    <string name="qrscan_contains_url">Skannattu QR-koodin URL:\n\n%1$s</string>
+    <string name="qrscan_fingerprint_label">Sormenjälki</string>
+    <string name="withdraw_verifycontact_explain">Muut voivat skannata tämän QR-koodin ottaakseen yhteyttä sinuun.\n\nVoit kytkeä QR-koodin pois täällä ja aktivoida sen uudelleen skannaamalla uudestaan.</string>
+    <string name="withdraw_verifygroup_explain">Muut voivat skannata tämän QR-koodin liittyäkseen ryhmään \"%1$s\".\n\nVoit kytkeä QR-koodin pois täällä ja aktivoida sen uudelleen skannaamalla.</string>
+    <string name="withdraw_qr_code">Kytke QR-koodi pois käytöstä</string>
+    <!-- "could" in the meaning of "possible at some point in the past, but no longer possible today" -->
+    <string name="revive_verifycontact_explain">Muut voivat skannata tämän QR-koodin ottaakseen yhteyttä sinuun.\n\nQR-koodi ei ole aktiivinen tällä laitteella.</string>
+    <!-- "could" in the meaning of "possible at some point in the past, but no longer possible today" -->
+    <string name="revive_verifygroup_explain">Muut voivat skannata tämän QR-koodin liittyäkseen ryhmään \"%1$s\".\n\nQR-koodi ei ole aktiivinen tällä laitteella.</string>
+    <string name="revive_qr_code">Aktivoi QR-koodi</string>
+    <string name="qrshow_title">QR-kutsukoodi</string>
+    <string name="qrshow_x_joining">%1$s liittyy</string>
+    <string name="qrshow_x_verified">%1$s varmistettu</string>
+    <string name="qrshow_x_has_joined_group">%1$s liittyi ryhmään.</string>
+    <string name="qrshow_join_group_title">QR-kutsukoodi</string>
+    <!-- This text is shown inside the "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by the group name, eg. "Scan to join group \"Testing group\"" -->
+    <string name="qrshow_join_group_hint">Skannaa liittyäksesi ryhmään \"%1$s\"</string>
+    <string name="qrshow_join_contact_title">QR-kutsukoodi</string>
+    <!-- This text is shown inside the "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and address eg. "Scan to chat with Alice (alice@example.org)" -->
+    <string name="qrshow_join_contact_hint">Skannaa aloittaaksesi keskustelun käyttäjän %1$s kanssa</string>
+    <string name="qrshow_join_contact_no_connection_toast">Ei internetyhteyttä, QR-koodin luominen ei onnistu.</string>
+    <string name="qraccount_ask_create_and_login">Luo uusi sähköpostiosoite palvelimella \"%1$s\" ja kirjaudu sisään?</string>
+    <string name="qraccount_ask_create_and_login_another">Luo uusi sähköpostiosoite palvelimella \"%1$s\" ja kirjaudu sisään?\n\nNykyistä tiliäsi ei poisteta. Käytä valintaa \"Vaihda tiliä\" vaihtaaksesi tilien välillä.</string>
+    <string name="qraccount_success_enter_name">Kirjautuminen onnistui - sähköpostiosoitteesa on %1$s\n\nVoit nyt halutessasi antaa nimen ja profiilikuvan, jotka näytetään muille kirjoittaessasi heille.</string>
+    <string name="qraccount_qr_code_cannot_be_used">Uutta tiliä ei voida luoda skannatulla QR-koodilla.</string>
+    <string name="qraccount_use_on_new_install">Skannattu QR-koodi on käytössä uuden tilin luomiseksi. Voit skannata QR-koodin uuden Delta Chat -asennuksen yhteydessä.</string>
+    <!-- first placeholder will be replaced by name and address of the inviter, second placeholder will be replaced by the name of the inviter. -->
+    <string name="secure_join_started">%1$s kutsui sinut tähän ryhmään.\n\nOdotetaan vastausta yhteystiedon %2$s laitteelta...</string>
+    <!-- placeholder will be replaced by the name of the inviter. -->
+    <string name="secure_join_replies">Vastaus saatu käyttäjältä %1$s, odotetaan lisäystä ryhmään...</string>
+    <string name="contact_verified">%1$s varmistettu.</string>
+    <string name="contact_not_verified">Ei voida varmistaa %1$s.</string>
+    <!-- translators: "setup" is the "encryption setup" here, as in "Autocrypt Setup Message" -->
+    <string name="contact_setup_changed">Asetukset muutettu kohteessa %1$s.</string>
+    <string name="verified_group_explain">(Kokeelliset) varmistetut ryhmät suojaavat aktiivisilta hyökkäyksiltä. Jokainen käyttäjä varmistetaan erikseen ja viestit ovat aina päästä-päähän-salattuja.</string>
+    <string name="copy_qr_data_success">QR-osoite kopioitu leikepöydälle</string>
+    <string name="mailto_dialog_header_select_chat">Valitse keskustelu viestien lähettämiseen</string>
+    <!-- first placeholder is the name of the chat -->
+    <string name="confirm_replace_draft">Keskustelussa %1$s on jo luonnos. Haluatko korvata sen?</string>
+    <string name="mailto_link_could_not_be_decoded">mailto-linkkiä ei voitu selvittää: %1$s</string>
+
+    <!-- notifications  -->
+    <string name="notify_dismiss">Hylkää</string>
+    <string name="notify_reply_button">Vastaa</string>
+    <string name="notify_new_message">Uusi viesti</string>
+    <string name="notify_background_connection_enabled">Yhteys käynnissä taustalla</string>
+    <string name="notify_priority_high">Korkea</string>
+    <string name="notify_priority_max">Maksimi</string>
+    <string name="notify_name_and_message">Nimi ja viesti</string>
+    <string name="notify_name_only">Pelkkä nimi</string>
+    <string name="notify_no_name_or_message">Ei nimeä eikä viestiä</string>
+
+
+    <!-- permissions -->
+    <string name="perm_required_title">Pääsylupa vaaditaan</string>
+    <string name="perm_continue">Jatka</string>
+    <string name="perm_explain_access_to_camera_denied">Ottaaksesi kuvia tai videoita mene sovelluksen asetuksiin, valitse \"Käyttöluvat\" ja kytke päälle \"Kamera\".</string>
+    <string name="perm_explain_access_to_mic_denied">Lähettääksesi ääniviestin mene sovelluksen asetuksiin, valitse \"Käyttöluvat\" ja kytke päälle \"Mikrofoni\".</string>
+    <string name="perm_explain_access_to_storage_denied">Lähettääksesi tai vastaanottaaksesi tiedostoja mene sovelluksen asetuksiin, valitse \"Käyttöluvat\" ja kytke päälle \"Tallennustila\".</string>
+    <string name="perm_explain_access_to_location_denied">Jakaaksesi sijaintisi mene sovelluksen asetuksiin, valitse \"Käyttöluvat\" ja kytke päälle \"Sijainti\".</string>
+
+    <!-- ImageEditorHud -->
+    <string name="ImageEditorHud_draw_anywhere_to_blur">Piirrää sumentaaksesi</string>
+    <string name="ImageEditorHud_add_text">Lisää teksti</string>
+    <string name="ImageEditorHud_blur">Sumennus</string>
+    <string name="ImageEditorHud_brush_marker">Merkkaustussi</string>
+    <string name="ImageEditorHud_brush_highlight">Korostuskynä</string>
+    <string name="ImageEditorHud_crop">Rajaa</string>
+    <string name="ImageEditorHud_flip">Käännä</string>
+    <string name="ImageEditorHud_rotate">Pyöritä</string>
+
+    <!-- dc_str_* resources -->
+    <string name="encrypted_message">Salattu viesti</string>
+
+    <!-- strings introduced on desktop. we want to share strings between the os, in general, please do not add generic strings here -->
+    <string name="about_offical_app_desktop">Tämä on virallinen Delta Chat -työpöytäsovellus.</string>
+    <string name="about_licensed_under_desktop">Tämä ohjelmisto on GNU GPL v3 -lisensoitu, ja lähdekoodi on saatavilla GitHubissa.</string>
+    <string name="welcome_desktop">Tervetuloa Delta Chatiin</string>
+    <string name="login_known_accounts_title_desktop">Tunnetut tilit</string>
+    <string name="global_menu_preferences_language_desktop">Kieli</string>
+    <string name="global_menu_file_desktop">Tiedosto</string>
+    <string name="global_menu_file_quit_desktop">Sulje</string>
+    <string name="global_menu_edit_desktop">Muokkaa</string>
+    <string name="global_menu_edit_undo_desktop">Kumoa</string>
+    <string name="global_menu_edit_redo_desktop">Tee uudelleen</string>
+    <string name="global_menu_edit_cut_desktop">Leikkaa</string>
+    <string name="global_menu_edit_copy_desktop">Kopioi</string>
+    <string name="global_menu_edit_paste_desktop">Liitä</string>
+    <string name="global_menu_view_desktop">Näytä</string>
+    <string name="global_menu_view_floatontop_desktop">Pidä päällimmäisenä</string>
+    <string name="global_menu_view_developer_desktop">Kehittäjä</string>
+    <string name="global_menu_view_developer_tools_desktop">Kehittäjätyökalut</string>
+    <string name="global_menu_help_desktop">Ohje</string>
+    <string name="global_menu_help_learn_desktop">Lisätietoja Delta Chatista</string>
+    <string name="global_menu_help_contribute_desktop">Osallistu GitHubissa</string>
+    <string name="global_menu_help_report_desktop">Ilmoita ongelma</string>
+    <string name="global_menu_help_about_desktop">Tietoja Delta Chatista</string>
+    <string name="global_menu_file_open_desktop">Avaa Delta Chat</string>
+    <string name="global_menu_minimize_to_tray">Pienennä</string>
+    <string name="no_chat_selected_suggestion_desktop">Valitse tai luo keskustelu</string>
+    <string name="write_message_desktop">Kirjoita viesti</string>
+    <string name="encryption_info_title_desktop">Salaustiedot</string>
+    <string name="delete_message_desktop">Poista viesti</string>
+    <string name="more_info_desktop">Lisätietoja</string>
+    <string name="timestamp_format_m_desktop">MMM D</string>
+    <string name="encryption_info_desktop">Näytä salaustiedot</string>
+    <string name="remove_desktop">Poista</string>
+    <string name="save_desktop">Tallenna</string>
+    <string name="name_desktop">Nimi</string>
+    <string name="autocrypt_key_transfer_desktop">Autocrypt-avainten siirto</string>
+    <string name="initiate_key_transfer_desktop">Autocrypt-asetusviesti jakaa turvallisesti päästä-päähän-salauksen asetukset toisten Autocrypt-yhteensopivien sovellusten kanssa. Asetukset salataan tässä näytettävällä asetuskoodilla, joka on syötettävä toiseen laitteeseen.</string>
+    <string name="select_group_image_desktop">Valitse ryhmän kuva</string>
+    <string name="imex_progress_title_desktop">Varmuuskopioinnin tila</string>
+    <string name="export_backup_desktop">Vie varmuuskopio</string>
+    <string name="show_key_transfer_message_desktop">Asetusviesti on lähetetty sinulle itsellesi. Avaa viesti toisella laitteella. Sinulta pyydetään asennuskoodia. Anna seuraavat numerot:</string>
+    <string name="autocrypt_correct_desktop">Autocrypt-asetukset siirretty.</string>
+    <string name="autocrypt_incorrect_desktop">Virheellinen asennuskoodi. Yritä uudelleen.</string>
+    <string name="create_chat_error_desktop">Keskustelua ei voitu luoda.</string>
+    <string name="forget_login_confirmation_desktop">Poista tämä kirjautuminen? Kaikki tiedot poistetaan, mukaan lukien päästä-päähän-salauksen asetukset, yhteystiedot, keskustelut, viestit ja media. Tämä toiminto on peruuttamaton.</string>
+    <string name="account_info_hover_tooltip_desktop2">Sähköposti: %1$s\nKoko: %2$s\nTilin tunniste: %3$s</string>
+    <string name="message_detail_sent_desktop">lähetetty</string>
+    <string name="message_detail_received_desktop">vastaanotettu</string>
+    <string name="menu.view.developer.open.log.folder">Avaa lokikansio</string>
+    <string name="menu.view.developer.open.current.log.file">Avaa nykyinen lokitiedosto</string>
+    <string name="explain_desktop_minimized_disabled_tray_pref">Työkalupalkin kuvaketta ei voida poistaa, koska Delta Chat käynnistettiin \"Käynnistä pienennettynä\" -valinnalla.</string>
+    <string name="no_spellcheck_suggestions_found">Oikeinkirjoitusehdotusta ei löydy.</string>
+    <string name="show_window">Näytä ikkuna</string>
+    <string name="login_socks5_experimental_warning">SOCKS5-tuki on kokeellinen. Käytä omalla vastuulla. Jos annat osoitteen sähköpostikenttään, DNS-etsintää ei tunneloida SOCKS5 läpi.</string>
+
+    <!-- accessibility, the general idea is to use the normal strings for accessibility hints wherever possible -->
+    <string name="a11y_delivery_status_error">Toimituksen tila: virhe</string>
+    <string name="a11y_encryption_padlock">Salauksen lukko</string>
+    <string name="a11y_delivery_status_sending">Toimituksen tila: lähetetään</string>
+    <string name="a11y_delivery_status_draft">Toimituksen tila: luonnos</string>
+    <string name="a11y_delivery_status_delivered">Toimituksen tila: toimitettu</string>
+    <string name="a11y_delivery_status_read">Toimituksen tila: luettu</string>
+    <string name="a11y_delivery_status_invalid">Toimituksen tila virheellinen</string>
+    <string name="a11y_message_context_menu_btn_label">Viestin toiminnot</string>
+    <string name="a11y_background_preview_label">Esikatselu taustalla</string>
+    <string name="a11y_disappearing_messages_activated">Viestien katoaminen päällä</string>
+
+
+    <!-- iOS permissions, copy from "deltachat-ios/Info.plist", which is used on missing translations in "deltachat-ios/LANG.lproj/InfoPlist.strings" -->
+    <string name="InfoPlist_NSCameraUsageDescription">Delta Chat käyttää kameraa kuvien ja videoiden kuvaamiseen ja lähettämiseen sekä QR-koodien skannaamiseen.</string>
+    <string name="InfoPlist_NSContactsUsageDescription">Delta Chat käyttää yhteystietojasi näyttämään listan sähköpostiosoitteista, joihin voit kirjoittaa. Delta Chatilla ei ole palvelimia, eikä yhteystietojasi lähetetä mihinkään.</string>
+    <string name="InfoPlist_NSMicrophoneUsageDescription">Delta Chat käyttää mikrofonia ääniviestien ja äänellisten videoiden tallentamiseen ja lähettämiseen.</string>
+    <string name="InfoPlist_NSPhotoLibraryUsageDescription">Delta Chat antaa sinun valita, mitkä kuvat kirjastostasi haluat lähettää.</string>
+    <string name="InfoPlist_NSPhotoLibraryAddUsageDescription">Delta Chat haluaa tallentaa kuvia kirjastoosi.</string>
+
+
+    <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->
+    <string name="pref_background_notifications">Ilmoitukset taustalla</string>
+    <string name="pref_background_notifications_explain">Käyttää yhteyttä palvelimeesi taustalla. Akun käytön optimointi on poistettava käytöstä.</string>
+    <string name="pref_background_notifications_rationale">Yhteyden ylläpitämiseksi sähköpostipalvelimen kanssa ja viestien vastaanottamiseksi taustalla, poista akun käytön optimointi käytöstä seuraavassa vaiheessa.\n\nDelta Chat käyttää vain vähän laitteen suorituskyvystä, eikä juurikaan kuluta akkua.</string>
+    <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
+    <string name="pref_reliable_service">Luotettava yhteys taustalla</string>
+    <string name="pref_reliable_service_explain">Vaatii pysyvän ilmoituksen</string>
+    <string name="perm_enable_bg_reminder_title">Napauta vastaanottaaksesi viestejä, kun Delta Chat on taustalla.</string>
+    <string name="perm_enable_bg_already_done">Annoit jo luvan viestien vastaanottamiselle taustalla.\n\nJos et saa viestejä taustalla, tarkista myös järjestelmäasetukset.</string>
+
+
+    <!-- device messages for updates -->
+    <string name="update_1_24_android">1.24 pikakatsaus:\n\n• Säästä napautuksia: vaihda tiliä ylävasemmalla keskustelulistan yltä\n• Säästä lisää napautuksia: napauta sovelluskuvaketta pitkään valitaksesi keskusteluja suoraan.\n• Säästä dataa: lataa suuria tiedostoja tarpeen mukaan.\n• Säästä hermoja: nopeammat liittymiset QR-koodien avulla ja lisää QR-koodivalintoja\n\nLisää 👉</string>
+    <string name="update_1_24_ios">1.24 pikakatsaus:\n\n• Keskustelun sisäinen haku keskustelun profiilisivulta.\n• Säästä dataa lataamalla suuria tiedostoja tarpeen mukaan.\n• Säästä hermoja liittymällä nopeammin QR-koodien kautta\n\nLisää 👉</string>
+    <string name="update_1_26">1.26 hiomista 💅\n\n•QR-koodit näyttävät paremmilta kaikilla alustoilla.\n• Avatarit ja mitalit näyttävät samankaltaisilta eri alustojen välillä.\n• Paljon ongelmia korjattu.</string>
+    <string name="update_1_28_android">1.28 Nostot:\n\n🔒Salaus: Uusi kokeellinen valinta yhteystietojen, salausavainten ja tekstiviestien säilyttämiseksi salattuina latteellasi. Saatavilla ainoastaan tilin luomisen ja varmuuskopioiden tuomisen yhteydessä.\n\n📫 Kirjoita sähköpostilistoille.\n\n💫 Nopeampi asetusten luonti monille sähköpostipalvelimille ja yksinkertaistetut verkkoasetukset virheellisten asetusten ehkäisemiseksi\n\n🐜 Paljon käyttäjien raportoimien ongelmien korjauksia.</string>
+    <string name="update_1_28_ios_extra_line">... ja nyt voit vaihtaa taustakuvan: \"Asetukset / Taustakuva\" :)</string>
+
+</resources>

res/values-fr/strings.xml

@@ -85,6 +85,9 @@
     <string name="this_month">Ce mois-ci</string>
     <string name="last_week">La semaine dernière</string>
     <string name="last_month">Le mois dernier</string>
+    <!-- the placeholder will be replaced by a date or time, resulting eg. in "Last seen at 12:13 AM" or "Last seen Nov 12" -->
+    <string name="last_seen_at">Vu·e pour la dernière fois à %1$s</string>
+    <string name="last_seen_unknown">Vu·e pour la dernière fois : inconnu</string>
     <!-- Translators: show beside messages that are "N minutes old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_minutes">
         <item quantity="one">%d min</item>
@@ -199,6 +202,7 @@
     <string name="menu_copy_link_to_clipboard">Copier le lien</string>
     <string name="menu_copy_text_to_clipboard">Copier le texte</string>
     <string name="menu_copy_image_to_clipboard">Copier l\'image</string>
+    <string name="menu_copy_email_to_clipboard">Copier l\'adresse de courriel</string>
     <string name="paste_from_clipboard">Coller depuis le presse-papiers</string>
     <string name="menu_forward">Faire suivre le message</string>
     <string name="menu_reply">Répondre au message</string>
@@ -341,8 +345,10 @@
         <item quantity="one">%dnouveaux messages</item>
         <item quantity="other">%d nouveaux messages</item>
     </plurals>
+    <!-- The placeholder will be replaced by the name of the recipient in a one-to-one chat. -->
+    <string name="chat_new_one_to_one_hint">Envoyez un message. Il n\'y a pas de problème si %1$s n\'utilise pas Delta Chat.</string>
     <string name="chat_new_broadcast_hint">Dans une liste de diffusion, les autres personnes recevront les messages dans leur discussion directe/privée avec vous.\n\nLes destinataires ne pourront pas se voir entre eux.</string>
-    <string name="chat_new_group_hint">Composez le premier message, permettant aux autres de répondre au sein de ce groupe. C\'est ok même si tous les membres n\'utilisent pas le Chat Delta. La transmission du premier message peut prendre un certain temps.</string>
+    <string name="chat_new_group_hint">Les autres participants ne verront ce groupe qu\'après que vous avez envoyé un premier message.</string>
     <string name="chat_record_slide_to_cancel">Glisser pour annuler</string>
     <string name="chat_record_explain">Appuyez et maintenez pour enregistrer un message vocal, relâchez pour l’envoyer</string>
     <string name="chat_no_chats_yet_title">Boîte de réception vide. Appuyez sur \"+\" pour commencer une nouvelle discussion.</string>
@@ -373,6 +379,12 @@
     <string name="mailing_list">Liste de diffusion</string>
     <string name="mailing_list_profile_info">Les changements du nom et de l\'avatar de la liste de diffusion s\'applique uniquement sur cet appareil.</string>
 
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">Démarrer...</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">Veuillez d\'abord accepter l\'invitation.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Afficher les positions dans le temps</string>
     <string name="show_location_traces">Afficher les traces</string>
@@ -520,7 +532,7 @@
     <string name="pref_blocked_contacts">Contacts bloqués</string>
     <string name="blocked_empty_hint">Si vous bloquez des contacts, ils seront affichés ici.</string>
     <string name="pref_password_and_account_settings">Mot de passe et compte</string>
-    <string name="pref_who_can_see_profile_explain">L\'image et le nom de votre profil seront affichés à côté de vos messages lorsque vous communiquez avec d\'autres utilisateurs. Les informations déjà envoyées ne peuvent pas être effacées ou supprimées.</string>
+    <string name="pref_who_can_see_profile_explain">Votre image de profil, votre nom et votre signature seront envoyés au côté de vos messages lorsque vous communiquerez avec d\'autres utilisateurs.</string>
     <string name="pref_your_name">Votre nom</string>
     <!-- Translators: The value entered here is visible only to recipients who DO NOT use Deltachat, so its not a "Status" but the last line in the E-Mail. -->
     <string name="pref_default_status_label">Signature</string>
@@ -595,12 +607,16 @@
     <string name="pref_send_copy_to_self">M\'envoyer une copie</string>
     <string name="pref_auto_folder_moves">Déplacer automatiquement vers le dossier DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Les discussions sont déplacées pour éviter d\'encombrer le dossier Boîte de réception</string>
+    <string name="pref_only_fetch_mvbox_title">Ne consulter que le dossier DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Ignorer les autres répertoires. Cela requiert que votre serveur déplace tous les messages de tchate dans le répertoire DeltaChat.</string>
     <string name="pref_show_emails">Voir les courriels classiques</string>
     <string name="pref_show_emails_no">Non, seulement les tchats</string>
     <string name="pref_show_emails_accepted_contacts">Pour les contacts acceptés</string>
     <string name="pref_show_emails_all">Tout</string>
     <string name="pref_experimental_features">Fonctionnalités expérimentales</string>
     <string name="pref_on_demand_location_streaming">Envoi de la géolocalisation à la demande</string>
+    <string name="pref_developer_mode">Mode développeur</string>
+    <string name="pref_developer_mode_explain">Active les options de débogage et peut rendre l\'application moins stable. Seulement pour les développeurs.</string>
     <string name="pref_background_default">Arrière-plan par défaut</string>
     <string name="pref_background_default_color">Couleur par défaut</string>
     <string name="pref_background_custom_image">Image personnalisée</string>
@@ -612,6 +628,7 @@
     <string name="up_to_x_most_worse_quality_images">Jusqu\'à %1$s, plus mauvaise qualité d\'image</string>
     <string name="up_to_x_most_balanced_quality_images">Jusqu\'à %1$s, qualité d\'image raisonnable </string>
     <string name="no_limit">Pas de limite</string>
+    <string name="download_failed">Échec du téléchargement</string>
     <!-- %1$s will be replaced by a human-readable number of bytes, eg. 32 KiB, 1 MiB. Resulting string eg. "1 MiB message" -->
     <string name="n_bytes_message">%1$s message</string>
     <!-- %1$s will be replaced by human-readable date and time -->
@@ -855,6 +872,8 @@
     <string name="explain_desktop_minimized_disabled_tray_pref">L\'icône système ne peut pas être enlevé car Delta Chat a été démarré avec l\'option --minimized.</string>
     <string name="no_spellcheck_suggestions_found">Aucune propositions de correction trouvées.</string>
     <string name="show_window">Afficher la fenêtre</string>
+    <string name="login_socks5_experimental_warning">Le support de SOCK5 est actuellement expérimental. Son utilisation est à vos risques et périls. Si vous saisissez une adresse de courriel, une requête DNS sera effectuée sans passer par SOCK5.</string>
+
     <!-- accessibility, the general idea is to use the normal strings for accessibility hints wherever possible -->
     <string name="a11y_delivery_status_error">État de la livraison : Erreur</string>
     <string name="a11y_encryption_padlock">Cadenas de chiffrement</string>
@@ -887,4 +906,6 @@
     <string name="perm_enable_bg_already_done">Vous avez déjà autorisé Delta Chat à recevoir des messages en arrière plan.\n\nSi vous ne les recevez toujours pas en arrière plan, vérifiez les paramètres de votre système.</string>
 
 
-    </resources>
+    <string name="update_1_28_ios_extra_line">... et vous pouvez désormais sélectionner un arrière-plan dans \"Configuration / Arrière-plan\" :)</string>
+
+</resources>

res/values-gl/strings.xml

@@ -379,6 +379,12 @@
     <string name="mailing_list">Lista de correo</string>
     <string name="mailing_list_profile_info">Cambios no nome da lista de correo e imaxe só se aplican neste dispositivo.</string>
 
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">Comezar...</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">Primeiro acepta a solicitude de conversa.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Mostrar localizacións no marco temporal</string>
     <string name="show_location_traces">Mostrar trazas</string>
@@ -601,6 +607,8 @@
     <string name="pref_send_copy_to_self">Enviar copia a ti mesmo</string>
     <string name="pref_auto_folder_moves">Mover automáticamente ao cartafol DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">As conversas móvense do cartafol de Entrada para evitar saturalo.</string>
+    <string name="pref_only_fetch_mvbox_title">Obter só desde cartafol DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Ignorar outros cartafoles. Require que o teu servidor mova as mensaxes de chat ao cartafol DeltaChat.</string>
     <string name="pref_show_emails">Mostrar correos clásicos</string>
     <string name="pref_show_emails_no">Non, só conversas</string>
     <string name="pref_show_emails_accepted_contacts">Para os contactos aceptados</string>
@@ -905,4 +913,7 @@
     <string name="update_1_24_android">1.24 dunha ollada:\n\n• Aforra toques: Selección de conta no canto superior esquerdo na lista de chats\n• Aforra máis toques: Presión longa na icona da app para abrir chats recentes\n• Aforra datos: Descarga ficheiros grandes baixo demanda\n• Por tranquilidade: únete con códigos QR sen bloqueos e máis rápido e novas opcións para os códigos QR\n\nMáis en 👉</string>
     <string name="update_1_24_ios">1.24 dunha ollada:\n\n• Fai unha busca no chat desde o perfil do chat\n• Aforra datos: Descarga ficheiros grandes baixo demanda\n• Por tranquilidade: únete con códigos QR sen bloqueo e máis rápido\n\nMáis en 👉</string>
     <string name="update_1_26">1.26 embelecido 💅\n\n• Tras facer que os códigos QR non bloqueasen a 1.24, agora son moito máis bonitos - en tódalas plataformas\n• Os avatares e insignias teñen aspecto máis homoxéneo en tódalas plataformas\n• Arranxamos moitos pequenos fallos</string>
+    <string name="update_1_28_android">Destacado en 1.28:\n\n🔒 Cifrado: unha nova opción experimental para gardar contactos, chaves de cifrado e mensaxes de texto cifrados no teu dispositivo. Só dispoñible cando creas a conta e importas ficheiros de copia de apoio.\n\n📫 Escribir a listas de correo\n\n💫 Configuración inicial máis rápida para servidores de email e opcións de rede simplificadas para evitar problemas de configuración\n\n🐜Mais un looooote de problemiñas que as usuarias nos comentaron</string>
+    <string name="update_1_28_ios_extra_line">...e podes elexir o tapiz en \"Axustes / Fondo\" :)</string>
+
 </resources>

res/values-it/strings.xml

@@ -86,7 +86,7 @@
     <string name="last_week">Ultima settimana</string>
     <string name="last_month">Ultimo mese</string>
     <!-- the placeholder will be replaced by a date or time, resulting eg. in "Last seen at 12:13 AM" or "Last seen Nov 12" -->
-    <string name="last_seen_at">Visto l\'ultima volta alle %1$s</string>
+    <string name="last_seen_at">Visto l\'ultima volta %1$s</string>
     <string name="last_seen_unknown">Visto l\'ultima volta: Sconosciuto</string>
     <!-- Translators: show beside messages that are "N minutes old". prefer a short string, prefer abbreviations if they're well-known -->
     <plurals name="n_minutes">
@@ -605,8 +605,10 @@
     <string name="pref_watch_sent_folder">Controlla Cartella Inviata</string>
     <string name="pref_watch_mvbox_folder">Controlla Cartella DeltaChat</string>
     <string name="pref_send_copy_to_self">Auto-invia Copia</string>
-    <string name="pref_auto_folder_moves">Sposta Automaticamente nella Cartella DeltaChat</string>
+    <string name="pref_auto_folder_moves">Sposta nella Cartella DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Le chat vengono spostate per evitare di riempire la cartella In Arrivo</string>
+    <string name="pref_only_fetch_mvbox_title">Recupera dalla Cartella DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Ignora altre cartelle. Richiede che il tuo server sposti i messaggi di chat nella cartella DeltaChat.</string>
     <string name="pref_show_emails">Mostra E-mail Tradizionali</string>
     <string name="pref_show_emails_no">No, solo chat</string>
     <string name="pref_show_emails_accepted_contacts">Per i contatti accettati</string>
@@ -911,4 +913,7 @@
     <string name="update_1_24_android">1.24 a colpo d\'occhio:\n\n• Salva tocchi: selezione dell\'account nell\'angolo in alto a sinistra dell\'elenco chat\n• Salva più tocchi: tocca a lungo l\'icona dell\'app per aprire direttamente le chat recenti\n• Salva traffico: scarica i grandi file in base alle proprie esigenze\n• Risparmiate nervosismo: unioni con codici QR più veloci e non bloccanti e nuove opzioni per i codici QR\n\nAltro su 👉</string>
     <string name="update_1_24_ios">1.24 a colpo d\'occhio:\n\n• Avvia una ricerca in-chat dal profilo della chat\n• Salva traffico: scarica file di grandi dimensioni in base alle esigenze\n• Risparmia nervosismo: ci si unisce con codici QR più veloci e non bloccanti\n\nAltro su 👉</string>
     <string name="update_1_26">1.26 rifinitura 💅\n\n• Dopo aver reso i codici QR non bloccanti nella 1.24, ora hanno anche un aspetto molto più bello - su tutte le piattaforme\n• Gli avatar e i badge sono simili su tutte le piattaforme\n• Molti bug risolti</string>
+    <string name="update_1_28_android">1.28 In evidenza:\n\n🔒 Crittografia: Una nuova opzione sperimentale per mantenere i contatti, le chiavi crittografiche e i messaggi di testo crittografati sul tuo dispositivo. Disponibile solo per la creazione di account e l\'importazione di file di backup.\n\n📫 Scrivi nella mailing list\n\n💫 Configurazione iniziale più rapida per più server di posta elettronica e opzioni di rete semplificate per prevenire configurazioni errate accidentali\n\n🐜 Moooooolti problemi riportati dagli utenti risolti</string>
+    <string name="update_1_28_ios_extra_line">... e ora puoi selezionare uno sfondo in \"Impostazioni / Sfondo\" :)</string>
+
 </resources>

res/values-nl/strings.xml

@@ -607,6 +607,8 @@
     <string name="pref_send_copy_to_self">Kopie versturen naar mijzelf</string>
     <string name="pref_auto_folder_moves">Automatisch verplaatsen naar DeltaChat-map</string>
     <string name="pref_auto_folder_moves_explain">Gesprekken worden verplaatst om je Postvak IN netjes te houden</string>
+    <string name="pref_only_fetch_mvbox_title">Alleen DeltaChat-map controleren</string>
+    <string name="pref_only_fetch_mvbox_explain">Negeer andere mappen. Hiervoor is vereist dat je server gesprekken kan verplaatsen naar de DeltaChat-map.</string>
     <string name="pref_show_emails">Klassieke e-mails tonen</string>
     <string name="pref_show_emails_no">Nee, alleen gesprekken</string>
     <string name="pref_show_emails_accepted_contacts">Van goedgekeurde contactpersonen</string>
@@ -911,4 +913,7 @@
     <string name="update_1_24_android">1.24 samengevat:\n\n• Bespaar moeite: accountkeuze zit nu links bovenaan de gesprekslijst\n• Bespaar nóg meer moeite: houd het app-pictogram lang ingedrukt om recente gesprekken direct te openen\n• Bespaar data: download grote bestanden alléén indien nodig\n• Bespaar frustratie: snellere, niet-in-de-weg-zittende QR-codes en nieuwe QR-code-opties\n\nMeer informatie is te vinden op 👉</string>
     <string name="update_1_24_ios">1.24 samengevat:\n\n• Doorzoek gesprekken vanuit profielen\n• Bespaar data: download grote bestanden alléén indien nodig\n• Bespaar frustratie: snellere, niet-in-de-weg-zittende QR-codes en nieuwe QR-code-opties\n\nMeer informatie 👉</string>
     <string name="update_1_26">1.26 oppoetsen 💅\n\n• Sinds 1.24 zitten QR-codes niet langer in de weg, maar sinds deze versie zien ze er ook nog eens beter uit - op alle ondersteunde systemen!\n• Profielfoto\'s en tellers zien er nu overal hetzelfde uit\n• Heel veel bugs opgelost</string>
+    <string name="update_1_28_android">1.28 Uitgelicht:\n\n🔒 Versleuteling: er is een nieuwe, experimentele optie beschikbaar voor het versleutelen van je contactpersonen, inloggegevens en tekstberichten op je apparaat zelf. Let op: deze optie is alléén beschikbaar tijdens het toevoegen van een account en het importeren van back-upbestanden.\n\n📫 Schrijf berichten aan een mailinglijst\n\n💫 Snellere initiële instelmethode voor meer e-mailservers en vereenvoudigde netwerkopties om onopzettelijke instellingen te voorkomen\n\n🐜 Héél véél gemelde problemen opgelost!</string>
+    <string name="update_1_28_ios_extra_line">…en je kunt voortaan een achtergrond kiezen via ‘Instellingen → Achtergrond’. :)</string>
+
 </resources>

res/values-pl/strings.xml

@@ -153,6 +153,8 @@
     <string name="contact">Kontakt</string>
     <string name="verified_contact">Zweryfikowany kontakt</string>
     <string name="camera">Kamera</string>
+    <!-- "capture" here means "start a video recording" or "take a photo"; eg. the description of the "shutter button" in the camera controls -->
+    <string name="capture">Zrób to</string>
     <string name="switch_camera">Przełącz kamerę</string>
     <string name="toggle_fullscreen">Przełącz na tryb pełnoekranowy</string>
     <string name="location">Lokalizacja</string>
@@ -267,6 +269,8 @@
     <!-- Translators: this is the opposite of "Pin", removing the sticky-state from sth. -->
     <string name="unpin">Odepnij</string>
     <string name="ConversationFragment_quoted_message_not_found">Nie znaleziono oryginalnej wiadomości</string>
+    <string name="reply_privately">Odpowiedz prywatnie </string>
+
     <string name="mute_for_one_hour">Wyłącz na 1 godzinę</string>
     <string name="mute_for_two_hours">Wyłącz na 2 godziny</string>
     <string name="mute_for_one_day">Wyłącz na 1 dzień</string>
@@ -403,6 +407,12 @@
     <string name="mailing_list">Lista mailingowa</string>
     <string name="mailing_list_profile_info">Zmiany nazwy i obrazu listy adresowej dotyczą tylko tego urządzenia.</string>
 
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">Uruchom…</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">Najpierw zaakceptuj prośbę o czat.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Pokaż lokalizacje w ramach czasowych</string>
     <string name="show_location_traces">Pokaż ślady</string>
@@ -625,12 +635,16 @@
     <string name="pref_send_copy_to_self">Wyślij kopię do siebie</string>
     <string name="pref_auto_folder_moves">Automatyczne przenoszenie do folderu DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Rozmowy na czacie są przenoszone, aby nie zaśmiecać folderu Skrzynka odbiorcza</string>
+    <string name="pref_only_fetch_mvbox_title">Pobieraj tylko z folderu DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Zignoruj inne foldery. Wymaga, aby twój serwer przenosił wiadomości czatu do folderu DeltaChat.</string>
     <string name="pref_show_emails">Pokaż klasyczne e-maile</string>
     <string name="pref_show_emails_no">Nie, tylko czaty</string>
     <string name="pref_show_emails_accepted_contacts">Dla zaakceptowanych kontaktów</string>
     <string name="pref_show_emails_all">Wszystkie</string>
     <string name="pref_experimental_features">Funkcje eksperymentalne</string>
     <string name="pref_on_demand_location_streaming">Przesyłanie strumieniowe lokalizacji na żądanie</string>
+    <string name="pref_developer_mode">Tryb programisty</string>
+    <string name="pref_developer_mode_explain">Aktywuje opcje debugowania i może spowodować, że aplikacja będzie mniej stabilna. Tylko dla programistów.</string>
     <string name="pref_background_default">Domyślne tło</string>
     <string name="pref_background_default_color">Domyślny kolor</string>
     <string name="pref_background_custom_image">Własny obraz</string>
@@ -923,4 +937,7 @@
     <string name="update_1_24_android">1.24 w skrócie:\n\n• Zapisywanie dotknięć: wybór konta w lewym górnym rogu listy czatu\n• Zapisywanie kolejnych dotknięć: dotknij i przytrzymaj ikony aplikacji, aby bezpośrednio otwierać ostatnie czaty\n• Oszczędzaj transfer: pobierz duże pliki w razie potrzeby\n• Oszczędzaj nerwy: szybsze, nieblokujące dołączanie za pomocą kodów QR i nowe opcje kodów QR\n\nWięcej na 👉</string>
     <string name="update_1_24_ios">1.24 w skrócie:\n\n• Rozpocznij wyszukiwanie na czacie z profilu czatu\n• Oszczędzaj transfer: pobierz duże pliki w razie potrzeby\n• Oszczędzaj nerwy: szybsze, nieblokujące dołączanie za pomocą kodów QR \n\nWięcej na 👉</string>
     <string name="update_1_26">1.26 dopracowanie 💅\n\n• Po tym jak w 1.24 kody QR przestały się blokować, teraz również wyglądają dużo ładniej - na wszystkich platformach\n• Awatary i plakietki wyglądają podobnie na różnych platformach\n• Naprawiono wiele błędów</string>
+    <string name="update_1_28_android">1.28 Najważniejsze informacje:\n\n🔒 Szyfrowanie: Nowa eksperymentalna opcja do utrzymywania kontaktów, szyfrowania sekretnych i tekstowych wiadomości zaszyfrowanych na twoim urządzeniu. Dostępne tylko podczas tworzenia konta i importowania plików kopii zapasowych.\n\n📫 Zapisywanie do listy dyskusyjnej\n\n💫 Szybsza konfiguracja początkowa dla większej liczby serwerów e-mail i usprawnionych opcji sieciowych, aby zapobiec przypadkowej błędnej konfiguracji\n\n🐜 Prawdopodobnie naprawione zgłaszane przez użytkownika problemy</string>
+    <string name="update_1_28_ios_extra_line">… i już teraz możesz wybrać tapetę w „Ustawienia » Tło” :) </string>
+
 </resources>

res/values-pt-rBR/strings.xml

@@ -345,6 +345,8 @@
         <item quantity="one">%d novas mensagens</item>
         <item quantity="other">%d novas mensagens</item>
     </plurals>
+    <!-- The placeholder will be replaced by the name of the recipient in a one-to-one chat. -->
+    <string name="chat_new_one_to_one_hint">Envie uma mensagem. Tudo bem se %1$s não usar o Chat Delta.  </string>
     <string name="chat_new_broadcast_hint">Em uma lista de transmissão, as pessoas receberão mensagens em seus bate-papos privados com você.\n\nOs destinatários não saberão uns dos outros. </string>
     <string name="chat_new_group_hint">Compor a primeira mensagem habilitará os participantes a ingressar no grupo.\n\n• Não tem problema se nem todos usarem o Delta Chat.\n\n• O envio da primeira mensagem pode demorar.</string>
     <string name="chat_record_slide_to_cancel">Deslize para cancelar</string>
@@ -377,6 +379,12 @@
     <string name="mailing_list">Lista de e-mail</string>
     <string name="mailing_list_profile_info">Alterações ao nome e imagem da lista de e-mails só se aplicam a este dispositivo.</string>
 
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">Iniciar...</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">Por favor, aceite o pedido de bate-papo primeiro.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Exibir localização no tempo.</string>
     <string name="show_location_traces">Exibir pegadas</string>
@@ -599,12 +607,16 @@
     <string name="pref_send_copy_to_self">Enviar cópia para mim</string>
     <string name="pref_auto_folder_moves">Mover automaticamente para a pasta DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Conversas serão movidas para evitar desordem na caixa de entrada</string>
+    <string name="pref_only_fetch_mvbox_title">Apenas pegar da pasta DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Ignore outras pastas. Requer que seu servidor mova mensagens de bate-papo para a pasta DeltaChat. </string>
     <string name="pref_show_emails">Exibir e-mails normais</string>
     <string name="pref_show_emails_no">Não, somente conversas</string>
     <string name="pref_show_emails_accepted_contacts">Para contatos aceitos</string>
     <string name="pref_show_emails_all">Todos</string>
     <string name="pref_experimental_features">Recursos experimentais</string>
     <string name="pref_on_demand_location_streaming">Streaming de localização sob demanda</string>
+    <string name="pref_developer_mode">Modo de Desenvolvedor</string>
+    <string name="pref_developer_mode_explain">Ativa as opções de depuração e pode tornar o aplicativo menos estável. Apenas para desenvolvedores.</string>
     <string name="pref_background_default">Fundo padrão</string>
     <string name="pref_background_default_color">Cor padrão</string>
     <string name="pref_background_custom_image">Imagem personalizada</string>
@@ -901,4 +913,7 @@
     <string name="update_1_24_android">1.24 em resumo:\n\n• Lembre de toques: seleção de conta no canto superior esquerdo da lista de bate-papo\n• Lembre mais toques: toque longo no ícone do aplicativo para abrir os bate-papos recentes diretamente\n• Economize tráfego: faça download grande arquivos conforme necessário\n• Não fique nervoso: uso de código QR mais rápido e sem bloqueio e novas opções de código QR\n\nMais em 👉</string>
     <string name="update_1_24_ios">1.24 em resumo:\n\n• Inicie uma pesquisa no bate-papo a partir do perfil do bate-papo\n• Economize tráfego: baixe arquivos grandes conforme necessário\n• Não fique nervoso: uso de código QR mais rápido e não bloqueante\n\nMais em 👉</string>
     <string name="update_1_26">Polimentos na 1.26 💅\n\n• Depois de tornar os códigos QR não bloqueadores na 1.24, eles também estão muito melhores agora - em todas as plataformas\n• Avatares e emblemas parecem semelhantes em todas as plataformas\n• Muitos bugs corrigidos</string>
+    <string name="update_1_28_android">Destaques da 1.28:\n\n🔒 Criptografia: uma nova opção experimental para manter seus contatos, segredos de criptografia e mensagens de texto criptografadas em seu dispositivo. Disponível apenas na criação de conta e importação de arquivos de backup.\n\n📫 Escrever para lista de e-mails\n\n💫 Configuração inicial mais rápida para mais servidores de e-mail e opções de rede simplificadas para evitar configurações incorretas acidentais\n\n🐜 Muuuuuuitos problemas relatados por usuários corrigidos</string>
+    <string name="update_1_28_ios_extra_line">… e você pode selecionar um papel de parede em \"Configurações / Papel de Parede\" agora :)</string>
+
 </resources>

res/values-ru/strings.xml

@@ -407,6 +407,12 @@
     <string name="mailing_list">Список рассылки</string>
     <string name="mailing_list_profile_info">Изменения названия и изображения списка рассылки применяются только к этому устройству.</string>
 
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">Запустить...</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">Пожалуйста, сначала примите запрос</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Показать местоположения с интервалом времени</string>
     <string name="show_location_traces">Показывать маршруты</string>
@@ -629,12 +635,16 @@
     <string name="pref_send_copy_to_self">Отправлять копию себе</string>
     <string name="pref_auto_folder_moves">Автоматически Перемещать в папку DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Сообщения чатов переносятся, чтобы избежать путаницы в папке «Входящие»</string>
+    <string name="pref_only_fetch_mvbox_title">Загружать только из папки DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Игнорировать другие папки. Необходимо чтобы ваш сервер перемещал сообщения в папку DeltaChat.</string>
     <string name="pref_show_emails">Показывать обычную почту</string>
     <string name="pref_show_emails_no">Нет, только чаты</string>
     <string name="pref_show_emails_accepted_contacts">Для принятых контактов</string>
     <string name="pref_show_emails_all">Все</string>
     <string name="pref_experimental_features">Экспериментальные функции</string>
     <string name="pref_on_demand_location_streaming">Трансляция местоположения по запросу</string>
+    <string name="pref_developer_mode">Режим разработчика</string>
+    <string name="pref_developer_mode_explain">Активирует отладочные опции, которые могут сделать приложение менее стабильным. Только для разработчиков.</string>
     <string name="pref_background_default">Фон по умолчанию</string>
     <string name="pref_background_default_color">Цвет по умолчанию</string>
     <string name="pref_background_custom_image">Пользовательское изображение</string>
@@ -673,8 +683,8 @@
 
     <!-- automatically delete message -->
     <string name="delete_old_messages">Удалить старые сообщения</string>
-    <string name="autodel_device_title">Удалить сообщения с устройства</string>
-    <string name="autodel_server_title">Удалить сообщения с сервера</string>
+    <string name="autodel_device_title">Удалять сообщения с устройства</string>
+    <string name="autodel_server_title">Удалять сообщения с сервера</string>
     <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
     <string name="autodel_device_ask">Вы хотите удалить %1$d сообщений сейчас и все новые загруженные сообщения \"%2$s\" в будущем?\n\n• Это включает в себя все медиафайлы\n\n• Сообщения будут удалены независимо от того, просмотрены они или нет\n\n• \"Сохранённые сообщения\" будут пропущены при локальном удалении</string>
     <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
@@ -696,7 +706,7 @@
 
     <!-- autocrypt -->
     <string name="autocrypt">Autocrypt</string>
-    <string name="autocrypt_explain">Autocrypt — новый и открытый протокол установления сквозного шифрования для электронной почты.\n\n Ваши настройки шифрования создаются автоматически, вы можете передавать их между устройствами используя сообщения настройки Autocrypt.</string>
+    <string name="autocrypt_explain">Autocrypt — новый и открытый протокол установления сквозного шифрования для электронной почты.\n\nВаши настройки шифрования создаются автоматически, вы можете передавать их между устройствами используя сообщения настройки Autocrypt.</string>
     <string name="autocrypt_send_asm_title">Сообщение с параметрами Autocrypt</string>
     <string name="autocrypt_send_asm_explain_before">\"Сообщение с параметрами Autocrypt\" служит для безопасной передачи параметров шифрования между собственными приложениями для работы с электронной почтой, поддерживающими протокол Autocrypt.\n\nЭти параметры шифруются с использованием специального кода, который показан здесь и должен быть введён в настраиваемом приложении.  </string>
     <string name="autocrypt_send_asm_button">Отправить сообщение с параметрами Autocrypt</string>
@@ -932,4 +942,7 @@
     <string name="update_1_24_android">Коротко о 1.24:\n\n• Смена аккаунта в левом верхнем углу списка чатов\n• Долгое нажатие по иконке приложения для открытия списка последних чатов\n• Отложенная загрузка больших файлов\n• Быстрое неблокирующее сканирование QR-кодов\n\nПодробнее на 👉</string>
     <string name="update_1_24_ios">Коротко о 1.24:\n\n• Начинайте поиск в чате из профиля чата\n• Сохраните траффик: Загрузка больших файлов по необходимости\n• Сохраните нервы: Быстрое неблокирующее сканирование QR-кодов\n\nПодробнее на 👉</string>
     <string name="update_1_26">Шлифуем 1.26 💅\n\n• После того как QR-коды стали неблокирующими в 1.24, они стали намного удобнее - на всех платформах\n• Аватары и значки выглядят одинаково - на любой платформе\n• Исправлено множество ошибок</string>
+    <string name="update_1_28_android">Новое в 1.28:\n\n🔒 Шифрование: новая экспериментальная опция, чтобы держать ваши контакты, ключи шифрования и текстовые сообщения зашифрованными на устройстве. Доступно только при создании аккаунта и импорте бэкапа.\n\n📫 Возможность писать в списки рассылки\n\n💫 Ускоренная настройка для большего числа почтовых серверов и упрощение сетевых опций\n\n🐜 Исправлено оооочень много ошибок</string>
+    <string name="update_1_28_ios_extra_line">… и теперь вы можете выбирать обои в «Настройки / Фон» :)</string>
+
 </resources>

res/values-sk/strings.xml

@@ -50,9 +50,9 @@
     <string name="loading">Načítam…</string>
     <string name="hide">Skryť</string>
     <string name="activate">Zapnúť</string>
-    <string name="load_remote_content">Načítajte vzdialené obrázky</string>
+    <string name="load_remote_content">Načítať vzdialené obrázky</string>
     <!-- possible answers to the question are: Never, Always, Once -->
-    <string name="load_remote_content_ask">Na sledovanie vás možno použiť obrázky na diaľku.\n\nToto nastavenie tiež umožňuje načítať písma a ďalší obsah. Aj keď je vypnutá, stále sa vám môžu zobrazovať vložené alebo uložené obrázky.\n\nNačítať vzdialené obrázky?</string>
+    <string name="load_remote_content_ask">Na sledovanie vás možno použiť obrázky nadiaľku.\n\nToto nastavenie tiež umožňuje načítať písma a ďalší obsah. Aj keď je vypnutá, stále sa vám môžu zobrazovať vložené alebo uložené obrázky.\n\nNačítať vzdialené obrázky?</string>
     <string name="always">Vždy</string>
     <string name="once">Raz</string>
     <string name="show_password">Ukáž heslo</string>
@@ -271,10 +271,10 @@
     <string name="ConversationFragment_quoted_message_not_found">Pôvodná správa sa nenašla</string>
     <string name="reply_privately">Odpovedajte súkromne</string>
 
-    <string name="mute_for_one_hour">Stíšiť 1 hodinu</string>
-    <string name="mute_for_two_hours">Stíšiť 2 hodiny</string>
-    <string name="mute_for_one_day">Stíšiť 1 deň</string>
-    <string name="mute_for_seven_days">Stíšiť 7 dní</string>
+    <string name="mute_for_one_hour">Stíšiť na 1 hodinu</string>
+    <string name="mute_for_two_hours">Stíšiť na 2 hodiny</string>
+    <string name="mute_for_one_day">Stíšiť na 1 deň</string>
+    <string name="mute_for_seven_days">Stíšiť na 7 dní</string>
     <string name="mute_forever">Stlmiť navždy</string>
 
     <string name="share_location_for_5_minutes">po dobu 5 minút</string>
@@ -407,6 +407,12 @@
     <string name="mailing_list">Zoznam adries</string>
     <string name="mailing_list_profile_info">Zmeny v zozname adries a obrázku sa vzťahujú iba na toto zariadenie.</string>
 
+    <!-- webxdc -->
+    <!-- "Start..." button for an app -->
+    <string name="start_app">Spustiť...</string>
+    <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
+    <string name="accept_request_first">Prosím, najprv prijmite požiadavku na čet.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Zobraziť polohy v časovom rámci</string>
     <string name="show_location_traces">Zobraziť stopy</string>
@@ -561,7 +567,7 @@
     <!-- Translators: The URL should not be localized, it is not clear which language the receiver prefers and the language will be detected on the server -->
     <string name="pref_default_status_text">Odoslané pomocou Delta Chat Messenger-a: https://delta.chat</string>
     <string name="pref_enter_sends">Zadajte odoslanie kľúča</string>
-    <string name="pref_enter_sends_explain">Stlačením klávesu Enter sa odošlú textové správy</string>
+    <string name="pref_enter_sends_explain">Textové správy sa odošlú po stlačení Enteru</string>
     <string name="pref_outgoing_media_quality">Kvalita odchádzajúcich médií</string>
     <string name="pref_outgoing_balanced">Vyvážený</string>
     <string name="pref_outgoing_worse">Horšia kvalita, malé rozmery</string>
@@ -593,7 +599,7 @@
     <string name="pref_incognito_keyboard_explain">Požiadajte o klávesnicu, aby deaktivovala prispôsobené učenie</string>
     <string name="pref_read_receipts">Prečítajte si potvrdenia</string>
     <string name="pref_read_receipts_explain">Ak sú potvrdenia o prečítaní zakázané, neuvidíte potvrdenia o prečítaní od ostatných.</string>
-    <string name="pref_manage_keys">Spravujte kľúče</string>
+    <string name="pref_manage_keys">Správa kľúčov</string>
     <string name="pref_use_system_emoji">Používajte systémové emodži</string>
     <string name="pref_use_system_emoji_explain">Vypnite vstavanú podporu emodži v aplikácii Delta Chat</string>
     <string name="pref_app_access">Prístup k aplikácii</string>
@@ -611,10 +617,10 @@
     <string name="pref_backup_export_explain">Záloha vám pomôže nastaviť novú inštaláciu na tomto alebo na inom zariadení.\n\nZáloha bude obsahovať všetky správy, kontakty a čety a vaše úplné nastavenie automatického šifrovania. Uložte záložný súbor na bezpečnom mieste alebo ho čo najskôr odstráňte.</string>
     <string name="pref_backup_export_start_button">Spustiť zálohovanie</string>
     <string name="pref_backup_written_to_x">Záloha bola úspešne zapísaná do priečinka „%1$s“.</string>
-    <string name="pref_managekeys_menu_title">Spravujte kľúče</string>
-    <string name="pref_managekeys_export_secret_keys">Exportujte tajné kľúče</string>
+    <string name="pref_managekeys_menu_title">Správa kľúčov</string>
+    <string name="pref_managekeys_export_secret_keys">Exportovať tajné kľúče</string>
     <string name="pref_managekeys_export_explain">Exportovať tajné kľúče do priečinka „%1$s“?</string>
-    <string name="pref_managekeys_import_secret_keys">Importujte tajné kľúče</string>
+    <string name="pref_managekeys_import_secret_keys">Importovať tajné kľúče</string>
     <string name="pref_managekeys_import_explain">Importovať tajné kľúče z priečinka „%1$s“?\n\n• Existujúce tajné kľúče nebudú odstránené\n\n• Posledný importovaný kľúč sa použije ako nový predvolený kľúč, pokiaľ v názve súboru nebude slovo „legacy“.</string>
     <string name="pref_managekeys_secret_keys_exported_to_x">Tajné kľúče boli úspešne zapísané do priečinka „%1$s“.</string>
     <string name="pref_managekeys_secret_keys_imported_from_x">Tajné kľúče importované z „%1$s“.</string>
@@ -627,14 +633,18 @@
     <string name="pref_watch_sent_folder">Pozrieť priečinok Odoslané</string>
     <string name="pref_watch_mvbox_folder">Sledujte priečinok DeltaChat</string>
     <string name="pref_send_copy_to_self">Odoslať kópiu sebe</string>
-    <string name="pref_auto_folder_moves">Automatické presuny do priečinka DeltaChat</string>
-    <string name="pref_auto_folder_moves_explain">Četové konverzácie sa presúvajú, aby sa predišlo preplneniu doručenej pošty</string>
+    <string name="pref_auto_folder_moves">Automaticky presúvať do priečinka DeltaChat</string>
+    <string name="pref_auto_folder_moves_explain">Četové konverzácie sa presunú, aby sa predišlo preplneniu doručenej pošty</string>
+    <string name="pref_only_fetch_mvbox_title">Prijímať iba z priečinka DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Ignorovať zvyšné priečinky. Vyžaduje, aby váš server presúvať správy četu do priečinka DeltaChat.</string>
     <string name="pref_show_emails">Zobraziť klasické e-maily</string>
     <string name="pref_show_emails_no">Nie, iba čety</string>
     <string name="pref_show_emails_accepted_contacts">Pre prijaté kontakty</string>
     <string name="pref_show_emails_all">Všetky</string>
     <string name="pref_experimental_features">Experimentálne vlastnosti</string>
     <string name="pref_on_demand_location_streaming">Streamovanie polohy na požiadanie</string>
+    <string name="pref_developer_mode">Režim pre vývojárov</string>
+    <string name="pref_developer_mode_explain">Zapína voľby pre ladenie a môže spôsobiť nižšiu stabilitu aplikácie. Iba pre vývojárov.</string>
     <string name="pref_background_default">Predvolené pozadie</string>
     <string name="pref_background_default_color">Predvolená farba</string>
     <string name="pref_background_custom_image">Vlastný obrázok</string>
@@ -701,7 +711,7 @@
     <string name="autocrypt_send_asm_explain_before">Správa o nastavení automatického šifrovania bezpečne zdieľa vaše komplexné nastavenie s ostatnými aplikáciami kompatibilnými s automatickým šifrovaním.\n\nNastavenie bude šifrované tu zobrazeným nastavovacím kódom a musí byť zadané na druhom zariadení.</string>
     <string name="autocrypt_send_asm_button">Pošlite správu s nastavením autokryptovania</string>
     <string name="autocrypt_send_asm_explain_after">Vaše nastavenie bolo odoslané vám. Prepnite na druhé zariadenie a otvorte správu o nastavení. Mali by ste byť požiadaní o nastavovací kód. Zadajte nasledujúce číslice:\n\n%1$s</string>
-    <string name="autocrypt_prefer_e2ee">Uprednostnite šifrovanie typu end-to-end</string>
+    <string name="autocrypt_prefer_e2ee">Preferovať šifrovanie typu end-to-end</string>
     <string name="autocrypt_asm_subject">Správa o nastavení automatického šifrovania</string>
     <string name="autocrypt_asm_general_body">Toto je správa o nastavení automatického šifrovania, ktorá sa používa na prenos komplexného nastavenia medzi klientmi.\n\nAk chcete dešifrovať a použiť svoje nastavenie, otvorte správu v klientovi kompatibilnom s automatickým šifrovaním a zadajte inštalačný kód uvedený na generujúcom zariadení.</string>
     <string name="autocrypt_asm_click_body">Toto je správa o automatickom šifrovaní, ktorá sa používa na prenos komplexného nastavenia medzi klientmi.\n\nAk chcete dešifrovať a použiť svoje nastavenie, klepnite na túto správu alebo na ňu kliknite.</string>
@@ -782,10 +792,10 @@
     <string name="qrshow_x_has_joined_group">%1$s sa pripojil k skupine.</string>
     <string name="qrshow_join_group_title">QR pozývací kód</string>
     <!-- This text is shown inside the "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by the group name, eg. "Scan to join group \"Testing group\"" -->
-    <string name="qrshow_join_group_hint">Naskenujte to a pripojte sa k skupine „%1$s“.</string>
+    <string name="qrshow_join_group_hint">Naskenujte a pripojte sa ku skupine „%1$s“.</string>
     <string name="qrshow_join_contact_title">QR pozývací kód</string>
     <!-- This text is shown inside the "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and address eg. "Scan to chat with Alice (alice@example.org)" -->
-    <string name="qrshow_join_contact_hint">Naskenujte to a vytvorte kontakt s %1$s .</string>
+    <string name="qrshow_join_contact_hint">Naskenujte a vytvorte kontakt s %1$s .</string>
     <string name="qrshow_join_contact_no_connection_toast">Nie je pripojenie na internet, nedá sa nastaviť kód QR.</string>
     <string name="qraccount_ask_create_and_login">Vytvoriť novú e-mailovú adresu na „%1$s“ a prihlásiť sa tam?</string>
     <string name="qraccount_ask_create_and_login_another">Vytvorte novú e-mailovú adresu na „%1$s“ a prihláste sa tam?\n\nVáš existujúci účet nebude odstránený. Medzi položkami môžete prepínať pomocou položky „Prepnúť účet“.</string>
@@ -853,7 +863,7 @@
     <string name="global_menu_edit_redo_desktop">Znova</string>
     <string name="global_menu_edit_cut_desktop">Vystrihnúť</string>
     <string name="global_menu_edit_copy_desktop">Kopírovať</string>
-    <string name="global_menu_edit_paste_desktop">Vložiť</string>
+    <string name="global_menu_edit_paste_desktop">Prilepiť</string>
     <string name="global_menu_view_desktop">Zobraziť</string>
     <string name="global_menu_view_floatontop_desktop">Plávajúce okno navrchu</string>
     <string name="global_menu_view_developer_desktop">Vývojár</string>
@@ -931,4 +941,6 @@
     <string name="update_1_24_android">1.24 v skratke:\n\n• Uloženie klepnutím: Výber účtu v ľavom hornom rohu zoznamu četov\n• Uloženie viacerými klepnutiami: Dlhým klepnutím na ikonu aplikácie priamo otvoríte nedávne čety\n• Ušetrite premávku: sťahujte veľké súbory podľa potreby\n• Ušetrite nervy: rýchlejšie pripojenie QR kódu bez blokovania a nové možnosti kódu QR\n\nViac na 👉 </string>
     <string name="update_1_24_ios">1.24 v skratke:\n\n• Spustite vyhľadávanie v čete z profilu četu\n• Ušetrite premávku: sťahujte veľké súbory podľa potreby\n• Ušetrite nervy: rýchlejšie pripájanie na QR kódy bez blokovania\n\nViac na 👉</string>
     <string name="update_1_26">1.26 vylepšenia 💅\n\n• Po tom, čo boli QR kódy vo verzii 1.24 neblokovateľné, teraz vyzerajú oveľa krajšie – na všetkých platformách\n• Avatary a odznaky vyzerajú na všetkých platformách podobne\n• Opravených veľa chýb</string>
+    <string name="update_1_28_ios_extra_line">… a teraz môžete vybrať pozadie v ponuke \"Nastavenia / Pozadie\" :)</string>
+
 </resources>

res/values-sq/strings.xml

@@ -605,6 +605,8 @@
     <string name="pref_send_copy_to_self">Dërgojini kopje vetes</string>
     <string name="pref_auto_folder_moves">Lëvizje të Vetvetishme te dosja DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Bisedat zhvendosen, që të shmanget rrëmuja te dosja Të marrë</string>
+    <string name="pref_only_fetch_mvbox_title">Sill Vetëm nga Dosje DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Shpërfill dosje të tjera. Lyp që shërbyesi juaj të kalojë mesazhe fjalosjeje te dosje DeltaChat.</string>
     <string name="pref_show_emails">Shfaq email-e klasikë</string>
     <string name="pref_show_emails_no">Jo, vetëm fjalosje</string>
     <string name="pref_show_emails_accepted_contacts">Për kontakte të pranuar</string>
@@ -908,4 +910,7 @@
     <string name="update_1_24_android">1.24 me një vështrim:\n\n• Ruani prekje: Përzgjedhje llogarish te cepi i sipërm majtas i listës së fjalosjeve\n• Ruani më tepër prekje: Prekeni gjatë ikonën e aplikacionit që të hapen drejtpërsëdrejti fjalosje së fundi\n• Ruani trafik: Shkarkoni kartela të mëdha, sipas nevojës\n• Kurseni nervat: hyrje më të shpejta jo bllokuese, me kod QR dhe mundësi të reja kodi QR\n\nMë tepër te 👉</string>
     <string name="update_1_24_ios">1.24 me një vështrim:\n\n• Filloni një kërkim brenda fjalosjeje, që prej profilit të fjalosjes\n• Ruani trafik: Shkarkoni kartela të mëdha, sipas nevojës\n• Kurseni nervat: hyrje më të shpejta jo bllokuese, me kod QR dhe mundësi të reja kodi QR\n\nMë tepër te 👉</string>
     <string name="update_1_26">1.26 po lustrohen 💅\n\n• Pasi kodet QR u bënë jo bllokues, në 1.24, tani ata duken shumë të hijshëm - në krejt platformat\n• Avatarët dhe stemat duken të ngjashëm nëpër platforma të ndryshme\n• Plot ndreqje të metash</string>
+    <string name="update_1_28_android">1.28 Në pah:\n\n🔒 Fshehtëzim: Një mundësi e re eksperimentale për të mbajtur të fshehtëzuara në pajisjen tuaj kontaktet, të fshehtat dhe mesazhe tekst tuajt. E mundshme vetëm gjatë krijimi llogarish dhe importimi kartelash kopjeruajtjeje.\n\n📫 Shkruani te listë postimesh\n\n💫 Ujdisje fillestare më e shpejtë për më tepër shërbyes email-i dhe mundësi të thjeshtuara punimi në rrjet, për të parandaluar formësim të gabuar aksidentalisht\n\n🐜 U ndreqën mjaaaaaaft probleme të njoftuara nga përdoruesit</string>
+    <string name="update_1_28_ios_extra_line">… dhe ju tani mund të përzgjidhni një sfond që nga “Rregullime / Sfond” :)</string>
+
 </resources>

res/values-tr/strings.xml

@@ -596,7 +596,7 @@
     <string name="pref_managekeys_import_explain">Sır anahtarlar \"%1$s\" üzerinden içe aktarılsın mı?\n\n• Varolan sır anahtarlar silinmeyecek\n\n• Son içe aktarılan anahtar, dosya adında \"legacy\" sözcüğü olmadıkça yeni varsayılan anahtar olarak kullanılacak.</string>
     <string name="pref_managekeys_secret_keys_exported_to_x">Sır anahtarlar \"%1$s\" üzerine başarıyla yazıldı.</string>
     <string name="pref_managekeys_secret_keys_imported_from_x">Sır anahtarlar \"%1$s\" üzerinden içe aktarıldı.</string>
-    <string name="pref_background">Arka plan</string>
+    <string name="pref_background">Arka Plan</string>
     <string name="pref_background_btn_default">Varsayılan Görseli Kullan</string>
     <string name="pref_background_btn_gallery">Galeriden Seç</string>
     <string name="pref_imap_folder_handling">IMAP Klasör İşleme</string>
@@ -607,6 +607,8 @@
     <string name="pref_send_copy_to_self">Kendime Kopya Gönder</string>
     <string name="pref_auto_folder_moves">DeltaChat Klasörüne Otomatik Taşınsın</string>
     <string name="pref_auto_folder_moves_explain">Sohbet görüşmeleri, Gelen Kutusu\'ndaki dağınıklığı önlemek için taşınır</string>
+    <string name="pref_only_fetch_mvbox_title">Yalnızca DeltaChat Klasöründen Getir</string>
+    <string name="pref_only_fetch_mvbox_explain">Diğer klasörleri yoksay. Sunucunuzun sohbet iletilerini DeltaChat klasörüne taşımasını gerektirir.</string>
     <string name="pref_show_emails">Klasik E-Postaları Göster</string>
     <string name="pref_show_emails_no">Hayır, yalnızca sohbetler</string>
     <string name="pref_show_emails_accepted_contacts">Kabul edilen kişiler için</string>
@@ -911,4 +913,7 @@
     <string name="update_1_24_android">Bir bakışta 1.24:\n\n• Dokunmaları kaydedin: Sohbet listesinin sol üst köşesinden hesap seçimi\n• Daha fazla dokunmayı kaydedin: Son sohbetleri doğrudan açmak için uygulama simgesine uzun dokunun\n• Akışı kaydedin: Gerektiğinde büyük dosyaları indirin\n• Sinirleri kaydedin: Daha hızlı, engellenmeyen QR kod katılımları ve yeni QR kod seçenekleri\n\nDaha fazlası 👉</string>
     <string name="update_1_24_ios">Bir bakışta 1.24:\n\n• Sohbetin profilinden bir sohbet içi arama başlatın\n• \n• Akışı kaydedin: Gerektiğinde büyük dosyaları indirin\n• Sinirleri kaydedin: Daha hızlı, engellenmeyen QR kod katılımları\n\nDaha fazlası 👉</string>
     <string name="update_1_26">1.26\'dan öne çıkanlar 💅\n\n• 1.24\'te QR kodları engelsiz yaptıktan sonra, artık daha güzel görünüyorlar - tüm platformlarda\n• Avatarlar ve rozetler, platform genelinde benzer görünüyor\n• Hataların çoğu düzeltildi</string>
+    <string name="update_1_28_android">1.28 Öne Çıkanlar:\n\n🔒 Şifreleme: Kişilerinizi, şifreleme sırlarınızı ve metin iletilerinizi aygıtınızda şifreli tutmak için yeni bir deneysel seçenek. Yalnızca hesap oluşturma ve yedek dosyaları içe aktarma sırasında kullanılabilir.\n\n📫 Posta listelerine yazma\n\n💫 Daha fazla e-posta sunucusu için daha hızlı ilk kurulum ve kazara yanlış yapılandırmayı önlemek için düzenlenen ağ seçenekleri\n\n🐜 Kullanıcıların raporladığı çoğu sorun çözüldü</string>
+    <string name="update_1_28_ios_extra_line">… ve şimdi \"Ayarlar / Arka Plan\"dan bir duvar kâğıdı seçebilirsiniz :)</string>
+
 </resources>

res/values-uk/strings.xml

@@ -635,6 +635,8 @@
     <string name="pref_send_copy_to_self">Відправити копію собі</string>
     <string name="pref_auto_folder_moves">Автоматично пересувати до папки DeltaChat</string>
     <string name="pref_auto_folder_moves_explain">Чати були переміщені, щоб уникнути плутанини у папці «Вхідні».</string>
+    <string name="pref_only_fetch_mvbox_title">Збирати лише з теки DeltaChat.</string>
+    <string name="pref_only_fetch_mvbox_explain">Ігнорувати інші теки. Вимагає від вашого сервера переміщувати повідомлення чату до теки DeltaChat.</string>
     <string name="pref_show_emails">Показувати звичайну пошту</string>
     <string name="pref_show_emails_no">Ні, лише чати</string>
     <string name="pref_show_emails_accepted_contacts">Для прийнятих контактів</string>
@@ -939,4 +941,7 @@
     <string name="update_1_24_android">Коротко про 1.24:\n\n• Менше дотиків: вибір облікового запису у верхньому лівому куті списку чатів\n• Ще менше дотиків: затисніть значок програми, щоб безпосередньо відкрити останні чати\n• Заощадження трафіку: завантажуйте великий файли за потреби\n• Заощаджуйте нерви: швидше приєднання через QR-коду без блокування та нові параметри QR-коду\n\nДокладніше на 👉 </string>
     <string name="update_1_24_ios">Коротко 1.24:\n\n• Почніть пошук у чаті з профілю чату\n• Заощаджуйте трафік: завантажуйте великі файли за потреби\n• Збережіть нерви: швидший, неблокуючий QR-код\n\nДокладніше на 👉 </string>
     <string name="update_1_26">Відшліфовування версії 1.26💅\n\n• Після того, як ми зробили QR-код не блокуючим у версії 1.24, вони також виглядають набагато краще – на всіх платформах\n• Аватари та значки схожі на різних платформах\n• Виправлено багато помилок</string>
+    <string name="update_1_28_android">Основні моменти версії 1.28:\n\n🔒 Шифрування: новий експериментальний варіант для збереження ваших контактів, секретів шифрування та текстових повідомлень у зашифрованому вигляді на вашому пристрої. Доступно лише під час створення облікового запису та імпортування файлів резервної копії.\n\n📫 Списки розсилки\n\n💫 Швидше початкове налаштування для більшої кількості серверів електронної пошти та спрощених мережевих параметрів, щоб запобігти випадковому неправильному налаштуванню\n\n🐜 Виправлено багаааааато помилок, про які повідомляли користувачі</string>
+    <string name="update_1_28_ios_extra_line">... і тепер ви можете обрати шпалери у \"Налаштування/Фон\":) </string>
+
 </resources>

res/values-zh-rCN/strings.xml

@@ -172,7 +172,7 @@
     <!-- consider keeping the term "broadcast"; check how these lists are called eg. on whatsapp in the destination language -->
     <string name="broadcast_list">广播列表</string>
     <string name="broadcast_lists">广播列表</string>
-    <string name="new_broadcast_list">新的广播列表</string>
+    <string name="new_broadcast_list">新建广播列表</string>
     <string name="add_recipients">添加收信人</string>
     <string name="menu_send">发送</string>
     <string name="menu_toggle_keyboard">切换 emoji 键盘</string>
@@ -223,7 +223,7 @@
     <string name="menu_edit_name">编辑名称</string>
     <string name="menu_settings">设置</string>
     <string name="menu_advanced">高级</string>
-    <string name="menu_view_profile"> 查看概要</string>
+    <string name="menu_view_profile">查看概要</string>
     <string name="menu_zoom_in">放大</string>
     <string name="menu_zoom_out">缩小</string>
     <string name="menu_save_log">保存日志</string>
@@ -367,7 +367,7 @@
 
     <!-- webxdc -->
     <!-- "Start..." button for an app -->
-    <string name="start_app">启动…</string>
+    <string name="start_app">开始…</string>
     <!-- this is a warning that is shown when one tries to send something to a chat that is not yet accepted. -->
     <string name="accept_request_first">请先接受聊天请求</string>
 
@@ -439,7 +439,7 @@
     <string name="connectivity_connected">已连接</string>
     <string name="sending">发送中…</string>
     <string name="last_msg_sent_successfully">上一条消息发送成功。</string>
-    <string name="not_supported_by_provider">你的邮件供应商不支持</string>
+    <string name="not_supported_by_provider">不被您的邮件提供商支持。</string>
     <!-- Used as a subtitle in quota context of "Connetivity" view. Should be be plural always, no number is prefixed or so. -->
     <string name="messages">消息</string>
     <!-- Used for describing resource usage, resulting string will be eg. "1.2 GiB of 3 GiB used" -->
@@ -473,8 +473,8 @@
     <string name="login_socks5_user">SOCKS5 用户名</string>
     <string name="login_socks5_password">SOCKS5 密码</string>
     <!-- Translators: %1$s will be replaced by an e-mail address -->
-    <string name="login_oauth2_checking_addr">检查 %1$s 中</string>
-    <string name="login_info_oauth2_title">使用简化设置继续？</string>
+    <string name="login_oauth2_checking_addr">正在检查 %1$s</string>
+    <string name="login_info_oauth2_title">使用简易设置继续？</string>
     <string name="login_info_oauth2_text">输入的电子邮件地址支持简化设置（OAuth 2.0）。\n\n在下一步中，请允许 Delta Chat 充当您的“通过电子邮件聊天”应用程序。\n\n不存在 Delta Chat 服务器，您的数据保留于您的设备！</string>
     <string name="login_certificate_checks">证书检查</string>
     <string name="login_error_mail">请输入有效的电子邮件地址</string>
@@ -593,6 +593,8 @@
     <string name="pref_send_copy_to_self">给自己发送副本</string>
     <string name="pref_auto_folder_moves">自动移动至 DeltaChat 文件夹</string>
     <string name="pref_auto_folder_moves_explain">移动聊天对话以免弄乱收件箱</string>
+    <string name="pref_only_fetch_mvbox_title">只从 DeltaChat 文件夹获取</string>
+    <string name="pref_only_fetch_mvbox_explain">忽略其他文件夹。需要你的服务器将聊天消息移动到 DeltaChat 文件夹。</string>
     <string name="pref_show_emails">显示传统电子邮件</string>
     <string name="pref_show_emails_no">不显示，仅聊天</string>
     <string name="pref_show_emails_accepted_contacts">已接受的联系人</string>
@@ -608,9 +610,9 @@
     <string name="export_aborted">导出已中止。</string>
     <string name="auto_download_messages">自动下载消息</string>
     <!-- %1$s will be replaced by a human-readable number of bytes, eg. 32 KiB, 1 MiB -->
-    <string name="up_to_x">最多 %1$s</string>
-    <string name="up_to_x_most_worse_quality_images">最多 %1$s，分辨率最低的图像</string>
-    <string name="up_to_x_most_balanced_quality_images">最多 %1$s，分辨率最均衡图像</string>
+    <string name="up_to_x">%1$s 以下</string>
+    <string name="up_to_x_most_worse_quality_images">%1$s 以下，图像质量最差</string>
+    <string name="up_to_x_most_balanced_quality_images">%1$s 以下，图像质量最均衡</string>
     <string name="no_limit">无限制</string>
     <string name="download_failed">下载失败</string>
     <!-- %1$s will be replaced by a human-readable number of bytes, eg. 32 KiB, 1 MiB. Resulting string eg. "1 MiB message" -->
@@ -897,4 +899,7 @@
     <string name="update_1_24_android">1.24 版变化一览：\n\n• 省手：在聊天列表左上角进行帐号选择\n• 进一步省手：长按应用图标直接打开最近的聊天\n• 省流量：按需下载大文件\n• 省精力：更快、无阻塞的二维码加入与新的二维码选项\n\n更多信息见 👉</string>
     <string name="update_1_24_ios">1.24 版变化一览：\n\n• 从聊天概要进行聊天内搜索\n• 省流量：按需下载大文件\n• 省精力：更快、无阻塞的二维码加入\n\n更多信息见 👉</string>
     <string name="update_1_26">1.26 继续完善 💅\n\n• 在 1.24 版中不拦截二维码后，它们现在在所有平台上看起来都更好了\n• 头像和徽章在不同平台上看起来差不多\n• 修复了很多 bug</string>
+    <string name="update_1_28_android">1.28 版主要变化：\n\n🔒 加密：一个新的实验性选项，可以在你的设备上保加密存你的联系人、加密信息和短信。仅在帐户创建和导入备份文件时可用。\n\n📫写信给邮件列表\n\n💫更快地对更多电子邮件服务器进行初始化设置，简化网络选项以防止意外的错误配置\n\n🐜 修复了许多用户报告的问题</string>
+    <string name="update_1_28_ios_extra_line">… 另外，你现在可以在“设置/背景”处选择壁纸了 :)</string>
+
 </resources>

res/values/arrays.xml

@@ -31,6 +31,7 @@
       <!-- sc     Sardinian -->              <item>Sardu</item>
       <!-- sq     Albanian -->               <item>Shqip</item>
       <!-- sk     Slovak -->                 <item>Slovenčina</item>
+      <!-- fi     Finnish -->                <item>Suomi</item>
       <!-- sv     Swedish -->                <item>Svenska</item>
       <!-- tr     Turkish -->                <item>Türkçe</item>
       <!-- ru     Russian -->                <item>Pусский</item>
@@ -75,6 +76,7 @@
       <item>sc</item>
       <item>sq</item>
       <item>sk</item>
+      <item>fi</item>
       <item>sv</item>
       <item>tr</item>
       <item>ru</item>

res/values/strings.xml

@@ -607,6 +607,8 @@
     <string name="pref_send_copy_to_self">Send Copy to Self</string>
     <string name="pref_auto_folder_moves">Automatic Moves to DeltaChat Folder</string>
     <string name="pref_auto_folder_moves_explain">Chat conversations are moved to avoid cluttering the Inbox</string>
+    <string name="pref_only_fetch_mvbox_title">Only Fetch from DeltaChat Folder</string>
+    <string name="pref_only_fetch_mvbox_explain">Ignore other folders. Requires your server to move chat messages to the DeltaChat folder.</string>
     <string name="pref_show_emails">Show Classic E-Mails</string>
     <string name="pref_show_emails_no">No, chats only</string>
     <string name="pref_show_emails_accepted_contacts">For accepted contacts</string>
@@ -911,4 +913,7 @@
     <string name="update_1_24_android">1.24 at a glance:\n\n• Save taps: Account selection in the upper left corner of the chat list\n• Save more taps: Long-tap the app icon to open recent chats directly\n• Save traffic: Download large files as needed\n• Save nerves: faster, non-blocking QR code joins and new QR code options\n\nMore at 👉</string>
     <string name="update_1_24_ios">1.24 at a glance:\n\n• Start an in-chat search from the chat\'s profile\n• Save traffic: Download large files as needed\n• Save nerves: faster, non-blocking QR code joins\n\nMore at 👉</string>
     <string name="update_1_26">1.26 polishing 💅\n\n• After making the QR codes non-blocking in 1.24, they also look much nicer now - on all platforms\n• Avatars and badges look similar across platform\n• Lots of bugs fixed</string>
+    <string name="update_1_28_android">1.28 Highlights:\n\n🔒 Encryption: A new experimental option for keeping your contacts, encryption secrets and text messages encrypted on your device. Only available on account creation and importing backup files.\n\n📫 Write to mailing list\n\n💫 Faster initial setup for more e-mail servers and streamlined networking options to prevent accidental misconfiguration\n\n🐜 Maaaaaany user-reported issues fixed</string>
+    <string name="update_1_28_ios_extra_line">… and you can select a wallpaper at \"Settings / Background\" now :)</string>
+
 </resources>

res/values/styles.xml

@@ -54,6 +54,7 @@
     <style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@color/white</item>
         <item name="android:textColorHint">#BFffffff</item>
+        <item name="android:textSize">20dp</item>
     </style>
 
     <style name="TextSecure.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">

res/xml/preferences_advanced.xml

@@ -36,6 +36,12 @@
             android:title="@string/pref_auto_folder_moves"
             android:summary="@string/pref_auto_folder_moves_explain"/>
 
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_only_fetch_mvbox"
+            android:title="@string/pref_only_fetch_mvbox_title"
+            android:summary="@string/pref_only_fetch_mvbox_explain" />
+
     </PreferenceCategory>
 
 

src/com/b44t/messenger/DcContext.java

@@ -199,7 +199,7 @@ public class DcContext {
     public native int          sendTextMsg          (int chat_id, String text);
     public native int          sendVideochatInvitation(int chat_id);
     public native boolean      sendWebxdcStatusUpdate(int msg_id, String payload, String descr);
-    public native String       getWebxdcStatusUpdates(int msg_id, int status_update_id);
+    public native String       getWebxdcStatusUpdates(int msg_id, int last_known_serial);
     public native int          addDeviceMsg         (String label, DcMsg msg);
     public native boolean      wasDeviceMsgEverAdded(String label);
     public DcLot               checkQr              (String qr) { return new DcLot(checkQrCPtr(qr)); }

src/org/thoughtcrime/securesms/ConversationActivity.java

@@ -325,6 +325,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       initializeDraft();
       doReinitializeDraft = false;
     }
+
+    attachmentManager.onResume();
   }
 
   @Override

src/org/thoughtcrime/securesms/ConversationFragment.java

@@ -16,6 +16,9 @@
  */
 package org.thoughtcrime.securesms;
 
+import static com.b44t.messenger.DcContact.DC_CONTACT_ID_SELF;
+import static org.thoughtcrime.securesms.util.RelayUtil.setForwardingMessageIds;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
@@ -77,10 +80,6 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static com.b44t.messenger.DcContact.DC_CONTACT_ID_SELF;
-import static org.thoughtcrime.securesms.util.RelayUtil.REQUEST_RELAY;
-import static org.thoughtcrime.securesms.util.RelayUtil.setForwardingMessageIds;
-
 @SuppressLint("StaticFieldLeak")
 public class ConversationFragment extends MessageSelectorFragment
 {
@@ -433,10 +432,10 @@ public class ConversationFragment extends MessageSelectorFragment
     }
 
     private void handleForwardMessage(final Set<DcMsg> messageRecords) {
-        Intent composeIntent = new Intent(getActivity(), ConversationListActivity.class);
+        Intent composeIntent = new Intent();
         int[] msgIds = DcMsg.msgSetToIds(messageRecords);
         setForwardingMessageIds(composeIntent, msgIds);
-        startActivityForResult(composeIntent, REQUEST_RELAY);
+        ConversationListRelayingActivity.start(this, composeIntent);
         getActivity().overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
     }
 
@@ -670,7 +669,7 @@ public class ConversationFragment extends MessageSelectorFragment
         int index = 0;
         for(int pos = firstPos; pos <= lastPos; pos++) {
             DcMsg message = ((ConversationAdapter) list.getAdapter()).getMsg(pos);
-            if (message.getFromId() != DC_CONTACT_ID_SELF && !message.isSeen()) {
+            if (message.getFromId() != DC_CONTACT_ID_SELF) {
                 ids[index] = message.getId();
                 index++;
             }
@@ -779,7 +778,7 @@ public class ConversationFragment extends MessageSelectorFragment
             else if(DozeReminder.isDozeReminderMsg(getContext(), messageRecord)) {
                 DozeReminder.dozeReminderTapped(getContext());
             }
-            else if(messageRecord.isInfo() && messageRecord.getParent() != null) {
+            else if(messageRecord.isInfo() && messageRecord.getParent() != null && messageRecord.getParent().getType() == DcMsg.DC_MSG_WEBXDC) {
                 scrollMaybeSmoothToMsgId(messageRecord.getParent().getId());
             }
             else {

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -466,7 +466,7 @@ public class ConversationItem extends BaseConversationItem
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
 
-      webxdcViewStub.get().setWebxdc(messageRecord);
+      webxdcViewStub.get().setWebxdc(messageRecord, "Webxdc");
       webxdcViewStub.get().setWebxdcClickListener(new ThumbnailClickListener());
       webxdcViewStub.get().setOnLongClickListener(passthroughClickListener);
 

src/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -98,12 +98,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     // it is not needed to keep all past update messages, however, when deleted, also the strings should be deleted.
     DcContext dcContext = DcHelper.getContext(this);
     DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-    msg.setText(getString(R.string.update_1_24_android) + " https://delta.chat/en/blog");
-    dcContext.addDeviceMsg("update_1_24n_android", msg); // addDeviceMessage() makes sure, messages with the same id are not added twice
-
-    msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-    msg.setText(getString(R.string.update_1_26));
-    dcContext.addDeviceMsg("update_1_26c_android", msg); // addDeviceMessage() makes sure, messages with the same id are not added twice
+    msg.setText(getString(R.string.update_1_28_android));
+    dcContext.addDeviceMsg("update_1_28e_android", msg); // addDeviceMessage() makes sure, messages with the same id are not added twice
 
     // create view
     setContentView(R.layout.conversation_list_activity);

src/org/thoughtcrime/securesms/ConversationListRelayingActivity.java

@@ -0,0 +1,37 @@
+package org.thoughtcrime.securesms;
+
+import static org.thoughtcrime.securesms.util.RelayUtil.REQUEST_RELAY;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+
+import androidx.fragment.app.Fragment;
+
+/**
+ * "Relaying" means "Forwarding or Sharing".
+ *
+ * When forwarding or sharing, we show the ConversationListActivity to the user.
+ * However, ConversationListActivity has `launchMode="singleTask"`, which means that this will
+ * destroy the existing ConversationListActivity.
+ *
+ * In API 20-29, `startActivityForResult()` could be used instead of `startActivity()`
+ * to override this behavior and get two instances of ConversationListActivity.
+ *
+ * As this is not possible anymore starting with API 30, we needed another solution, and created
+ * this activity here.
+ *
+ * See https://github.com/deltachat/deltachat-android/issues/1704.
+ */
+
+public class ConversationListRelayingActivity extends ConversationListActivity {
+  public static void start(Fragment fragment, Intent intent) {
+    intent.setComponent(new ComponentName(fragment.getContext(), ConversationListRelayingActivity.class));
+    fragment.startActivityForResult(intent, REQUEST_RELAY);
+  }
+
+  public static void start(Activity activity, Intent intent) {
+    intent.setComponent(new ComponentName(activity, ConversationListRelayingActivity.class));
+    activity.startActivityForResult(intent, REQUEST_RELAY);
+  }
+}

src/org/thoughtcrime/securesms/CreateProfileActivity.java

@@ -10,7 +10,6 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -27,6 +26,8 @@ import androidx.annotation.NonNull;
 import androidx.loader.app.LoaderManager;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.transition.Transition;
 import com.soundcloud.android.crop.Crop;
 
 import org.thoughtcrime.securesms.components.AvatarSelector;
@@ -48,12 +49,12 @@ import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.SecureRandom;
 
+
 @SuppressLint("StaticFieldLeak")
 public class CreateProfileActivity extends BaseActionBarActivity implements EmojiKeyboardProvider.EmojiEventListener {
 
@@ -74,8 +75,10 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
   private View                   reveal;
 
   private boolean fromWelcome;
+  private boolean avatarChanged;
+  private boolean imageLoaded;
 
-  private byte[] avatarBytes;
+  private Bitmap avatarBmp;
   private AttachmentManager attachmentManager;
 
 
@@ -94,6 +97,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
     getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
 
     attachmentManager = new AttachmentManager(this, () -> {});
+    avatarChanged = false;
     initializeResources();
     initializeEmojiInput();
     initializeProfileName();
@@ -170,49 +174,38 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
 
       case Crop.REQUEST_CROP:
         if (resultCode == Activity.RESULT_OK) {
-
-          new AsyncTask<Void, Void, byte[]>() {
-            @Override
-            protected byte[] doInBackground(Void... params) {
-              try {
-                try {
-                  Uri imageUri = Crop.getOutput(data);
-                  Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), imageUri);
-                  ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                  bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
-                  return stream.toByteArray();
-                } catch (Exception any) {
-                  Log.e(TAG, "could not send raw JPG to core. Using scaled JPG.", any);
-                }
-                BitmapUtil.ScaleResult result =
-                    BitmapUtil.createScaledBytes(CreateProfileActivity.this, Crop.getOutput(data), new ProfileMediaConstraints());
-                return result.getBitmap();
-              } catch (BitmapDecodingException e) {
-                Log.w(TAG, e);
-                return null;
-              }
-            }
-
-            @Override
-            protected void onPostExecute(byte[] result) {
-              if (result != null) {
-                avatarBytes = result;
-                GlideApp.with(CreateProfileActivity.this)
-                        .load(avatarBytes)
-                        .skipMemoryCache(true)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .circleCrop()
-                        .into(avatar);
-              } else {
-                Toast.makeText(CreateProfileActivity.this, R.string.error, Toast.LENGTH_LONG).show();
-              }
-            }
-          }.execute();
+          setAvatarView(data);
         }
         break;
     }
   }
 
+  private void setAvatarView(Intent data) {
+    final Uri output = Crop.getOutput(data);
+    final ProfileMediaConstraints constraints = new ProfileMediaConstraints();
+    GlideApp.with(this)
+            .asBitmap()
+            .load(output)
+            .skipMemoryCache(true)
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .centerCrop()
+            .override(constraints.getImageMaxWidth(this), constraints.getImageMaxHeight(this))
+        .into(new SimpleTarget<Bitmap>() {
+              @Override
+              public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
+                avatarChanged = true;
+                imageLoaded = true;
+                avatarBmp = resource;
+              }
+            });
+    GlideApp.with(this)
+            .load(output)
+            .circleCrop()
+            .skipMemoryCache(true)
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .into(avatar);
+  }
+
   private void onFileSelected(Uri inputFile) {
     Uri outputFile = Uri.fromFile(new File(getCacheDir(), "cropped"));
     if (inputFile == null) {
@@ -232,13 +225,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
     this.reveal       = ViewUtil.findById(this, R.id.reveal);
     this.statusView   = ViewUtil.findById(this, R.id.status_text);
 
-    this.avatar.setImageDrawable(new ResourceContactPhoto(R.drawable.ic_camera_alt_white_24dp).asDrawable(this, getResources().getColor(R.color.grey_400)));
-
-    this.avatar.setOnClickListener(view ->
-            new AvatarSelector(this, LoaderManager.getInstance(this), new AvatarSelectedListener(), avatarBytes != null)
-                    .show(this, avatar)
-    );
-
     passwordAccountSettings.setOnClickListener(view -> {
       Intent intent = new Intent(this, RegistrationActivity.class);
       startActivity(intent);
@@ -264,32 +250,21 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
   }
 
   private void initializeProfileAvatar() {
-    String address = DcHelper.get(this, DcHelper.CONFIG_ADDRESS);
-
-    if (AvatarHelper.getSelfAvatarFile(this).exists() && AvatarHelper.getSelfAvatarFile(this).length() > 0) {
-      new AsyncTask<Void, Void, byte[]>() {
-        @Override
-        protected byte[] doInBackground(Void... params) {
-          try {
-            return Util.readFully(new FileInputStream(AvatarHelper.getSelfAvatarFile(CreateProfileActivity.this)));
-          } catch (IOException e) {
-            Log.w(TAG, e);
-            return null;
-          }
-        }
-
-        @Override
-        protected void onPostExecute(byte[] result) {
-          if (result != null) {
-            avatarBytes = result;
-            GlideApp.with(CreateProfileActivity.this)
-                    .load(result)
-                    .circleCrop()
-                    .into(avatar);
-          }
-        }
-      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    File avatarFile = AvatarHelper.getSelfAvatarFile(this);
+    if (avatarFile.exists() && avatarFile.length() > 0) {
+      imageLoaded = true;
+      GlideApp.with(this)
+              .load(avatarFile)
+              .circleCrop()
+              .into(avatar);
+    } else {
+      imageLoaded = false;
+      avatar.setImageDrawable(new ResourceContactPhoto(R.drawable.ic_camera_alt_white_24dp).asDrawable(this, getResources().getColor(R.color.grey_400)));
     }
+    avatar.setOnClickListener(view ->
+            new AvatarSelector(this, LoaderManager.getInstance(this), new AvatarSelectedListener(), imageLoaded)
+                    .show(this, avatar)
+    );
   }
 
 
@@ -337,12 +312,14 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
         DcHelper.set(context, DcHelper.CONFIG_DISPLAY_NAME, name);
         setStatusText();
 
-        try {
-          AvatarHelper.setSelfAvatar(CreateProfileActivity.this, avatarBytes);
-          Prefs.setProfileAvatarId(CreateProfileActivity.this, new SecureRandom().nextInt());
-        } catch (IOException e) {
-          Log.w(TAG, e);
-          return false;
+        if (avatarChanged) {
+          try {
+            AvatarHelper.setSelfAvatar(CreateProfileActivity.this, avatarBmp);
+            Prefs.setProfileAvatarId(CreateProfileActivity.this, new SecureRandom().nextInt());
+          } catch (IOException e) {
+            Log.w(TAG, e);
+            return false;
+          }
         }
 
         return true;
@@ -378,7 +355,9 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
           AttachmentManager.selectImage(CreateProfileActivity.this, REQUEST_CODE_AVATAR);
           break;
         case AvatarSelector.REMOVE_PHOTO:
-          avatarBytes = null;
+          avatarBmp = null;
+          imageLoaded = false;
+          avatarChanged = true;
           avatar.setImageDrawable(new ResourceContactPhoto(R.drawable.ic_camera_alt_white_24dp).asDrawable(CreateProfileActivity.this, getResources().getColor(R.color.grey_400)));
           break;
         case AvatarSelector.TAKE_PHOTO:

src/org/thoughtcrime/securesms/ShareActivity.java

@@ -17,7 +17,6 @@
 
 package org.thoughtcrime.securesms;
 
-import static org.thoughtcrime.securesms.util.RelayUtil.REQUEST_RELAY;
 import static org.thoughtcrime.securesms.util.RelayUtil.setSharedText;
 
 import android.Manifest;
@@ -263,11 +262,13 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement
     if (chatId != -1) {
       composeIntent = getBaseShareIntent(ConversationActivity.class);
       composeIntent.putExtra(EXTRA_CHAT_ID, chatId);
+      RelayUtil.setSharedUris(composeIntent, resolvedExtras);
+      startActivity(composeIntent);
     } else {
-      composeIntent = getBaseShareIntent(ConversationListActivity.class);
+      composeIntent = getBaseShareIntent(ConversationListRelayingActivity.class);
+      RelayUtil.setSharedUris(composeIntent, resolvedExtras);
+      ConversationListRelayingActivity.start(this, composeIntent);
     }
-    RelayUtil.setSharedUris(composeIntent, resolvedExtras);
-    startActivityForResult(composeIntent, REQUEST_RELAY);
     // We use startActivityForResult() here so that the conversations list is correctly updated. (hide "Device messages", ...)a
     // With startActivity() the list was not always updated before and after sharing and incorrectly showed or did not show the device talk.
     finish();

src/org/thoughtcrime/securesms/WebxdcActivity.java

@@ -70,13 +70,15 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
     webSettings.setGeolocationEnabled(false);
     webSettings.setAllowFileAccessFromFileURLs(false);
     webSettings.setAllowUniversalAccessFromFileURLs(false);
+    webSettings.setDatabaseEnabled(true);
+    webSettings.setDomStorageEnabled(true);
     webView.addJavascriptInterface(new InternalJSApi(), "InternalJSApi");
 
     // `msg_id` in the subdomain makes sure, different apps using same files do not share the same cache entry
     // (WebView may use a global cache shared across objects).
     // (a random-id would also work, but would need maintenance and does not add benefits as we regard the file-part interceptRequest() only,
     // also a random-id is not that useful for debugging)
-    webView.loadUrl("webxdc://msg" + appMessageId + ".localhost/index.html");
+    webView.loadUrl("https://acc" + dcContext.getAccountId() + "-msg" + appMessageId + ".localhost/index.html");
 
     Util.runOnAnyBackgroundThread(() -> {
       JSONObject info = this.dcAppMsg.getWebxdcInfo();
@@ -147,7 +149,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
     int eventId = event.getId();
     if ((eventId == DcContext.DC_EVENT_WEBXDC_STATUS_UPDATE && event.getData1Int() == dcAppMsg.getId())) {
       Log.i(TAG, "handleEvent");
-      webView.loadUrl("javascript:window.__webxdcUpdate(" + event.getData2Int() + ");");
+      webView.loadUrl("javascript:window.__webxdcUpdate();");
     }
   }
 
@@ -182,9 +184,9 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
     }
 
     @JavascriptInterface
-    public String getStatusUpdates(int statusUpdateId) {
+    public String getStatusUpdates(int lastKnownSerial) {
       Log.i(TAG, "getStatusUpdates");
-      return WebxdcActivity.this.dcContext.getWebxdcStatusUpdates(WebxdcActivity.this.dcAppMsg.getId(), statusUpdateId);
+      return WebxdcActivity.this.dcContext.getWebxdcStatusUpdates(WebxdcActivity.this.dcAppMsg.getId(), lastKnownSerial    );
     }
   }
 }

src/org/thoughtcrime/securesms/components/WebxdcView.java

@@ -55,7 +55,7 @@ public class WebxdcView extends FrameLayout {
     this.viewListener = listener;
   }
 
-  public void setWebxdc(final @NonNull DcMsg dcMsg)
+  public void setWebxdc(final @NonNull DcMsg dcMsg, String defaultSummary)
   {
     try {
       JSONObject info = dcMsg.getWebxdcInfo();
@@ -76,7 +76,7 @@ public class WebxdcView extends FrameLayout {
       // subtitle
       String summary = info.optString("summary");
       if (summary.isEmpty()) {
-        summary = Util.getPrettyFileSize(dcMsg.getFilebytes()) + " Webxdc";
+        summary = defaultSummary;
       }
       appSubtitle.setText(summary);
     } catch (Exception e) {

src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java

@@ -7,7 +7,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 import android.text.InputFilter;
 import android.util.AttributeSet;
-import android.view.inputmethod.EditorInfo;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
@@ -30,7 +29,6 @@ public class EmojiEditText extends AppCompatEditText {
     if (!Prefs.isSystemEmojiPreferred(getContext())) {
       setFilters(appendEmojiFilter(this.getFilters()));
     }
-    setImeOptions(getImeOptions() | EditorInfo.IME_FLAG_NO_FULLSCREEN);
   }
 
   public void insertEmoji(String emoji) {

src/org/thoughtcrime/securesms/connect/DcHelper.java

@@ -58,6 +58,7 @@ public class DcHelper {
     public static final String CONFIG_SENTBOX_WATCH = "sentbox_watch";
     public static final String CONFIG_MVBOX_WATCH = "mvbox_watch";
     public static final String CONFIG_MVBOX_MOVE = "mvbox_move";
+    public static final String CONFIG_ONLY_FETCH_MVBOX = "only_fetch_mvbox";
     public static final String CONFIG_BCC_SELF = "bcc_self";
     public static final String CONFIG_SHOW_EMAILS = "show_emails";
     public static final String CONFIG_MEDIA_QUALITY = "media_quality";
@@ -200,7 +201,11 @@ public class DcHelper {
     dcContext.setStockTranslation(117, context.getString(R.string.secure_join_started));
     dcContext.setStockTranslation(118, context.getString(R.string.secure_join_replies));
     dcContext.setStockTranslation(119, context.getString(R.string.qrshow_join_contact_hint));
-    dcContext.setStockTranslation(120, context.getString(R.string.qrshow_join_group_hint));
+
+    // HACK: svg does not handle entities correctly and shows `"` as the text `quot;`.
+    // until that is fixed, we fix the most obvious errors (core uses encode_minimal, so this does not affect so many characters)
+    // cmp. https://github.com/deltachat/deltachat-android/issues/2187
+    dcContext.setStockTranslation(120, context.getString(R.string.qrshow_join_group_hint).replace("\"", ""));
   }
 
   public static File getImexDir() {

src/org/thoughtcrime/securesms/mms/AttachmentManager.java

@@ -309,7 +309,7 @@ public class AttachmentManager {
           } else if (slide.hasDocument()) {
             if (slide.isWebxdcDocument()) {
               DcMsg instance = msg != null ? msg : DcHelper.getContext(context).getMsg(slide.dcMsgId);
-              webxdcView.setWebxdc(instance);
+              webxdcView.setWebxdc(instance, context.getString(R.string.videochat_tap_to_open));
               webxdcView.setWebxdcClickListener((v, s) -> {
                 WebxdcActivity.openWebxdcActivity(context, instance);
               });
@@ -399,6 +399,18 @@ public class AttachmentManager {
     return result;
   }
 
+  // should be called when the attachement manager comes into view again.
+  // if the attachment manager contains a webxdc, its summary is updated.
+  public void onResume() {
+    if (slide.isPresent()) {
+      if (slide.get().isWebxdcDocument()) {
+        if (webxdcView != null) {
+          webxdcView.setWebxdc(DcHelper.getContext(context).getMsg(slide.get().dcMsgId), context.getString(R.string.videochat_tap_to_open));
+        }
+      }
+    }
+  }
+
   public boolean isAttachmentPresent() {
     return attachmentViewStub.resolved() && attachmentViewStub.get().getVisibility() == View.VISIBLE;
   }

src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java

@@ -1,5 +1,13 @@
 package org.thoughtcrime.securesms.preferences;
 
+import static android.app.Activity.RESULT_OK;
+import static android.text.InputType.TYPE_TEXT_VARIATION_URI;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_BCC_SELF;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_E2EE_ENABLED;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MVBOX_MOVE;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ONLY_FETCH_MVBOX;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SENTBOX_WATCH;
+
 import android.Manifest;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -32,13 +40,6 @@ import org.thoughtcrime.securesms.util.ScreenLockUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.views.ProgressDialog;
 
-import static android.app.Activity.RESULT_OK;
-import static android.text.InputType.TYPE_TEXT_VARIATION_URI;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_BCC_SELF;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_E2EE_ENABLED;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MVBOX_MOVE;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SENTBOX_WATCH;
-
 
 public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
                                         implements DcEventCenter.DcEventDelegate
@@ -52,6 +53,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
   CheckBoxPreference sentboxWatchCheckbox;
   CheckBoxPreference bccSelfCheckbox;
   CheckBoxPreference mvboxMoveCheckbox;
+  CheckBoxPreference onlyFetchMvboxCheckbox;
 
   @Override
   public void onCreate(Bundle paramBundle) {
@@ -82,10 +84,21 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
     mvboxMoveCheckbox = (CheckBoxPreference) this.findPreference("pref_mvbox_move");
     mvboxMoveCheckbox.setOnPreferenceChangeListener((preference, newValue) -> {
       boolean enabled = (Boolean) newValue;
+      DcHelper.getAccounts(getContext()).stopIo();
       dcContext.setConfigInt(CONFIG_MVBOX_MOVE, enabled? 1 : 0);
+      DcHelper.getAccounts(getContext()).startIo();
       return true;
     });
 
+    onlyFetchMvboxCheckbox = this.findPreference("pref_only_fetch_mvbox");
+    onlyFetchMvboxCheckbox.setOnPreferenceChangeListener(((preference, newValue) -> {
+      boolean enabled = (Boolean) newValue;
+      DcHelper.getAccounts(getContext()).stopIo();
+      dcContext.setConfigInt(CONFIG_ONLY_FETCH_MVBOX, enabled? 1 : 0);
+      DcHelper.getAccounts(getContext()).startIo();
+      return true;
+    }));
+
     Preference manageKeys = this.findPreference("pref_manage_keys");
     manageKeys.setOnPreferenceClickListener(new ManageKeysListener());
 
@@ -137,6 +150,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
     sentboxWatchCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_SENTBOX_WATCH));
     bccSelfCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_BCC_SELF));
     mvboxMoveCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_MVBOX_MOVE));
+    onlyFetchMvboxCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_ONLY_FETCH_MVBOX));
   }
 
   @Override

src/org/thoughtcrime/securesms/profiles/AvatarHelper.java

@@ -42,13 +42,13 @@ public class AvatarHelper {
         return new File(dirString);
     }
 
-    public static void setSelfAvatar(@NonNull Context context, @Nullable byte[] data) throws IOException {
-        if (data == null) {
+    public static void setSelfAvatar(@NonNull Context context, @Nullable Bitmap bitmap) throws IOException {
+        if (bitmap == null) {
             DcHelper.set(context, DcHelper.CONFIG_SELF_AVATAR, null);
         } else {
             File avatar = File.createTempFile("selfavatar", ".jpg", context.getCacheDir());
             FileOutputStream out = new FileOutputStream(avatar);
-            out.write(data);
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, out);
             out.close();
             DcHelper.set(context, DcHelper.CONFIG_SELF_AVATAR, avatar.getPath()); // The avatar is copied to the blobs directory here...
             //noinspection ResultOfMethodCallIgnored

src/org/thoughtcrime/securesms/search/SearchFragment.java

@@ -163,9 +163,7 @@ public class SearchFragment extends Fragment implements SearchListAdapter.EventL
     if (conversationList != null) {
       DcContext dcContext = DcHelper.getContext(getContext());
       int chatId = message.getChatId();
-      int msgId = message.getId();
       int startingPosition = DcMsg.getMessagePosition(message, dcContext);
-      int msgs[] = dcContext.getChatMsgs(chatId, 0, 0);
       conversationList.openConversation(chatId, startingPosition);
     }
   }

src/org/thoughtcrime/securesms/util/MediaUtil.java

@@ -82,6 +82,9 @@ public class MediaUtil {
     if (type == null) {
       final String extension = MimeTypeMap.getFileExtensionFromUrl(uri.toString());
       type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
+      if (type == null) {
+        type = "application/octet-stream";
+      }
     }
     return getCorrectedMimeType(type);
   }