update version number

* use string 'Saved Proxies' as header for proxy settings

'Connections' is a bit broad,
also there is only one connection.
'Saved Proxies' is also what Telegram is using.

* move proxy settings in 'Advanced' down

logically, this seems to be a better fit.
Account/Password is still the most important bit,
even if not directly needed in chatmail and Proxy is used more often.

* add proxy settings icon to main screen

* use 'cable' instead of 'shield'. things are rewired, but not more protected or secured.

.github/workflows/release.yml

@@ -54,13 +54,16 @@ jobs:
           echo "DC_RELEASE_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }}" >> ~/.gradle/gradle.properties
           echo "DC_RELEASE_KEY_ALIAS=${{ secrets.ALIAS }}" >> ~/.gradle/gradle.properties
           echo "DC_RELEASE_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> ~/.gradle/gradle.properties
-          ./gradlew --no-daemon assembleFossRelease
+          ./gradlew assembleFossRelease
+          rm build/outputs/apk/foss/release/*universal*
+          ./gradlew assembleGplayRelease
+          mv build/outputs/apk/gplay/release/*universal* build/outputs/apk/foss/release/ArcaneChat-gplay.apk
 
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
-          body: "If you don't know what APK file to download for your phone, download the one that has 'universal' in its name, it should work for all phones"
+          body: '[<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite) [<img src="store/get-it-on-IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="48">](https://apt.izzysoft.de/fdroid/index/apk/chat.delta.lite) [<img src="store/get-it-on-apklis.png" alt="Disponible en Apklis" height="48">](https://www.apklis.cu/application/chat.delta.lite) [<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)'
           prerelease: ${{ contains(github.event.ref, '-beta') }}
           fail_on_unmatched_files: true
           files: build/outputs/apk/foss/release/*.apk

CHANGELOG.md

@@ -1,4 +1,47 @@
-# Delta Chat Android Changelog
+# ArcaneChat Android Changelog
+
+## v1.46.15
+2024-09
+
+* new proxy settings screen available at "Advanced / Proxy"
+* manage a list of HTTP(S), SOCKS5 or Shadowsocks proxies
+* proxies icon shown on the chatlist if proxies are used
+* improve profile deletion dialog: show name, size and avatar of the profile being deleted
+* improve notification: allow to "Mark Read" from the notification
+* automatic reconfiguration, e.g. switching to implicit TLS if STARTTLS port stops working
+* parallelize IMAP and SMTP connection attempts
+* always use preloaded DNS results
+* always move auto-generated messages to DeltaChat folder
+* ignore invalid securejoin messages silently
+* delete messages from a chatmail server immediately by default
+* make resending pending messages possible
+* don't SMTP-send messages to self-chat if BccSelf is disabled
+* HTTP(S) tunneling
+* don't put displayname into From/To/Sender if it equals to address
+* hide sync messages from INBOX (use IMAP APPEND command to upload sync messages)
+* more verbose SMTP connection establishment errors
+* log unexpected message state when resending fails
+* fix: avoid app being killed when processing a PUSH notification
+* fix crash when refreshing avatar
+* fix crash in gallery
+* fix: shorten message text in locally sent messages too
+* fix: Set http I/O timeout to 1 minute rather than whole request timeout
+* fix: don't sync QR code token before populating the group
+* update to core 1.145.0
+
+
+## v1.46.14
+2024-09
+
+* add monochrome/themed launcher icon support
+* allow to remove the selected profile in "Switch Profile" dialog
+* improve display of selected profile in "Switch Profile" dialog
+* improve the hit/tap area to open "Switch Profile" dialog in the main screen's toolbar
+* add support for system per-app language and remove in-app language selector
+* remove the experimental "encrypt database" checkbox in classic registration screen
+* fix various bugs
+* update to core 1.142.12
+
 
 ## v1.46.13
 2024-08

README.md

@@ -2,15 +2,10 @@
 
 A [Delta Chat](https://delta.chat/) client for Android.
 
-[<img src="store/get-it-on-IzzyOnDroid.png"
-     alt="Get it on IzzyOnDroid"
-     height="48">](https://apt.izzysoft.de/fdroid/index/apk/chat.delta.lite)
-[<img src="store/get-it-on-apklis.png"
-     alt="Disponible en Apklis"
-     height="48">](https://www.apklis.cu/application/chat.delta.lite)
-[<img src="store/get-it-on-github.png"
-     alt="Get it on GitHub"
-     height="48">](https://github.com/ArcaneChat/android/releases/latest)
+[<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite)
+[<img src="store/get-it-on-IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="48">](https://apt.izzysoft.de/fdroid/index/apk/chat.delta.lite)
+[<img src="store/get-it-on-apklis.png" alt="Disponible en Apklis" height="48">](https://www.apklis.cu/application/chat.delta.lite)
+[<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)
 
 
 <img alt="Screenshot" src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="298" /> <img alt="Screenshot" src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="298" />

build.gradle

@@ -33,8 +33,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 30000688
-        versionName "1.46.16"
+        versionCode 30000691
+        versionName "1.46.19"
 
         applicationId "chat.delta.lite"
         multiDexEnabled true

jni/dc_wrapper.c

@@ -276,6 +276,12 @@ JNIEXPORT void Java_com_b44t_messenger_DcAccounts_setPushDeviceToken(JNIEnv *env
 }
 
 
+JNIEXPORT jboolean Java_com_b44t_messenger_DcAccounts_backgroundFetch(JNIEnv *env, jobject obj, jint timeout_seconds)
+{
+    return dc_accounts_background_fetch(get_dc_accounts(env, obj), timeout_seconds) != 0;
+}
+
+
 JNIEXPORT jint Java_com_b44t_messenger_DcAccounts_addAccount(JNIEnv *env, jobject obj)
 {
     return dc_accounts_add_account(get_dc_accounts(env, obj));

metadata/it/changelogs/6864.txt

@@ -0,0 +1,7 @@
+- nuovo inserimento: puoi creare un nuovo profilo con un tocco su "Crea Nuovo Profilo" - oppure utilizzare un accesso esistente o la configurazione del secondo dispositivo come al solito
+i contatti possono essere allegati come "Schede" in "Allega/Contatto"; quando il destinatario tocca le carte, è possibile stabilire la crittografia end-to-end garantita
+- aggiungi contatti manualmente in "Nuova Chat / Nuovo Contatto / Aggiungi Contatto Manualmente"
+ - invia qualsiasi emoji come reazione
+ - mostrare le reazioni nei riepiloghi
+ - blocca/archivia/ecc. le chat direttamente dai risultati di ricerca
+ - Risolti bug e altro ancora

metadata/it/changelogs/6904.txt

@@ -0,0 +1,4 @@
+- aggiungi un'opzione per contrassegnare tutte le chat selezionate come "Lette" (tocca a lungo una chat per avviare la modalità di selezione)
+ - i nuovi profili chatmail per dispositivo singolo hanno come impostazione predefinita "Elimina Messaggi Dopo il Download"
+ - quando si utilizza un profilo chatmail su più dispositivi, la cancellazione viene modificata in "Automatica" (la strategia di cancellazione dipende quindi dal server)
+ - Risolti bug e altro ancora

scripts/ndk-make.sh

@@ -51,8 +51,7 @@ if test -z "$ANDROID_NDK_ROOT"; then
 fi
 
 # for reproducible build:
-ROOT_DIR="$(realpath $(dirname $(dirname "$0")))"
-export RUSTFLAGS="-C link-args=-Wl,--build-id=none --remap-path-prefix=$HOME/.cargo= --remap-path-prefix=$ROOT_DIR="
+export RUSTFLAGS="-C link-args=-Wl,--build-id=none --remap-path-prefix=$HOME/.cargo= --remap-path-prefix=$(realpath $(dirname $(dirname "$0")))="
 export SOURCE_DATE_EPOCH=1
 export CARGO_TARGET_DIR=/tmp/arcanechat-build
 # always use the same path to NDK:

src/gplay/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java

@@ -17,7 +17,7 @@ import com.google.firebase.messaging.RemoteMessage;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.util.Prefs;
+import org.thoughtcrime.securesms.service.FetchForegroundService;
 import org.thoughtcrime.securesms.util.Util;
 
 public class FcmReceiveService extends FirebaseMessagingService {
@@ -92,18 +92,17 @@ public class FcmReceiveService extends FirebaseMessagingService {
     return prefixedToken;
   }
 
+  @WorkerThread
   @Override
   public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
     Log.i(TAG, "FCM push notification received");
-    // the app is running (again) now and fetching and notifications should be processed as usual.
-    // to support accounts that do not send PUSH notifications and for simplicity,
-    // we just let the app run as long as possible.
+    FetchForegroundService.start(this);
   }
 
   @Override
   public void onDeletedMessages() {
     Log.i(TAG, "FCM push notifications dropped");
-    // nothing special to do as we're running now and notifications should be processed as usual.
+    FetchForegroundService.start(this);
   }
 
   @Override

src/main/AndroidManifest.xml

@@ -262,6 +262,11 @@
         </intent-filter>
     </activity>
 
+    <activity android:name=".proxy.ProxySettingsActivity"
+              android:label="@string/proxy_settings"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".LogViewActivity"
               android:label="@string/pref_log_header"
               android:windowSoftInputMode="stateHidden"
@@ -388,6 +393,10 @@
         android:name=".service.GenericForegroundService"
         android:foregroundServiceType="dataSync" />
 
+    <service
+        android:name=".service.FetchForegroundService"
+        android:foregroundServiceType="dataSync" />
+
     <service
         android:name=".service.IPCAddAccountsService"
         android:foregroundServiceType="dataSync"

src/main/assets/help/cs/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#lze-znovu-použít-můj-stávající-soukromý-klíč">Lze znovu použít můj stávající soukromý klíč?</a></li>
+      <li><a href="#importkey">Lze znovu použít můj stávající soukromý klíč?</a></li>
       <li><a href="#nemohu-do-delta-chatu-zavést-můj-stávající-pgp-klíč">Nemohu do ArcaneChatu zavést můj stávající PGP klíč.</a></li>
       <li><a href="#security-audits">Was ArcaneChat independently audited for security vulnerabilities?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#proč-můžu-nastavit-sledování-složky-odeslané">Proč můžu nastavit sledování složky Odeslané?</a></li>
       <li><a href="#proč-mohu-zvolit-nesledovat-složku-deltachat">Proč mohu zvolit nesledovat složku DeltaChat?</a></li>
       <li><a href="#lze-delta-chat-používat-s-protonmail--tutanota--criptext">Lze ArcaneChat používat s Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#how-can-i-delete-my-account">How can I delete my account?</a></li>
+      <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#mám-zájem-o-technické-podrobnosti-kde-najdu-víc">Mám zájem o technické podrobnosti. Kde najdu víc?</a></li>
       <li><a href="#jak-je-financován-vývoj-delta-chatu">Jak je financován vývoj ArcaneChatu?</a></li>
     </ul>
@@ -1146,10 +1146,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="lze-znovu-použít-můj-stávající-soukromý-klíč">
+      <h3 id="importkey">
         
         
-          Lze znovu použít můj stávající soukromý klíč? <a href="#lze-znovu-použít-můj-stávající-soukromý-klíč" class="anchor"></a>
+          Lze znovu použít můj stávající soukromý klíč? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1277,7 +1277,7 @@ You can read the <a href="https://delta.chat/assets/blog/2019-first-security-rev
 and wait a moment until a QR code is shown</p>
   </li>
   <li>
-    <p>On the second device, <a href="https://get.delta.chat">install ArcaneChat</a></p>
+    <p>On the second device, <a href="https://github.com/ArcaneChat">install ArcaneChat</a></p>
   </li>
   <li>
     <p>On the second device, start ArcaneChat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
@@ -1379,7 +1379,7 @@ V tuto chvíli jsme zaměřeni na poskytování stabilní verze jako nativní ap
 významných obchodech (Google Play / iOS / Windows / macOS / Linux repositories) .</li>
   <li>Pokud nemáš dostatečná práva instalovat programy na svůj pracovní počítač, můžeš použít
 přenosnou verzi pro Windows nebo AppImage pro Linux. 
-Všechny softwarové balíčky jsou na <a href="https://get.delta.chat">get.delta.chat</a>.</li>
+Všechny softwarové balíčky jsou na <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1791,7 +1791,7 @@ pro složku Odeslané přes IMAP).</p>
 programu (např. Thunderbird) spolu s ArcaneChatem, a chtít z tohoto programu také 
 psát zprávy do hovorů ArcaneChatu.</p>
 
-<p>Nicméně doporučujeme používat ArcaneChat Desktop Client; ten lze stáhnout z <a href="https://get.delta.chat">get.delta.chat</a>. Možnost sledování složky “Odeslané”
+<p>Nicméně doporučujeme používat ArcaneChat Desktop Client; ten lze stáhnout z <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. Možnost sledování složky “Odeslané”
 může být v budoucnu zrušena. Byla totiž vytvořena v době, kdy ArcaneChat Desktop
 nebyl dostupný na všech platformách.</p>
     
@@ -1829,22 +1829,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="how-can-i-delete-my-account">
+      <h3 id="remove-account">
         
         
-          How can I delete my account? <a href="#how-can-i-delete-my-account" class="anchor"></a>
+          How can I delete my account? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>As you use an e-mail account for ArcaneChat,
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/cs/chatmail">3rd party chatmail server</a>.</p>
+
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
 how you can delete your account depends on your e-mail provider.
-We don’t have any control over your e-mail account,
+We don’t have any control over e-mail accounts at those providers,
 so unfortunately we can’t help you with that.</p>
 
-<p>If you want to keep the account,
+<p>If you want to continue using a classic e-mail account with other apps,
 but uninstall ArcaneChat,
-it is recommended to leave any group chat before uninstalling ArcaneChat.</p>
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="mám-zájem-o-technické-podrobnosti-kde-najdu-víc">
         

src/main/assets/help/de/help.html

@@ -55,7 +55,7 @@
       <li><a href="#wie-kann-ich-ende-zu-ende-verschlüsselung-und-löschen-von-nachrichten-sicherstellen">Wie kann ich Ende-zu-Ende-Verschlüsselung und Löschen von Nachrichten sicherstellen?</a></li>
       <li><a href="#pfs">Unterstützt ArcaneChat “Perfect Forward Secrecy”?</a></li>
       <li><a href="#ist-die-ende-zu-ende-verschlüsselung-von-delta-chat-genauso-sicher-wie-die-von-signal">Ist die Ende-zu-Ende-Verschlüsselung von ArcaneChat genauso sicher wie die von Signal?</a></li>
-      <li><a href="#kann-ich-meinen-existierenden-privaten-schlüssel-weiter-verwenden">Kann ich meinen existierenden privaten Schlüssel weiter verwenden?</a></li>
+      <li><a href="#importkey">Kann ich meinen existierenden privaten Schlüssel weiter verwenden?</a></li>
       <li><a href="#ich-kann-meinen-existierenden-pgp-schlüssel-nicht-in-delta-chat-importieren">Ich kann meinen existierenden PGP-Schlüssel nicht in ArcaneChat importieren.</a></li>
       <li><a href="#security-audits">Wurde ArcaneChat unabhängig auf Sicherheitslücken geprüft?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#warum-gibt-es-die-funktion-gesendet-ordner-beobachten">Warum gibt es die Funktion “Gesendet-Ordner beobachten”?</a></li>
       <li><a href="#warum-kann-ich-deltachat-ordner-beobachten-ausschalten">Warum kann ich “DeltaChat-Ordner beobachten” ausschalten?</a></li>
       <li><a href="#ist-delta-chat-kompatibel-mit-protonmail--tutanota--criptext">Ist ArcaneChat kompatibel mit Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#wie-kann-ich-mein-konto-löschen">Wie kann ich mein Konto löschen?</a></li>
+      <li><a href="#remove-account">Wie kann ich mein Konto löschen?</a></li>
       <li><a href="#ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos">Ich bin an technischen Details interessiert. Gibt es hierzu weitere Infos?</a></li>
       <li><a href="#wie-wird-delta-chat-finanziert">Wie wird ArcaneChat finanziert?</a></li>
     </ul>
@@ -1081,10 +1081,10 @@ vergangenen verschlüsselten Nachrichten hat.</p>
 <p>In jedem Fall verwendet die Ende-zu-Ende-Verschlüsselung von ArcaneChat eine <a href="#openpgp-secure">sichere Untermenge von OpenPGP</a>
 das [unabhängig sicherheitsgeprüft] wurde (../assets/blog/2019-first-security-review.pdf).</p>
     
-      <h3 id="kann-ich-meinen-existierenden-privaten-schlüssel-weiter-verwenden">
+      <h3 id="importkey">
         
         
-          Kann ich meinen existierenden privaten Schlüssel weiter verwenden? <a href="#kann-ich-meinen-existierenden-privaten-schlüssel-weiter-verwenden" class="anchor"></a>
+          Kann ich meinen existierenden privaten Schlüssel weiter verwenden? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1186,7 +1186,7 @@ Es wurden keine kritischen Probleme gefunden, aber zwei Probleme mit hohem Schwe
     <p>Gehen Sie auf dem ersten Gerät zu <strong>Einstellungen → Zweites Gerät hinzufügen</strong>, entsperren Sie den Bildschirm, falls erforderlich und warten Sie einen Moment, bis ein QR-Code angezeigt wird</p>
   </li>
   <li>
-    <p>Auf dem zweiten Gerät <a href="https://get.delta.chat">ArcaneChat installieren</a></p>
+    <p>Auf dem zweiten Gerät <a href="https://github.com/ArcaneChat">ArcaneChat installieren</a></p>
   </li>
   <li>
     <p>Auf dem zweiten Gerät ArcaneChat starten, “Als Zweitgerät hinzufügen” wählen und den QR-Code vom ersten Gerät scannen</p>
@@ -1267,7 +1267,7 @@ Verwenden Sie nach Möglichkeit ein Nicht-Gast-Netzwerk. Wenn Sie Zugriff auf de
 <ul>
   <li>Es gibt keine direkten Pläne, aber einige vorläufige Gedanken.</li>
   <li>Es gibt 2-3 Möglichkeiten, einen ArcaneChat Web-Client einzuführen, aber sie bedeuten alle immense Arbeit. Im Moment fokussieren wir uns darauf, stabile native Apps in den Appstores (Google Play/iOS/Windows/macOS/Linux repositories) anzubieten.</li>
-  <li>Sollten Sie einen Web-Client benötigen, weil Sie auf Ihrem Arbeitsrechner keine Software installieren dürfen, können Sie den Windows Desktop-Client bzw. Applmage für Linux nutzen. Sie finden diese unter <a href="https://get.delta.chat">get.delta.chat</a>.</li>
+  <li>Sollten Sie einen Web-Client benötigen, weil Sie auf Ihrem Arbeitsrechner keine Software installieren dürfen, können Sie den Windows Desktop-Client bzw. Applmage für Linux nutzen. Sie finden diese unter <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1612,7 +1612,7 @@ wenn Sie eine <a href="#signature">Signaturtext</a> einfügen.</p>
 
 <p>Der einzige Grund, den Gesendet-Ordner zu beobachten, ist, wenn Sie ein weiteres E-Mail-Programm (wie Thunderbird) mit demselben E-Mail-Account verwenden und die von dort versendeten Nachrichten in der Chat-Historie aufgeführt werden sollen.</p>
 
-<p>Wir empfehlen für diesen Zweck aber “ArcaneChat Desktop”; Sie können die App unter <a href="https://get.delta.chat">get.delta.chat</a> herunterladen. Möglicherweise wird die Option “Gesendet-Ordner beobachten” zukünftig wegfallen; sie kommt aus einer Zeit, als ArcaneChat Desktop noch nicht auf allen Plattformen zur Verfügung stand.</p>
+<p>Wir empfehlen für diesen Zweck aber “ArcaneChat Desktop”; Sie können die App unter <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a> herunterladen. Möglicherweise wird die Option “Gesendet-Ordner beobachten” zukünftig wegfallen; sie kommt aus einer Zeit, als ArcaneChat Desktop noch nicht auf allen Plattformen zur Verfügung stand.</p>
     
       <h3 id="warum-kann-ich-deltachat-ordner-beobachten-ausschalten">
         
@@ -1640,17 +1640,38 @@ wenn Sie eine <a href="#signature">Signaturtext</a> einfügen.</p>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-fähige E-Mail-Anwendung</a> herstellen</li>
 </ul>
     
-      <h3 id="wie-kann-ich-mein-konto-löschen">
+      <h3 id="remove-account">
         
         
-          Wie kann ich mein Konto löschen? <a href="#wie-kann-ich-mein-konto-löschen" class="anchor"></a>
+          Wie kann ich mein Konto löschen? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>Da Sie ein E-Mail-Konto für ArcaneChat verwenden, hängt von Ihrem E-Mail-Anbieter ab, wie Sie Ihr Konto löschen können. Wir haben keine Kontrolle über Ihr E-Mail-Konto, daher können wir Ihnen dabei leider nicht helfen.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/de/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Wenn Sie das Konto behalten, aber ArcaneChat deinstallieren möchten, ist es ratsam, aktive Gruppen zu verlassen, bevor Sie ArcaneChat deinstallieren.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="ich-bin-an-technischen-details-interessiert-gibt-es-hierzu-weitere-infos">
         

src/main/assets/help/en/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#can-i-reuse-my-existing-private-key">Can I reuse my existing private key?</a></li>
+      <li><a href="#importkey">Can I reuse my existing private key?</a></li>
       <li><a href="#i-cant-import-my-existing-pgp-key-into-delta-chat">I can’t import my existing PGP key into ArcaneChat.</a></li>
       <li><a href="#security-audits">Was ArcaneChat independently audited for security vulnerabilities?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#why-can-i-choose-to-watch-the-sent-folder">Why can I choose to watch the “Sent” folder?</a></li>
       <li><a href="#why-can-i-choose-not-to-watch-the-deltachat-folder">Why can I choose not to watch the DeltaChat folder?</a></li>
       <li><a href="#is-delta-chat-compatible-with-protonmail--tutanota--criptext">Is ArcaneChat compatible with Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#how-can-i-delete-my-account">How can I delete my account?</a></li>
+      <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#im-interested-in-the-technical-details-can-you-tell-me-more">I’m interested in the technical details. Can you tell me more?</a></li>
       <li><a href="#how-are-delta-chat-developments-funded">How are ArcaneChat developments funded?</a></li>
     </ul>
@@ -1150,10 +1150,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="can-i-reuse-my-existing-private-key">
+      <h3 id="importkey">
         
         
-          Can I reuse my existing private key? <a href="#can-i-reuse-my-existing-private-key" class="anchor"></a>
+          Can I reuse my existing private key? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1283,7 +1283,7 @@ You can read the <a href="https://delta.chat/assets/blog/2019-first-security-rev
 and wait a moment until a QR code is shown</p>
   </li>
   <li>
-    <p>On the second device, <a href="https://get.delta.chat">install ArcaneChat</a></p>
+    <p>On the second device, <a href="https://github.com/ArcaneChat">install ArcaneChat</a></p>
   </li>
   <li>
     <p>On the second device, start ArcaneChat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
@@ -1386,7 +1386,7 @@ app stores (Google Play/iOS/Windows/macOS/Linux repositories) as native apps.</l
   <li>If you need a Web Client, because you are not allowed to install software on
 the computer you work with, you can use the portable Windows Desktop Client,
 or the AppImage for Linux. You can find them on
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1800,7 +1800,7 @@ mail program (like Thunderbird) next to your ArcaneChat app, and want your MUA
 to participate in chat conversations.</p>
 
 <p>However, we recommend using the ArcaneChat Desktop Client; you can download it
-on <a href="https://get.delta.chat">get.delta.chat</a>. The option to watch the “Sent”
+on <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. The option to watch the “Sent”
 folder might go away in the future. It was introduced at a time where there was
 no ArcaneChat Desktop client available on all platforms.</p>
     
@@ -1838,22 +1838,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="how-can-i-delete-my-account">
+      <h3 id="remove-account">
         
         
-          How can I delete my account? <a href="#how-can-i-delete-my-account" class="anchor"></a>
+          How can I delete my account? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>As you use an e-mail account for ArcaneChat,
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/en/chatmail">3rd party chatmail server</a>.</p>
+
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
 how you can delete your account depends on your e-mail provider.
-We don’t have any control over your e-mail account,
+We don’t have any control over e-mail accounts at those providers,
 so unfortunately we can’t help you with that.</p>
 
-<p>If you want to keep the account,
+<p>If you want to continue using a classic e-mail account with other apps,
 but uninstall ArcaneChat,
-it is recommended to leave any group chat before uninstalling ArcaneChat.</p>
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="im-interested-in-the-technical-details-can-you-tell-me-more">
         

src/main/assets/help/es/help.html

@@ -55,7 +55,7 @@
       <li><a href="#cómo-puedo-asegurar-el-cifrado-de-extremo-a-extremo-y-la-eliminación-de-mensajes">¿Cómo puedo asegurar el cifrado de extremo a extremo y la eliminación de mensajes?</a></li>
       <li><a href="#pfs">¿Soporta ArcaneChat Perfect Forward Secrecy?</a></li>
       <li><a href="#es-el-cifrado-de-extremo-a-extremo-de-delta-chat-tan-seguro-como-el-de-signal">¿Es el cifrado de extremo a extremo de ArcaneChat tan seguro como el de Signal?</a></li>
-      <li><a href="#puedo-reutilizar-mi-clave-privada-existente">¿Puedo reutilizar mi clave privada existente?</a></li>
+      <li><a href="#importkey">¿Puedo reutilizar mi clave privada existente?</a></li>
       <li><a href="#no-puedo-importar-mi-clave-pgp-existente-en-delta-chat">No puedo importar mi clave PGP existente en ArcaneChat.</a></li>
       <li><a href="#security-audits">¿Se auditó ArcaneChat de forma independiente en busca de vulnerabilidades de seguridad?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#por-qué-puedo-elegir-monitorear-la-carpeta-enviados">¿Por qué puedo elegir monitorear la carpeta “Enviados”?</a></li>
       <li><a href="#por-qué-puedo-elegir-no-monitorear-la-carpeta-deltachat">¿Por qué puedo elegir no monitorear la carpeta DeltaChat?</a></li>
       <li><a href="#delta-chat-es-compatible-con-protonmail--tutanota--criptext">¿ArcaneChat es compatible con Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#cómo-puedo-eliminar-mi-cuenta">¿Cómo puedo eliminar mi cuenta?</a></li>
+      <li><a href="#remove-account">¿Cómo puedo eliminar mi cuenta?</a></li>
       <li><a href="#estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">Estoy interesado en los detalles técnicos. ¿Pueden decirme más?</a></li>
       <li><a href="#cómo-se-financia-el-desarrollo-de-delta-chat">¿Cómo se financia el desarrollo de ArcaneChat?</a></li>
     </ul>
@@ -1110,10 +1110,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="puedo-reutilizar-mi-clave-privada-existente">
+      <h3 id="importkey">
         
         
-          ¿Puedo reutilizar mi clave privada existente? <a href="#puedo-reutilizar-mi-clave-privada-existente" class="anchor"></a>
+          ¿Puedo reutilizar mi clave privada existente? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1245,7 +1245,7 @@ You can read the <a href="https://delta.chat/assets/blog/2019-first-security-rev
 and wait a moment until a QR code is shown</p>
   </li>
   <li>
-    <p>En el otro dispositivo, <a href="https://get.delta.chat">instala ArcaneChat</a></p>
+    <p>En el otro dispositivo, <a href="https://github.com/ArcaneChat">instala ArcaneChat</a></p>
   </li>
   <li>
     <p>On the second device, start ArcaneChat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
@@ -1348,7 +1348,7 @@ tiendas de aplicaciones (Google Play/iOS/Windows/macOS/Linux repositorios) como
   <li>Si necesitas un cliente web, porque no tienes permiso para instalar software en
 el ordenador con que trabajas, puedes utilizar el cliente portátil Windows Desktop Client
 o el AppImage para Linux. Puedes encontrarlos en
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1746,7 +1746,7 @@ programa de correo (como Thunderbird) a la vez que su aplicación ArcaneChat, y
 también participe en conversaciones de chat.</p>
 
 <p>No obstante, recomendamos utilizar el cliente de escritorio ArcaneChat; puede descargarlo
-en <a href="https://get.delta.chat">get.delta.chat</a>. La opción de observar la carpeta “Enviados”
+en <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. La opción de observar la carpeta “Enviados”
 podría desaparecer en el futuro. Se introdujo en un momento en que no había
 cliente ArcaneChat Desktop disponible en todas las plataformas.</p>
     
@@ -1782,20 +1782,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="cómo-puedo-eliminar-mi-cuenta">
+      <h3 id="remove-account">
         
         
-          ¿Cómo puedo eliminar mi cuenta? <a href="#cómo-puedo-eliminar-mi-cuenta" class="anchor"></a>
+          ¿Cómo puedo eliminar mi cuenta? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>Al utilizar una cuenta de correo electrónico para ArcaneChat,
-La forma de eliminar tu cuenta depende de tu proveedor de correo electrónico.
-No tenemos ningún control sobre su cuenta de correo electrónico,
-Lamentablemente no podemos ayudarte con eso.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/es/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Si quieres mantener la cuenta, pero desinstalar ArcaneChat, se recomienda salir de cualquier chat grupal antes de desinstalar ArcaneChat.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="estoy-interesado-en-los-detalles-técnicos-pueden-decirme-más">
         

src/main/assets/help/fr/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#puis-je-ré-utiliser-ma-clé-privée-existante-">Puis-je ré-utiliser ma clé privée existante ?</a></li>
+      <li><a href="#importkey">Puis-je ré-utiliser ma clé privée existante ?</a></li>
       <li><a href="#je-narrive-pas-à-importer-ma-clé-pgp-existante-dans-delta-chat">Je n’arrive pas à importer ma clé PGP existante dans ArcaneChat.</a></li>
       <li><a href="#security-audits">Est-ce qu’un audit indépendant des failles de sécurité a été réalisé sur ArcaneChat ?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#pourquoi-puis-je-choisir-de-regarder-le-dossier-envoyés">Pourquoi puis-je choisir de regarder le dossier “Envoyés”?</a></li>
       <li><a href="#pourquoi-puis-je-choisir-de-ne-pas-regarder-le-dossier-delta-chat">Pourquoi puis-je choisir de ne pas regarder le dossier ArcaneChat?</a></li>
       <li><a href="#delta-chat-est-il-compatible-avec-protonmail--tutanota--criptext-">ArcaneChat est-il compatible avec Protonmail / Tutanota / Criptext ?</a></li>
-      <li><a href="#comment-supprimer-mon-compte-">Comment supprimer mon compte ?</a></li>
+      <li><a href="#remove-account">Comment supprimer mon compte ?</a></li>
       <li><a href="#les-détails-techniques-mintéressent-pouvez-vous-men-dire-plus-">Les détails techniques m’intéressent. Pouvez-vous m’en dire plus ?</a></li>
       <li><a href="#comment-est-financé-le-développement-de-delta-chat-">Comment est financé le développement de ArcaneChat ?</a></li>
     </ul>
@@ -1124,10 +1124,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="puis-je-ré-utiliser-ma-clé-privée-existante-">
+      <h3 id="importkey">
         
         
-          Puis-je ré-utiliser ma clé privée existante ? <a href="#puis-je-ré-utiliser-ma-clé-privée-existante-" class="anchor"></a>
+          Puis-je ré-utiliser ma clé privée existante ? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1231,7 +1231,7 @@ Le rapport complet <a href="https://delta.chat/assets/blog/2019-first-security-r
     <p>Sur le premier appareil, allez dans <strong>Paramètres → Ajouter un deuxième appareil</strong>, déverrouillez l’écran si nécessaire, et patientez un peu jusqu’à ce qu’un code QR s’affiche.</p>
   </li>
   <li>
-    <p>Sur le deuxième appareil, <a href="https://get.delta.chat">installez ArcaneChat</a>.</p>
+    <p>Sur le deuxième appareil, <a href="https://github.com/ArcaneChat">installez ArcaneChat</a>.</p>
   </li>
   <li>
     <p>Sur le deuxième appareil, ouvrez ArcaneChat, sélectionnez <strong>Ajouter comme deuxième appareil</strong>, et scannez le code QR du premier appareil.</p>
@@ -1329,7 +1329,7 @@ end-to-end encrypted messages with your communication partners.</li>
   <li>Il y a 2-3 façons d’introduire un client Web ArcaneChat, mais toutes représentent
  un travail conséquent. Pour l’instant, nous nous concentrons à sortir des versions stables dans tous les magasins d’applications (Google Play/iOS/Windows/macOS/centre de paquets Linux) en tant qu’applications natives.</li>
   <li>Si vous avez besoin d’un client Web parce que vous n’êtes pas autorisé à installer des logiciels sur l’ordinateur sur lequel vous travaillez, vous pouvez utiliser le Client Portable pour bureaux Windows ou l’AppImage pour Linux. Vous pouvez les trouver sur 
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1710,7 +1710,7 @@ if you set a <a href="#signature">signature text</a>.</p>
 
 <p>La seule raison de regarder le dossier Envoyés est si vous utilisez un autre programme de courriel (tel que Thunderbird) en parallèle de votre application ArcaneChat, et que vous voulez que votre client de messagerie participe aux discussions.</p>
 
-<p>Cependant, nous recommandons d’utiliser le client de bureau ArcaneChat; vous pouvez le télécharger sur <a href="https://get.delta.chat">get.delta.chat</a>. L’option de regarder le dossier “Envoyés” pourrait disparaître dans le futur. Elle a été introduite à une époque où il n’y avait pas de client de bureau ArcaneChat disponible sur toutes les plateformes.</p>
+<p>Cependant, nous recommandons d’utiliser le client de bureau ArcaneChat; vous pouvez le télécharger sur <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. L’option de regarder le dossier “Envoyés” pourrait disparaître dans le futur. Elle a été introduite à une époque où il n’y avait pas de client de bureau ArcaneChat disponible sur toutes les plateformes.</p>
     
       <h3 id="pourquoi-puis-je-choisir-de-ne-pas-regarder-le-dossier-delta-chat">
         
@@ -1744,18 +1744,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="comment-supprimer-mon-compte-">
+      <h3 id="remove-account">
         
         
-          Comment supprimer mon compte ? <a href="#comment-supprimer-mon-compte-" class="anchor"></a>
+          Comment supprimer mon compte ? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>Étant donné que vous utilisez ArcaneChat à travers un compte courriel, la façon dont vous pouvez supprimer votre compte dépend de votre fournisseur de courriel.
-Comme nous n’exerçons aucun contrôle sur votre compte courriel, nous ne sommes pas en mesure de vous aider à le supprimer.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/fr/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Si vous souhaitez conserver votre compte mais désinstaller ArcaneChat, nous vous recommandons de quitter toutes les discussions de groupe avant de procéder à la désinstallation.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="les-détails-techniques-mintéressent-pouvez-vous-men-dire-plus-">
         

src/main/assets/help/id/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#can-i-reuse-my-existing-private-key">Can I reuse my existing private key?</a></li>
+      <li><a href="#importkey">Can I reuse my existing private key?</a></li>
       <li><a href="#i-cant-import-my-existing-pgp-key-into-delta-chat">I can’t import my existing PGP key into ArcaneChat.</a></li>
       <li><a href="#security-audits">Was ArcaneChat independently audited for security vulnerabilities?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#why-can-i-choose-to-watch-the-sent-folder">Why can I choose to watch the “Sent” folder?</a></li>
       <li><a href="#why-can-i-choose-not-to-watch-the-deltachat-folder">Why can I choose not to watch the DeltaChat folder?</a></li>
       <li><a href="#is-delta-chat-compatible-with-protonmail--tutanota--criptext">Is ArcaneChat compatible with Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#how-can-i-delete-my-account">How can I delete my account?</a></li>
+      <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#im-interested-in-the-technical-details-can-you-tell-me-more">I’m interested in the technical details. Can you tell me more?</a></li>
       <li><a href="#how-are-delta-chat-developments-funded">How are ArcaneChat developments funded?</a></li>
     </ul>
@@ -1150,10 +1150,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="can-i-reuse-my-existing-private-key">
+      <h3 id="importkey">
         
         
-          Can I reuse my existing private key? <a href="#can-i-reuse-my-existing-private-key" class="anchor"></a>
+          Can I reuse my existing private key? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1283,7 +1283,7 @@ You can read the <a href="https://delta.chat/assets/blog/2019-first-security-rev
 and wait a moment until a QR code is shown</p>
   </li>
   <li>
-    <p>On the second device, <a href="https://get.delta.chat">install ArcaneChat</a></p>
+    <p>On the second device, <a href="https://github.com/ArcaneChat">install ArcaneChat</a></p>
   </li>
   <li>
     <p>On the second device, start ArcaneChat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
@@ -1386,7 +1386,7 @@ app stores (Google Play/iOS/Windows/macOS/Linux repositories) as native apps.</l
   <li>If you need a Web Client, because you are not allowed to install software on
 the computer you work with, you can use the portable Windows Desktop Client,
 or the AppImage for Linux. You can find them on
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1800,7 +1800,7 @@ mail program (like Thunderbird) next to your ArcaneChat app, and want your MUA
 to participate in chat conversations.</p>
 
 <p>However, we recommend using the ArcaneChat Desktop Client; you can download it
-on <a href="https://get.delta.chat">get.delta.chat</a>. The option to watch the “Sent”
+on <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. The option to watch the “Sent”
 folder might go away in the future. It was introduced at a time where there was
 no ArcaneChat Desktop client available on all platforms.</p>
     
@@ -1838,22 +1838,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="how-can-i-delete-my-account">
+      <h3 id="remove-account">
         
         
-          How can I delete my account? <a href="#how-can-i-delete-my-account" class="anchor"></a>
+          How can I delete my account? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>As you use an e-mail account for ArcaneChat,
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/id/chatmail">3rd party chatmail server</a>.</p>
+
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
 how you can delete your account depends on your e-mail provider.
-We don’t have any control over your e-mail account,
+We don’t have any control over e-mail accounts at those providers,
 so unfortunately we can’t help you with that.</p>
 
-<p>If you want to keep the account,
+<p>If you want to continue using a classic e-mail account with other apps,
 but uninstall ArcaneChat,
-it is recommended to leave any group chat before uninstalling ArcaneChat.</p>
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="im-interested-in-the-technical-details-can-you-tell-me-more">
         

src/main/assets/help/it/help.html

@@ -55,7 +55,7 @@
       <li><a href="#come-posso-garantire-la-crittografia-e-leliminazione-end-to-end-dei-messaggi">Come posso garantire la crittografia e l’eliminazione end-to-end dei messaggi?</a></li>
       <li><a href="#pfs">ArcaneChat supporta Perfect Forward Secrecy?</a></li>
       <li><a href="#la-crittografia-end-to-end-di-delta-chat-è-sicura-quanto-quella-di-signal">La crittografia end-to-end di ArcaneChat è sicura quanto quella di Signal?</a></li>
-      <li><a href="#posso-riutilizzare-la-mia-chiave-privata-esistente">Posso riutilizzare la mia chiave privata esistente?</a></li>
+      <li><a href="#importkey">Posso riutilizzare la mia chiave privata esistente?</a></li>
       <li><a href="#non-riesco-a-importare-la-mia-chiave-pgp-esistente-in-delta-chat">Non riesco a importare la mia chiave PGP esistente in ArcaneChat.</a></li>
       <li><a href="#security-audits">ArcaneChat è stata verificata in modo indipendente per le vulnerabilità di sicurezza?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#perché-posso-scegliere-di-guardare-la-cartella-inviata">Perché posso scegliere di guardare la cartella “Inviata”?</a></li>
       <li><a href="#perché-posso-scegliere-di-non-guardare-la-cartella-deltachat">Perché posso scegliere di non guardare la cartella DeltaChat?</a></li>
       <li><a href="#delta-chat-è-compatibile-con-protonmail--tutanota--criptext">ArcaneChat è compatibile con Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#come-posso-eliminare-il-mio-profilo">Come posso eliminare il mio profilo?</a></li>
+      <li><a href="#remove-account">Come posso eliminare il mio profilo?</a></li>
       <li><a href="#sono-interessato-ai-dettagli-tecnici-mi-puoi-dire-di-più">Sono interessato ai dettagli tecnici. Mi puoi dire di più?</a></li>
       <li><a href="#come-viene-finanziato-lo-sviluppo-di-delta-chat">Come viene finanziato lo sviluppo di ArcaneChat?</a></li>
     </ul>
@@ -1137,10 +1137,10 @@ messaggi crittografati precedenti.</p>
 <p>In ogni caso, la crittografia end-to-end di ArcaneChat utilizza un <a href="#openpgp-secure">sottoinsieme sicuro di OpenPGP</a>
 che è stato <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">controllato in modo indipendente sulla sicurezza</a>.</p>
     
-      <h3 id="posso-riutilizzare-la-mia-chiave-privata-esistente">
+      <h3 id="importkey">
         
         
-          Posso riutilizzare la mia chiave privata esistente? <a href="#posso-riutilizzare-la-mia-chiave-privata-esistente" class="anchor"></a>
+          Posso riutilizzare la mia chiave privata esistente? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1270,7 +1270,7 @@ Puoi leggere il <a href="https://delta.chat/assets/blog/2019-first-security-revi
 e attendere un attimo fino a quando non viene visualizzato un codice QR</p>
   </li>
   <li>
-    <p>Sul secondo dispositivo, <a href="https://get.delta.chat">installare ArcaneChat</a></p>
+    <p>Sul secondo dispositivo, <a href="https://github.com/ArcaneChat">installare ArcaneChat</a></p>
   </li>
   <li>
     <p>Sul secondo dispositivo, avviare ArcaneChat, selezionare <strong>Aggiungi Come Secondo Dispositivo</strong> e scansionare il codice QR del vecchio dispositivo.</p>
@@ -1370,7 +1370,7 @@ gli app store (repository Google Play/iOS/Windows/macOS/Linux) come app native.<
   <li>Se hai bisogno di un Client Web, perché non sei autorizzato a installare software sul
 computer con cui lavori, puoi utilizzare il client Desktop Windows Portatile,
 o l’AppImage per Linux. Le trovi su
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1762,7 +1762,7 @@ programma di posta (come Thunderbird) accanto alla tua app ArcaneChat e desideri
 per partecipare a conversazioni in chat.</p>
 
 <p>Tuttavia, consigliamo di utilizzare il client desktop ArcaneChat; puoi scaricarlo
-su <a href="https://get.delta.chat">get.delta.chat</a>. L’opzione per guardare la cartella
+su <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. L’opzione per guardare la cartella
 “Inviata” potrebbe scomparire in futuro. È stato introdotto in un momento in cui non c’era
 nessun client ArcaneChat Desktop disponibile su tutte le piattaforme.</p>
     
@@ -1800,22 +1800,38 @@ che usa.</li>
 <a href="https://autocrypt.org/dev-status.html">App di posta elettronica abilitata per Autocrypt</a>.</li>
 </ul>
     
-      <h3 id="come-posso-eliminare-il-mio-profilo">
+      <h3 id="remove-account">
         
         
-          Come posso eliminare il mio profilo? <a href="#come-posso-eliminare-il-mio-profilo" class="anchor"></a>
+          Come posso eliminare il mio profilo? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>Poiché utilizzi un profilo e-mail per ArcaneChat,
-il modo in cui puoi eliminare il tuo profilo dipende dal tuo provider e-mail.
-Non abbiamo alcun controllo sul tuo profilo e-mail,
-quindi purtroppo non possiamo aiutarti in questo.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/it/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Se vuoi mantenere il profilo,
-ma disinstallare ArcaneChat,
-si consiglia di uscire da qualsiasi chat di gruppo prima di disinstallare ArcaneChat.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="sono-interessato-ai-dettagli-tecnici-mi-puoi-dire-di-più">
         

src/main/assets/help/nl/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#kan-ik-mijn-bestaande-privésleutel-hergebruiken">Kan ik mijn bestaande privésleutel hergebruiken?</a></li>
+      <li><a href="#importkey">Kan ik mijn bestaande privésleutel hergebruiken?</a></li>
       <li><a href="#ik-kan-mijn-bestaande-pgp-sleutel-niet-importeren">Ik kan mijn bestaande PGP-sleutel niet importeren</a></li>
       <li><a href="#security-audits">Heeft ArcaneChat ooit onafhankelijke beveiligingscontroles ondergaan?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#waarom-kan-ik-kiezen-om-de-map-verzonden-te-controleren">Waarom kan ik kiezen om de map ‘Verzonden’ te controleren?</a></li>
       <li><a href="#waarom-kan-ik-kiezen-om-de-deltachat-map-te-negeren">Waarom kan ik kiezen om de DeltaChat-map te negeren?</a></li>
       <li><a href="#is-delta-chat-compatibel-met-protonmailtutanotacriptext">Is ArcaneChat compatibel met Protonmail/Tutanota/Criptext?</a></li>
-      <li><a href="#hoe-kan-ik-mijn-account-verwijderen">Hoe kan ik mijn account verwijderen?</a></li>
+      <li><a href="#remove-account">Hoe kan ik mijn account verwijderen?</a></li>
       <li><a href="#ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">Ik wil graag meer weten over de gebruikte technieken. Waar kan ik meer informatie vinden?</a></li>
       <li><a href="#hoe-wordt-de-ontwikkeling-van-delta-chat-gefinancierd">Hoe wordt de ontwikkeling van ArcaneChat gefinancierd?</a></li>
     </ul>
@@ -1143,10 +1143,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="kan-ik-mijn-bestaande-privésleutel-hergebruiken">
+      <h3 id="importkey">
         
         
-          Kan ik mijn bestaande privésleutel hergebruiken? <a href="#kan-ik-mijn-bestaande-privésleutel-hergebruiken" class="anchor"></a>
+          Kan ik mijn bestaande privésleutel hergebruiken? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1275,7 +1275,7 @@ Het <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">voll
 en wacht totdat de QR-code in beeld verschijnt.</p>
   </li>
   <li>
-    <p><a href="https://get.delta.chat">Installeer ArcaneChat</a> op het tweede apparaat.</p>
+    <p><a href="https://github.com/ArcaneChat">Installeer ArcaneChat</a> op het tweede apparaat.</p>
   </li>
   <li>
     <p>Start ArcaneChat op het tweede apparaat, kies <strong>Toevoegen als tweede apparaat</strong> en scan de QR-code met het eerste apparaat.</p>
@@ -1377,7 +1377,7 @@ inspanningen. Momenteel ligt voor ons de focus op stabiele uitgaven maken voor a
   <li>Als je een webclient nodig hebt omdat je geen software mag installeren op
 je computer, dan kun je de meeneembare (portable) versie gebruiken van de Windows-client,
 of de AppImage van de Linux-client. Deze kun je downloaden op
- <a href="https://get.delta.chat">get.delta.chat</a>.</li>
+ <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1785,7 +1785,7 @@ en eenmaal middels imap naar de map ‘Verzonden’).</p>
 ArcaneChat-app gebruikt en wilt dat je andere apparaten deel uitmaken van gesprekken.</p>
 
 <p>Wij raden echter aan om in dat geval de ArcaneChat-app te installeren op je computer:
-<a href="https://get.delta.chat">get.delta.chat</a>. De optie om de map ‘Verzonden’ te controleren
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. De optie om de map ‘Verzonden’ te controleren
 wordt in de toekomst mogelijk verwijderd. De functie deed zijn intrede toen er nog niet
 op alle platformen een ArcaneChat-client beschikbaar was.</p>
     
@@ -1823,22 +1823,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="hoe-kan-ik-mijn-account-verwijderen">
+      <h3 id="remove-account">
         
         
-          Hoe kan ik mijn account verwijderen? <a href="#hoe-kan-ik-mijn-account-verwijderen" class="anchor"></a>
+          Hoe kan ik mijn account verwijderen? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>ArcaneChat maakt gebruik van je e-mailaccount,
-dus de verwijderprocedure is afhankelijk van je provider.
-We hebben geen zeggenschap over je account,
-dus helaas kunnen we je daar niet bij helpen.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/nl/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Als je je account wilt behouden maar ArcaneChat
-niet wilt verwijderen, verlaat dan groeps-
-gesprekken voordat je ArcaneChat verwijdert.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="ik-wil-graag-meer-weten-over-de-gebruikte-technieken-waar-kan-ik-meer-informatie-vinden">
         

src/main/assets/help/pl/help.html

@@ -55,7 +55,7 @@
       <li><a href="#jak-mogę-zapewnić-kompleksowe-szyfrowanie-i-usuwanie-wiadomości">Jak mogę zapewnić kompleksowe szyfrowanie i usuwanie wiadomości?</a></li>
       <li><a href="#pfs">Czy ArcaneChat obsługuje funkcję Perfect Forward Secrecy?</a></li>
       <li><a href="#czy-szyfrowanie-end-to-end-delta-chat-jest-tak-samo-bezpieczne-jak-signal">Czy szyfrowanie end-to-end ArcaneChat jest tak samo bezpieczne jak Signal?</a></li>
-      <li><a href="#czy-mogę-ponownie-wykorzystać-mój-istniejący-klucz-prywatny">Czy mogę ponownie wykorzystać mój istniejący klucz prywatny?</a></li>
+      <li><a href="#importkey">Czy mogę ponownie wykorzystać mój istniejący klucz prywatny?</a></li>
       <li><a href="#nie-mogę-zaimportować-istniejącego-klucza-pgp-do-delta-chat">Nie mogę zaimportować istniejącego klucza PGP do ArcaneChat.</a></li>
       <li><a href="#security-audits">Czy ArcaneChat był niezależnie kontrolowany pod kątem luk w zabezpieczeniach?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#po-co-mam-wybrać-opcję-oglądania-folderu-wysłane">Po co mam wybrać opcję oglądania folderu „Wysłane”?</a></li>
       <li><a href="#dlaczego-mogę-nie-widzieć-folderu-deltachat">Dlaczego mogę nie widzieć folderu DeltaChat?</a></li>
       <li><a href="#czy-delta-chat-jest-kompatybilny-z-protonmail--tutanota--criptext">Czy ArcaneChat jest kompatybilny z Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#jak-mogę-usunąć-swoje-konto">Jak mogę usunąć swoje konto?</a></li>
+      <li><a href="#remove-account">Jak mogę usunąć swoje konto?</a></li>
       <li><a href="#interesują-mnie-szczegóły-techniczne-możesz-powiedzieć-mi-coś-więcej">Interesują mnie szczegóły techniczne. Możesz powiedzieć mi coś więcej?</a></li>
       <li><a href="#w-jaki-sposób-finansowany-jest-rozwój-delta-chat">W jaki sposób finansowany jest rozwój ArcaneChat?</a></li>
     </ul>
@@ -824,10 +824,10 @@ nadal będziesz mógł pisać, ale nie będziesz już powiadamiany o żadnych no
 
 <p>W każdym razie szyfrowanie end-to-end ArcaneChat wykorzystuje <a href="#openpgp-secure">bezpieczny podzbiór OpenPGP</a>, który został poddany <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">niezależnemu audytowi bezpieczeństwa</a>.</p>
     
-      <h3 id="czy-mogę-ponownie-wykorzystać-mój-istniejący-klucz-prywatny">
+      <h3 id="importkey">
         
         
-          Czy mogę ponownie wykorzystać mój istniejący klucz prywatny? <a href="#czy-mogę-ponownie-wykorzystać-mój-istniejący-klucz-prywatny" class="anchor"></a>
+          Czy mogę ponownie wykorzystać mój istniejący klucz prywatny? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -914,7 +914,7 @@ W przypadku innych programów można znaleźć rozwiązanie online.</p>
     <p>Na pierwszym urządzeniu przejdź do <strong>Ustawienia → Dodaj kolejne urządzenie</strong>, w razie potrzeby odblokuj ekran i poczekaj chwilę, aż pojawi się kod QR</p>
   </li>
   <li>
-    <p>Na drugim urządzeniu <a href="https://get.delta.chat">zainstaluj ArcaneChat</a></p>
+    <p>Na drugim urządzeniu <a href="https://github.com/ArcaneChat">zainstaluj ArcaneChat</a></p>
   </li>
   <li>
     <p>Na drugim urządzeniu uruchom ArcaneChat, wybierz <strong>Dodaj jako kolejne urządzenie</strong> i zeskanuj kod QR z pierwszego urządzenia</p>
@@ -993,7 +993,7 @@ W przypadku innych programów można znaleźć rozwiązanie online.</p>
 <ul>
   <li>Nie ma bezpośrednich planów, ale wstępne przemyślenia.</li>
   <li>Istnieją 2-3 możliwości wprowadzenia klienta Web ArcaneChat, ale wszystkie wymagają znaczącej pracy. Na razie skupiamy się na udostępnianiu stabilnych wersji we wszystkich sklepach z aplikacjami (repozytoria Google Play/iOS/Windows/macOS/Linux) jako aplikacji natywnych.</li>
-  <li>Jeśli potrzebujesz klienta Web, ponieważ nie możesz instalować oprogramowania na komputerze, na którym pracujesz, możesz użyć przenośnego klienta Windows Desktop lub AppImage dla Linuxa. Możesz je znaleźć na <a href="https://get.delta.chat">get.delta.chat</a>.</li>
+  <li>Jeśli potrzebujesz klienta Web, ponieważ nie możesz instalować oprogramowania na komputerze, na którym pracujesz, możesz użyć przenośnego klienta Windows Desktop lub AppImage dla Linuxa. Możesz je znaleźć na <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1299,7 +1299,7 @@ jeśli chcesz sprawdzić, czy Twoje poświadczenia są przetwarzane w bezpieczny
 
 <p>Jedynym powodem, dla którego ktoś chce oglądać folder Wysłane, jest to, że używa innego programu pocztowego (takiego jak Thunderbird) razem z aplikacją ArcaneChat i chce, aby jego program pocztowy „uczestniczył” w rozmowach na czacie.</p>
 
-<p>Jednak zalecamy używanie klienta ArcaneChat Desktop; możesz go pobrać z <a href="https://get.delta.chat">get.delta.chat</a>. Opcja oglądania folderu „Wysłane” może w przyszłości zniknąć. Została wprowadzona w czasie, gdy na żadnej platformie nie był dostępny klient ArcaneChat Desktop.</p>
+<p>Jednak zalecamy używanie klienta ArcaneChat Desktop; możesz go pobrać z <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. Opcja oglądania folderu „Wysłane” może w przyszłości zniknąć. Została wprowadzona w czasie, gdy na żadnej platformie nie był dostępny klient ArcaneChat Desktop.</p>
     
       <h3 id="dlaczego-mogę-nie-widzieć-folderu-deltachat">
         
@@ -1326,18 +1326,38 @@ jeśli chcesz sprawdzić, czy Twoje poświadczenia są przetwarzane w bezpieczny
   <li>ArcaneChat 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="jak-mogę-usunąć-swoje-konto">
+      <h3 id="remove-account">
         
         
-          Jak mogę usunąć swoje konto? <a href="#jak-mogę-usunąć-swoje-konto" class="anchor"></a>
+          Jak mogę usunąć swoje konto? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>Gdy korzystasz z konta e-mail w ArcaneChat, sposób usunięcia konta zależy od dostawcy poczty e-mail.
-Nie mamy żadnej kontroli nad twoim kontem e-mail, więc niestety nie możemy ci w tym pomóc.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/pl/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Jeśli chcesz zachować konto, ale odinstalować ArcaneChat, zaleca się opuszczenie każdego czatu grupowego przed odinstalowaniem ArcaneChat.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="interesują-mnie-szczegóły-techniczne-możesz-powiedzieć-mi-coś-więcej">
         

src/main/assets/help/pt/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#posso-reutilizar-minha-chave-privada-existente">Posso reutilizar minha chave privada existente?</a></li>
+      <li><a href="#importkey">Posso reutilizar minha chave privada existente?</a></li>
       <li><a href="#eu-não-posso-importar-minha-chave-pgp-existente-para-o-delta-chat">Eu não posso importar minha chave PGP existente para o ArcaneChat.</a></li>
       <li><a href="#security-audits">Was ArcaneChat independently audited for security vulnerabilities?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#por-que-eu-posso-escolher-assistir-à-pasta-enviado">Por que eu posso escolher assistir à pasta “Enviado”?</a></li>
       <li><a href="#por-que-eu-posso-escolher-não-observar-a-pasta-deltachat">Por que eu posso escolher não observar a pasta DeltaChat?</a></li>
       <li><a href="#o-delta-chat-é-compatível-com-protonmail--tutanota--criptext">O ArcaneChat é compatível com Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#how-can-i-delete-my-account">How can I delete my account?</a></li>
+      <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#estou-interessado-nos-detalhes-técnicos-pode-me-dizer-mais">Estou interessado nos detalhes técnicos. Pode me dizer mais?</a></li>
       <li><a href="#como-são-os-desenvolvimentos-do-delta-chat-financiados">Como são os desenvolvimentos do ArcaneChat financiados?</a></li>
     </ul>
@@ -1144,10 +1144,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="posso-reutilizar-minha-chave-privada-existente">
+      <h3 id="importkey">
         
         
-          Posso reutilizar minha chave privada existente? <a href="#posso-reutilizar-minha-chave-privada-existente" class="anchor"></a>
+          Posso reutilizar minha chave privada existente? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1277,7 +1277,7 @@ You can read the <a href="https://delta.chat/assets/blog/2019-first-security-rev
 and wait a moment until a QR code is shown</p>
   </li>
   <li>
-    <p>On the second device, <a href="https://get.delta.chat">install ArcaneChat</a></p>
+    <p>On the second device, <a href="https://github.com/ArcaneChat">install ArcaneChat</a></p>
   </li>
   <li>
     <p>On the second device, start ArcaneChat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
@@ -1380,7 +1380,7 @@ app stores (Google Play/iOS/Windows/macOS/Linux repositórios) como aplicativos
   <li>Se você precisa de um Cliente Web, porque não está autorizado a instalar software em
 o computador com o qual você trabalha, você pode usar o Windows Desktop Client portátil,
 ou o AppImage para Linux. Você pode encontrá-los em
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1786,7 +1786,7 @@ programa de correio (como Thunderbird) ao lado de seu aplicativo ArcaneChat, e q
 para participar numa conversa de chat.</p>
 
 <p>No entanto, recomendamos o uso do ArcaneChat cliente Desktop; você pode baixá-lo
-no <a href="https://get.delta.chat">get.delta.chat</a>. A opção de observar o “Enviado
+no <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. A opção de observar o “Enviado
 pasta pode ir embora no futuro. Ela foi introduzida num momento em que havia
 nenhum cliente ArcaneChat no desktop disponível em todas as plataformas.</p>
     
@@ -1824,22 +1824,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="how-can-i-delete-my-account">
+      <h3 id="remove-account">
         
         
-          How can I delete my account? <a href="#how-can-i-delete-my-account" class="anchor"></a>
+          How can I delete my account? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>As you use an e-mail account for ArcaneChat,
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/pt/chatmail">3rd party chatmail server</a>.</p>
+
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
 how you can delete your account depends on your e-mail provider.
-We don’t have any control over your e-mail account,
+We don’t have any control over e-mail accounts at those providers,
 so unfortunately we can’t help you with that.</p>
 
-<p>If you want to keep the account,
+<p>If you want to continue using a classic e-mail account with other apps,
 but uninstall ArcaneChat,
-it is recommended to leave any group chat before uninstalling ArcaneChat.</p>
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="estou-interessado-nos-detalhes-técnicos-pode-me-dizer-mais">
         

src/main/assets/help/ru/help.html

@@ -55,7 +55,7 @@
       <li><a href="#как-я-могу-обеспечить-сквозное-шифрование-и-удаление-сообщений">Как я могу обеспечить сквозное шифрование и удаление сообщений?</a></li>
       <li><a href="#pfs">Поддерживает ли ArcaneChat Совершенную Прямую Секретность?</a></li>
       <li><a href="#является-ли-сквозное-шифрование-delta-chat-таким-же-безопасным-как-signal">Является ли сквозное шифрование ArcaneChat таким же безопасным как Signal?</a></li>
-      <li><a href="#можно-ли-повторно-использовать-существующий-секретный-ключ">Можно ли повторно использовать существующий секретный ключ?</a></li>
+      <li><a href="#importkey">Можно ли повторно использовать существующий секретный ключ?</a></li>
       <li><a href="#я-не-могу-импортировать-мой-существующий-ключ-pgp-в-delta-chat">Я не могу импортировать мой существующий ключ PGP в ArcaneChat.</a></li>
       <li><a href="#security-audits">Проходил ли ArcaneChat независимую проверку на наличие уязвимостей безопасности?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#для-чего-нужен-параметр-следить-за-папкой-отправлено">Для чего нужен параметр “следить за папкой Отправлено”?</a></li>
       <li><a href="#почему-я-могу-отключить-следить-за-папкой-delta-chat">Почему я могу отключить “следить за папкой ArcaneChat”?</a></li>
       <li><a href="#совместим-ли-delta-chat-с-protonmail--tutanota--criptext">Совместим ли ArcaneChat с Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#как-я-могу-удалить-аккаунт">Как я могу удалить аккаунт?</a></li>
+      <li><a href="#remove-account">Как я могу удалить аккаунт?</a></li>
       <li><a href="#меня-интересуют-технические-детали-можете-рассказать-больше">Меня интересуют технические детали. Можете рассказать больше?</a></li>
       <li><a href="#как-финансируются-разработки-delta-chat">Как финансируются разработки ArcaneChat?</a></li>
     </ul>
@@ -543,12 +543,12 @@
         
       </h3>
 
-<p>Yes, ArcaneChat automatically uses Push Notifications for <a href="https://delta.chat/chatmail">chatmail</a> profiles.
-And no, there is no alternative on Apple’s phones to achieve instant message delivery
-because Apple devices do not allow ArcaneChat to fetch data in the background.
-Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">ArcaneChat’s privacy-preserving Push Notification system</a>
-does not expose data to Apple that it doesn’t already have.</p>
+<p>Да, ArcaneChat автоматически использует Push-уведомления для профилей <a href="https://delta.chat/chatmail">chatmail</a>.
+И нет, на устройствах Apple нет альтернативы для обеспечения мгновенной доставки сообщений,
+поскольку устройства Apple не позволяют ArcaneChat запрашивать данные в фоновом режиме.
+Push-уведомления автоматически активируются для пользователей iOS, потому что
+<a href="#privacy-notifications">Система Push-уведомлений ArcaneChat, обеспечивающая конфиденциальность</a>
+не передает данные Apple, которых у нее еще нет.</p>
     
       <h3 id="android-push">
         
@@ -1150,10 +1150,10 @@ Signal и большинство других мессенджеров, подд
 <p>В любом случае, сквозное шифрование ArcaneChat использует <a href="#openpgp-secure">безопасное подмножество OpenPGP</a>
 которое прошло <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">независимую проверку безопасности</a>.</p>
     
-      <h3 id="можно-ли-повторно-использовать-существующий-секретный-ключ">
+      <h3 id="importkey">
         
         
-          Можно ли повторно использовать существующий секретный ключ? <a href="#можно-ли-повторно-использовать-существующий-секретный-ключ" class="anchor"></a>
+          Можно ли повторно использовать существующий секретный ключ? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1204,11 +1204,11 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
 
 <ul>
   <li>
-    <p>2024 March, we received a deep security analysis from the Applied Cryptography
-research group at ETH Zuerich and addressed all raised issues. 
-See our blog post about <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-End encryption</a> for more detailed information and the
+    <p>В марте 2024 года мы получили подробный анализ безопасности от исследовательской группы
+Applied Cryptography в ETH Цюрихе и устранили все выявленные проблемы. 
+Читайте наш пост в блоге о <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-End encryption</a> для более подробной информации и 
 <a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of ArcaneChat</a> 
-research paper published afterwards.</p>
+научной статьи, опубликованной позже.</p>
   </li>
   <li>
     <p>В Апреле 2023 г. мы исправили проблемы безопасности и конфиденциальности в веб-интерфейсе,
@@ -1279,7 +1279,7 @@ Chat Rust <a href="https://github.com/deltachat/deltachat-core-rust/">ядро</
 и подождите немного, пока не появится QR-код</p>
   </li>
   <li>
-    <p>На втором устройстве, <a href="https://get.delta.chat">установите ArcaneChat</a></p>
+    <p>На втором устройстве, <a href="https://github.com/ArcaneChat">установите ArcaneChat</a></p>
   </li>
   <li>
     <p>На втором устройстве запустите ArcaneChat, выберите <strong>Добавить как второе устройство</strong> и отсканируйте QR-код со старого устройства</p>
@@ -1378,7 +1378,7 @@ PIN-код разблокировки экрана, графический кл
   <li>Если вам нужен веб-клиент, поскольку вы не можете устанавливать программное обеспечение на
 компьютере, на которым вы работаете, вы можете использовать портативный настольный клиент Windows
 или AppImage для Linux. Вы можете найти их на
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1767,7 +1767,7 @@ PIN-код разблокировки экрана, графический кл
 почтовую программу (например, Thunderbird) вместе с приложением ArcaneChat.</p>
 
 <p>Однако мы рекомендуем использовать настольный клиент ArcaneChat; вы можете скачать его
-на <a href="https://get.delta.chat">get.delta.chat</a>. Опция для слежения за папкой “Отправлено”
+на <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. Опция для слежения за папкой “Отправлено”
 может быть убрана в будущем. Эта функция была представлена в то время, когда не было
  настольного клиента ArcaneChat доступного на всех платформах.</p>
     
@@ -1803,22 +1803,38 @@ Protonmail, Tutanota или Criptext. Однако, эти сообщения н
 <a href="https://autocrypt.org/dev-status.html">Приложением эл.почты с поддержкой Autocrypt</a>.</li>
 </ul>
     
-      <h3 id="как-я-могу-удалить-аккаунт">
+      <h3 id="remove-account">
         
         
-          Как я могу удалить аккаунт? <a href="#как-я-могу-удалить-аккаунт" class="anchor"></a>
+          Как я могу удалить аккаунт? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>Поскольку вы используете учётную запись эл.почты для ArcaneChat,
-способ удаления своей учетной записи зависит от вашего провайдера эл.почты.
-Мы не имеем никакого контроля над вашей учётной записью эл.почты,
-поэтому, к сожалению, мы не можем вам с этим помочь.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/ru/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Если вы хотите сохранить учётную запись,
-но удаляете ArcaneChat,
-перед удалением ArcaneChat рекомендуется выйти из группового чата.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="меня-интересуют-технические-детали-можете-рассказать-больше">
         

src/main/assets/help/sk/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#môžem-znova-použiť-svoj-existujúci-súkromný-kľúč">Môžem znova použiť svoj existujúci súkromný kľúč?</a></li>
+      <li><a href="#importkey">Môžem znova použiť svoj existujúci súkromný kľúč?</a></li>
       <li><a href="#nemôžem-importovať-môj-existujúci-pgp-kľúč-do-delta-chat">Nemôžem importovať môj existujúci PGP kľúč do ArcaneChat.</a></li>
       <li><a href="#security-audits">Was ArcaneChat independently audited for security vulnerabilities?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#prečo-si-môžem-vybrať-sledovanie-priečinka-odoslané">Prečo si môžem vybrať sledovanie priečinka „Odoslané“?</a></li>
       <li><a href="#prečo-sa-môžem-rozhodnúť-nesledovať-priečinok-deltachat">Prečo sa môžem rozhodnúť nesledovať priečinok DeltaChat?</a></li>
       <li><a href="#je-delta-chat-kompatibilný-s-protonmail--tutanota--criptext">Je ArcaneChat kompatibilný s Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#how-can-i-delete-my-account">How can I delete my account?</a></li>
+      <li><a href="#remove-account">How can I delete my account?</a></li>
       <li><a href="#zaujímajú-ma-technické-detaily-môžete-mi-povedať-viac">Zaujímajú ma technické detaily. Môžete mi povedať viac?</a></li>
       <li><a href="#ako-sa-financuje-vývoj-delta-chat">Ako sa financuje vývoj ArcaneChat?</a></li>
     </ul>
@@ -1150,10 +1150,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="môžem-znova-použiť-svoj-existujúci-súkromný-kľúč">
+      <h3 id="importkey">
         
         
-          Môžem znova použiť svoj existujúci súkromný kľúč? <a href="#môžem-znova-použiť-svoj-existujúci-súkromný-kľúč" class="anchor"></a>
+          Môžem znova použiť svoj existujúci súkromný kľúč? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1283,7 +1283,7 @@ You can read the <a href="https://delta.chat/assets/blog/2019-first-security-rev
 and wait a moment until a QR code is shown</p>
   </li>
   <li>
-    <p>On the second device, <a href="https://get.delta.chat">install ArcaneChat</a></p>
+    <p>On the second device, <a href="https://github.com/ArcaneChat">install ArcaneChat</a></p>
   </li>
   <li>
     <p>On the second device, start ArcaneChat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
@@ -1386,7 +1386,7 @@ obchodov s aplikáciami (repozitáre Google Play/iOS/Windows/macOS/Linux) ako na
   <li>Ak potrebujete webového klienta, pretože nemáte povolené inštalovať softvér
 na počítač, s ktorým pracujete, môžete použiť prenosného klienta Windows Desktop Client,
 alebo AppImage pre Linux. Nájdete ich na
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1796,7 +1796,7 @@ poštový program (napríklad Thunderbird) vedľa vašej aplikácie ArcaneChat a
  aby sa zúčastňoval chatových konverzácií.</p>
 
 <p>Odporúčame však použiť ArcaneChat Desktop Client; môžete si ho stiahnuť
-na <a href="https://get.delta.chat">get.delta.chat</a>. Možnosť sledovať „Odoslané“
+na <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. Možnosť sledovať „Odoslané“
 priečinok môže v budúcnosti zmiznúť. Bolo to zavedené v čase, kedy nebol
 ArcaneChat Desktop dostupný na všetkých platformách.</p>
     
@@ -1834,22 +1834,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="how-can-i-delete-my-account">
+      <h3 id="remove-account">
         
         
-          How can I delete my account? <a href="#how-can-i-delete-my-account" class="anchor"></a>
+          How can I delete my account? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>As you use an e-mail account for ArcaneChat,
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/sk/chatmail">3rd party chatmail server</a>.</p>
+
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
 how you can delete your account depends on your e-mail provider.
-We don’t have any control over your e-mail account,
+We don’t have any control over e-mail accounts at those providers,
 so unfortunately we can’t help you with that.</p>
 
-<p>If you want to keep the account,
+<p>If you want to continue using a classic e-mail account with other apps,
 but uninstall ArcaneChat,
-it is recommended to leave any group chat before uninstalling ArcaneChat.</p>
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="zaujímajú-ma-technické-detaily-môžete-mi-povedať-viac">
         

src/main/assets/help/sq/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#a-mund-të-ripërdor-kyçin-tim-ekzistues-privat">A mund të ripërdor kyçin tim ekzistues privat?</a></li>
+      <li><a href="#importkey">A mund të ripërdor kyçin tim ekzistues privat?</a></li>
       <li><a href="#seksportoj-dot-kyçet-e-mi-ekzistues-pgp-në-delta-chat">S’eksportoj dot kyçet e mi ekzistues PGP në ArcaneChat.</a></li>
       <li><a href="#security-audits">A është bërë auditim i pavarur i ArcaneChat-it për cenueshmëri sigurie?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#pse-mund-të-zgjedh-të-vëzhgoj-dosjen-të-dërguar">Pse mund të zgjedh të vëzhgoj dosjen “Të dërguar”?</a></li>
       <li><a href="#pse-mund-të-zgjedh-të-mos-e-vëzhgoj-dosjen-deltachat">Pse mund të zgjedh të mos e vëzhgoj dosjen DeltaChat?</a></li>
       <li><a href="#a-është-i-përputhshëm-delta-chat-i-me-protonmail-in--tutanota-n--criptext-in">A është i përputhshëm ArcaneChat-i me Protonmail-in / Tutanota-n / Criptext-in?</a></li>
-      <li><a href="#si-mund-ta-fshij-llogarinë-time">Si mund ta fshij llogarinë time?</a></li>
+      <li><a href="#remove-account">Si mund ta fshij llogarinë time?</a></li>
       <li><a href="#më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">Më interesojnë hollësitë teknike. Mund të më tregoni diçka më tepër?</a></li>
       <li><a href="#si-financohet-zhvillimi-i-delta-chat-it">Si financohet zhvillimi i ArcaneChat-it?</a></li>
     </ul>
@@ -1151,10 +1151,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="a-mund-të-ripërdor-kyçin-tim-ekzistues-privat">
+      <h3 id="importkey">
         
         
-          A mund të ripërdor kyçin tim ekzistues privat? <a href="#a-mund-të-ripërdor-kyçin-tim-ekzistues-privat" class="anchor"></a>
+          A mund të ripërdor kyçin tim ekzistues privat? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1283,7 +1283,7 @@ Mund të lexoni <a href="https://delta.chat/assets/blog/2019-first-security-revi
 dhe prisni një çast sa të shfaqet një kod QR</p>
   </li>
   <li>
-    <p>Te pajisja e dytë, <a href="https://get.delta.chat">instaloni ArcaneChat-in</a></p>
+    <p>Te pajisja e dytë, <a href="https://github.com/ArcaneChat">instaloni ArcaneChat-in</a></p>
   </li>
   <li>
     <p>Në pajisjen e dytë, nisni ArcaneChat-in, përzgjidhni <strong>Shtoje si Pajisje të Dytë</strong> dhe skanoni kodin QR që nga pajisja e vjetër</p>
@@ -1388,7 +1388,7 @@ përkatës.</li>
   <li>Nëse ju duhet një Klient Web, ngaqë s’keni leje të instaloni software në
 kompjuterin me të cilin punoni, mund të përdorni Klientin e bartshëm për
 Windows Desktop, ose AppImage për Linux. Mund t’i gjeni te
-<a href="https://get.delta.chat">get.delta.chat</a>.</li>
+<a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1806,7 +1806,7 @@ përdoret tjetër program email-sh (bie fjala, Thunderbird-i) në krah të
 aplikacionit tuaj ArcaneChat, dhe doni që MUA juaj të marrë pjesë në biseda.</p>
 
 <p>Sidoqoftë, rekomandojmë të përdoret Klienti Desktop i ArcaneChat-it; mund ta 
-shkarkoni që nga <a href="https://get.delta.chat">get.delta.chat</a>. Mundësia për vëzhgim
+shkarkoni që nga <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. Mundësia për vëzhgim
 të dosjes “Të dërguar” mund të hiqet në të ardhmen. Qe prurë në kohët kur s’kish
 klient Desktop ArcaneChat për krejt platformat.</p>
     
@@ -1845,22 +1845,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="si-mund-ta-fshij-llogarinë-time">
+      <h3 id="remove-account">
         
         
-          Si mund ta fshij llogarinë time? <a href="#si-mund-ta-fshij-llogarinë-time" class="anchor"></a>
+          Si mund ta fshij llogarinë time? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>Ngaqë për ArcaneChat-in përdorni një llogari email,
-se si mund të fshini llogarinë tuaj, varet nga shërbimi juaj email.
-Nuk kemi fuqi mbi llogarinë tuaj email,
-ndaj, mjerisht, s’mund t’ju ndihmojmë për këtë.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/sq/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Nëse doni ta mbani llogarinë,
-por të çinstaloni ArcaneChat-in,
-rekomandohet të braktisni çfarëdo grupi fjalosjeje, para çinstalimit të ArcaneChat-it.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="më-interesojnë-hollësitë-teknike-mund-të-më-tregoni-diçka-më-tepër">
         

src/main/assets/help/uk/help.html

@@ -55,7 +55,7 @@
       <li><a href="#як-забезпечити-наскрізне-шифрування-та-видалення-повідомлень">Як забезпечити наскрізне шифрування та видалення повідомлень?</a></li>
       <li><a href="#pfs">Чи підтримує ArcaneChat цілковиту пряму секретність (Perfect Forward Secrecy)?</a></li>
       <li><a href="#чи-є-наскрізне-шифрування-delta-chat-таким-же-безпечним-як-signal">Чи є наскрізне шифрування ArcaneChat таким же безпечним, як Signal?</a></li>
-      <li><a href="#чи-можна-повторно-використовувати-існуючий-закритий-ключ">Чи можна повторно використовувати існуючий закритий ключ?</a></li>
+      <li><a href="#importkey">Чи можна повторно використовувати існуючий закритий ключ?</a></li>
       <li><a href="#я-не-можу-імпортувати-свій-існуючий-pgp-ключ-у-delta-chat">Я не можу імпортувати свій існуючий PGP ключ у ArcaneChat.</a></li>
       <li><a href="#security-audits">Чи проходив ArcaneChat незалежний аудит на наявність вразливостей у безпеці?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#чому-я-можу-обрати-стеження-за--папкою-надіслані">Чому я можу обрати стеження за  папкою “Надіслані”?</a></li>
       <li><a href="#чому-я-можу-відмовитись-від-стеження-за--папкою-deltachat">Чому я можу відмовитись від стеження за  папкою DeltaChat?</a></li>
       <li><a href="#чи-сумісний-delta-chat-із-protonmail--tutanota--criptext">Чи сумісний ArcaneChat із Protonmail / Tutanota / Criptext?</a></li>
-      <li><a href="#як-мені-видалити-свій-обліковий-запис">Як мені видалити свій обліковий запис?</a></li>
+      <li><a href="#remove-account">Як мені видалити свій обліковий запис?</a></li>
       <li><a href="#мене-цікавлять-технічні-деталі-можете-розповісти-більше">Мене цікавлять технічні деталі. Можете розповісти більше?</a></li>
       <li><a href="#як-фінансується-розробка-delta-chat">Як фінансується розробка ArcaneChat?</a></li>
     </ul>
@@ -831,10 +831,10 @@ Autocrypt використовує обмежену і <a href="#openpgp-secure"
 
 <p>У будь-якому випадку, наскрізне шифрування ArcaneChat використовує <a href="#openpgp-secure">безпечну підмножину OpenPGP</a> який пройшов <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">незалежний аудит безпеки</a>.</p>
     
-      <h3 id="чи-можна-повторно-використовувати-існуючий-закритий-ключ">
+      <h3 id="importkey">
         
         
-          Чи можна повторно використовувати існуючий закритий ключ? <a href="#чи-можна-повторно-використовувати-існуючий-закритий-ключ" class="anchor"></a>
+          Чи можна повторно використовувати існуючий закритий ключ? <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -917,7 +917,7 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
     <p>На першому пристрої перейдіть до <strong>Налаштування → Додати другий пристрій</strong>, розблокуйте екран, якщо потрібно і трохи зачекайте, поки не з’явиться QR-код</p>
   </li>
   <li>
-    <p>На другому пристрої <a href="https://get.delta.chat">встановіть ArcaneChat</a></p>
+    <p>На другому пристрої <a href="https://github.com/ArcaneChat">встановіть ArcaneChat</a></p>
   </li>
   <li>
     <p>На другому пристрої запустіть ArcaneChat, виберіть <strong>Додати як другий пристрій</strong> і відскануйте QR-код зі старого пристрою</p>
@@ -995,7 +995,7 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
 <ul>
   <li>Немає найближчих планів, крім попередніх думок.</li>
   <li>Є 2-3 способи створити веб-клієнт ArcaneChat, але всі вони вимагають значної роботи. На даний момент ми зосереджені на отриманні стабільних релізів в усіх магазини додатків (Google Play / IOS / Windows / MacOS / репозитаріїв Linux), як нативних додатків.</li>
-  <li>Якщо вам потрібен веб-клієнт, через заборону встановлювати програмне забезпечення на комп’ютері, з яким ви працюєте, ви можете використовувати портативний клієнт Windows Desktop або AppImage для Linux. Ви можете знайти їх на <a href="https://get.delta.chat">get.delta.chat</a>.</li>
+  <li>Якщо вам потрібен веб-клієнт, через заборону встановлювати програмне забезпечення на комп’ютері, з яким ви працюєте, ви можете використовувати портативний клієнт Windows Desktop або AppImage для Linux. Ви можете знайти їх на <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>.</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1316,7 +1316,7 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
 
 <p>Єдина причина, через яку захочеться стежити за папкою Надіслане, полягає в тому, що якщо ви використовуєте іншу поштову програму (наприклад, Thunderbird) разом із вашим додатком ArcaneChat і хочете, щоб ваш поштовий клієнт брав участь у розмовах.</p>
 
-<p>Однак ми рекомендуємо використовувати клієнт ArcaneChat Desktop; Ви можете завантажити його на <a href="https://get.delta.chat">get.delta.chat</a>. Можливість стеження папки “Надіслане” може зникнути в майбутньому. Вона був представлена у той час, коли на всіх платформах ще не було клієнта ArcaneChat Desktop.</p>
+<p>Однак ми рекомендуємо використовувати клієнт ArcaneChat Desktop; Ви можете завантажити його на <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a>. Можливість стеження папки “Надіслане” може зникнути в майбутньому. Вона був представлена у той час, коли на всіх платформах ще не було клієнта ArcaneChat Desktop.</p>
     
       <h3 id="чому-я-можу-відмовитись-від-стеження-за--папкою-deltachat">
         
@@ -1344,17 +1344,38 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
   <li>ArcaneChat може наскрізно шифрувати через будь-якого провайдера електронної пошти з будь-якою <a href="https://autocrypt.org/dev-status.html">поштовою програмою з підтримкою автошифрування</a>.</li>
 </ul>
     
-      <h3 id="як-мені-видалити-свій-обліковий-запис">
+      <h3 id="remove-account">
         
         
-          Як мені видалити свій обліковий запис? <a href="#як-мені-видалити-свій-обліковий-запис" class="anchor"></a>
+          Як мені видалити свій обліковий запис? <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>Оскільки ви використовуєте обліковий запис електронної пошти для ArcaneChat, спосіб видалення облікового запису залежить від вашого постачальника послуг електронної пошти. Ми не маємо жодного контролю над вашим обліковим записом електронної пошти, тому, на жаль, ми не можемо вам у цьому допомогти.</p>
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/uk/chatmail">3rd party chatmail server</a>.</p>
 
-<p>Якщо ви хочете зберегти обліковий запис, але видалити ArcaneChat, перед видаленням ArcaneChat рекомендується покинути будь-які групові чати.</p>
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
+how you can delete your account depends on your e-mail provider.
+We don’t have any control over e-mail accounts at those providers,
+so unfortunately we can’t help you with that.</p>
+
+<p>If you want to continue using a classic e-mail account with other apps,
+but uninstall ArcaneChat,
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="мене-цікавлять-технічні-деталі-можете-розповісти-більше">
         

src/main/assets/help/zh_CN/help.html

@@ -55,7 +55,7 @@
       <li><a href="#how-can-i-ensure-message-end-to-end-encryption-and-deletion">How can I ensure message end-to-end encryption and deletion?</a></li>
       <li><a href="#pfs">Does ArcaneChat support Perfect Forward Secrecy?</a></li>
       <li><a href="#is-end-to-end-encryption-of-delta-chat-as-safe-as-signal">Is end-to-end encryption of ArcaneChat as safe as Signal?</a></li>
-      <li><a href="#我可以重复使用现有的私钥吗">我可以重复使用现有的私钥吗？</a></li>
+      <li><a href="#importkey">我可以重复使用现有的私钥吗？</a></li>
       <li><a href="#我无法将现有的-pgp-密钥导入-delta-chat">我无法将现有的 PGP 密钥导入 ArcaneChat。</a></li>
       <li><a href="#security-audits">Was ArcaneChat independently audited for security vulnerabilities?</a></li>
     </ul>
@@ -97,7 +97,7 @@
       <li><a href="#为什么我可以选择监视已发送文件夹">为什么我可以选择监视“已发送”文件夹？</a></li>
       <li><a href="#为什么我可以选择不监视-deltachat-文件夹">为什么我可以选择不监视 DeltaChat 文件夹？</a></li>
       <li><a href="#delta-chat-与-protonmail--tutanota--criptext-兼容吗">ArcaneChat 与 Protonmail / Tutanota / Criptext 兼容吗？</a></li>
-      <li><a href="#如何删除我的账户">如何删除我的账户？</a></li>
+      <li><a href="#remove-account">如何删除我的账户？</a></li>
       <li><a href="#我对技术细节很感兴趣能告诉我更多吗">我对技术细节很感兴趣。能告诉我更多吗？</a></li>
       <li><a href="#delta-chat-的开发是如何被资助的">ArcaneChat 的开发是如何被资助的?</a></li>
     </ul>
@@ -1117,10 +1117,10 @@ past encrypted messages.</p>
 <p>In any case, ArcaneChat’s end-to-end encryption uses a <a href="#openpgp-secure">secure subset of OpenPGP</a>
 which has been <a href="https://delta.chat/assets/blog/2019-first-security-review.pdf">independently security-audited</a>.</p>
     
-      <h3 id="我可以重复使用现有的私钥吗">
+      <h3 id="importkey">
         
         
-          我可以重复使用现有的私钥吗？ <a href="#我可以重复使用现有的私钥吗" class="anchor"></a>
+          我可以重复使用现有的私钥吗？ <a href="#importkey" class="anchor"></a>
         
         
       </h3>
@@ -1240,7 +1240,7 @@ You can read the <a href="https://delta.chat/assets/blog/2019-first-security-rev
 and wait a moment until a QR code is shown</p>
   </li>
   <li>
-    <p>On the second device, <a href="https://get.delta.chat">install ArcaneChat</a></p>
+    <p>On the second device, <a href="https://github.com/ArcaneChat">install ArcaneChat</a></p>
   </li>
   <li>
     <p>On the second device, start ArcaneChat, select <strong>Add as Second Device</strong>, and scan the QR code from the old device</p>
@@ -1338,7 +1338,7 @@ end-to-end encrypted messages with your communication partners.</li>
 <ul>
   <li>目前没有计划，但有一些初步的想法。</li>
   <li>有 2-3 种途径来实现 ArcaneChat Web 客户端，但是它们都需要巨大的工作量。目前，我们专注于将稳定的版本作为本地应用程序发布到所有应用程序商店（Google Play/iOS/Windows/macOS/Linux 仓库）。</li>
-  <li>如果是因为不能在工作的电脑上安装软件而需要一个 Web 客户端，您可以使用便携版的 Windows 桌面客户端，或者在 Linux 上使用 AppImage 版。您可以在 <a href="https://get.delta.chat">get.delta.chat</a> 找到它们。</li>
+  <li>如果是因为不能在工作的电脑上安装软件而需要一个 Web 客户端，您可以使用便携版的 Windows 桌面客户端，或者在 Linux 上使用 AppImage 版。您可以在 <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a> 找到它们。</li>
 </ul>
     
       <h2 id="webxdc">
@@ -1716,7 +1716,7 @@ if you set a <a href="#signature">signature text</a>.</p>
 
 <p>监视已发送文件夹的唯一原因是：您在使用ArcaneChat软件的同时也使用其他的邮件应用程序（比如 Thunderbird），并且想让邮件分发代理参与聊天对话。</p>
 
-<p>不过，我们推荐使用 ArcaneChat 桌面客户端；您可以在 <a href="https://get.delta.chat">get.delta.chat</a> 下载它。监视“已发送”文件夹的选项是在还没有 ArcaneChat 桌面客户端的时候引入的，这个选项可能会在未来消失。</p>
+<p>不过，我们推荐使用 ArcaneChat 桌面客户端；您可以在 <a href="https://github.com/ArcaneChat">github.com/ArcaneChat</a> 下载它。监视“已发送”文件夹的选项是在还没有 ArcaneChat 桌面客户端的时候引入的，这个选项可能会在未来消失。</p>
     
       <h3 id="为什么我可以选择不监视-deltachat-文件夹">
         
@@ -1749,22 +1749,38 @@ uses.</li>
 <a href="https://autocrypt.org/dev-status.html">Autocrypt-enabled e-mail app</a>.</li>
 </ul>
     
-      <h3 id="如何删除我的账户">
+      <h3 id="remove-account">
         
         
-          如何删除我的账户？ <a href="#如何删除我的账户" class="anchor"></a>
+          如何删除我的账户？ <a href="#remove-account" class="anchor"></a>
         
         
       </h3>
 
-<p>As you use an e-mail account for ArcaneChat,
+<p>If you use a default chat profile
+you can simply uninstall the app.
+This will automatically trigger deletion of all associated account data on the chatmail server.
+For more info, please refer to <a href="https://nine.testrun.org/info.html#account-deletion">nine.testrun.org account-deletion</a> for the default onboarding server,
+or the respective page from your chosen <a href="https://delta.chat/zh_CN/chatmail">3rd party chatmail server</a>.</p>
+
+<p>If you have set up your chat profile on multiple devices
+you need to remove it from all devices.</p>
+
+<p>If you are using more than one account,
+but don’t want to get rid of all of them,
+you can remove it in the account switcher menu (on android and iOS),
+or in the sidebar with a right click (in the desktop client).</p>
+
+<p>Accounts on <a href="https://providers.delta.chat">classic e-mail providers</a>
+will not be deleted automatically;
 how you can delete your account depends on your e-mail provider.
-We don’t have any control over your e-mail account,
+We don’t have any control over e-mail accounts at those providers,
 so unfortunately we can’t help you with that.</p>
 
-<p>If you want to keep the account,
+<p>If you want to continue using a classic e-mail account with other apps,
 but uninstall ArcaneChat,
-it is recommended to leave any group chat before uninstalling ArcaneChat.</p>
+it is recommended to leave any group chat before uninstalling ArcaneChat.
+Otherwise you might receive undecryptable messages from those group chats.</p>
     
       <h3 id="我对技术细节很感兴趣能告诉我更多吗">
         

src/main/java/com/b44t/messenger/DcAccounts.java

@@ -33,6 +33,7 @@ public class DcAccounts {
     public native void            stopIo               ();
     public native void            maybeNetwork         ();
     public native void            setPushDeviceToken   (String token);
+    public native boolean         backgroundFetch      (int timeoutSeconds);
 
     public native int             addAccount           ();
     public native int             migrateAccount       (String dbfile);

src/main/java/com/b44t/messenger/DcContext.java

@@ -31,6 +31,7 @@ public class DcContext {
     public final static int DC_EVENT_WEBXDC_STATUS_UPDATE        = 2120;
     public final static int DC_EVENT_WEBXDC_INSTANCE_DELETED     = 2121;
     public final static int DC_EVENT_WEBXDC_REALTIME_DATA        = 2150;
+    public final static int DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE = 2200;
 
     public final static int DC_IMEX_EXPORT_SELF_KEYS = 1;
     public final static int DC_IMEX_IMPORT_SELF_KEYS = 2;
@@ -55,6 +56,7 @@ public class DcContext {
     public final static int DC_QR_BACKUP            = 251;
     public final static int DC_QR_BACKUP2           = 252;
     public final static int DC_QR_WEBRTC            = 260;
+    public final static int DC_QR_PROXY             = 271;
     public final static int DC_QR_ADDR              = 320;
     public final static int DC_QR_TEXT              = 330;
     public final static int DC_QR_URL               = 332;

src/main/java/com/b44t/messenger/rpc/Rpc.java

@@ -138,6 +138,10 @@ public class Rpc {
         getResult("leave_webxdc_realtime", accountId, instanceMessageId);
     }
 
+    public int getAccountFileSize(int accountId) throws RpcException {
+        return getResult("get_account_file_size", accountId).getAsInt();
+    }
+
     private static class Request {
         private final String jsonrpc = "2.0";
         public final String method;

src/main/java/org/thoughtcrime/securesms/ConversationActivity.java

@@ -38,7 +38,6 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.PowerManager;
 import android.os.Vibrator;
 import android.provider.Browser;
 import android.text.Editable;
@@ -302,12 +301,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     DcHelper.getNotificationCenter(this).updateVisibleChat(dcContext.getAccountId(), chatId);
 
     attachmentManager.onResume();
-
-    // action bar might be hidden by workaround in onStop()
-    ActionBar supportActionBar = getSupportActionBar();
-    if (supportActionBar != null && !supportActionBar.isShowing()) {
-        supportActionBar.show();
-    }
   }
 
   @Override
@@ -322,23 +315,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     AudioSlidePlayer.stopAll();
   }
 
-  @Override
-  public void onStop() {
-    super.onStop();
-
-    // hack/workaround to fix https://github.com/deltachat/deltachat-android/issues/2798
-    // the real cause of the problem is still unknown but hiding the action bar here fixes it
-    if ( Build.VERSION.SDK_INT >= 34) {
-      ActionBar supportActionBar = getSupportActionBar();
-      if (supportActionBar != null && container.isKeyboardOpen()) {
-        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        if (!pm.isInteractive()) {
-          supportActionBar.hide();
-        }
-      }
-    }
-  }
-
   @Override
   public void onConfigurationChanged(Configuration newConfig) {
     Log.i(TAG, "onConfigurationChanged(" + newConfig.orientation + ")");
@@ -1056,18 +1032,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         e.printStackTrace();
       }
     }
-    else if (action == ACTION_SEND_OUT && quote.isPresent() && EmojiProvider.getInstance(this).maybeEmoji(body)){
-      int quotedMsg = quote.get().getQuotedMsg().getId();
-      try {
-        rpc.sendReaction(dcContext.getAccountId(), quotedMsg, body.equals(getSelfReaction(quotedMsg))? "" : body);
-        future.set(chatId);
-        return future;
-      } catch (RpcException e) {
-        e.printStackTrace();
-        msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
-        msg.setText(body);
-      }
-    }
     else if (!body.isEmpty()){
       msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
       msg.setText(body);

src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -20,6 +20,7 @@ import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
 import static org.thoughtcrime.securesms.ConversationActivity.STARTING_POSITION_EXTRA;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ADDRESS;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SERVER_FLAGS;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL;
 import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
 import static org.thoughtcrime.securesms.util.RelayUtil.getDirectSharingChatId;
 import static org.thoughtcrime.securesms.util.RelayUtil.getSharedTitle;
@@ -66,6 +67,7 @@ import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.connect.DirectShareUtil;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.qr.QrActivity;
 import org.thoughtcrime.securesms.qr.QrCodeHandler;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -121,7 +123,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
           // Util.copy(inputStream, new FileOutputStream(outputFile));
           // msg.setFile(outputFile, "image/jpeg");
 
-          msg.setText(getString(R.string.update_1_46_android, "https://get.delta.chat/#changelogs"));
+          msg.setText(getString(R.string.update_1_46_android, "https://raw.githubusercontent.com/ArcaneChat/android/refs/heads/main/CHANGELOG.md"));
         }
         dcContext.addDeviceMsg(deviceMsgLabel, msg);
 
@@ -186,7 +188,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
     TooltipCompat.setTooltipText(selfAvatar, getText(R.string.switch_account));
     selfAvatar.setOnClickListener(v -> AccountManager.getInstance().showSwitchAccountMenu(this));
-    title.setOnClickListener(v -> {
+    findViewById(R.id.avatar_and_title).setOnClickListener(v -> {
       if (!isRelayingMessageContent(this)) {
         AccountManager.getInstance().showSwitchAccountMenu(this);
       }
@@ -265,7 +267,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     DcContext dcContext = DcHelper.getContext(this);
     int accountId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, dcContext.getAccountId());
     if (getIntent().getBooleanExtra(CLEAR_NOTIFICATIONS, false)) {
-      DcHelper.getNotificationCenter(this).removeAllNotifiations(accountId);
+      DcHelper.getNotificationCenter(this).removeAllNotifications(accountId);
     }
     if (accountId != dcContext.getAccountId()) {
       AccountManager.getInstance().switchAccountAndStartActivity(this, accountId);
@@ -312,6 +314,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   }
 
   public void refreshAvatar() {
+    if (selfAvatarContainer == null) return;
+
     if (isRelayingMessageContent(this)) {
       selfAvatarContainer.setVisibility(View.GONE);
     } else {
@@ -377,20 +381,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
     if (!isRelayingMessageContent(this)) {
       inflater.inflate(R.menu.text_secure_normal, menu);
-      MenuItem item = menu.findItem(R.id.menu_global_map);
-      if (Prefs.isLocationStreamingEnabled(this)) {
-        item.setVisible(true);
-      }
-
-      if (!Prefs.isLocationStreamingEnabled(this)) {
-        menu.findItem(R.id.menu_global_map).setVisible(false);
-      }
-
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-          MenuCompat.setGroupDividerEnabled(menu, true);
-      } else{
-          menu.setGroupVisible(R.id.extra_services, false);
-      }
+      menu.findItem(R.id.menu_global_map).setVisible(Prefs.isLocationStreamingEnabled(this));
+      menu.findItem(R.id.menu_proxy_settings).setVisible(!TextUtils.isEmpty(DcHelper.get(this, CONFIG_PROXY_URL)));
+      MenuCompat.setGroupDividerEnabled(menu, true);
     }
 
     super.onPrepareOptionsMenu(menu);
@@ -453,6 +446,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
       case R.id.menu_global_map:
         WebxdcActivity.openMaps(this, 0);
         return true;
+      case R.id.menu_proxy_settings:
+        startActivity(new Intent(this, ProxySettingsActivity.class));
+        return true;
       case android.R.id.home:
         onBackPressed();
         return true;
@@ -460,10 +456,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
         startActivity(new Intent(this, ProfileActivity.class));
         return true;
       case R.id.menu_webxdc_apps_store:
-          handleShowBot("xstore@testrun.org", "OPENPGP4FPR:37DC2B704A2AE2F6A96235CE0C3A0EBCA4F5801D#a=xstore%40testrun.org&n=&i=-1IGtynaivZ&s=JqHsvvcDmnW");
+        handleShowBot("juegos@buzon.uy", "OPENPGP4FPR:d3d403a734be71fe9293a00311fef80dbe5dbc89#a=juegos%40buzon.uy&n=&i=WQZY-8FODS3&s=ZQBkaclFzao");
         return true;
       case R.id.menu_public_bots:
-          handleShowBot("publicbots@testrun.org", "OPENPGP4FPR:4DB8117591B27184A903FF7E9F469E00D40E13E7#a=publicbots%40testrun.org&n=Public%20Bots&i=zSuQpFtBa_Q&s=weLMu1-o1o1");
+        handleShowBot("puente@buzon.uy", "OPENPGP4FPR:4B41E5AFAF78A0C71DB56138D5BEFED00A45F97A#a=puente%40buzon.uy&n=Public%20Bots&i=ZC_oaJtuvJP&s=5SE96rRovsK");
         return true;
     }
 

src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java

@@ -5,7 +5,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -13,6 +15,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.text.util.Linkify;
 import android.util.Log;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -47,6 +50,7 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints;
+import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.qr.RegistrationQrActivity;
 import org.thoughtcrime.securesms.scribbles.ScribbleActivity;
 import org.thoughtcrime.securesms.util.Prefs;
@@ -132,13 +136,29 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
     handleIntent();
   }
 
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    menu.clear();
+    getMenuInflater().inflate(R.menu.instant_onboarding_menu, menu);
+    return super.onPrepareOptionsMenu(menu);
+  }
+
   @Override
   public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     super.onOptionsItemSelected(item);
-    if (item.getItemId() == android.R.id.home) {
+
+    switch (item.getItemId()) {
+    case android.R.id.home:
       getOnBackPressedDispatcher().onBackPressed();
       return true;
+    case R.id.menu_proxy_settings:
+      startActivity(new Intent(this, ProxySettingsActivity.class));
+      return true;
+    case R.id.menu_view_log:
+      startActivity(new Intent(this, LogViewActivity.class));
+      return true;
     }
+
     return false;
   }
 
@@ -290,32 +310,15 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
     signUpBtn.setOnClickListener(view -> createProfile());
 
-    Button otherOptionsBtn = findViewById(R.id.other_options_button);
-    otherOptionsBtn.setOnClickListener(view -> showOtherOptionsDialog());
-  }
-
-  private void showOtherOptionsDialog() {
-    View view = View.inflate(this, R.layout.signup_options_view, null);
-    AlertDialog signUpDialog = new AlertDialog.Builder(this)
-      .setView(view)
-      .setTitle(R.string.instant_onboarding_show_more_instances)
-      .setNegativeButton(R.string.cancel, null)
-      .create();
-
-    view.findViewById(R.id.use_other_server).setOnClickListener((v) -> {
+    findViewById(R.id.use_other_server).setOnClickListener((v) -> {
       WebViewActivity.openUrlInBrowser(this, INSTANCES_URL);
-      signUpDialog.dismiss();
     });
-    view.findViewById(R.id.login_button).setOnClickListener((v) -> {
+    findViewById(R.id.login_button).setOnClickListener((v) -> {
       startRegistrationActivity();
-      signUpDialog.dismiss();
     });
-    view.findViewById(R.id.scan_qr_button).setOnClickListener((v) -> {
+    findViewById(R.id.scan_qr_button).setOnClickListener((v) -> {
       new IntentIntegrator(this).setCaptureActivity(RegistrationQrActivity.class).initiateScan();
-      signUpDialog.dismiss();
     });
-
-    signUpDialog.show();
   }
 
   private void startRegistrationActivity() {
@@ -330,7 +333,11 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
       privacyPolicyBtn.setText(getString(R.string.qrlogin_ask_login, providerHost));
     } else {
       signUpBtn.setText(R.string.instant_onboarding_create);
-      privacyPolicyBtn.setTextColor(getResources().getColor(R.color.def_accent));
+
+      try (TypedArray typedArray = obtainStyledAttributes(new int[]{R.attr.colorAccent})) {
+        privacyPolicyBtn.setTextColor(typedArray.getColor(0, Color.BLACK));
+      }
+
       if (DEFAULT_CHATMAIL_HOST.equals(providerHost)) {
         privacyPolicyBtn.setText(getString(R.string.instant_onboarding_agree_default2, providerHost));
       } else {
@@ -386,7 +393,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
   private void progressError(String data2) {
     progressDialog.dismiss();
-    maybeShowConfigurationError(this, data2);
+    WelcomeActivity.maybeShowConfigurationError(this, data2);
   }
 
   private void progressSuccess() {
@@ -399,22 +406,6 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
     finishAffinity();
   }
 
-  public static void maybeShowConfigurationError(Activity activity, String data2) {
-    if (data2 != null && !data2.isEmpty()) {
-      AlertDialog d = new AlertDialog.Builder(activity)
-        .setMessage(data2)
-        .setPositiveButton(android.R.string.ok, null)
-        .create();
-      d.show();
-      try {
-        //noinspection ConstantConditions
-        Linkify.addLinks((TextView) d.findViewById(android.R.id.message), Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES);
-      } catch(NullPointerException e) {
-        Log.e(TAG, "Linkify failed", e);
-      }
-    }
-  }
-
   @SuppressLint("StaticFieldLeak")
   private void createProfile() {
     if (TextUtils.isEmpty(this.name.getText())) {

src/main/java/org/thoughtcrime/securesms/LogViewFragment.java

@@ -17,6 +17,7 @@
 
 package org.thoughtcrime.securesms;
 
+import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.Context;
@@ -35,6 +36,7 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.PermissionChecker;
 import androidx.fragment.app.Fragment;
 
 import com.b44t.messenger.DcContext;
@@ -255,6 +257,13 @@ public class LogViewFragment extends Fragment {
         builder.append("rtl=").append(isRtl).append("\n");
       }
 
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        boolean notifPermGranted = PermissionChecker.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) == PermissionChecker.PERMISSION_GRANTED;
+        builder.append("post-notifications-granted=").append(notifPermGranted).append("\n");
+      } else {
+        builder.append("post-notifications-granted=<not needed>").append("\n");
+      }
+
       final String token = FcmReceiveService.getToken();
       builder.append("push-enabled=").append(Prefs.isPushEnabled(context)).append("\n");
       builder.append("push-token=").append(token == null ? "<empty>" : token).append("\n");

src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java

@@ -12,11 +12,7 @@ import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SEND_SECURITY;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SEND_SERVER;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SEND_USER;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SERVER_FLAGS;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_ENABLED;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_HOST;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_PASSWORD;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_PORT;
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_USER;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.getContext;
 import static org.thoughtcrime.securesms.service.IPCAddAccountsService.ACCOUNT_DATA;
 
@@ -59,6 +55,7 @@ import com.google.android.material.textfield.TextInputEditText;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Util;
@@ -96,7 +93,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
     Spinner certCheck;
 
     private SwitchCompat proxySwitch;
-    private Group proxyGroup;
 
     @Override
     public void onCreate(Bundle bundle) {
@@ -127,15 +123,11 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         authMethod = findViewById(R.id.auth_method);
         certCheck = findViewById(R.id.cert_check);
 
-        proxyGroup = findViewById(R.id.socks5_group);
-        proxySwitch = findViewById(R.id.socks5_switch);
-        proxySwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            proxyGroup.setVisibility(isChecked? advancedGroup.getVisibility() : View.GONE);
+        proxySwitch = findViewById(R.id.proxy_settings);
+        proxySwitch.setOnClickListener(l -> {
+            proxySwitch.setChecked(!proxySwitch.isChecked()); // revert toggle
+            startActivity(new Intent(this, ProxySettingsActivity.class));
         });
-        TextInputEditText proxyHostInput = findViewById(R.id.socks5_host_text);
-        TextInputEditText proxyPortInput = findViewById(R.id.socks5_port_text);
-        proxyHostInput.setOnFocusChangeListener((view, focused) -> focusListener(view, focused, VerificationType.SERVER));
-        proxyPortInput.setOnFocusChangeListener((view, focused) -> focusListener(view, focused, VerificationType.PORT));
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -161,7 +153,16 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         advancedIcon.setOnClickListener(l -> onAdvancedSettings());
         advancedIcon.setRotation(45);
         viewLogText.setOnClickListener((view) -> showLog());
+
         boolean isConfigured = DcHelper.isConfigured(getApplicationContext());
+        boolean expandAdvanced = false;
+        String strVal;
+        int intVal;
+
+        intVal = DcHelper.getInt(this, CONFIG_PROXY_ENABLED);
+        proxySwitch.setChecked(intVal == 1);
+        expandAdvanced = expandAdvanced || intVal == 1;
+
         if (isConfigured) {
             String email = DcHelper.get(this, CONFIG_ADDRESS);
             emailInput.setText(email);
@@ -170,10 +171,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             }
             passwordInput.setText(DcHelper.get(this, CONFIG_MAIL_PASSWORD));
 
-            boolean expandAdvanced = false;
-            String strVal;
-            int intVal;
-
             TextInputEditText imapLoginInput = findViewById(R.id.imap_login_text);
             strVal = DcHelper.get(this, CONFIG_MAIL_USER);
             imapLoginInput.setText(strVal);
@@ -213,17 +210,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             smtpSecurity.setSelection(intVal);
             expandAdvanced = expandAdvanced || intVal != 0;
 
-            intVal = DcHelper.getInt(this, CONFIG_SOCKS5_ENABLED);
-            proxySwitch.setChecked(intVal == 1);
-            expandAdvanced = expandAdvanced || intVal == 1;
-
-            proxyHostInput.setText(DcHelper.get(this, CONFIG_SOCKS5_HOST));
-            proxyPortInput.setText(DcHelper.get(this, CONFIG_SOCKS5_PORT));
-            TextInputEditText proxyUserInput = findViewById(R.id.socks5_user_text);
-            TextInputEditText proxyPasswordInput = findViewById(R.id.socks5_password_text);
-            proxyUserInput.setText(DcHelper.get(this, CONFIG_SOCKS5_USER));
-            proxyPasswordInput.setText(DcHelper.get(this, CONFIG_SOCKS5_PASSWORD));
-
             int serverFlags = DcHelper.getInt(this, CONFIG_SERVER_FLAGS);
             int sel = 0;
             if((serverFlags&DcContext.DC_LP_AUTH_OAUTH2)!=0) {
@@ -242,8 +228,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             int certCheckFlags = DcHelper.getInt(this, "imap_certificate_checks");
             certCheck.setSelection(certCheckFlags);
             expandAdvanced = expandAdvanced || certCheckFlags != 0;
-
-            if (expandAdvanced) { onAdvancedSettings(); }
         } else if (getIntent() != null && getIntent().getBundleExtra(ACCOUNT_DATA) != null) {
           // Companion app might have sent account data
           Bundle b = getIntent().getBundleExtra(ACCOUNT_DATA);
@@ -261,6 +245,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
           }
         }
 
+        if (expandAdvanced) { onAdvancedSettings(); }
         registerForEvents();
     }
 
@@ -272,6 +257,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
     public void onResume() {
         super.onResume();
         dynamicTheme.onResume(this);
+        proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1);
     }
 
     private void showLog() {
@@ -574,12 +560,10 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
     private void onAdvancedSettings() {
         boolean advancedViewVisible = advancedGroup.getVisibility() == View.VISIBLE;
         if (advancedViewVisible) {
-            proxyGroup.setVisibility(View.GONE);
             advancedGroup.setVisibility(View.GONE);
             advancedIcon.setRotation(45);
         } else {
             advancedGroup.setVisibility(View.VISIBLE);
-            if (proxySwitch.isChecked()) proxyGroup.setVisibility(View.VISIBLE);
             advancedIcon.setRotation(0);
         }
     }
@@ -621,15 +605,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         setConfig(R.id.smtp_port_text, CONFIG_SEND_PORT, true);
         setConfig(R.id.smtp_login_text, CONFIG_SEND_USER, false);
         setConfig(R.id.smtp_password_text, CONFIG_SEND_PASSWORD, false);
-        if (proxySwitch.isChecked()) {
-            DcHelper.getContext(this).setConfigInt(CONFIG_SOCKS5_ENABLED, 1);
-            setConfig(R.id.socks5_host_text, CONFIG_SOCKS5_HOST, true);
-            setConfig(R.id.socks5_port_text, CONFIG_SOCKS5_PORT, true);
-            setConfig(R.id.socks5_user_text, CONFIG_SOCKS5_USER, true);
-            setConfig(R.id.socks5_password_text, CONFIG_SOCKS5_PASSWORD, false);
-        } else {
-            DcHelper.getContext(this).setConfigInt(CONFIG_SOCKS5_ENABLED, 0);
-        }
 
         DcHelper.getContext(this).setConfigInt(CONFIG_MAIL_SECURITY, imapSecurity.getSelectedItemPosition());
         DcHelper.getContext(this).setConfigInt(CONFIG_SEND_SECURITY, smtpSecurity.getSelectedItemPosition());

src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java

@@ -69,26 +69,9 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
         super.onCreate(bundle);
         setContentView(R.layout.welcome_activity);
 
-        Button signUpButton = findViewById(R.id.signup_button);
-        Button signInButton = findViewById(R.id.signin_button);
-
-        View view = View.inflate(this, R.layout.login_options_view, null);
-        AlertDialog signInDialog = new AlertDialog.Builder(this)
-          .setView(view)
-          .setTitle(R.string.onboarding_alternative_logins)
-          .setNegativeButton(R.string.cancel, null)
-          .create();
-        view.findViewById(R.id.add_as_second_device_button).setOnClickListener((v) -> {
-          startAddAsSecondDeviceActivity();
-          signInDialog.dismiss();
-        });
-        view.findViewById(R.id.backup_button).setOnClickListener((v) -> {
-          startImportBackup();
-          signInDialog.dismiss();
-        });
-
-        signUpButton.setOnClickListener((v) -> startInstantOnboardingActivity());
-        signInButton.setOnClickListener((v) -> signInDialog.show());
+        findViewById(R.id.signup_button).setOnClickListener((v) -> startInstantOnboardingActivity());
+        findViewById(R.id.add_as_second_device_button).setOnClickListener((v) -> startAddAsSecondDeviceActivity());
+        findViewById(R.id.backup_button).setOnClickListener((v) -> startImportBackup());
 
         registerForEvents();
         initializeActionBar();
@@ -296,6 +279,8 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
     }
 
     public static void maybeShowConfigurationError(Activity activity, String data2) {
+        if (activity.isFinishing()) return;  // avoid android.view.WindowManager$BadTokenException
+
         if (data2 != null && !data2.isEmpty()) {
             AlertDialog d = new AlertDialog.Builder(activity)
                 .setMessage(data2)

src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListAdapter.java

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.accounts;
 
-import android.app.Activity;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,7 +10,6 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.b44t.messenger.DcAccounts;
-import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 
 import org.thoughtcrime.securesms.R;
@@ -92,7 +90,7 @@ public class AccountSelectionListAdapter extends RecyclerView.Adapter
   @Override
   public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
     int id = accountList[i];
-    DcContext dcContext = (id == DcContact.DC_CONTACT_ID_ADD_ACCOUNT)? null : accounts.getAccount(id);
+    DcContext dcContext = accounts.getAccount(id);
 
     ViewHolder holder = (ViewHolder) viewHolder;
     holder.unbind(glideRequests);

src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java

@@ -4,10 +4,12 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@@ -16,15 +18,20 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.b44t.messenger.DcAccounts;
+import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
+import com.b44t.messenger.rpc.Rpc;
+import com.b44t.messenger.rpc.RpcException;
 
 import org.thoughtcrime.securesms.ConnectivityActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.AvatarView;
 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -100,11 +107,7 @@ public class AccountSelectionListFragment extends DialogFragment implements DcEv
     int accountId = listItem.getAccountId();
     DcAccounts dcAccounts = DcHelper.getAccounts(getActivity());
 
-    if (accountId == dcAccounts.getSelectedAccount().getAccountId()) {
-      menu.findItem(R.id.delete).setVisible(false);
-    } else {
-      Util.redMenuItem(menu, R.id.delete);
-    }
+    Util.redMenuItem(menu, R.id.delete);
 
     if (dcAccounts.getAccount(accountId).isMuted()) {
       menu.findItem(R.id.menu_mute_notifications).setTitle(R.string.menu_unmute);
@@ -138,14 +141,45 @@ public class AccountSelectionListFragment extends DialogFragment implements DcEv
     AccountSelectionListFragment.this.dismiss();
     if (activity == null) return;
     DcAccounts accounts = DcHelper.getAccounts(activity);
+    Rpc rpc = DcHelper.getRpc(activity);
+
+    View dialogView = View.inflate(activity, R.layout.dialog_delete_profile, null);
+    AvatarView avatar = dialogView.findViewById(R.id.avatar);
+    TextView nameView = dialogView.findViewById(R.id.name);
+    TextView addrView = dialogView.findViewById(R.id.address);
+    TextView sizeView = dialogView.findViewById(R.id.size_label);
+    TextView description = dialogView.findViewById(R.id.description);
+    DcContext dcContext = accounts.getAccount(accountId);
+    String name = dcContext.getConfig("displayname");
+    DcContact contact = dcContext.getContact(DcContact.DC_CONTACT_ID_SELF);
+    if (TextUtils.isEmpty(name)) {
+      name = contact.getAddr();
+    }
+    Recipient recipient = new Recipient(getContext(), contact, name);
+    avatar.setAvatar(GlideApp.with(activity), recipient, false);
+    nameView.setText(name);
+    addrView.setText(contact.getAddr());
+    try {
+      sizeView.setText(Util.getPrettyFileSize(rpc.getAccountFileSize(accountId)));
+    } catch (RpcException e) {
+      e.printStackTrace();
+    }
+    description.setText(activity.getString(R.string.delete_account_explain_with_name, name));
+
     AlertDialog dialog = new AlertDialog.Builder(activity)
-      .setTitle(accounts.getAccount(accountId).getNameNAddr())
-      .setMessage(R.string.forget_login_confirmation_desktop)
+      .setTitle(R.string.delete_account)
+      .setView(dialogView)
       .setNegativeButton(R.string.cancel, (d, which) -> AccountManager.getInstance().showSwitchAccountMenu(activity))
       .setPositiveButton(R.string.delete, (d2, which2) -> {
-          DcHelper.getNotificationCenter(activity).removeAllNotifiations(accountId);
+          boolean selected = accountId == accounts.getSelectedAccount().getAccountId();
+          DcHelper.getNotificationCenter(activity).removeAllNotifications(accountId);
           accounts.removeAccount(accountId);
-          AccountManager.getInstance().showSwitchAccountMenu(activity);
+          if (selected) {
+            DcContext selAcc = accounts.getSelectedAccount();
+            AccountManager.getInstance().switchAccountAndStartActivity(activity, selAcc.isOk()? selAcc.getAccountId() : 0);
+          } else {
+            AccountManager.getInstance().showSwitchAccountMenu(activity);
+          }
       })
       .show();
     Util.redPositiveButton(dialog);

src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListItem.java

@@ -68,15 +68,24 @@ public class AccountSelectionListItem extends LinearLayout {
     String name;
     String addr = null;
     int unreadCount = 0;
-    boolean isMuted = dcContext != null && dcContext.isMuted();
+    boolean isMuted = dcContext.isMuted();
 
     Recipient recipient;
-    if (accountId != DcContact.DC_CONTACT_ID_ADD_ACCOUNT) {
+    if (accountId == DcContact.DC_CONTACT_ID_ADD_ACCOUNT) {
+      name = getContext().getString(R.string.add_account);
+      enableSwitch.setVisibility(View.INVISIBLE);
+      recipient = null;
+      this.contactPhotoImage.setSeenRecently(false); // hide connectivity dot
+    } else {
       self = dcContext.getContact(DcContact.DC_CONTACT_ID_SELF);
-      addr = dcContext.isCommunity()? getContext().getString(R.string.community) : self.getAddr();
       name = dcContext.getConfig("displayname");
       if (TextUtils.isEmpty(name)) {
-        name = addr;
+        name = self.getAddr();
+      }
+      if (dcContext.isCommunity()) {
+        addr = getContext().getString(R.string.community);
+      } else if (!dcContext.isChatmail()) {
+        addr = self.getAddr();
       }
       unreadCount = dcContext.getFreshMsgs().length;
 
@@ -84,17 +93,12 @@ public class AccountSelectionListItem extends LinearLayout {
       enableSwitch.setVisibility(View.VISIBLE);
       recipient = new Recipient(getContext(), self, name);
       this.contactPhotoImage.setConnectivity(dcContext.getConnectivity());
-    } else {
-      name = getContext().getString(R.string.add_account);
-      enableSwitch.setVisibility(View.INVISIBLE);
-      recipient = null;
-      this.contactPhotoImage.setSeenRecently(false); // hide connectivity dot
     }
     this.contactPhotoImage.setAvatar(glideRequests, recipient, false);
 
-    setSelected(selected);
     nameView.setCompoundDrawablesWithIntrinsicBounds(isMuted? R.drawable.ic_volume_off_grey600_18dp : 0, 0, 0, 0);
 
+    setSelected(selected);
     if (selected) {
       addrView.setTypeface(null, Typeface.BOLD);
       nameView.setTypeface(null, Typeface.BOLD);

src/main/java/org/thoughtcrime/securesms/connect/DcEventCenter.java

@@ -11,6 +11,7 @@ import com.b44t.messenger.DcEvent;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.service.FetchForegroundService;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.ArrayList;
@@ -177,6 +178,10 @@ public class DcEventCenter {
         DcHelper.getNotificationCenter(context).removeNotifications(accountId, event.getData1Int());
         break;
 
+      case DcContext.DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE:
+        FetchForegroundService.stop(context);
+        break;
+
       case DcContext.DC_EVENT_IMEX_PROGRESS:
         sendToCurrentAccountObservers(event);
         return 0;

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

@@ -75,11 +75,8 @@ public class DcHelper {
     public static final String CONFIG_SHOW_EMAILS = "show_emails";
     public static final String CONFIG_MEDIA_QUALITY = "media_quality";
     public static final String CONFIG_WEBRTC_INSTANCE = "webrtc_instance";
-    public static final String CONFIG_SOCKS5_ENABLED = "socks5_enabled";
-    public static final String CONFIG_SOCKS5_HOST = "socks5_host";
-    public static final String CONFIG_SOCKS5_PORT = "socks5_port";
-    public static final String CONFIG_SOCKS5_USER = "socks5_user";
-    public static final String CONFIG_SOCKS5_PASSWORD = "socks5_password";
+    public static final String CONFIG_PROXY_ENABLED = "proxy_enabled";
+    public static final String CONFIG_PROXY_URL = "proxy_url";
     public static final String CONFIG_VERIFIED_ONE_ON_ONE_CHATS = "verified_one_on_one_chats";
     public static final String CONFIG_WEBXDC_REALTIME_ENABLED = "webxdc_realtime_enabled";
 

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

@@ -638,14 +638,12 @@ public class AttachmentManager {
   private class EditButtonListener implements View.OnClickListener {
     @Override
     public void onClick(View v) {
-      if (Build.VERSION.SDK_INT >= 19) {
+      Uri imgUri = getSlideUri();
+      if (imgUri != null) {
         Intent intent = new Intent(context, ScribbleActivity.class);
-        intent.setData(getSlideUri());
+        intent.setData(imgUri);
         ((Activity) context).startActivityForResult(intent, ScribbleActivity.SCRIBBLE_REQUEST_CODE);
       }
-      else {
-        Toast.makeText(context, "Image editing requires Android 4.4 KitKat or newer.", Toast.LENGTH_LONG).show();
-      }
     }
   }
 

src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java

@@ -8,6 +8,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import com.b44t.messenger.DcContext;
+
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.util.Util;
 
@@ -16,6 +18,7 @@ public class MarkReadReceiver extends BroadcastReceiver {
   public static final  String CANCEL_ACTION         = "org.thoughtcrime.securesms.notifications.CANCEL";
   public static final  String ACCOUNT_ID_EXTRA      = "account_id";
   public static final  String CHAT_ID_EXTRA         = "chat_id";
+  public static final  String MSG_ID_EXTRA          = "msg_id";
 
   @Override
   public void onReceive(final Context context, Intent intent) {
@@ -26,6 +29,7 @@ public class MarkReadReceiver extends BroadcastReceiver {
 
     final int accountId = intent.getIntExtra(ACCOUNT_ID_EXTRA, 0);
     final int chatId = intent.getIntExtra(CHAT_ID_EXTRA, DC_CHAT_NO_CHAT);
+    final int msgId = intent.getIntExtra(MSG_ID_EXTRA, 0);
     if (accountId == 0 || chatId == DC_CHAT_NO_CHAT) {
       return;
     }
@@ -33,7 +37,9 @@ public class MarkReadReceiver extends BroadcastReceiver {
     Util.runOnAnyBackgroundThread(() -> {
       DcHelper.getNotificationCenter(context).removeNotifications(accountId, chatId);
       if (markNoticed) {
-        DcHelper.getAccounts(context).getAccount(accountId).marknoticedChat(chatId);
+        DcContext dcContext = DcHelper.getAccounts(context).getAccount(accountId);
+        dcContext.marknoticedChat(chatId);
+        dcContext.markseenMsgs(new int[]{msgId});
       }
     });
   }

src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java

@@ -128,22 +128,24 @@ public class NotificationCenter {
                 .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT | IntentUtils.FLAG_MUTABLE());
     }
 
-    private PendingIntent getRemoteReplyIntent(ChatData chatData) {
+    private PendingIntent getRemoteReplyIntent(ChatData chatData, int msgId) {
         Intent intent = new Intent(RemoteReplyReceiver.REPLY_ACTION);
         intent.setClass(context, RemoteReplyReceiver.class);
         intent.setData(Uri.parse("custom://"+chatData.accountId+"."+chatData.chatId));
         intent.putExtra(RemoteReplyReceiver.ACCOUNT_ID_EXTRA, chatData.accountId);
         intent.putExtra(RemoteReplyReceiver.CHAT_ID_EXTRA, chatData.chatId);
+        intent.putExtra(RemoteReplyReceiver.MSG_ID_EXTRA, msgId);
         intent.setPackage(context.getPackageName());
         return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | IntentUtils.FLAG_MUTABLE());
     }
 
-    private PendingIntent getMarkAsReadIntent(ChatData chatData, boolean markNoticed) {
+    private PendingIntent getMarkAsReadIntent(ChatData chatData, int msgId, boolean markNoticed) {
         Intent intent = new Intent(markNoticed? MarkReadReceiver.MARK_NOTICED_ACTION : MarkReadReceiver.CANCEL_ACTION);
         intent.setClass(context, MarkReadReceiver.class);
         intent.setData(Uri.parse("custom://"+chatData.accountId+"."+chatData.chatId));
         intent.putExtra(MarkReadReceiver.ACCOUNT_ID_EXTRA, chatData.accountId);
         intent.putExtra(MarkReadReceiver.CHAT_ID_EXTRA, chatData.chatId);
+        intent.putExtra(MarkReadReceiver.MSG_ID_EXTRA, msgId);
         intent.setPackage(context.getPackageName());
         return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | IntentUtils.FLAG_MUTABLE());
     }
@@ -166,6 +168,7 @@ public class NotificationCenter {
     public static final int ID_PERMANENT   = 1;
     public static final int ID_MSG_SUMMARY = 2;
     public static final int ID_GENERIC     = 3;
+    public static final int ID_FETCH       = 4;
     public static final int ID_MSG_OFFSET  = 0; // msgId is added - as msgId start at 10, there are no conflicts with lower numbers
 
 
@@ -379,7 +382,7 @@ public class NotificationCenter {
                     .setCategory(NotificationCompat.CATEGORY_MESSAGE)
                     .setOnlyAlertOnce(!signal)
                     .setContentText(line)
-                    .setDeleteIntent(getMarkAsReadIntent(chatData, false))
+                    .setDeleteIntent(getMarkAsReadIntent(chatData, msgId, false))
                     .setContentIntent(getOpenChatIntent(chatData));
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -450,11 +453,11 @@ public class NotificationCenter {
             // if privacy options are enabled, the buttons are not added.
             if (privacy.isDisplayContact() && privacy.isDisplayMessage()) {
                 try {
-                    PendingIntent inNotificationReplyIntent = getRemoteReplyIntent(chatData);
-                    PendingIntent markReadIntent = getMarkAsReadIntent(chatData, true);
+                    PendingIntent inNotificationReplyIntent = getRemoteReplyIntent(chatData, msgId);
+                    PendingIntent markReadIntent = getMarkAsReadIntent(chatData, msgId, true);
 
                     NotificationCompat.Action markAsReadAction = new NotificationCompat.Action(R.drawable.check,
-                            context.getString(R.string.notify_dismiss),
+                            context.getString(R.string.mark_as_read_short),
                             markReadIntent);
 
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -567,7 +570,7 @@ public class NotificationCenter {
         } catch (Exception e) { Log.w(TAG, e); }
     }
 
-    public void removeAllNotifiations(int accountId) {
+    public void removeAllNotifications(int accountId) {
         NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
         String tag = String.valueOf(accountId);
         synchronized (inboxes) {

src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java

@@ -27,6 +27,7 @@ import android.os.Bundle;
 import androidx.core.app.RemoteInput;
 
 import com.b44t.messenger.DcContext;
+import com.b44t.messenger.DcMsg;
 
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.util.Util;
@@ -41,6 +42,7 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
   public static final String REPLY_ACTION  = "org.thoughtcrime.securesms.notifications.WEAR_REPLY";
   public static final String ACCOUNT_ID_EXTRA = "account_id";
   public static final String CHAT_ID_EXTRA = "chat_id";
+  public static final String MSG_ID_EXTRA = "msg_id";
   public static final String EXTRA_REMOTE_REPLY = "extra_remote_reply";
 
   @SuppressLint("StaticFieldLeak")
@@ -50,6 +52,7 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
     Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
     final int accountId = intent.getIntExtra(ACCOUNT_ID_EXTRA, 0);
     final int chatId = intent.getIntExtra(CHAT_ID_EXTRA, DC_CHAT_NO_CHAT);
+    final int msgId = intent.getIntExtra(MSG_ID_EXTRA, 0);
 
     if (remoteInput == null || chatId == DC_CHAT_NO_CHAT || accountId == 0) return;
 
@@ -58,10 +61,17 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
     if (responseText != null) {
       Util.runOnAnyBackgroundThread(() -> {
         DcContext dcContext = DcHelper.getAccounts(context).getAccount(accountId);
+        dcContext.marknoticedChat(chatId);
+        dcContext.markseenMsgs(new int[]{msgId});
         if (dcContext.getChat(chatId).isContactRequest()) {
           dcContext.acceptChat(chatId);
         }
-        dcContext.sendTextMsg(chatId, responseText.toString());
+
+        DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
+        msg.setText(responseText.toString());
+        msg.setQuote(dcContext.getMsg(msgId));
+        dcContext.sendMsg(chatId, msg);
+
         DcHelper.getNotificationCenter(context).removeNotifications(accountId, chatId);
       });
     }

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

@@ -35,6 +35,7 @@ import com.b44t.messenger.rpc.RpcException;
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.ConversationActivity;
 import org.thoughtcrime.securesms.LogViewActivity;
+import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.RegistrationActivity;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
@@ -157,6 +158,11 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
       return true;
     }));
 
+    this.findPreference("proxy_settings_button").setOnPreferenceClickListener((preference) -> {
+      startActivity(new Intent(getActivity(), ProxySettingsActivity.class));
+      return true;
+    });
+
     Preference passwordAndAccount = this.findPreference("password_account_settings_button");
     passwordAndAccount.setOnPreferenceClickListener(((preference) -> {
       boolean result = ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.pref_password_and_account_settings), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT);
@@ -389,6 +395,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
                   }
               )
               .setNegativeButton(R.string.cancel, null)
+              .setNeutralButton(R.string.learn_more, (d, w) -> DcHelper.openHelp(getActivity(), "#importkey"))
               .show();
         })
         .execute();

src/main/java/org/thoughtcrime/securesms/proxy/ProxyListAdapter.java

@@ -0,0 +1,172 @@
+package org.thoughtcrime.securesms.proxy;
+
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.b44t.messenger.DcContext;
+import com.b44t.messenger.DcLot;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.connect.DcHelper;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+public class ProxyListAdapter extends BaseAdapter {
+  private enum ProxyState {
+    CONNECTED,
+    CONNECTING,
+    NOT_CONNECTED,
+  }
+
+  @NonNull  private final Context context;
+  @NonNull  private final DcContext dcContext;
+  @NonNull  private final List<String> proxies = new LinkedList<>();
+  @Nullable private ItemClickListener itemClickListener;
+  @Nullable private ProxyState proxyState;
+  @Nullable private String selectedProxy;
+
+  public ProxyListAdapter(@NonNull Context context)
+  {
+    this.context = context;
+    this.dcContext = DcHelper.getContext(context);
+  }
+
+  @Override
+  public int getCount() {
+    return proxies.size();
+  }
+
+  @Override
+  public Object getItem(int position) {
+    return proxies.get(position);
+  }
+
+  @Override
+  public long getItemId(int position) {
+    return position;
+  }
+
+  @Override
+  public View getView(final int position, View v, final ViewGroup parent) {
+    if (v == null) {
+      v = LayoutInflater.from(context).inflate(R.layout.proxy_list_item, parent, false);
+    }
+
+    TextView host = v.findViewById(R.id.host);
+    TextView protocol = v.findViewById(R.id.protocol);
+    ImageView checkmark = v.findViewById(R.id.checkmark);
+    TextView status = v.findViewById(R.id.status);
+
+    final String proxyUrl = (String)getItem(position);
+    final DcLot qrParsed = dcContext.checkQr(proxyUrl);
+    if (qrParsed.getState() == DcContext.DC_QR_PROXY) {
+      host.setText(qrParsed.getText1());
+      protocol.setText(proxyUrl.split(":", 2)[0]);
+    } else {
+      host.setText(proxyUrl);
+      protocol.setText(R.string.unknown);
+    }
+    if (proxyUrl.equals(selectedProxy)) {
+      checkmark.setVisibility(View.VISIBLE);
+      status.setVisibility(View.VISIBLE);
+      status.setText(getConnectivityString());
+    } else {
+      checkmark.setVisibility(View.GONE);
+      status.setVisibility(View.GONE);
+    }
+
+    v.setOnClickListener(view -> {
+      if (itemClickListener != null) {
+        itemClickListener.onItemClick(proxyUrl);
+      }
+    });
+    v.findViewById(R.id.share).setOnClickListener(view -> {
+      if (itemClickListener != null) {
+        itemClickListener.onItemShare(proxyUrl);
+      }
+    });
+    v.findViewById(R.id.delete).setOnClickListener(view -> {
+      if (itemClickListener != null) {
+        itemClickListener.onItemDelete(proxyUrl);
+      }
+    });
+
+    return v;
+  }
+
+  public void changeData(String newProxies) {
+    proxies.clear();
+    if (!TextUtils.isEmpty(newProxies)) {
+      Collections.addAll(proxies, newProxies.split("\n"));
+    }
+    selectedProxy = proxies.isEmpty()? null : proxies.get(0);
+    proxyState = null; // to force notifyDataSetChanged() in refreshConnectivity()
+    refreshConnectivity();
+  }
+
+  public void setSelectedProxy(String proxyUrl) {
+    selectedProxy = proxyUrl;
+    notifyDataSetChanged();
+  }
+
+  private String getConnectivityString() {
+    if (proxyState == ProxyState.CONNECTED) {
+      return context.getString(R.string.connectivity_connected);
+    }
+    if (proxyState == ProxyState.CONNECTING) {
+      return context.getString(R.string.connectivity_connecting);
+    }
+    return context.getString(R.string.connectivity_not_connected);
+  }
+
+  public void refreshConnectivity() {
+    if (DcHelper.getInt(context, CONFIG_PROXY_ENABLED) != 1) {
+      if (proxyState != ProxyState.NOT_CONNECTED) {
+        proxyState = ProxyState.NOT_CONNECTED;
+        notifyDataSetChanged();
+      }
+      return;
+    }
+
+    int connectivity = dcContext.getConnectivity();
+    if (connectivity >= DcContext.DC_CONNECTIVITY_WORKING) {
+      if (proxyState != ProxyState.CONNECTED) {
+        proxyState = ProxyState.CONNECTED;
+        notifyDataSetChanged();
+      }
+    } else if (connectivity >= DcContext.DC_CONNECTIVITY_CONNECTING) {
+      if (proxyState != ProxyState.CONNECTING) {
+        proxyState = ProxyState.CONNECTING;
+        notifyDataSetChanged();
+      }
+    } else if (proxyState != ProxyState.NOT_CONNECTED) {
+      proxyState = ProxyState.NOT_CONNECTED;
+      notifyDataSetChanged();
+    }
+  }
+
+  public void setItemClickListener(@Nullable ItemClickListener listener) {
+    itemClickListener = listener;
+  }
+
+  public interface ItemClickListener {
+    void onItemClick(String proxyUrl);
+    void onItemShare(String proxyUrl);
+    void onItemDelete(String proxyUrl);
+  }
+
+}

src/main/java/org/thoughtcrime/securesms/proxy/ProxySettingsActivity.java

@@ -0,0 +1,189 @@
+package org.thoughtcrime.securesms.proxy;
+
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.SwitchCompat;
+
+import com.b44t.messenger.DcContext;
+import com.b44t.messenger.DcEvent;
+import com.b44t.messenger.DcLot;
+
+import org.thoughtcrime.securesms.BaseActionBarActivity;
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.connect.DcEventCenter;
+import org.thoughtcrime.securesms.connect.DcHelper;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.Util;
+
+import java.util.LinkedList;
+
+public class ProxySettingsActivity extends BaseActionBarActivity
+  implements ProxyListAdapter.ItemClickListener, DcEventCenter.DcEventDelegate {
+
+  private final DynamicTheme dynamicTheme = new DynamicTheme();
+  private SwitchCompat proxySwitch;
+  private ProxyListAdapter adapter;
+
+  @Override
+  public void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+    dynamicTheme.onCreate(this);
+    setContentView(R.layout.proxy_settings_activity);
+
+    ActionBar actionBar = getSupportActionBar();
+    if (actionBar != null) {
+      actionBar.setTitle(R.string.proxy_settings);
+      actionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
+    adapter = new ProxyListAdapter(this);
+    adapter.setItemClickListener(this);
+
+    proxySwitch = findViewById(R.id.proxy_switch);
+    proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1);
+    proxySwitch.setOnClickListener(l -> {
+      if (proxySwitch.isChecked() && adapter.getCount() == 0) {
+        showAddProxyDialog();
+      } else {
+        DcHelper.set(this, CONFIG_PROXY_ENABLED, proxySwitch.isChecked()? "1" : "0");
+        restartIO();
+      }
+    });
+
+    ListView proxyList = findViewById(R.id.proxy_list);
+    proxyList.setAdapter(adapter);
+    proxyList.addHeaderView(View.inflate(this, R.layout.proxy_list_header, null), null, false);
+    View footer = View.inflate(this, R.layout.proxy_list_footer, null);
+    footer.setOnClickListener(l -> showAddProxyDialog());
+    proxyList.addFooterView(footer);
+    adapter.changeData(DcHelper.get(this, CONFIG_PROXY_URL));
+    DcHelper.getEventCenter(this).addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    DcHelper.getEventCenter(this).removeObservers(this);
+  }
+
+  public boolean onOptionsItemSelected(MenuItem item) {
+    int id = item.getItemId();
+    if (id == android.R.id.home) {
+      finish();
+      return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+
+  @Override
+  public void onItemClick(String proxyUrl) {
+    if (DcHelper.getContext(this).setConfigFromQr(proxyUrl)) {
+      restartIO();
+      adapter.setSelectedProxy(proxyUrl);
+      proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1);
+    } else {
+      Toast.makeText(this, R.string.proxy_invalid, Toast.LENGTH_LONG).show();
+    }
+  }
+
+  @Override
+  public void onItemShare(String proxyUrl) {
+    Intent intent = new Intent(Intent.ACTION_SEND);
+    intent.setType("text/plain");
+    intent.putExtra(Intent.EXTRA_TEXT, proxyUrl);
+    startActivity(Intent.createChooser(intent, getString(R.string.chat_share_with_title)));
+  }
+
+  @Override
+  public void onItemDelete(String proxyUrl) {
+    String host = DcHelper.getContext(this).checkQr(proxyUrl).getText1();
+    AlertDialog dialog = new AlertDialog.Builder(this)
+      .setTitle(R.string.proxy_delete)
+      .setMessage(getString(R.string.proxy_delete_explain, host))
+      .setPositiveButton(R.string.delete, (dlg, btn) -> deleteProxy(proxyUrl))
+      .setNegativeButton(android.R.string.cancel, null)
+      .show();
+    Util.redPositiveButton(dialog);
+  }
+
+  private void deleteProxy(String proxyUrl) {
+    final LinkedList<String> proxies = new LinkedList<>();
+    for (String proxy: DcHelper.get(this, CONFIG_PROXY_URL).split("\n")) {
+      if (!proxy.equals(proxyUrl)) {
+        proxies.add(proxy);
+      }
+    }
+    if (proxies.isEmpty()) {
+      DcHelper.set(this, CONFIG_PROXY_ENABLED, "0");
+      proxySwitch.setChecked(false);
+    }
+    String proxyUrls = String.join("\n", proxies);
+    DcHelper.set(this, CONFIG_PROXY_URL, proxyUrls);
+    restartIO();
+    adapter.changeData(proxyUrls);
+  }
+
+  private void showAddProxyDialog() {
+    View view = View.inflate(this, R.layout.single_line_input, null);
+    EditText inputField = view.findViewById(R.id.input_field);
+    inputField.setHint(R.string.proxy_add_url_hint);
+
+    new AlertDialog.Builder(this)
+      .setTitle(R.string.proxy_add)
+      .setMessage(R.string.proxy_add_explain)
+      .setView(view)
+      .setPositiveButton(R.string.proxy_use_proxy, (dialog, whichButton) -> {
+          String newProxy = inputField.getText().toString().trim();
+          DcContext dcContext = DcHelper.getContext(this);
+          final DcLot qrParsed = dcContext.checkQr(newProxy);
+          if (qrParsed.getState() == DcContext.DC_QR_PROXY) {
+            dcContext.setConfigFromQr(newProxy);
+            restartIO();
+            adapter.changeData(DcHelper.get(this, CONFIG_PROXY_URL));
+          } else {
+            Toast.makeText(this, R.string.proxy_invalid, Toast.LENGTH_LONG).show();
+          }
+          proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1);
+      })
+      .setNegativeButton(android.R.string.cancel, (dialog, whichButton) -> {
+          if (proxySwitch.isChecked() && adapter.getCount() == 0) {
+            // user enabled switch without having proxies yet, revert
+            proxySwitch.setChecked(false);
+          }
+      })
+      .setCancelable(false)
+      .show();
+  }
+
+  private void restartIO() {
+    DcContext dcContext = DcHelper.getContext(this);
+    dcContext.stopIo();
+    dcContext.startIo();
+  }
+
+  @Override
+  public void handleEvent(@NonNull DcEvent event) {
+    if (event.getId() == DcContext.DC_EVENT_CONNECTIVITY_CHANGED) {
+      adapter.refreshConnectivity();
+    }
+  }
+
+}

src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java

@@ -0,0 +1,74 @@
+package org.thoughtcrime.securesms.service;
+
+import android.app.Notification;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
+
+import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.notifications.FcmReceiveService;
+import org.thoughtcrime.securesms.notifications.NotificationCenter;
+import org.thoughtcrime.securesms.util.Util;
+
+public final class FetchForegroundService extends Service {
+  private static final String TAG = FcmReceiveService.class.getSimpleName();
+  private static final Object SERVICE_LOCK = new Object();
+  private static Intent service;
+
+  public static void start(Context context) {
+    GenericForegroundService.createFgNotificationChannel(context);
+    synchronized (SERVICE_LOCK) {
+      if (service == null) {
+        service = new Intent(context, FetchForegroundService.class);
+        ContextCompat.startForegroundService(context, service);
+      }
+    }
+  }
+
+  public static void stop(Context context) {
+    synchronized (SERVICE_LOCK) {
+      if (service != null) {
+        context.stopService(service);
+        service = null;
+      }
+    }
+  }
+
+  @Override
+  public void onCreate() {
+    Log.i(TAG, "Creating fetch service");
+    super.onCreate();
+
+    Notification notification = new NotificationCompat.Builder(this, NotificationCenter.CH_GENERIC)
+      .setContentTitle(getString(R.string.connectivity_updating))
+      .setSmallIcon(R.drawable.notification_permanent)
+      .build();
+
+    startForeground(NotificationCenter.ID_FETCH, notification);
+
+    Util.runOnAnyBackgroundThread(() -> {
+      Log.i(TAG, "Starting fetch");
+      if (!ApplicationContext.dcAccounts.backgroundFetch(300)) { // as startForeground() was called, there is time
+        FetchForegroundService.stop(this);
+      } // else we stop FetchForegroundService on DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE
+    });
+  }
+
+  @Override
+  public void onDestroy() {
+    stopForeground(true);
+  }
+
+  @Nullable
+  @Override
+  public IBinder onBind(Intent intent) {
+    return null;
+  }
+}

src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java

@@ -185,7 +185,7 @@ public final class GenericForegroundService extends Service {
   }
 
   @TargetApi(Build.VERSION_CODES.O)
-  static private void createFgNotificationChannel(Context context) {
+  static public void createFgNotificationChannel(Context context) {
     if(!CHANNEL_CREATED.get() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       CHANNEL_CREATED.set(true);
       NotificationChannel channel = new NotificationChannel(NotificationCenter.CH_GENERIC,

src/main/res/drawable/baseline_proxy_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,5V4c0,-0.55 -0.45,-1 -1,-1h-2c-0.55,0 -1,0.45 -1,1v1h-1v4c0,0.55 0.45,1 1,1h1v7c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2V7c0,-2.21 -1.79,-4 -4,-4S5,4.79 5,7v7H4c-0.55,0 -1,0.45 -1,1v4h1v1c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-1h1v-4c0,-0.55 -0.45,-1 -1,-1H7V7c0,-1.1 0.9,-2 2,-2s2,0.9 2,2v10c0,2.21 1.79,4 4,4s4,-1.79 4,-4v-7h1c0.55,0 1,-0.45 1,-1V5H20z"/>
+</vector>

src/main/res/drawable/delete_account_item_background.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- read issue: https://github.com/deltachat/deltachat-android/issues/480 before introducing an attr here. -->
+    <solid android:color="@color/delete_account_item_bg" />
+    <corners android:radius="8dp" />
+</shape>

src/main/res/drawable/ic_launcher_foreground_monochrome.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <group android:scaleX="0.43"
+      android:scaleY="0.43"
+      android:translateX="13.2"
+      android:translateY="13.2">
+    <path
+        android:pathData="M22,0.002C9.852,0.149 0,10.127 0,22.275 0,34.423 9.852,44.146 22,43.998 34.851,41.825 30.778,38.561 43.633,43.485 36.973,31.766 43.857,30.986 44,21.725 44,9.577 34.148,-0.146 22,0.002ZM21.853,4.515c2.535,0 4.766,0.33 6.648,1.027 1.247,0.457 2.032,1.04 2.461,1.725 0.008,0.006 0.029,-0.006 0.037,0 0.736,0.564 1.102,1.217 1.102,1.982 -0,0.589 -0.237,1.08 -0.698,1.468 -0.461,0.387 -0.965,0.55 -1.579,0.55 -0.883,0 -1.931,-0.509 -3.122,-1.578C25.491,8.604 24.461,7.848 23.616,7.414 22.79,6.965 21.828,6.717 20.715,6.717c-1.421,0 -2.604,0.259 -3.526,0.771 -0.903,0.511 -1.359,1.155 -1.359,1.945 -0,0.534 0.234,1.019 0.624,1.504 0.865,0.678 2.652,1.796 5.509,3.376 3.322,1.844 5.688,3.255 7.052,4.293 0.648,0.487 1.229,1.029 1.763,1.615 0.036,0.039 0.075,0.071 0.11,0.11 0.013,0.012 0.024,0.025 0.037,0.037 0.865,0.826 1.591,1.771 2.204,2.825 0.864,1.487 1.322,3.076 1.322,4.734 -0,2.913 -1.303,5.475 -3.856,7.706 -2.535,2.216 -5.489,3.339 -8.888,3.339 -3.092,-0 -5.692,-0.897 -7.823,-2.679 -0.382,-0.32 -0.715,-0.668 -1.028,-1.027 -1.962,-1.756 -2.938,-4.045 -2.938,-6.899 -0,-2.866 1.146,-5.271 3.489,-7.192 2.318,-1.886 5.167,-3.026 8.521,-3.449 -0.846,-0.699 -1.807,-1.471 -3.048,-2.348 -1.825,-1.292 -3.041,-2.328 -3.71,-3.082 -0.024,-0.022 -0.05,-0.052 -0.073,-0.073 -0.31,-0.282 -0.574,-0.541 -0.771,-0.771 -0.653,-0.775 -0.992,-1.618 -0.992,-2.532 -0,-1.363 0.776,-2.454 2.351,-3.229 1.575,-0.79 3.636,-1.174 6.17,-1.174zM24.167,19.56c-5.511,0.728 -8.264,3.761 -8.264,9.137 -0,2.618 0.587,4.688 1.8,6.201 0.013,0.012 0.024,0.025 0.037,0.037 1.249,1.151 2.644,1.761 4.224,1.761 1.901,0 3.472,-0.766 4.701,-2.238 1.229,-1.487 1.836,-3.492 1.836,-6.018 -0,-2.979 -1.148,-5.66 -3.416,-8.073 -0.293,-0.273 -0.594,-0.542 -0.918,-0.807z"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"/>
+  </group>
+</vector>

src/main/res/layout/conversation_list_activity.xml

@@ -1,97 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:id="@id/container"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@id/container"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_alignParentTop="true"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:minHeight="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:contentInsetStart="14dp"
-            app:contentInsetLeft="14dp"
-            android:elevation="4dp"
-            android:theme="?attr/actionBarStyle">
+  <androidx.appcompat.widget.Toolbar
+      android:id="@+id/toolbar"
+      android:layout_alignParentTop="true"
+      android:layout_width="match_parent"
+      android:layout_height="?attr/actionBarSize"
+      android:minHeight="?attr/actionBarSize"
+      android:background="?attr/colorPrimary"
+      app:contentInsetStart="0dp"
+      app:contentInsetLeft="0dp"
+      android:elevation="4dp"
+      android:theme="?attr/actionBarStyle">
 
-        <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-          <RelativeLayout
-              android:id="@+id/self_avatar_container"
-              android:orientation="vertical"
-              android:layout_width="wrap_content"
-              android:layout_height="45dp">
-            <org.thoughtcrime.securesms.components.AvatarView
-                android:id="@+id/self_avatar"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
-                android:clickable="true"
-                app:inverted="true"
-                android:contentDescription="@string/pref_profile_info_headline" />
-            <ImageView android:id="@+id/unread_indicator"
-                       android:layout_width="20dp"
-                       android:layout_height="20dp"
-                       android:layout_marginLeft="20dp"
-                       android:layout_marginStart="20dp"
-                       app:layout_constraintTop_toTopOf="parent"
-                       android:layout_marginBottom="16dp"
-                       android:contentDescription="@null"
-                       android:visibility="gone"
-                       />
-          </RelativeLayout>
+      <LinearLayout
+          android:id="@+id/avatar_and_title"
+          android:orientation="horizontal"
+          android:layout_width="0dp"
+          android:layout_weight="1"
+          android:paddingStart="14dp"
+          android:layout_height="match_parent"
+          android:layout_marginEnd="10dp">
 
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView style="@style/TextSecure.TitleTextStyle"
-                      android:id="@+id/toolbar_title"
-                      android:layout_width="0dp"
-                      android:layout_height="wrap_content"
-                      android:text="@string/app_name"
-                      android:layout_weight="1"
-                      android:layout_gravity="center_vertical"
-                      android:paddingRight="10dp"
-                      android:ellipsize="end"
-                      android:maxLines="1"/>
+        <RelativeLayout
+            android:id="@+id/self_avatar_container"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp">
+          <org.thoughtcrime.securesms.components.AvatarView
+              android:id="@+id/self_avatar"
+              android:layout_width="35dp"
+              android:layout_height="35dp"
+              android:layout_marginRight="10dp"
+              android:layout_marginEnd="10dp"
+              android:layout_marginTop="5dp"
+              android:layout_marginBottom="5dp"
+              android:clickable="true"
+              app:inverted="true"
+              android:contentDescription="@string/pref_profile_info_headline" />
+          <ImageView
+              android:id="@+id/unread_indicator"
+              android:layout_width="20dp"
+              android:layout_height="20dp"
+              android:layout_marginLeft="20dp"
+              android:layout_marginStart="20dp"
+              app:layout_constraintTop_toTopOf="parent"
+              android:layout_marginBottom="16dp"
+              android:contentDescription="@null"
+              android:visibility="gone"
+              />
+        </RelativeLayout>
 
-            <ImageView android:id="@+id/search_action"
-                       android:layout_width="wrap_content"
-                       android:layout_height="match_parent"
-                       android:src="@drawable/ic_search_white_24dp"
-                       android:paddingRight="12dp"
-                       android:paddingEnd="12dp"
-                       android:paddingLeft="12dp"
-                       android:paddingStart="12dp"
-                       android:layout_marginTop="4dp"
-                       android:layout_marginBottom="4dp"
-                       android:layout_gravity="center_vertical"
-                       android:contentDescription="@string/search"/>
-
-        </LinearLayout>
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <FrameLayout android:id="@+id/fragment_container"
-                 android:layout_below="@id/toolbar"
-                 android:layout_width="match_parent"
-                 android:layout_height="match_parent"/>
-
-    <org.thoughtcrime.securesms.components.SearchToolbar
-            android:id="@+id/search_toolbar"
-            android:layout_width="match_parent"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            style="@style/TextSecure.TitleTextStyle"
+            android:id="@+id/toolbar_title"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:elevation="4dp"
-            android:visibility="invisible"
-            tools:visibility="visible"/>
+            android:text="@string/app_name"
+            android:layout_weight="1"
+            android:layout_gravity="center_vertical"
+            android:paddingRight="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"/>
+      </LinearLayout>
+
+      <ImageView
+          android:id="@+id/search_action"
+          android:layout_width="wrap_content"
+          android:layout_height="match_parent"
+          android:src="@drawable/ic_search_white_24dp"
+          android:paddingRight="12dp"
+          android:paddingEnd="12dp"
+          android:paddingLeft="12dp"
+          android:paddingStart="12dp"
+          android:layout_marginTop="4dp"
+          android:layout_marginBottom="4dp"
+          android:layout_gravity="center_vertical"
+          android:contentDescription="@string/search"/>
+
+    </LinearLayout>
+
+  </androidx.appcompat.widget.Toolbar>
+
+  <FrameLayout
+      android:id="@+id/fragment_container"
+      android:layout_below="@id/toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"/>
+
+  <org.thoughtcrime.securesms.components.SearchToolbar
+      android:id="@+id/search_toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentTop="true"
+      android:elevation="4dp"
+      android:visibility="invisible"
+      tools:visibility="visible"/>
 
 </RelativeLayout>

src/main/res/layout/dialog_delete_profile.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingLeft="20dp"
+      android:paddingRight="20dp"
+      android:paddingTop="10dp"
+      android:paddingBottom="10dp"
+      android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp"
+        android:text="@string/delete_account_ask" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:background="@drawable/delete_account_item_background">
+
+      <org.thoughtcrime.securesms.components.AvatarView
+          android:id="@+id/avatar"
+          android:layout_width="50dp"
+          android:layout_height="50dp" />
+
+      <LinearLayout
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:layout_marginLeft="16dp"
+          android:layout_marginStart="16dp"
+          android:paddingRight="16dp"
+          android:paddingEnd="16dp"
+          android:orientation="vertical">
+
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:fontFamily="sans-serif"
+            android:textSize="16sp"
+            tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />
+
+        <TextView
+            android:id="@+id/address"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textDirection="ltr"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+
+            android:textSize="14sp"
+            android:fontFamily="sans-serif-light"
+            tools:text="me@example.com" />
+
+        <TextView
+            android:id="@+id/size_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="12sp"
+            android:fontFamily="sans-serif-light"
+            tools:text="150 MB" />
+
+      </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:text="@string/delete_account_explain_with_name"/>
+
+  </LinearLayout>
+
+</ScrollView>
+

src/main/res/layout/instant_onboarding_activity.xml

@@ -7,13 +7,14 @@
   <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"
+      android:layout_marginLeft="16dp"
+      android:layout_marginRight="16dp"
+      android:layout_marginBottom="16dp"
       android:layout_marginTop="20dp"
       android:orientation="vertical">
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="16dp"
-                  android:layout_marginRight="16dp"
                   android:orientation="horizontal">
 
       <ImageView android:id="@+id/avatar"
@@ -42,8 +43,6 @@
         android:id="@+id/information_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginTop="16dp"
         android:gravity="start"
         android:text="@string/set_name_and_avatar_explain"
@@ -54,11 +53,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginTop="16dp"
         android:text=""
-        android:textColor="@color/def_accent"
+        android:textColor="?attr/colorAccent"
         android:textSize="16sp"/>
 
     <Button
@@ -68,20 +65,38 @@
         android:layout_height="wrap_content"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginTop="20dp"
         android:text="@string/instant_onboarding_create"/>
 
     <Button
         style="@style/ButtonSecondary"
-        android:id="@+id/other_options_button"
+        android:id="@+id/use_other_server"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:layout_margin="16dp"
-        android:text="@string/instant_onboarding_show_more_instances" />
+        android:layout_marginTop="16dp"
+        android:text="@string/instant_onboarding_other_server"/>
+
+    <Button
+        style="@style/ButtonSecondary"
+        android:id="@+id/login_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/manual_account_setup_option"/>
+
+    <Button
+        style="@style/ButtonSecondary"
+        android:id="@+id/scan_qr_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/scan_invitation_code"/>
 
   </LinearLayout>
 

src/main/res/layout/proxy_list_footer.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:background="?attr/conversation_list_item_background"
+    >
+
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingTop="10dp"
+      android:paddingBottom="10dp"
+      android:text="@string/proxy_add"
+      android:drawablePadding="5dp"
+      android:singleLine="true"
+      android:ellipsize="marquee"
+      android:fontFamily="sans-serif"
+      android:textSize="16sp"
+      />
+
+</LinearLayout>

src/main/res/layout/proxy_list_header.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:text="@string/proxy_list_header"
+    android:textColor="?attr/colorAccent"
+    android:textSize="16sp"
+    android:textStyle="bold"
+    android:typeface="sans"
+    />

src/main/res/layout/proxy_list_item.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:background="?attr/conversation_list_item_background"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
+    >
+
+  <TextView
+      android:id="@+id/host"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentTop="true"
+      android:layout_alignParentStart="true"
+      android:layout_toStartOf="@id/share"
+      android:drawablePadding="5dp"
+      android:singleLine="true"
+      android:ellipsize="marquee"
+      android:fontFamily="sans-serif"
+      android:textSize="16sp"
+      tools:text="127.0.0.1:1080"
+      />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/host"
+        android:layout_toStartOf="@id/share"
+        android:layout_marginTop="5dp"
+        android:gravity="center_vertical"
+        >
+
+      <ImageView
+          android:id="@+id/checkmark"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_vertical|end"
+          android:layout_marginEnd="5dp"
+          android:contentDescription="@null"
+          android:src="@drawable/ic_delivery_status_sent"
+          app:tint="?attr/conversation_list_item_date_color"
+          />
+
+      <TextView
+          android:id="@+id/status"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="5dp"
+          android:singleLine="true"
+          android:ellipsize="marquee"
+          android:textAppearance="?android:attr/textAppearanceSmall"
+          android:textSize="14sp"
+          android:fontFamily="sans-serif-light"
+          tools:text="@string/connectivity_connected"
+          />
+
+        <TextView
+            android:id="@+id/protocol"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="1dp"
+            android:paddingBottom="1dp"
+            android:textAllCaps="true"
+            android:textColor="?attr/conversation_list_item_date_color"
+            android:background="@drawable/archived_indicator_background"
+            style="@style/Signal.Text.Caption"
+            tools:text="socks5"
+            />
+
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/share"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_toStartOf="@id/delete"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="5dp"
+        android:contentDescription="@string/menu_share"
+        android:background="@drawable/touch_highlight_background"
+        android:src="@drawable/ic_share_white_24dp"
+        app:tint="?attr/conversation_list_item_date_color"
+        />
+
+    <ImageButton
+        android:id="@+id/delete"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:contentDescription="@string/delete"
+        android:background="@drawable/touch_highlight_background"
+        android:src="@drawable/ic_delete_white_24dp"
+        app:tint="?attr/conversation_list_item_date_color"
+        />
+
+</RelativeLayout>

src/main/res/layout/proxy_settings_activity.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:context=".proxy.ProxySettingsActivity">
+
+  <androidx.appcompat.widget.SwitchCompat
+      android:id="@+id/proxy_switch"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:padding="16dp"
+      android:text="@string/proxy_use_proxy" />
+
+  <ListView
+      android:id="@+id/proxy_list"
+      android:paddingTop="10dp"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content" />
+
+</LinearLayout>

src/main/res/layout/registration_activity.xml

@@ -123,7 +123,7 @@
             android:visibility="gone"
             tools:visibility="visible"
             app:constraint_referenced_ids="inbox, imap_login, imap_server, imap_port, imap_security_label, imap_security, outbox_view_spacer_top,
-            outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, auth_method_label, auth_method, cert_check_label, cert_check, view_log_button, socks5_switch" />
+            outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, auth_method_label, auth_method, cert_check_label, cert_check, view_log_button, proxy_settings" />
 
         <ImageView
             android:id="@+id/advanced_icon"
@@ -151,6 +151,17 @@
             app:layout_constraintStart_toEndOf="@id/advanced_icon"
             app:layout_constraintTop_toBottomOf="@id/no_servers_hint" />
 
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/proxy_settings"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:text="@string/proxy_use_proxy"
+            app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
+            app:layout_constraintStart_toStartOf="@id/guideline_root_start"
+            app:layout_constraintTop_toBottomOf="@id/advanced_text" />
+
         <TextView
             android:id="@+id/inbox"
             android:layout_width="wrap_content"
@@ -159,7 +170,7 @@
             android:layout_marginTop="8dp"
             android:text="@string/login_inbox"
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-            app:layout_constraintTop_toBottomOf="@id/advanced_text" />
+            app:layout_constraintTop_toBottomOf="@id/proxy_settings" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/imap_login"
@@ -378,110 +389,6 @@
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
             app:layout_constraintTop_toBottomOf="@id/cert_check_label" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/socks5_switch"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingBottom="10dp"
-            android:text="@string/login_socks5_use_socks5"
-            app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
-            app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-            app:layout_constraintTop_toBottomOf="@id/cert_check" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/socks5_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            tools:visibility="gone"
-            app:constraint_referenced_ids="socks5_experimental_warning, socks5_host, socks5_port, socks5_user, socks5_password" />
-
-        <TextView
-            android:id="@+id/socks5_experimental_warning"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="left"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingTop="1dp"
-            android:paddingBottom="10dp"
-            android:text="@string/login_socks5_experimental_warning"
-            android:textColor="@color/gray50"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/socks5_switch" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/socks5_host"
-            android:layout_width="0dp"
-            android:layout_height="58dp"
-            app:errorEnabled="true"
-            app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
-            app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-            app:layout_constraintTop_toBottomOf="@id/socks5_experimental_warning">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/socks5_host_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/login_socks5_host"
-                android:inputType="textUri|textNoSuggestions" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/socks5_port"
-            android:layout_width="0dp"
-            android:layout_height="58dp"
-            app:errorEnabled="true"
-            app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
-            app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-            app:layout_constraintTop_toBottomOf="@id/socks5_host">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/socks5_port_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/login_socks5_port"
-                android:inputType="number" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/socks5_user"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
-            app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-            app:layout_constraintTop_toBottomOf="@id/socks5_port">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/socks5_user_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textNoSuggestions"
-                android:hint="@string/login_socks5_user" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/socks5_password"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
-            app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-            app:layout_constraintTop_toBottomOf="@id/socks5_user"
-            app:passwordToggleEnabled="true">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/socks5_password_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/login_socks5_password"
-                android:inputType="textPassword" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
         <TextView
             android:id="@+id/view_log_button"
             android:layout_width="0dp"
@@ -495,7 +402,7 @@
             android:paddingBottom="32dp"
             app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-            app:layout_constraintTop_toBottomOf="@id/socks5_password" />
+            app:layout_constraintTop_toBottomOf="@id/cert_check" />
 
         <TextView
             android:id="@+id/sub_header"

src/main/res/layout/welcome_activity.xml

@@ -53,14 +53,23 @@
 
         <Button
             style="@style/ButtonSecondary"
-            android:id="@+id/signin_button"
+            android:id="@+id/add_as_second_device_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="24dp"
             android:paddingRight="24dp"
             android:layout_marginBottom="16dp"
-            android:text="@string/onboarding_alternative_logins"/>
+            android:text="@string/multidevice_receiver_title"/>
 
+        <Button
+            style="@style/ButtonSecondary"
+            android:id="@+id/backup_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/import_backup_title"/>
 
     </LinearLayout>
 

src/main/res/menu/instant_onboarding_menu.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/proxy_settings"
+          android:id="@+id/menu_proxy_settings"
+          app:showAsAction="never"/>
+
+    <item android:title="@string/pref_view_log"
+          android:id="@+id/menu_view_log"
+          app:showAsAction="never"/>
+
+</menu>

src/main/res/menu/text_secure_normal.xml

@@ -5,7 +5,7 @@
     <item android:title="@string/qr_code"
           android:id="@+id/menu_qr"
           android:icon="@drawable/baseline_qr_code_24"
-          app:showAsAction="always"/>
+          app:showAsAction="ifRoom"/>
 
     <item android:title="@string/invite_friends"
           android:id="@+id/menu_invite_friends" />
@@ -18,6 +18,13 @@
         android:visible="false"
         />
 
+    <item android:title="@string/proxy_settings"
+        android:id="@+id/menu_proxy_settings"
+        android:icon="@drawable/baseline_proxy_24"
+        app:showAsAction="always"
+        android:visible="false"
+        />
+
     <item android:title="@string/menu_settings"
           android:id="@+id/menu_settings" />
 

src/main/res/values-bg/strings.xml

@@ -321,6 +321,7 @@
     <string name="videochat_tap_to_open">Докоснете, за да отворите</string>
     <string name="videochat_instance">Сървър за видеочат</string>
     <string name="videochat_instance_placeholder">Вашият сървър за видеочат</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Примери: https://meet.jit.si/$ROOM или basicwebrtc:https://вашият-сървър</string>
     <string name="videochat_instance_explain_2">Ако настройката е разрешена, можете да започвате видеочат от всеки чат. Изисква съвместимо приложение или браузър и от двете страни.</string>
     <string name="videochat_instance_from_qr">Да се използва ли \"%1$s\" за поканване на други към видеочатове?\n\nСлед като тази настройка бъде зададена, ще можете да започвате видеочат от всеки чат. Тя ще замени предишната настройка за видеочатове, ако има такава.</string>
@@ -496,7 +497,7 @@
     <string name="multidevice_title">Добавяне на допълнително устройство</string>
     <string name="multidevice_same_network_hint">Уверете се, че и двете устройства са свързани към една и съща Wi-Fi или друга мрежа</string>
     <string name="multidevice_this_creates_a_qr_code">Ще бъде създаден QR код, чрез сканиране на който другото устройство може да копира акаунта.</string>
-    <string name="multidevice_install_dc_on_other_device">Инсталирайте ArcaneChat на другото Ви устройство (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Инсталирайте ArcaneChat на другото Ви устройство (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Стартирайте ArcaneChat, докоснете \"Добавяне като допълнително устройство\" и сканирайте кода, показан тук</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -591,13 +592,14 @@
     <string name="login_smtp_port">SMTP порт</string>
     <string name="login_smtp_security">Сигурност на SMTP връзката</string>
     <string name="login_auth_method">Метод за оторизация</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Да се използва SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 хост</string>
     <string name="login_socks5_port">SOCKS5 порт</string>
     <string name="login_socks5_user">SOCKS5 потребител</string>
     <string name="login_socks5_password">SOCKS5 парола</string>
+
     <string name="login_info_oauth2_title">Да се продължи ли с опростената настройка?</string>
     <string name="login_info_oauth2_text">Въведеният адрес за електронна поща поддържа опростена настройка (OAuth 2.0).\n\nНа следващата стъпка, моля позволете на ArcaneChat да действа в качеството си на избраното от Вас приложение за чат върху електронна поща.\n\nArcaneChat няма сървъри, Вашите данни стоят на Вашето устройство.</string>
     <string name="login_certificate_checks">Проверки на сертификатите</string>
@@ -907,7 +909,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Мястото за съхранение, предоставено от Вашия доставчик, скоро ще бъде изчерпано:%1$s%% вече са използвани.\n\nМоже да нямате възможност да получавате съобщения, ако мястото за съхранение е заето напълно.\n\n👉 Моля, проверете дали не бихте могли да изтриете стари данни през уеб интерфейса на доставчика и обмислете дали да не включите \"Настройки / Изтриване на старите съобщения\". Можете по всяко време да проверите текущо използваното място за съхранение в \"Настройки / Свързаност\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Изглежда датата и часът на Вашето устройство са неточни (%1$s).\n\nНастройте часовника ⏰🔧, за да имате сигурност, че Вашите съобщения се получават правилно.</string>
-    <string name="devicemsg_update_reminder">⚠️ Възможно е версията на Вашия ArcaneChat да е неактуална.\n\nТова може да създаде проблеми, тъй като Вашите чат партньори използват по-нови версии; освен това Ви липсват най-новите възможности.😳\nМоля, проверете за актуализации на https://get.delta.chat или в ползвания от Вас магазин за приложения.</string>
+    <string name="devicemsg_update_reminder">⚠️ Възможно е версията на Вашия ArcaneChat да е неактуална.\n\nТова може да създаде проблеми, тъй като Вашите чат партньори използват по-нови версии; освен това Ви липсват най-новите възможности.😳\nМоля, проверете за актуализации на https://github.com/ArcaneChat или в ползвания от Вас магазин за приложения.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Отключете, за да продължите</string>
@@ -974,6 +976,7 @@
     <string name="mailto_link_could_not_be_decoded">Неуспешно декодиране на mailto връзка: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Затваряне</string>
     <string name="notify_reply_button">Отговор</string>
     <string name="notify_new_message">Ново съобщение</string>

src/main/res/values-ca/strings.xml

@@ -313,6 +313,7 @@
     <string name="videochat_tap_to_open">Toca per obrir-ho</string>
     <string name="videochat_instance">Instància de vídeo xat</string>
     <string name="videochat_instance_placeholder">La vostra instància de vídeo xat</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Exemples: https://meet.jit.si/$ROOM o basicwebrtc:https://your-server</string>
     <string name="videochat_invitation">Invitació a un vídeo xat</string>
     <string name="videochat_invitation_body">Heu sigut convidats a un vídeo xat, cliqueu %1$s per unir-vos-hi.</string>
@@ -510,7 +511,7 @@
     <string name="login_smtp_port">Port SMTP</string>
     <string name="login_smtp_security">Seguretat SMTP</string>
     <string name="login_auth_method">Mètode d\'autorització</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_info_oauth2_title">Voleu continuar amb la configuració simplificada?</string>
     <string name="login_info_oauth2_text">L’adreça d\'e-mail que heu introduït admet una configuració simplificada. (OAuth2).\n\nEn el pas següent, permeteu que ArcaneChat actuï com a xat amb l\'aplicació de correu electrònic..\n\nNo hi ha servidors de ArcaneChat, les vostres dades romanen al vostre dispositiu!</string>

src/main/res/values-cs/strings.xml

@@ -450,7 +450,7 @@
     <string name="tab_all_media_empty_hint">Zde se zobrazí média sdílená v jakémkoli chatu.</string>
     <string name="media_preview">Náhled multimedia</string>
     <string name="send_message">Pošli zprávu</string>
-    <string name="multidevice_install_dc_on_other_device">Nainstalujte si ArcaneChat do druhého zařízení (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Nainstalujte si ArcaneChat do druhého zařízení (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Spusťte ArcaneChat, klepněte na „Přidat jako druhé zařízení“ a naskenujte zde zobrazený kód</string>
     <string name="login_title">Přihlaš se</string>
@@ -718,7 +718,7 @@
     <string name="chat_protection_enabled_explanation">Nyní je zaručeno, že všechny zprávy v tomto chatu jsou šifrovány end-to-end.\n\nŠifrování end-to-end udržuje zprávy soukromé mezi vámi a vašimi partnery v chatu. Nedokáže je přečíst ani váš poskytovatel e-mailu.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️%1$svyžaduje end-to-end šifrování, které pro tento chat ještě není nastaveno. Klepnutím se dozvíte více. </string>
     <string name="devicemsg_self_deleted">Smazali jste chat „Uložené zprávy“.\n\nℹ️ Chcete-li znovu použít funkci „Uložené zprávy“, vytvořte si nový chat. </string>
-    <string name="devicemsg_update_reminder">⚠️ Vaše verze ArcaneChatu může být zastaralá.\n\nTo může způsobit problémy, protože vaši partneři v chatu používají novější verze – a vám chybí nejnovější funkce 😳\nAktualizace najdete na https://get.delta.chat nebo v obchodě s aplikacemi . </string>
+    <string name="devicemsg_update_reminder">⚠️ Vaše verze ArcaneChatu může být zastaralá.\n\nTo může způsobit problémy, protože vaši partneři v chatu používají novější verze – a vám chybí nejnovější funkce 😳\nAktualizace najdete na https://github.com/ArcaneChat nebo v obchodě s aplikacemi . </string>
 
     <!-- qr code stuff -->
     <string name="qr_code">QR kód</string>

src/main/res/values-da/strings.xml

@@ -398,13 +398,14 @@
     <string name="login_smtp_port">SMTP port</string>
     <string name="login_smtp_security">SMTP sikkerhed</string>
     <string name="login_auth_method">Autorisationsmetode</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Brug SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 Værtsnavn</string>
     <string name="login_socks5_port">SOCKS5 Port</string>
     <string name="login_socks5_user">SOCKS5 Brugernavn</string>
     <string name="login_socks5_password">SOCKS5 adgangskode</string>
+
     <string name="login_info_oauth2_title">Fortsæt med forenklet opsætning?</string>
     <string name="login_info_oauth2_text">Indtastet e-mail adresse understøtter simple opsætning (OAuth2).\n\nTillad i næste trin at ArcaneChat agerer som samtale med e-mail program.\n\nDer er ingen ArcaneChat servere, data forbliver på enhed.</string>
     <string name="login_certificate_checks">Certifikationstjek</string>

src/main/res/values-de/strings.xml

@@ -332,6 +332,7 @@
     <string name="videochat_tap_to_open">Öffnen</string>
     <string name="videochat_instance">Videochat-Instanz</string>
     <string name="videochat_instance_placeholder">Videochat-Instanz</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Beispiele: https://meet.jit.si/$ROOM oder basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">Wenn aktiv, können Sie einen Videochat aus jedem Chat starten. Videochats erfordern beidseitig eine kompatible App oder einen kompatiblen Browser.</string>
     <string name="videochat_instance_from_qr">\"%1$s\" verwenden, um andere zu Videochats einzuladen?\n\nWenn Sie diese Einstellung vornehmen, können Sie von jedem Chat aus einen Videochat starten. Dies überschreibt, falls vorhanden, die bisherige Einstellung zu Videochats.</string>
@@ -510,7 +511,7 @@
     <string name="multidevice_title">Zweitgerät hinzufügen</string>
     <string name="multidevice_same_network_hint">Beide Geräte müssen im selben Wi-Fi oder Netzwerk sein.</string>
     <string name="multidevice_this_creates_a_qr_code">Erstellt einen QR-Code, den ein Zweitgerät scannen kann, um das Profil zu kopieren.</string>
-    <string name="multidevice_install_dc_on_other_device">ArcaneChat auf dem anderen Gerät installieren (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">ArcaneChat auf dem anderen Gerät installieren (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">ArcaneChat starten, \"Ich habe bereits ein Profil / Als Zweitgerät hinzufügen\" wählen und den QR-Code scannen</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -605,13 +606,25 @@
     <string name="login_smtp_port">SMTP-Port</string>
     <string name="login_smtp_security">SMTP-Sicherheit</string>
     <string name="login_auth_method">Autorisierungsmethode</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Proxy</string>
+    <string name="proxy_use_proxy">Proxy verwenden</string>
+    <string name="proxy_add">Proxy hinzufügen</string>
+    <string name="proxy_add_explain">Unterstützte Typen: HTTP(S), SOCKS5 und Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Proxy URL hier eingeben</string>
+    <string name="proxy_invalid">Ungültige oder nicht unterstützte Proxy-URL</string>
+    <string name="proxy_list_header">Proxies</string>
+    <string name="proxy_delete">Proxy löschen</string>
+    <string name="proxy_delete_explain">\"%1$s\" löschen?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">SOCKS5 verwenden</string>
     <string name="login_socks5_host">SOCKS5-Host</string>
     <string name="login_socks5_port">SOCKS5-Port</string>
     <string name="login_socks5_user">SOCKS5-Anmeldename</string>
     <string name="login_socks5_password">SOCKS5-Passwort</string>
+
     <string name="login_info_oauth2_title">Weiter mit vereinfachter Einrichtung?</string>
     <string name="login_info_oauth2_text">Die eingegebene E-Mail-Adresse unterstützt eine vereinfachte Einrichtung (OAuth 2.0).\n\nBitte erlauben Sie ArcaneChat im nächsten Schritt, als Chat-über-E-Mail-App zu arbeiten.\n\nArcaneChat sammelt keine Benutzerdaten, alles bleibt auf Ihrem Gerät.</string>
     <string name="login_certificate_checks">Zertifikatsüberprüfung</string>
@@ -924,7 +937,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Der Speicherplatz Ihres Anbieters ist bald erschöpft; bereits %1$s%% sind verbraucht.\n\nSie können möglicherweise keine Nachrichten mehr empfangen, wenn der Speicherplatz komplett verbraucht ist.\n\n👉 Bitte prüfen Sie, ob Sie alte Daten im Webinterface des Anbieters löschen können, und erwägen Sie, \"Einstellungen / Chats und Medien / Alte Nachrichten löschen\" zu aktivieren. Den aktuellen Speicherverbrauch können Sie jederzeit unter \"Einstellungen / Verbindungsstatus\" überprüfen.</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Ihr Gerät scheint ein falsches Datum oder eine falsche Uhrzeit (%1$s) zu verwenden.\n\nStellen Sie Ihre Uhr ⏰🔧 richtig ein, um sicherzustellen, dass Ihre Nachrichten korrekt empfangen werden.</string>
-    <string name="devicemsg_update_reminder">⚠️ Ihre Delta-Chat-Version ist möglicherweise veraltet.\n\nDies kann zu Problemen führen, wenn Ihre Chat-PartnerInnen neuere Versionen verwenden - und Ihnen die neuesten Funktionen fehlen. 😳\nBitte überprüfen Sie https://get.delta.chat oder Ihren App-Store auf Updates.</string>
+    <string name="devicemsg_update_reminder">⚠️ Ihre Delta-Chat-Version ist möglicherweise veraltet.\n\nDies kann zu Problemen führen, wenn Ihre Chat-PartnerInnen neuere Versionen verwenden - und Ihnen die neuesten Funktionen fehlen. 😳\nBitte überprüfen Sie https://github.com/ArcaneChat oder Ihren App-Store auf Updates.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Entsperren zum Fortfahren</string>
@@ -991,6 +1004,7 @@
     <string name="mailto_link_could_not_be_decoded">Mailto-Link konnte nicht dekodiert werden: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Verwerfen</string>
     <string name="notify_reply_button">Antworten</string>
     <string name="notify_new_message">Neue Nachricht</string>

src/main/res/values-el/strings.xml

@@ -289,6 +289,7 @@
     <string name="videochat_tap_to_open">Πατήστε για Άνοιγμα</string>
     <string name="videochat_instance">Παρουσία στη Βιντεοκλήση</string>
     <string name="videochat_instance_placeholder">Η παρουσία σας στη βιντεοκλήση</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Παράδειγμα: https://meet.jit.si/$ROOM ή basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">Αν είναι ενεργοποιημένο, μπορείτε να ξεκινήσετε μια συνομιλία μέσω βίντεο από κάθε συνομιλία. Απαιτεί μια συμβατή εφαρμογή ή ένα πρόγραμμα περιήγησης και στα δύο άκρα.</string>
     <string name="videochat_instance_from_qr">Χρήση \"%1$s\" για να προσκαλέσετε άλλους στη βιντεοκλήση;\n\nΑφού ρυθμιστεί, μπορείτε να ξεκινήσετε μια συνομιλία μέσω βίντεο από κάθε συνομιλία. Αυτό αντικαθιστά οποιαδήποτε προηγούμενη ρύθμιση για συνομιλίες μέσω βίντεο.</string>
@@ -491,13 +492,14 @@
     <string name="login_smtp_port">Θύρα SMTP</string>
     <string name="login_smtp_security">Ασφάλεια SMTP</string>
     <string name="login_auth_method">Μέθοδος Πιστοποίησης</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Χρήση SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 Κεντρικός</string>
     <string name="login_socks5_port">Θύρα SOCKS5</string>
     <string name="login_socks5_user">Χρήστης SOCKS5</string>
     <string name="login_socks5_password">Κωδικός SOCKS5</string>
+
     <string name="login_info_oauth2_title">Συνέχεια με την απλοποιημένη ρύθμιση;</string>
     <string name="login_info_oauth2_text">Η εισαγόμενη διεύθυνση e-mail υποστηρίζει μια απλοποιημένη ρύθμιση (OAuth 2.0).\n\nΣτο επόμενο βήμα, επιτρέψτε στο ArcaneChat να λειτουργεί ως η εφαρμογή Chat μέσω ηλεκτρονικού ταχυδρομείου.\n\nΔεν υπάρχουν διακομιστές ArcaneChat, τα δεδομένα σας παραμένει στη συσκευή σας.</string>
     <string name="login_certificate_checks">Έλεγχοι Πιστοποιητικών</string>
@@ -770,7 +772,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Ο αποθηκευτικός χώρος του παρόχου σας πρόκειται να εξαντληθεί: %1$s %% χρησιμοποιούνται ήδη.\n\nΕνδέχεται να μην μπορείτε να λαμβάνετε μηνύματα εάν ο χώρος αποθήκευσης είναι πλήρης.\n\n👉 Ελέγξτε εάν μπορείτε να διαγράψετε παλιά δεδομένα στη διεπαφή ιστού του παρόχου και εξετάστε το ενδεχόμενο ενεργοποίηση \"Ρυθμίσεις / Διαγραφή παλαιών μηνυμάτων\". Μπορείτε να ελέγξετε την τρέχουσα χρήση αποθηκευτικού χώρου ανά πάσα στιγμή στις \"Ρυθμίσεις / Συνδεσιμότητα\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Η ημερομηνία ή η ώρα στη συσκευή σας φαίνεται να είναι μην είναι ακριβής (%1$s).\n\nΠροσαρμόστε το ρολόι σας ⏰🔧 για να βεβαιωθείτε ότι τα μηνύματά σας λαμβάνονται σωστά.</string>
-    <string name="devicemsg_update_reminder">⚠️ Η έκδοση ArcaneChat μπορεί να είναι παλιά.\n\nΑυτό μπορεί να προκαλέσει προβλήματα επειδή οι συνεργάτες συνομιλίας σας χρησιμοποιούν νεότερες εκδόσεις - και δεν έχετε τις πιο πρόσφατες λειτουργίες 😳\nΕλέγξτε τη https://get.delta.chat ή το κατάστημα εφαρμογών σας για ενημερώσεις .</string>
+    <string name="devicemsg_update_reminder">⚠️ Η έκδοση ArcaneChat μπορεί να είναι παλιά.\n\nΑυτό μπορεί να προκαλέσει προβλήματα επειδή οι συνεργάτες συνομιλίας σας χρησιμοποιούν νεότερες εκδόσεις - και δεν έχετε τις πιο πρόσφατες λειτουργίες 😳\nΕλέγξτε τη https://github.com/ArcaneChat ή το κατάστημα εφαρμογών σας για ενημερώσεις .</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Εισαγάγετε το μυστικό που έχει οριστεί από το σύστημά σας για να συνεχίσετε.</string>
@@ -828,6 +830,7 @@
     <string name="mailto_link_could_not_be_decoded">Αδυναμία αποκωδικοποίησης του συνδέσμου mailto: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Απόρριψη</string>
     <string name="notify_reply_button">Απάντηση</string>
     <string name="notify_new_message">Νέο μήνυμα</string>

src/main/res/values-es/strings.xml

@@ -173,6 +173,7 @@
     <string name="video">Video</string>
     <string name="documents">Documentos</string>
     <string name="contact">Contacto</string>
+    <string name="bot">Bot</string>
     <string name="camera">Cámara</string>
     <!-- As in "start a video recording" or "take a photo"; eg. the description of the "shutter button" in cameras -->
     <string name="capture">Capturar</string>
@@ -281,6 +282,10 @@
     <string name="select_chat">Seleccionar chat</string>
     <string name="select_more">Seleccionar más</string>
     <string name="menu_edit_name">Editar nombre</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_explain">Establece un apodo que se te mostrará en lugar de \"%1$s\". Déjalo en blanco para utilizar el nombre elegido por el contacto.</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_placeholder">Apodo para \"%1$s\"</string>
     <string name="menu_settings">Ajustes</string>
     <string name="menu_advanced">Avanzado</string>
     <string name="menu_view_profile">Ver perfil</string>
@@ -343,6 +348,7 @@
     <string name="videochat_tap_to_open">Toca para abrir</string>
     <string name="videochat_instance">Instancia de videollamada</string>
     <string name="videochat_instance_placeholder">Tu instancia de videollamada</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Ejemplo: https://tu-servidor.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Si el videochat está activado, puedes iniciar un videochat desde cada chat. Los chats de vídeo necesitan una aplicación o un navegador compatible en los dos lados.</string>
     <string name="videochat_instance_from_qr">¿Usa \"%1$s\" para invitar a otros a la videollamada?\n\nUna vez configurado, puedes iniciar una videollamada desde el chat individual. Esto reemplaza la configuración previa de videollamadas. Si la hubiera.</string>
@@ -535,7 +541,7 @@
     <string name="multidevice_title">Añadir otro dispositivo</string>
     <string name="multidevice_same_network_hint">Asegúrate de que ambos dispositivos estén conectados en la misma red o Wi-Fi</string>
     <string name="multidevice_this_creates_a_qr_code">Esto crea un código QR que el otro dispositivo puede escanear para copiar la cuenta.</string>
-    <string name="multidevice_install_dc_on_other_device">Instala ArcaneChat en tu otro dispositivo (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Instala ArcaneChat en tu otro dispositivo (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Inicia ArcaneChat, toca \"Añadir desde otro dispositivo\" y escanea el código mostrado aquí</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -630,13 +636,14 @@
     <string name="login_smtp_port">Puerto SMTP</string>
     <string name="login_smtp_security">Seguridad SMTP</string>
     <string name="login_auth_method">Método de autorización</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Usar SOCKS5</string>
     <string name="login_socks5_host">Servidor SOCKS5</string>
     <string name="login_socks5_port">Puerto SOCKS5</string>
     <string name="login_socks5_user">Usuario SOCKS5</string>
     <string name="login_socks5_password">Contraseña SOCKS5</string>
+
     <string name="login_info_oauth2_title">¿Continuar con la configuración simplificada?</string>
     <string name="login_info_oauth2_text">La dirección de correo electrónico introducida admite una configuración simplificada (OAuth 2.0).\n\nEn el próximo paso, permita que ArcaneChat actúe como su aplicación de chat por correo electrónico.\n\nNo hay servidores de ArcaneChat, tus datos permanecen en tu dispositivo.</string>
     <string name="login_certificate_checks">Comprobaciones de certificados</string>
@@ -949,7 +956,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ El almacenamiento de tu proveedor está por excederse, ya tienes %1$s%% en uso.\n\nQuizás no puedas recibir mensajes cuando el almacenamiento esté al 100%% de uso.\n\n👉 Por favor chequea si puedes eliminar los datos antiguos en la página web del proveedor y considera habilitar \"Ajustes / Eliminar mensajes antiguos\". Puedes chequear tu almacenamiento actual en cualquier momento en \"Ajustes / Conectividad\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Fecha y hora de tu dispositivo parecen ser inexactas (%1$s).\n\nAjusta tu reloj ⏰🔧 para asegurarte que los mensajes sean recibidos correctamente.</string>
-    <string name="devicemsg_update_reminder">⚠️ Tu versión de ArcaneChat puede estar desactualizada.\n\nEso puede crear problemas porque tus contactos usan nuevas versiones - y tú te estás perdiendo las últimas novedades 😳\nChequea https://get.delta.chat o tu tienda de aplicaciones para actualizaciones.</string>
+    <string name="devicemsg_update_reminder">⚠️ Tu versión de ArcaneChat puede estar desactualizada.\n\nEso puede crear problemas porque tus contactos usan nuevas versiones - y tú te estás perdiendo las últimas novedades 😳\nChequea https://github.com/ArcaneChat o tu tienda de aplicaciones para actualizaciones.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Desbloquear para continuar</string>
@@ -1017,6 +1024,7 @@
     <string name="mailto_link_could_not_be_decoded">El enlace mailto no se pudo decodificar: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Descartar</string>
     <string name="notify_reply_button">Responder</string>
     <string name="notify_new_message">Nuevo mensaje</string>
@@ -1176,4 +1184,5 @@
     <!-- device messages for updates -->
     <string name="update_1_46_android">Nueva pantalla de bienvenida 🐣 y más:\n\n⚡️ Regístrese en servidores de chatmail rápidos y seguros (https://delta.chat/chatmail) o use servidores de correo electrónico clásicos\n\n👉 Notificaciones PUSH para cualquier servidor de chatmail\n\n👤 Presenta un amigo a otro de forma segura usando \"Adjuntar Contacto\"\n\n🥰 Reacciona con cualquier emoji\n\n📌 Ancla chats directamente desde los resultados de la búsqueda... y MUCHO más en %1$s</string>
     <string name="update_1_46_ios">Nueva pantalla inicial 🐣 y más:\n\n⚡️ Regístrese en servidores de chatmail rápidos y seguros (https://delta.chat/chatmail) o use servidores de correo electrónico clásicos\n\n👉 Notificaciones PUSH para cualquier servidor de chatmail\n\n👤 Reciba \"Contactos adjuntos\" y conéctese con sus amigos\n\n🥰 Selección de reacción más rápida... y MÁS en %1$s</string>
-    </resources>
+    <string name="update_switch_profile_placement">ℹ️ Se movió la opción \"Cambiar perfil\": toca tu imagen de perfil en la esquina superior de la pantalla principal para agregar o cambiar perfiles 💡</string>
+</resources>

src/main/res/values-fa/strings.xml

@@ -317,6 +317,7 @@
     <string name="videochat_tap_to_open">برای باز کردن ضربه بزنید. </string>
     <string name="videochat_instance">جلسه تماس تصویری</string>
     <string name="videochat_instance_placeholder">جلسه تماس تصویری شما</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">مثال‌: 
 https://meet.jit.si/$ROOM 
 یا
@@ -490,7 +491,7 @@ https://meet.jit.si/$ROOM
     <string name="multidevice_title">افزودن دستگاه دوم</string>
     <string name="multidevice_same_network_hint">مطمئن شوید هر دو دستگاه در یک وای‌فای یا شبکه هستند</string>
     <string name="multidevice_this_creates_a_qr_code">این یک کد کیوآر ایجاد می‌کند که دستگاه دوم می‌تواند برای کپی حساب اسکن کند.</string>
-    <string name="multidevice_install_dc_on_other_device">دلتاچت را روی دستگاه دیگر خود نصب کنید (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">دلتاچت را روی دستگاه دیگر خود نصب کنید (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">دلتاچت را باز کنید، روی «افزودن به عنوان دستگاه دوم» بزنید و کد نشان داده شده در اینجا را اسکن کنید</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -572,13 +573,14 @@ https://meet.jit.si/$ROOM
     <string name="login_smtp_port">SMTP Port</string>
     <string name="login_smtp_security">SMTP Security</string>
     <string name="login_auth_method">Authorization Method</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">استفاده از SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 Host</string>
     <string name="login_socks5_port">SOCKS5 Port</string>
     <string name="login_socks5_user">SOCKS5 User</string>
     <string name="login_socks5_password">SOCKS5 Password</string>
+
     <string name="login_info_oauth2_title">با تنظیم‌ها ساده‌ شده ادامه می‌دهید؟</string>
     <string name="login_info_oauth2_text">نشانی رایانامه وارد شده از تنظیم‌های ساده پشتیبانی می‌کند
 (OAuth 2.0).\n\nIn
@@ -887,7 +889,7 @@ https://meet.jit.si/$ROOM
 ساعت دستگاه خود را تنظیم کنید ⏰🔧 تا پیام‌ها به درستی دریافت شوند. </string>
     <string name="devicemsg_update_reminder">هشدار⚠️ ممکن است نسخه دلتاچت مورد استفاده قدیمی شده باشد. 
 این موضوع ممکن است مشکلاتی ایجاد کند چون مخاطبین شما از نسخه‌های جدیدتر استفاده می‌کنند. همچنین قابلیت‌های جدید را هم از دست می‌دهید😳
-لطفا برای دریافت نسخه جدید به app store یا https://get.delta.chat مراجعه کنید. </string>
+لطفا برای دریافت نسخه جدید به app store یا https://github.com/ArcaneChat مراجعه کنید. </string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">برای ادامه، لطفا رمز تعیین شده توسط سیستم خود را وارد کنید</string>
@@ -954,6 +956,7 @@ https://meet.jit.si/$ROOM
     <string name="mailto_link_could_not_be_decoded">امکان کدگشایی پیوند mailto وجود ندارد: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">صرف نظر</string>
     <string name="notify_reply_button">پاسخ</string>
     <string name="notify_new_message">پیام جدید</string>

src/main/res/values-fi/strings.xml

@@ -321,6 +321,7 @@
     <string name="videochat_tap_to_open">Napauta avataksesi</string>
     <string name="videochat_instance">Videokeskustelun tarjoaja</string>
     <string name="videochat_instance_placeholder">Videokeskustelusi tarjoaja</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Esimerkkejä: https://meet.jit.si/$ROOM tai basicwebrtc:https://sinun-palvelimesi</string>
     <string name="videochat_instance_explain_2">Jos videokeskustelu on kytketty päälle, voit aloittaa videokeskustelun mistä tahansa keskustelusta. Videokeskustelu vaatii molemmilta yhteensopivan sovelluksen tai selaimen.</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>
@@ -499,7 +500,7 @@
     <string name="multidevice_title">Lisää toinen laite</string>
     <string name="multidevice_same_network_hint">Varmista että molemmat laitteet ovat samassa Wi-Fi verkossa</string>
     <string name="multidevice_this_creates_a_qr_code">Tämä luo QR koodin, jolla toinen laite saa ladattua kopion profiilista.</string>
-    <string name="multidevice_install_dc_on_other_device">Lataa ArcaneChat toiselle laitteellesi (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Lataa ArcaneChat toiselle laitteellesi (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Avaa ArcaneChat, valitse \"Minulla on jo profiili / Lisää toiseksi laitteeksi\" ja skannaa täällä näkyvä koodi</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -594,13 +595,14 @@
     <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 -->
+    <!-- deprecated -->
     <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>
+
     <string name="login_info_oauth2_title">Jatka yksinkertaistetulla käyttöönotolla?</string>
     <string name="login_info_oauth2_text">Annettu sähköpostiosoite tukee yksinkertaista käyttöönottoa (OAuth 2.0).\n\nSeuraavassa vaiheessa sinun tulisi antaa ArcaneChatille oikeus toimia keskustelusovelluksena sähköpostia hyödyntäen.\n\nArcaneChat ei kerää käyttäjädataa, kaikki tallennetaan vain laitteellesi.</string>
     <string name="login_certificate_checks">Varmenteiden tarkastus</string>
@@ -910,7 +912,7 @@
     <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">⚠️ ArcaneChat -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>
+    <string name="devicemsg_update_reminder">⚠️ ArcaneChat -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://github.com/ArcaneChat</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Avaa lukitus jatkaaksesi</string>
@@ -977,6 +979,7 @@
     <string name="mailto_link_could_not_be_decoded">mailto-linkkiä ei voitu selvittää: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Hylkää</string>
     <string name="notify_reply_button">Vastaa</string>
     <string name="notify_new_message">Uusi viesti</string>

src/main/res/values-fr/strings.xml

@@ -4,7 +4,9 @@
     <string name="app_name">ArcaneChat</string>
     <string name="ok">OK</string>
     <string name="cancel">Annuler</string>
-   <string name="clear_search">Effacer la recherche</string>
+   <!-- the word "or" to separate blocks in the user interface that are mutually exclusive -->
+    <string name="or_separator">ou</string>
+    <string name="clear_search">Effacer la recherche</string>
     <string name="yes">Oui</string>
     <string name="no">Non</string>
     <string name="select">Sélectionner</string>
@@ -52,6 +54,7 @@
     <string name="show_full_message">Montrer le message complet...</string>
     <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
     <string name="mark_all_as_read">Marquer tout comme lu</string>
+    <string name="mark_as_read">Marquer comme lu</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
     <string name="mark_as_read_short">Lu</string>
     <!-- Placeholder text when something is loading -->
@@ -203,6 +206,8 @@
 
     <!-- menu labels (or icon, buttons...) -->
     <string name="menu_new_contact">Nouveau contact</string>
+    <string name="menu_new_classic_contact">Ajouter le contact à la main</string>
+    <string name="new_classic_contact_explain">Les contacts ajoutés à la main peuvent être contactés par e-mail classique. Le chiffrement de bout en bout n\'est pas garanti.</string>
     <string name="menu_new_chat">Nouvelle discussion</string>
     <string name="menu_new_group">Nouveau groupe</string>
     <string name="clone_chat">Cloner la discussion</string>
@@ -326,6 +331,7 @@
     <string name="videochat_tap_to_open">Appuyer pour ouvrir</string>
     <string name="videochat_instance">Instance de discussion vidéo</string>
     <string name="videochat_instance_placeholder">Votre instance de discussion vidéo</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Par exemple : https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Si vous avez activé les discussions vidéo, vous pouvez démarrer une conversation vidéo dans chacune de vos discussions. Il faut que chaque participant-e ait une application ou un navigateur compatibles pour pouvoir utiliser cette option.</string>
     <string name="videochat_instance_from_qr">Utiliser « %1$s » pour inviter d\'autres personnes à des discussions vidéo ?\n\nUne fois configuré, vous pouvez discuter en vidéo dans chaque discussion privée. Remplace vos préférences de configurations précédentes pour les discussions vidéos.</string>
@@ -437,6 +443,9 @@
     <string name="send_file_to">Envoyer \"%1$s\" à</string>
     <!-- title shown above a list contacts where one should be selected (eg. when a webxdc attempts to send a message to a chat) -->
     <string name="send_message_to">Envoyer un message à</string>
+    <string name="enable_realtime">Canaux Webxdc temps réel</string>
+    <string name="enable_realtime_explain">Enclenchez l\'API temps réel Webxdc pour créer des connexions entre les appareils.</string>
+
     <!-- map -->
     <string name="filter_map_on_time">Afficher les positions pour une période</string>
     <string name="show_location_traces">Afficher les traces</string>
@@ -507,7 +516,7 @@
     <string name="multidevice_title">Ajouter un deuxième appareil</string>
     <string name="multidevice_same_network_hint">Vérifiez que les deux appareils sont bien connectés au même Wi-Fi ou réseau.</string>
     <string name="multidevice_this_creates_a_qr_code">Crée un code QR que vous pouvez scanner avec le deuxième appareil pour copier le compte.</string>
-    <string name="multidevice_install_dc_on_other_device">Installer ArcaneChat sur votre autre appareil (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Installer ArcaneChat sur votre autre appareil (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Lancez ArcaneChat, appuyez sur \"Ajouter comme deuxième appareil\" et scannez le code affiché ici.</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -554,6 +563,18 @@
     <string name="part_of_total_used">%1$s sur %2$s utilisé</string>
 
 
+    <!-- welcome and login -->
+    <!-- Primary button on the welcome screen, allows to create an instant profile -->
+    <string name="onboarding_create_instant_account">Créer un nouveau compte</string>
+    <!-- Secondary button on the welcome screen, allows to "Add as Second Device", "Restore from Backup"  -->
+    <string name="onboarding_alternative_logins">Je possède déjà un compte</string>
+    <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
+    <string name="instant_onboarding_title">Votre compte</string>
+    <!-- Confirmation button on the instant onboarding screen -->
+    <string name="instant_onboarding_create">Accepter et créer le compte</string>
+    <!-- Secondary, link-like button to open a page with other possible instances -->
+    <string name="instant_onboarding_show_more_instances">Utiliser un autre serveur</string>
+    <string name="instant_onboarding_other_server">Lister les serveurs de discussions</string>
     <string name="scan_invitation_code">Scanner le code d\'invitation</string>
     <string name="login_title">Connexion</string>
     <!-- for classic email, we use the classical term "Account" -->
@@ -574,13 +595,23 @@
     <string name="login_smtp_port">Port SMTP</string>
     <string name="login_smtp_security">Sécurité SMTP</string>
     <string name="login_auth_method">Méthode d\'autorisation</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Proxy</string>
+    <string name="proxy_use_proxy">Utiliser le proxy</string>
+    <string name="proxy_add">Ajouter un proxy</string>
+    <string name="proxy_add_explain">Types de proxy supportés: HTTP(S), SOCKS5 et Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Entrez l\'URL du proxy ici</string>
+    <string name="proxy_invalid">URL invalide ou non supportée</string>
+    <string name="proxy_list_header">Sauver les proxy</string>
+    <string name="proxy_delete">Effacer le proxy</string>
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Utiliser SOCKS5</string>
     <string name="login_socks5_host">Hôte SOCKS5</string>
     <string name="login_socks5_port">Port SOCKS5</string>
     <string name="login_socks5_user">Utilisateur SOCKS5</string>
     <string name="login_socks5_password">Mot de passe SOCKS5</string>
+
     <string name="login_info_oauth2_title">Continuer avec une configuration simplifiée ?</string>
     <string name="login_info_oauth2_text">L\'adresse de courriel saisie prend en charge une configuration simplifiée (OAuth2.0). \n\nDans l\'étape suivante, autorisez ArcaneChat à agir comme votre application de Chat avec courriel . Il n\'y a pas de serveur ArcaneChat, vos données restent sur votre appareil !</string>
     <string name="login_certificate_checks">Vérification du certificat</string>
@@ -662,6 +693,8 @@
     <string name="pref_incognito_keyboard_explain">Demander que le clavier désactive l\'apprentissage personnalisé</string>
     <string name="pref_read_receipts">Accusés de lecture</string>
     <string name="pref_read_receipts_explain">Si les accusés de lecture sont désactivés, vous ne pourrez pas voir les accusés de lecture des autres.</string>
+    <string name="pref_server">Serveur</string>
+    <string name="pref_encryption">Chiffrement</string>
     <string name="pref_manage_keys">Gérer les clés</string>
     <string name="pref_use_system_emoji">Utiliser les émojis système</string>
     <string name="pref_use_system_emoji_explain">Désactiver la prise en charge des émojis intégrés de ArcaneChat</string>
@@ -736,6 +769,9 @@
     <string name="pref_edit_profile">Édition du profil</string>
     <string name="disable_imap_idle">Désactiver IMAP IDLE</string>
     <string name="disable_imap_idle_explain">N\'utilisez pas d\'extension IMAP IDLE, même si elle est prise en charge par votre serveur, car elle provoque des retards dans la récupération des messages. Activez cette option uniquement pour effectuer des tests.</string>
+    <string name="send_stats_to_devs">Envoyer les statistiques aux développeurs ArcaneChat</string>
+
+
     <!-- Emoji picker and categories -->
     <string name="emoji_search_results">Résultats de la recherche</string>
     <string name="emoji_not_found">Pas d\'emoji trouvé</string>
@@ -795,6 +831,7 @@
     <string name="systemmsg_read_receipt_subject">Accusé de lecture</string>
     <!-- deprecated -->
     <string name="systemmsg_read_receipt_body">Ceci est un accusé de lecture pour le message \"%1$s\".\n\nCela signifie que le message a été affiché sur l\'appareil du destinataire, pas forcément que le contenu ait été lu.</string>
+    <string name="systemmsg_cannot_decrypt">Ce message ne peut pas être déchiffré.\n\n• Essayez de demander à l\'expéditeur de vous l\'envoyer à nouveaux.\n\n• Si vous venez de réinstaller ArcaneChat il serait bien de le reconfigurer en sélectionnant \"Ajouter un deuxième appareil\" ou d\'importer une sauvegarde.</string>
     <string name="systemmsg_unknown_sender_for_chat">Expéditeur inconnu de cette discussion. Voir « Info » pour plus de détails.</string>
     <string name="systemmsg_subject_for_new_contact">Message de %1$s</string>
     <string name="systemmsg_failed_sending_to">Échec de l\'envoi du message à %1$s.</string>
@@ -864,6 +901,7 @@
     <string name="chat_protection_enabled_explanation">Il n\'est pas garanti que tous les messages de cette discussion sont chiffrés de bout en bout.\n\nLe chiffrement de bout en bout assure la confidentialité des messages échangés par les membres d\'une discussion. Même votre fournisseur de courriel ne peut pas les lire. </string>
     <string name="chat_protection_broken_tap_to_learn_more">%1$s a envoyé un message depuis un nouvel appareil. Appuyez pour en savoir plus.</string>
     <string name="chat_protection_broken_explanation">Le chiffrement de bout en bout ne peut plus être garanti, probablement parce que %1$s a réinstallé ArcaneChat ou envoyé un message depuis un nouvel appareil.\n\nVous pouvez convenir d\'une rencontre physique afin de scanner à nouveau son code QR pour ré-instaurer la garantie du chiffrement de bout en bout.</string>
+    <string name="invalid_unencrypted_explanation">Pour établir un chiffrement de bout en bout vous pouvez rencontrer vos contacts en personne et scanner leur code QR.</string>
     <string name="learn_more">En savoir plus</string>
 
     <string name="devicemsg_self_deleted">Vous avez supprimé la discussion \"Messages sauvegardés\".\n\nℹ️ Pour utiliser la fonctionnalité \"Message enregistrés\" à nouveau, commencez une nouvelle discussion avec vous-même.</string>
@@ -871,7 +909,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Bientôt plus d\'espace de stockage chez votre fournisseur, %1$s%% utilisés.\n\nVous ne serez peut-être plus en mesure de recevoir des messages quand votre espace de stockage sera plein.\n\n👉 Veuillez vérifier si vous avez d\'anciens éléments à supprimer directement sur l\'interface web de votre fournisseur et envisagez d\'activer \"Paramètres / Supprimer les anciens messages\". Vous pouvez vérifier à tout moment le volume d\'espace de stockage en cours d\'utilisation depuis \"Paramètres / Connectivité\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ L\'heure ou la date de votre appareil semble erronée (%1$s).\n\nRéglez votre horloge ⏰🔧 pour que vos messages soient bien reçus.</string>
-    <string name="devicemsg_update_reminder">⚠️ Votre version de ArcaneChat semble obsolète.\n\nCela risque de créer des dysfonctionnements parce que vos contacts utilisent des versions plus récentes - en plus, vous ratez les nouvelles fonctionnalités 😳\n Rendez-vous sur https://get.delta.chat ou sur votre magasin d\'applications pour effectuer la mise à jour !</string>
+    <string name="devicemsg_update_reminder">⚠️ Votre version de ArcaneChat semble obsolète.\n\nCela risque de créer des dysfonctionnements parce que vos contacts utilisent des versions plus récentes - en plus, vous ratez les nouvelles fonctionnalités 😳\n Rendez-vous sur https://github.com/ArcaneChat ou sur votre magasin d\'applications pour effectuer la mise à jour !</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Déverrouillez votre appareil pour continuer</string>
@@ -881,6 +919,7 @@
     <string name="load_qr_code_as_image">Charger le code QR comme une image</string>
     <string name="qrscan_title">Numériser le QR code</string>
     <string name="qrscan_hint">Placez votre caméra au dessus du QR code</string>
+    <string name="qrscan_hint_desktop">Placez le code QR devant la caméra</string>
     <string name="qrscan_failed">Le code QR n\'a pas pu être décodé</string>
     <string name="qrscan_ask_join_group">Voulez-vous rejoindre le groupe \"%1$s\" ?</string>
     <string name="qrscan_fingerprint_mismatch">L\'empreinte digitale numérisée ne correspond pas à la dernière empreinte digitale vue depuis  %1$s</string>
@@ -909,6 +948,7 @@
     <string name="qrshow_join_contact_no_connection_toast">Pas de connexion Internet, ne peut pas effectuer la configuration du QR code.</string>
     <string name="qraccount_ask_create_and_login">Créer une nouvelle adresse de courriel sur « %1$s » et se connecter ici ?</string>
     <string name="qraccount_ask_create_and_login_another">Créer une nouvelle adresse de courriel sur « %1$s » et s\'y connecter ?\n\nVotre compte existant ne sera pas supprimé. Utilisez l\'élément de menu « Changer de compte » pour passer d\'un compte à l\'autre.</string>
+    <string name="set_name_and_avatar_explain">Choisissez un nom que vos contacts reconnaîtrons. Vous pouvez également définir une image pour votre profile.</string>
     <string name="qraccount_qr_code_cannot_be_used">Le code QR scanné ne peut pas être utilisé pour ouvrir un nouveau compte.</string>
     <!-- the placeholder will be replaced by the e-mail address of the profile -->
     <string name="qrlogin_ask_login">Se connecter au compte « %1$s » ?</string>
@@ -918,6 +958,8 @@
     <string name="secure_join_started">%1$s vous a invité à rejoindre ce groupe.\n\nEn attente de la réponse de l’appareil de %2$s…</string>
     <!-- placeholder will be replaced by the name of the inviter. -->
     <string name="secure_join_replies">%1$s a répondu, en attente d’être ajouté au groupe…</string>
+    <string name="secure_join_wait">Chiffrement de bout en bout en cours d\'établissement, merci de patienter...</string>
+    <string name="secure_join_wait_timeout">Le chiffrement de bout en bout n\'est pas encore garanti, mais vous pouvez déjà envoyer un message.</string>
     <string name="contact_verified">%1$s connu.</string>
     <string name="contact_not_verified">Impossible de garantir le chiffrement de bout en bout avec %1$s.</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
@@ -933,6 +975,7 @@
     <string name="mailto_link_could_not_be_decoded">Le lien mailto n\'a pas pu être décodé: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Rejeter</string>
     <string name="notify_reply_button">Répondre</string>
     <string name="notify_new_message">Nouveau message</string>
@@ -944,6 +987,8 @@
     <string name="notify_no_name_or_message">Pas de nom ou de message</string>
     <string name="notifications_disabled">Notifications désactivées</string>
     <string name="new_messages">Nouveaux messages</string>
+    <!-- Body text for a generic "New messages" notification. Shown if we do not have more information about a new messages. Note, that the string is also referenced at https://github.com/deltachat/notifiers -->
+    <string name="new_messages_body">Vous avez de nouveaux messages</string>
     <string name="n_messages_in_m_chats">%1$d messages dans %2$d discussions</string>
 
 
@@ -1075,6 +1120,10 @@
     <string name="InfoPlist_NSPhotoLibraryAddUsageDescription">ArcaneChat veut enregistrer les images dans votre bibliothèque photo.</string>
 
 
+    <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->
+    <string name="pref_instant_delivery">Envoi Immédiat</string>
+    <string name="pref_background_notifications">Utiliser une connexion en arrière plan</string>
+    <string name="pref_reliable_service">Forcer une connexion en arrière plan</string>
     <string name="pref_background_notifications_rationale">Pour maintenir une connexion à votre serveur de courriel et recevoir les messages en arrière-plan, ignorez l\'optimisation de la batterie à l\'étape suivante.\n\nArcaneChat utilise peu de ressources et prend garde à ne pas vider votre batterie.</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
     <string name="perm_enable_bg_reminder_title">Touchez ici pour recevoir des messages pendant que DeltaChat est en arrière-plan.</string>

src/main/res/values-gl/strings.xml

@@ -295,6 +295,7 @@
     <string name="videochat_tap_to_open">Toca para abrir</string>
     <string name="videochat_instance">Instancia para video chat</string>
     <string name="videochat_instance_placeholder">A túa instancia para video chat</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Exemplos: https://meet.jit.si/$ROOM ou basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">Se o chat por vídeo está activado, podes iniciar o chat de vídeo desde cada chat. Os chats de vídeo requiren unha app compatible ou un navegador compatible nos dous extremos.</string>
     <string name="videochat_instance_from_qr">¿Usar \"%1$s\" para convidar a outras a chats de vídeo?\n\nUnha vez establecido podes iniciar o chat desde a conversa un-a-un. Esto restablece o axuste anterior para video chats se existise.</string>
@@ -498,13 +499,14 @@
     <string name="login_smtp_port">Porto SMTP</string>
     <string name="login_smtp_security">Seguridade SMTP</string>
     <string name="login_auth_method">Método de autorización</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Usar SOCKS5</string>
     <string name="login_socks5_host">Servidor SOCKS5</string>
     <string name="login_socks5_port">Porto SOCKS5</string>
     <string name="login_socks5_user">Usuaria SOCKS5</string>
     <string name="login_socks5_password">Contrasinal SOCKS5</string>
+
     <string name="login_info_oauth2_title">Continuar co axuste simplificado?</string>
     <string name="login_info_oauth2_text">O enderezo introducido soporta o axuste simplificado (OAuth 2.0).\n\nNo seguinte paso, permite a ArcaneChat actuar como app de Conversa sobre Correo-e.\n\nNon hai servidores ArcaneChat, os teus datos permanecen no dispositivo.</string>
     <string name="login_certificate_checks">Comprobacións do certificado</string>
@@ -750,7 +752,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ A almacenaxe do teu provedor vaise esgotar, xa utilizaches %1$s %%.\n\nPode que non recibas mensaxes cando a almacenaxe chegue a 100%% utilizado.\n\n👉 Mira se podes eliminar datos antigos na interface web do teu provedor e pensa se debes activar \"Axustes / Eliminar Mensaxes Antigas\". Podes ver a almacenaxe actual utilizada en \"Axustes / Conectividade\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ A hora ou data no teu dispositivo poderían ser incorrectas (%1$s).\n\nAxusta o reloxio ⏰🔧 para asegurar que as túas mensaxes son recibidas correctamente.</string>
-    <string name="devicemsg_update_reminder">⚠️ A túa versión de ArcaneChat podería estar desactualizada.\n\nEsto podería causar problemas porque os teus correspondentes utilizan versións máis novas - e ademáis non tes as últimas características 😳\nVai a https://get.delta.chat ou tenda de aplicacións para máis detalles.</string>
+    <string name="devicemsg_update_reminder">⚠️ A túa versión de ArcaneChat podería estar desactualizada.\n\nEsto podería causar problemas porque os teus correspondentes utilizan versións máis novas - e ademáis non tes as últimas características 😳\nVai a https://github.com/ArcaneChat ou tenda de aplicacións para máis detalles.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Escribe o código establecido no sistema para continuar.</string>
@@ -804,6 +806,7 @@
     <string name="mailto_link_could_not_be_decoded">a ligazón mailto non se puido descodificar: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Desbotar</string>
     <string name="notify_reply_button">Responder</string>
     <string name="notify_new_message">Nova mensaxe</string>

src/main/res/values-hu/strings.xml

@@ -44,7 +44,7 @@
     <string name="unarchive">Archiválás visszavonása</string>
     <string name="mute">Némítás</string>
     <string name="ephemeral_messages">Eltűnő üzenetek</string>
-    <string name="ephemeral_messages_hint">A csevegés minden tagjára vonatkozik, ha a ArcaneChat-et használják; az üzeneteket továbbra is másolhatják, menthetik és továbbíthatják, vagy más e-mail klienseket használhatnak.</string>
+    <string name="ephemeral_messages_hint">A csevegés minden tagjára vonatkozik, ha a ArcaneChat használják; az üzeneteket továbbra is másolhatják, menthetik és továbbíthatják, vagy más e-mail klienseket használhatnak.</string>
     <string name="save">Mentés</string>
     <string name="chat">Csevegés</string>
     <string name="media">Média</string>
@@ -85,8 +85,8 @@
     <string name="file_not_found">%1$s nem található.</string>
     <string name="copied_to_clipboard">Vágólapra másolva.</string>
     <string name="contacts_headline">Névjegyek</string>
-    <string name="email_address">E-mail cím</string>
-    <string name="bad_email_address">Rossz e-mail cím.</string>
+    <string name="email_address">E-mail-cím</string>
+    <string name="bad_email_address">Hibás e-mail-cím.</string>
     <string name="password">Jelszó</string>
     <string name="existing_password">Jelenlegi jelszó</string>
     <string name="now">Most</string>
@@ -160,6 +160,7 @@
     <string name="video">Videó</string>
     <string name="documents">Dokumentumok</string>
     <string name="contact">Névjegy</string>
+    <string name="bot">Bot</string>
     <string name="camera">Kamera</string>
     <!-- As in "start a video recording" or "take a photo"; eg. the description of the "shutter button" in cameras -->
     <string name="capture">Rögzítés</string>
@@ -180,7 +181,7 @@
     <string name="green">Zöld</string>
     <string name="red">Piros</string>
     <string name="blue">Kék</string>
-    <string name="orange">Narancs</string>
+    <string name="orange">Narancssárga</string>
     <string name="cyan">Cián</string>
     <string name="purple">Lila</string>
     <string name="magenta">Magenta</string>
@@ -232,7 +233,7 @@
     <string name="invite_friends">Ismerősök meghívása</string>
     <!-- %1$s is replaced by the user's invitation link ("https://i.delta.chat/...") -->
     <string name="invite_friends_text">Lépjen kapcsolatba velem a ArcaneChat-en:\n%1$s</string>
-    <string name="menu_copy_selection_to_clipboard">Kiválasztás másolása</string>
+    <string name="menu_copy_selection_to_clipboard">Kiválasztott(ak) másolása</string>
     <string name="menu_copy_link_to_clipboard">Hívatkozás másolása</string>
     <string name="menu_copy_text_to_clipboard">Szöveg másolása</string>
     <string name="menu_copy_image_to_clipboard">Kép másolása</string>
@@ -251,7 +252,7 @@
     <string name="show_app_in_chat">Alkalmazás megjelenítése a csevegésben</string>
     <string name="menu_share">Megosztás</string>
     <!-- Verb "to block sth." usually a mailing list or a contact, not a noun -->
-    <string name="block">Blokkolás</string>
+    <string name="block">Letiltás</string>
     <string name="menu_block_contact">Névjegy letiltása</string>
     <string name="menu_unblock_contact">Tiltás visszavonása</string>
     <string name="accept">Elfogadás</string>
@@ -266,6 +267,10 @@
     <string name="select_chat">Csevegés kiválasztása</string>
     <string name="select_more">Több kiválasztása</string>
     <string name="menu_edit_name">Név szerkesztése</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_explain">Állítson be egy becenevet a(z) „%1$s” nevű ismerősének. Ha üresen hagyja, akkor az ismerőse által választott név jelenik meg.</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_placeholder">Becenév megadása „%1$s“ számára</string>
     <string name="menu_settings">Beállítások</string>
     <string name="menu_advanced">Haladó</string>
     <string name="menu_view_profile">Profil megtekintése</string>
@@ -274,13 +279,13 @@
     <string name="menu_save_log">Naplófájl mentése</string>
     <string name="menu_more_options">További beállítások</string>
     <string name="menu_learn_spelling">Helyesírás tanulása</string>
-    <string name="menu_chat_audit_log">Csevegés ellenőrzési naplófájl</string>
+    <string name="menu_chat_audit_log">Csevegésellenőrzési-naplófájl</string>
     <string name="jump_to_message">Ugrás az üzenetre</string>
     <string name="copy_json">JSON másolása</string>
     <string name="replace_draft">Piszkozat cseréje</string>
     <string name="title_share_location">Helyszín megosztása a csoport összes tagjával</string>
     <string name="device_talk">Eszközüzenetek</string>
-    <string name="device_talk_subtitle">Helyileg generált üzenetek</string>
+    <string name="device_talk_subtitle">Helyileg előállított üzenetek</string>
     <string name="device_talk_explain">Ebben a csevegésben üzenetek jelennek meg az eszközön, amelyek az alkalmazás frissítéseiről és a használat során felmerülő problémákról tájékoztatnak.</string>
     <string name="device_talk_welcome_message2">Lépjen kapcsolatba az ismerőseivel!\n\n🙌 Koppintson a „QR-kódra” mind a két eszköz főképernyőjén. Válassza a „QR-kód beolvasása” lehetőséget az egyik eszközön, és irányítsa a másik eszközre\n\n🌍 Ha nem ugyanabban a szobában tartózkodnak az ismerősével, akkor szkenneljen videohíváson keresztül, vagy ossza meg a meghívó hivatkozást a „QR-kód bolvasása”-ból.\n\nMajd: Élvezze az üzenetküldés-élményt a valaha létezett legnagyobb decentralizált hálózaton keresztül, ami az e-mail és - más népszerű alkalmazásokkal ellentétben - központi kiszolgáló vagy nyomon követés nélkül, illetve anélkül, hogy önt, ismerőseit, kollégáit vagy családját nagy szervezeteknek adná el.</string>
     <string name="edit_contact">Névjegy szerkesztése</string>
@@ -291,13 +296,13 @@
     <!-- Verb "to pin", making something sticky, not a noun or abbreviation for "pin number". -->
     <string name="pin">Kitűzés</string>
     <!-- Opposite of "Pin chat", removing the sticky-state from a chat. -->
-    <string name="unpin">Kitűzés visszavonása</string>
+    <string name="unpin">Kitűzés megszüntetése</string>
     <string name="ConversationFragment_quoted_message_not_found">Nem található az eredeti üzenet</string>
     <string name="reply_privately">Válasz privátban</string>
     <string name="source_code">Forráskód</string>
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">Hozzáadás a kezdőképernyőhöz</string>
-    <string name="donate">Támogatás</string>
+    <string name="donate">Adományozás</string>
 
     <string name="mute_for_one_hour">Némítás 1 órára</string>
     <string name="mute_for_two_hours">Némítás 2 órára</string>
@@ -321,15 +326,16 @@
     <string name="videochat_invite_user_to_videochat">Meghívja videócsevegésbe őt: %1$s?</string>
     <string name="videochat_invite_user_hint">Ehhez mindkét oldalon kompatibilis alkalmazás vagy böngésző szükséges.</string>
     <string name="videochat_contact_invited_hint">%1$s meg lett híva egy videócsevegésbe.</string>
-    <string name="videochat_you_invited_hint">Ön elküdött egy videócsevegés meghívót.</string>
+    <string name="videochat_you_invited_hint">Ön elküdött egy videócsevegés-meghívót.</string>
     <string name="videochat_tap_to_join">Koppintson ide a csatlakozáshoz.</string>
     <string name="videochat_tap_to_open">Koppintson ide a megnyitáshoz.</string>
-    <string name="videochat_instance">Videócsevegés példány</string>
-    <string name="videochat_instance_placeholder">Az ön videócsevegés példánya</string>
+    <string name="videochat_instance">Videócsevegés-példány</string>
+    <string name="videochat_instance_placeholder">Az ön videócsevegés-példánya</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Például: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Ha engedélyezve van, akkor minden csevegésből indíthat videócsevegést. Kompatibilis alkalmazást vagy böngészőt igényel mindkét oldalon.</string>
     <string name="videochat_instance_from_qr">„%1$s” használata mások meghívásához a videócsevegésekbe?\n\nAmint beállította, minden egyes csevegésből indíthat videócsevegést. Ez minden korábbi beállítás helyébe lép a videócsevegéseknél.</string>
-    <string name="videochat_invitation">Videócsevegés meghívó</string>
+    <string name="videochat_invitation">Videócsevegés-meghívó</string>
     <string name="videochat_invitation_body">Ön meg lett híva egy videócsevegésbe, kattintson ide: %1$s a csatlakozáshoz.</string>
 
     <!-- get confirmations -->
@@ -351,11 +357,11 @@
     <string name="ask_forward">Továbbítja az üzenetet a számára: %1$s?</string>
     <string name="ask_forward_multiple">Továbbítja az üzenetet a következő csevegésbe: %1$d?</string>
     <string name="ask_export_attachment">A mellékletek exportálása lehetővé teszi, hogy más alkalmazások is hozzáférjenek azokhoz az eszközön.\n\nFolytatja?</string>
-    <string name="ask_block_contact">Blokkolja ezt az ismerősét? Többé nem fog üzeneteket kapni tőle.</string>
-    <string name="ask_unblock_contact">Feloldja ennek az ismerősének a blokkolását? Ezután képes lesz üzeneteket fogadni tőle.</string>
-    <string name="ask_delete_contacts">Ismerős törlése?\n\nA folyamatban lévő csevegésekkel rendelkező vagy a rendszer névjegyzékéből származó ismerősök nem törölhetőek véglegesen.</string>
-    <string name="ask_delete_contact">%1$s nevű ismerősének tölése?\n\nA folyamatban lévő csevegésekkel rendelkező vagy a rendszer névjegyzékéből származó ismerősök nem törölhetőek véglegesen.</string>
-    <string name="cannot_delete_contacts_in_use">A folyamatban lévő csevegésekkel rendelkező ismerősök nem törölhetőek.</string>
+    <string name="ask_block_contact">Letiltja ezt az ismerősét? Többé nem fog üzeneteket kapni tőle.</string>
+    <string name="ask_unblock_contact">Feloldja ennek az ismerősének a letiltását? Ezután képes lesz üzeneteket fogadni tőle.</string>
+    <string name="ask_delete_contacts">Ismerős törlése?\n\nA folyamatban lévő csevegésekkel rendelkező vagy a rendszer névjegyzékéből származó ismerősök nem törölhetők véglegesen.</string>
+    <string name="ask_delete_contact">%1$s nevű ismerősének tölése?\n\nA folyamatban lévő csevegésekkel rendelkező vagy a rendszer névjegyzékéből származó ismerősök nem törölhetők véglegesen.</string>
+    <string name="cannot_delete_contacts_in_use">A folyamatban lévő csevegésekkel rendelkező ismerősök nem törölhetők.</string>
     <string name="ask_start_chat_with">Csevegés vele: %1$s?</string>
     <string name="ask_delete_value">%s törlése?</string>
     <!-- %1$s is replaced by a comma-separated list of names -->
@@ -367,8 +373,8 @@
 
     <!-- contact list -->
     <string name="contacts_title">Névjegyek</string>
-    <string name="contacts_enter_name_or_email">Adjon meg egy nevet vagy egy e-mail címet</string>
-    <string name="contacts_type_email_above">Írja be a fenti e-mail címet</string>
+    <string name="contacts_enter_name_or_email">Adjon meg egy nevet vagy egy e-mail-címet</string>
+    <string name="contacts_type_email_above">Írja be a fenti e-mail-címet</string>
     <string name="contacts_empty_hint">Még nincsenek névjegyek.</string>
 
 
@@ -397,10 +403,10 @@
     <string name="chat_record_explain">Hangüzenet rögzítéséhez koppintson és tartsa lenyomva; Az elküldéshez engedje el.</string>
     <string name="chat_no_chats_yet_title">Nincsenek csevegések.\nÉrintse meg a „+” gombot egy új csevegés indításához.</string>
     <string name="chat_all_archived">Minden csevegés archiválva van.\nÉrintse meg a „+” gombot egy új csevegés indításához.</string>
-    <string name="chat_share_with_title">Megosztás ezzel</string>
+    <string name="chat_share_with_title">Megosztás vele:</string>
     <string name="chat_input_placeholder">Üzenet</string>
     <string name="chat_archived_label">Archivált</string>
-    <string name="chat_request_label">Kérelem</string>
+    <string name="chat_request_label">Kérés</string>
     <string name="chat_no_messages">Nincsenek üzenetek.</string>
     <string name="chat_self_talk_subtitle">Magamnak küldött üzenetek</string>
     <string name="archive_empty_hint">Az archivált csevegések itt fognak megjelenni.</string>
@@ -426,7 +432,7 @@
     <!-- "Start..." button for an app -->
     <string name="start_app">Indítás...</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">Először fogadja el a csevegési kérelmet.</string>
+    <string name="accept_request_first">Először fogadja el a csevegéskérést.</string>
     <!-- title shown above a list of chats where one should be selected (eg. when sharing files from a webxdc). the placeholder will be replaced by a file name -->
     <string name="send_file_to">„%1$s” küldése neki...</string>
     <!-- title shown above a list contacts where one should be selected (eg. when a webxdc attempts to send a message to a chat) -->
@@ -465,7 +471,7 @@
     <!-- create/edit groups, contact/group profile -->
     <string name="group_name">Csoport neve</string>
     <string name="group_avatar">Csoport képe</string>
-    <string name="remove_group_image">Csoportkép törlése</string>
+    <string name="remove_group_image">Csoportkép eltávolítása</string>
     <string name="change_group_image">Csoport képének megváltoztatása</string>
     <string name="group_create_button">Csoport készítése</string>
     <string name="group_please_enter_group_name">Csoport nevének magaása.</string>
@@ -496,7 +502,7 @@
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new email addresses. -->
     <string name="aeap_addr_changed">%1$s megváltoztatta a címét erről: %2$s, erre: %3$s </string>
     <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
-    <string name="aeap_explanation">Ön megváltoztatta a saját e-mail címét erről: %1$s erre: %2$s.\n\nHa most üzenetet küld egy ellenőrzött csoportba, az ottani ismerősei automatikusan lecserélik a z ön régi címét az új címére.\n\nEzért nagyon ajánlott beállítani, hogy a régi e-mail szolgáltatója minden e-mailt továbbítson-e az új e-mail címére. Ellenkező esetben lemaradhat azoknak az ismerőseinek az üzeneteiről, akik még nem kapták meg az új címét.</string>
+    <string name="aeap_explanation">Ön megváltoztatta a saját E-mail-címét erről: %1$s erre: %2$s.\n\nHa most üzenetet küld egy ellenőrzött csoportba, az ottani ismerősei automatikusan lecserélik az ön régi címét az új címére.\n\nEzért nagyon ajánlott beállítani, hogy a régi E-mail szolgáltatója minden E-mailt továbbítson-e az új E-mail-címére. Ellenkező esetben lemaradhat azoknak az ismerőseinek az üzeneteiről, akik még nem kapták meg az új címét.</string>
 
 
     <!-- Multi Device -->
@@ -504,9 +510,9 @@
     <string name="multidevice_title">Második eszköz hozzáadása</string>
     <string name="multidevice_same_network_hint">Győződjön meg róla, hogy mindkét eszköz ugyanazon a Wi-Fi-n vagy hálózaton van-e</string>
     <string name="multidevice_this_creates_a_qr_code">Ez egy QR-kódot hoz létre, amelyet a második eszközön beolvashat a profil másolásához.</string>
-    <string name="multidevice_install_dc_on_other_device">Telepítse a ArcaneChat-et a másik eszközére (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Telepítse a ArcaneChat-et a másik eszközére (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
-    <string name="multidevice_tap_scan_on_other_device">Indítsa el a ArcaneChat-et, koppintson a „Már van bejelentkezésem / Hozzáadás második eszközként” lehetőségre, és olvassa be az itt látható kódot.</string>
+    <string name="multidevice_tap_scan_on_other_device">Indítsa el a ArcaneChat-et, koppintson a „Már van profilom / Hozzáadás második eszközként” lehetőségre, és olvassa be az itt megjelenő kódot.</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
     <string name="multidevice_qr_subtitle">Második eszköz beállításának beolvasása a(z) %1$s számára</string>
     <string name="multidevice_receiver_title">Hozzáadás második eszközként</string>
@@ -584,7 +590,7 @@
     <!-- for classic email, we use the classical term "Account" -->
     <string name="login_header">Jelentkezzen be az e-mail fiókjába</string>
     <!-- for classic email, we use the classical term "Account" -->
-    <string name="login_explain">Bejelentkezés meglévő e-mail fiókkal</string>
+    <string name="login_explain">Bejelentkezés meglévő e-mail-fiókkal</string>
     <string name="login_subheader">Az ismert e-mail szolgáltatók esetében a rendszer automatikus beállításokat hoz létre. Kivételes esetekben az IMAP-ot engedélyezni kell az e-mail szolgáltatójának webes beállításaiban. Forduljon az e-mail szolgáltatójához vagy ismerőseihez további segítségért.</string>
     <string name="login_no_servers_hint">A ArcaneChat nem gyűjt felhasználói adatokat, minden az ön eszközén marad.</string>
     <string name="login_inbox">Bejövő</string>
@@ -599,25 +605,29 @@
     <string name="login_smtp_port">SMTP port</string>
     <string name="login_smtp_security">SMTP biztonság</string>
     <string name="login_auth_method">Jogosultság kezelési eljárás</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Proxy</string>
+    <string name="proxy_use_proxy">Proxy használata</string>
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">SOCKS5 használata</string>
     <string name="login_socks5_host">SOCKS5 kiszolgáló</string>
     <string name="login_socks5_port">SOCKS5 port</string>
     <string name="login_socks5_user">SOCKS5 felhasználó</string>
     <string name="login_socks5_password">SOCKS5 jelszó</string>
+
     <string name="login_info_oauth2_title">Folytatja az egyszerűsített beállítást?</string>
-    <string name="login_info_oauth2_text">A megadott e-mail cím támogatja az egyszerűsített beállítást (OAuth 2.0).\n\nA következő lépésben engedélyezze a ArcaneChat számára, hogy az e-mailen keresztüli csevegés alkalmazásaként működjön.\n\nA ArcaneChat nem gyűjt felhasználói adatokat, minden adat az eszközön marad.</string>
+    <string name="login_info_oauth2_text">A megadott E-mail-cím támogatja az egyszerűsített beállítást (OAuth 2.0).\n\nA következő lépésben engedélyezze a ArcaneChat számára, hogy az e-mailen keresztüli csevegés alkalmazásaként működjön.\n\nA ArcaneChat nem gyűjt felhasználói adatokat, minden adat az eszközön marad.</string>
     <string name="login_certificate_checks">Tanúsítvány ellenőrzése</string>
-    <string name="login_error_mail">Adjon meg egy érvényes e-mail címet</string>
-    <string name="login_error_server">Adjon meg egy érvényes kiszolgáló / IP-címet</string>
+    <string name="login_error_mail">Adjon meg egy érvényes e-mail-címet</string>
+    <string name="login_error_server">Adjon meg egy érvényes kiszolgáló- / IP-címet</string>
     <string name="login_error_port">Adjon meg egy érvényes portot (1-65535)</string>
-    <string name="login_error_required_fields">Adjon meg egy érvényes e-mail címet és egy jelszót</string>
+    <string name="login_error_required_fields">Adjon meg egy érvényes e-mail-címet és egy jelszót</string>
     <string name="import_backup_title">Biztonsági mentés visszaállítása</string>
     <string name="import_backup_ask">A biztonsági mentés itt található: „%1$s”.\n\nAz összes adatot és beállítást szeretné importálni és használni belőle?</string>
     <string name="import_backup_no_backup_found">A biztonsági mentés nem található.\n\nMásolja a biztonsági mentést ide: „%1$s” és próbálja újra. Másik lehetőségként nyomja meg az „Üzenetküldés indítása” gombot a normál beállítási folyamat folytatásához.</string>
     <!-- Translators: %1$s will be replaced by the e-mail address -->
-    <string name="login_error_cannot_login">Nem lehetett bejelentkezni ide: „%1$s”. Ellenőrizze, hogy a megadott e-mail cím és a jelszó helyes-e.</string>
+    <string name="login_error_cannot_login">Nem lehetett bejelentkezni ide: „%1$s”. Ellenőrizze, hogy a megadott e-mail-cím és a jelszó helyes-e.</string>
     <!-- TLS certificate checks -->
     <string name="accept_invalid_certificates">Érvénytelen tanúsítványok elfogadása</string>
     <string name="switch_account">Profilváltás</string>
@@ -667,7 +677,7 @@
     <string name="pref_notifications">Értesítések</string>
     <string name="pref_notifications_show">Megjelenítés</string>
     <string name="pref_notifications_priority">Prioritás</string>
-    <string name="pref_notifications_explain">Rendszer értesítések engedélyezése az új üzenetekről</string>
+    <string name="pref_notifications_explain">Rendszerértesítések engedélyezése az új üzenetekről</string>
     <string name="pref_show_notification_content">Üzenet tartalmának megjelenítése az értesítésben</string>
     <string name="pref_show_notification_content_explain">Az értesítésekben megjelenik az üzenet feladója és első szavai</string>
     <string name="pref_led_color">LED színe</string>
@@ -675,7 +685,7 @@
     <string name="pref_silent">Csendes</string>
     <string name="pref_privacy">Adatvédelem</string>
     <string name="pref_chats_and_media">Csevegések és média</string>
-    <string name="pref_system_default">Alapbeállítás</string>
+    <string name="pref_system_default">Rendszer alapértelmezett</string>
     <!-- Translators: as in "opposite of dark" -->
     <string name="pref_light_theme">Világos</string>
     <string name="pref_dark_theme">Sötét</string>
@@ -712,7 +722,7 @@
     <string name="pref_backup_export_x">%1$s exportálása</string>
     <!-- the placeholder will be replaced by the number of profiles to export; the number is always larger than 1 -->
     <string name="pref_backup_export_all">Mind a(z) %1$d profil exportálása</string>
-    <string name="pref_backup_export_start_button">Biztonsági mentés indítása</string>
+    <string name="pref_backup_export_start_button">Biztonsági mentés készítése</string>
     <string name="pref_backup_written_to_x">A biztonsági mentés sikeresen létrehozva itt: „%1$s”.</string>
     <string name="pref_managekeys_menu_title">Privát kulcsok kezelése</string>
     <string name="pref_managekeys_export_secret_keys">Privát kulcsok exportálása</string>
@@ -804,7 +814,7 @@
     <string name="autodel_server_warn_multi_device">Ha az egyszeri törlés engedélyezve van, akkor nem használhatja ezt a profilt több eszközről.</string>
     <string name="autodel_confirm">Értem, törölje ezeket az üzeneteket</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
-    <string name="autodel_at_once">Egyszer</string>
+    <string name="autodel_at_once">Egyszer a letöltés után</string>
     <string name="after_30_seconds">30 másodperc elteltével</string>
     <string name="after_1_minute">1 perc elteltével</string>
     <string name="after_5_minutes">5 perc elteltével</string>
@@ -816,19 +826,19 @@
     <string name="autodel_after_1_year">1 év elteltével</string>
 
     <!-- autocrypt -->
-    <string name="autocrypt_send_asm_title">Autocrypt beállító üzenet küldése</string>
-    <string name="autocrypt_send_asm_explain_before">Egy autocrypt beállító üzenet biztonságosan megosztja az ön végpontok közötti beállításait más autocrypt-kompatibilis alkalmazásokkal.\n\nA beállítás titkosítása egy, itt megjelenő beállítási kóddal történik, amelyet a másik eszközön kell begépelni.</string>
-    <string name="autocrypt_send_asm_button">Autocrypt beállító üzenet küldése</string>
+    <string name="autocrypt_send_asm_title">Autocryptbeállító-üzenet küldése</string>
+    <string name="autocrypt_send_asm_explain_before">Egy autocryptbeállító-üzenet biztonságosan megosztja az ön végpontok közötti beállításait más autocrypt-kompatibilis alkalmazásokkal.\n\nA beállítás titkosítása egy, itt megjelenő beállítási kóddal történik, amelyet a másik eszközön kell begépelni.</string>
+    <string name="autocrypt_send_asm_button">Autocryptbeállító-üzenet küldése</string>
     <string name="autocrypt_send_asm_explain_after">A beállításokat elküldtük önnek. Váltson a másik eszközre, és nyissa meg a beállítási üzenetet. Meg kell adnia a beállítási kódot. Írja be a következő számjegyeket:</string>
     <string name="autocrypt_prefer_e2ee">Végpontok közötti titkosítás előnyben részesítése</string>
-    <string name="autocrypt_asm_subject">Autocrypt beállító üzenet</string>
-    <string name="autocrypt_asm_general_body">Ez az autocrypt beállító üzenet a végpontok közötti beállítások kliensek közötti átvitelére szolgál.\n\nA beállítások visszafejtéséhez és használatához nyissa meg az üzenetet egy autocrypt-kompatibilis kliensben, és írja be a generáló eszközön megjelenő beállítási kódot.</string>
-    <string name="autocrypt_asm_click_body">Ez az Autocrypt beállító üzenet, amelyet a végpontok közötti titkosítási beállítások átvitelére használnak a kliensek között.\n\n\nA beállítások visszafejtéséhez és használatához koppintson vagy kattintson erre az üzenetre.</string>
-    <string name="autocrypt_continue_transfer_title">Autocrypt beállító üzenet</string>
+    <string name="autocrypt_asm_subject">Autocryptbeállító-üzenet</string>
+    <string name="autocrypt_asm_general_body">Ez az autocryptbeállító-üzenet a végpontok közötti beállítások kliensek közötti átvitelére szolgál.\n\nA beállítások visszafejtéséhez és használatához nyissa meg az üzenetet egy autocrypt-kompatibilis kliensben, és írja be az előállító eszközön megjelenő beállítási kódot.</string>
+    <string name="autocrypt_asm_click_body">Ez az Autocryptbeállító-üzenet, amelyet a végpontok közötti titkosítási beállítások átvitelére használnak a kliensek között.\n\n\nA beállítások visszafejtéséhez és használatához koppintson vagy kattintson erre az üzenetre.</string>
+    <string name="autocrypt_continue_transfer_title">Autocryptbeállító-üzenet</string>
     <string name="autocrypt_continue_transfer_please_enter_code"> Adja meg a másik eszközön megjelenő beállítási kódot.</string>
     <string name="autocrypt_continue_transfer_succeeded">A végpontok közötti beállítások átvitele megtörtént. Ez az eszköz most már készen áll az autocrypt használatára a másik eszközzel megegyező beállításokkal.</string>
     <string name="autocrypt_continue_transfer_retry">Újra</string>
-    <string name="autocrypt_bad_setup_code">Rossz beállítási kód. Próbálja újra.\n\nHa nem emlékszik a beállítási kódra, küldjön új Autocrypt Beállítás üzenetet a másik eszközről.</string>
+    <string name="autocrypt_bad_setup_code">Rossz beállítási kód. Próbálja újra.\n\nHa nem emlékszik a beállítási kódra, küldjön új Autocryptbeállító-üzenetet a másik eszközről.</string>
 
 
     <!-- system messages -->
@@ -854,9 +864,9 @@
     <!-- %1$s will be replaced by name and address of the contact added to the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="add_member_by_other">%2$s hozzáadta %1$s nevű tagot.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group -->
-    <string name="remove_member_by_you">Ön eltávolította %1$s nevű tagot.</string>
+    <string name="remove_member_by_you">Eltávolította őt: %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
-    <string name="remove_member_by_other">%2$s eltávolította %1$s nevű tagot.</string>
+    <string name="remove_member_by_other">%2$s eltávolította őt: %1$s.</string>
     <!-- "left" in the meaning of "exited" -->
     <string name="group_left_by_you">Ön elhagyta a csoportot.</string>
     <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
@@ -918,7 +928,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Az e-mail szolgáltatójától kapott tárhelye hamarosan elfogy: %1$s%% már felhasználásra került.\n\n\nElképzelhető, hogy nem tud üzeneteket fogadni, ha a tárhelye megtelt.\n\n👉 Ellenőrizze, hogy a szolgáltatója webes felületén törölheti-e a régi adatokat, és fontolja meg a „Beállítások / Csevegések és média / Régi üzenetek törlése” engedélyezését. Az aktuális tárhelyhasználatot bármikor ellenőrizheti a „Beállítások / Tárhely” menüpontban.</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Az eszközén lévő dátum vagy idő pontatlannak tűnik (%1$s).\n\nJavítsa meg az órát ⏰🔧 az üzenetek helyes fogadásának biztosítása érdekében.</string>
-    <string name="devicemsg_update_reminder">⚠️ Lehet, hogy a ArcaneChat verziója elavult.\n\nEz problémákat okozhat, mivel az ismerősei újabb verziókat használnak - továbbá hiányoznak a legújabb funkciók 😳\nEllenőrizze a https://get.delta.chat oldalon vagy az alkalmazásboltban a frissítéseket.</string>
+    <string name="devicemsg_update_reminder">⚠️ Lehet, hogy a ArcaneChat verziója elavult.\n\nEz problémákat okozhat, mivel az ismerősei újabb verziókat használnak - továbbá hiányoznak a legújabb funkciók 😳\nEllenőrizze a https://github.com/ArcaneChat oldalon vagy az alkalmazásboltban a frissítéseket.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Feloldás a folytatáshoz</string>
@@ -932,7 +942,7 @@
     <string name="qrscan_failed">A QR-kódot nem sikerült értelmezni</string>
     <string name="qrscan_ask_join_group">Biztosan csatlakozik a(z) „%1$s” nevű szobához?</string>
     <string name="qrscan_fingerprint_mismatch">A beolvasott ujjlenyomat nem egyezik a(z) %1$s utoljára látott ujjlenyomatával.</string>
-    <string name="qrscan_no_addr_found">Ez a QR-kód tartalmaz egy ujjlenyomatot, de nem tartalmaz e-mail címet.\n\nA sávon kívüli ellenőrzéshez először hozzon létre titkosított kapcsolatot a címzetthez.</string>
+    <string name="qrscan_no_addr_found">Ez a QR-kód tartalmaz egy ujjlenyomatot, de nem tartalmaz e-mail-címet.\n\nA sávon kívüli ellenőrzéshez először hozzon létre titkosított kapcsolatot a címzetthez.</string>
     <string name="qrscan_contains_text">A beolvasott QR-kód szövege:\n\n%1$s</string>
     <string name="qrscan_contains_url">A beolvasott QR-kód hivatkozás:\n\n%1$s</string>
     <string name="qrscan_fingerprint_label">Ujjlenyomat</string>
@@ -985,6 +995,7 @@
     <string name="mailto_link_could_not_be_decoded">Nem sikerült dekódolni a mailto hivatkozást: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Elvetés</string>
     <string name="notify_reply_button">Válasz</string>
     <string name="notify_new_message">Új üzenet</string>
@@ -1059,15 +1070,15 @@
     <string name="select_group_image_desktop">Csoport képének kiválasztása</string>
     <string name="export_backup_desktop">Biztonsági mentés exportálása</string>
     <string name="autocrypt_correct_desktop">Autocrypt beállítások átvitele.</string>
-    <string name="forget_login_confirmation_desktop">Törli ezt a bejelentkezést? Minden törlődik, beleértve a végpontok közötti titkosítási beállításokat, névjegyeket, csevegéseket, üzeneteket és médiát. Ez a művelet nem vonható vissza.</string>
+    <string name="forget_login_confirmation_desktop">Törli ezt a profilt? Minden törlődik, beleértve a végpontok közötti titkosítási beállításokat, névjegyeket, csevegéseket, üzeneteket és médiát. Ez a művelet nem vonható vissza.</string>
     <string name="message_detail_sent_desktop">elküldött</string>
     <string name="message_detail_received_desktop">érkezett</string>
     <string name="menu.view.developer.open.log.folder">Naplófájlok könyvtárának megnyitása</string>
     <string name="menu.view.developer.open.current.log.file">Jelenlegi naplófájl megnyitása</string>
     <string name="explain_desktop_minimized_disabled_tray_pref" tools:ignore="TypographyDashes">A tálca ikonja nem kapcsolható ki, mivel a ArcaneChat a --minimized opcióval indult.</string>
-    <string name="no_spellcheck_suggestions_found">Nem találhatóak helyesírási javaslatok.</string>
+    <string name="no_spellcheck_suggestions_found">Nem találhatók helyesírási javaslatok.</string>
     <string name="show_window">Ablak megjelenítése</string>
-    <string name="login_socks5_experimental_warning">A SOCKS5 támogatás jelenleg kísérleti jellegű. Használja saját felelősségére. Ha beír egy címet az e-mail mezőbe, akkor lesz olyan DNS lekérés, ami nem fog átjutni a SOCKS5 csatornán.</string>
+    <string name="login_socks5_experimental_warning">A SOCKS5 támogatás jelenleg kísérleti jellegű. Használja saját felelősségére. Ha beír egy címet az e-mail-mezőbe, akkor lesz olyan DNS lekérés, ami nem fog átjutni a SOCKS5 csatornán.</string>
 
     <!-- title of the "keybindings" dialog (for the keybindings names as such, where possible the normal command strings are used) -->
     <string name="keybindings">Billentyűkötések</string>
@@ -1121,9 +1132,9 @@
     <string name="shortcut_step2_tap_add_to_home_screen">Válassza a „Hozzáadás a kezdőképernyőhöz” lehetőséget, hogy az alkalmazást hozzáadja a kezdőképernyőhöz.</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">A ArcaneChat az eszköze kameráját használja fényképek és videók készítésére és küldésére, valamint QR-kódok beolvasására.</string>
-    <string name="InfoPlist_NSContactsUsageDescription">A ArcaneChat a névjegyek segítségével megjeleníti azon e-mail címek listáját, amelyekkel cseveghet. A ArcaneChat-nek nincs központi kiszolgálója, a névjegyeit nem küldjük el sehova.</string>
-    <string name="InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription">A ArcaneChat-nek engedélyre van szüksége ahhoz, hogy megoszthassa az ön tartózkodási helyszínét arra az időtartamra, ameddig engedélyezte a helyszínmegosztást.</string>
-    <string name="InfoPlist_NSLocationWhenInUseUsageDescription">A ArcaneChat-nek engedélyre van szüksége ahhoz, hogy megoszthassa az ön tartózkodási helyszínét arra az időtartamra, ameddig engedélyezte a helyszínmegosztást.</string>
+    <string name="InfoPlist_NSContactsUsageDescription">A ArcaneChat a névjegyek segítségével megjeleníti azon e-mail-címek listáját, amelyekkel cseveghet. A ArcaneChatnek nincs központi kiszolgálója, a névjegyeit nem küldjük el sehova.</string>
+    <string name="InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription">A ArcaneChatnek engedélyre van szüksége ahhoz, hogy megoszthassa az ön tartózkodási helyszínét arra az időtartamra, ameddig engedélyezte a helyszínmegosztást.</string>
+    <string name="InfoPlist_NSLocationWhenInUseUsageDescription">A ArcaneChatnek engedélyre van szüksége ahhoz, hogy megoszthassa az ön tartózkodási helyszínét arra az időtartamra, ameddig engedélyezte a helyszínmegosztást.</string>
     <string name="InfoPlist_NSMicrophoneUsageDescription">A ArcaneChat az eszköze mikrofonját használja a hangüzenetek és a hangos videók rögzítésére, valamint küldésére.</string>
     <string name="InfoPlist_NSPhotoLibraryUsageDescription">A ArcaneChat segítségével kiválaszthatja, hogy mely fényképeket szeretné elküldeni a könyvtárából.</string>
     <string name="InfoPlist_NSPhotoLibraryAddUsageDescription">A ArcaneChat el akarja menteni a képeket az eszköze fotótárába.</string>
@@ -1132,11 +1143,11 @@
     <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->
     <string name="pref_instant_delivery">Azonnali kézbesítés</string>
     <string name="pref_background_notifications">Háttérkapcsolat használata</string>
-    <string name="pref_background_notifications_explain">Figyelmen kívül hagyott akkumulátor-optimalizációt igényel, akkor használja, ha a Push szolgáltatás nem érhető el</string>
+    <string name="pref_background_notifications_explain">Mellőzött akkumulátor-optimalizációt igényel, akkor használja, ha a Push szolgáltatás nem érhető el</string>
     <string name="pref_reliable_service">Kényszerített háttérkapcsolat</string>
-    <string name="pref_reliable_service_explain">Állandó értesítést jelenít meg</string>
+    <string name="pref_reliable_service_explain">Egy állandó értesítést jelenít meg</string>
 
-    <string name="pref_background_notifications_rationale">Az e-mail kiszolgálóval való kapcsolat fenntartásához és az üzenetek háttérben történő fogadásához hagyja figyelmen kívül az akkumulátor optimalizálását a következő lépésben.\n\nA ArcaneChat kevés erőforrást használ, és ügyel arra, hogy ne merítse az akkumulátort.</string>
+    <string name="pref_background_notifications_rationale">Az e-mail kiszolgálóval való kapcsolat fenntartásához és az üzenetek háttérben történő fogadásához mellőzze az akkumulátor optimalizálását a következő lépésben.\n\nA ArcaneChat kevés erőforrást használ, és ügyel arra, hogy ne merítse az akkumulátort.</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
     <string name="perm_enable_bg_reminder_title">Koppintson ide az üzenetek fogadásához, miközben a ArcaneChat a háttérben fut.</string>
     <string name="perm_enable_bg_already_done">Már engedélyezve van a ArcaneChat számára, hogy a háttérben üzeneteket fogadjon.\n\nHa az üzenetek még mindig nem érkeznek meg a háttérben, ellenőrizze a rendszerbeállításokat is.</string>
@@ -1144,4 +1155,6 @@
     <!-- device messages for updates -->
     <string name="update_1_46_android">Új szolgáltatások 🐣 és további tudnivalók:\n\n⚡️ Regisztráljon biztonságos, gyors chatmail kiszolgálókra (https://delta.chat/chatmail) vagy használja a klasszikus e-mail kiszolgálókat\n\n👉 PUSH értesítések bármely chatmail kiszolgálóra\n\n👤 Kapcsolja össze ismerőseit biztonságosan a „Névjegyek csatolásával”\n\n🥰 Reagáljon bármilyen hangulatjellel\n\n📌 Tűzze ki a csevegéseket közvetlenül a keresésből ... tudjon meg többet itt: %1$s</string>
     <string name="update_1_46_ios">Új szolgáltatások 🐣 és további tudnivalók:\n\n⚡️ Regisztráljon biztonságos, gyors chatmail kiszolgálókra (https://delta.chat/chatmail) vagy használja a klasszikus e-mail kiszolgálókat\n\n👉 PUSH értesítések bármely chatmail kiszolgálóra\n\n👤 Fogadjon „Csatolt névjegyeket\" és csatlakozzon az ismerőseihez”\n\n🥰 Gyorsabb üzenetreakció kiválasztás ... tudjon meg többet itt: %1$s</string>
-    </resources>
+    <string name="update_switch_profile_placement">ℹ️ A „Profilváltás” opció át lett helyezve:
+Érintse meg a főképernyő felső sarkában lévő profilképet a profilok hozzáadásához vagy váltásához 💡</string>
+</resources>

src/main/res/values-in/strings.xml

@@ -278,6 +278,7 @@
     <string name="videochat_you_invited_hint">Anda diundang ke obrolan video.</string>
     <string name="videochat_tap_to_join">Ketuk untuk bergabung</string>
     <string name="videochat_tap_to_open">Ketuk untuk membuka</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Contoh: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_from_qr">Gunakan \"%1$s\" untuk mengundang orang lain ke obrolan video? Setelah diatur, Anda dapat memulai obrolan video dari setiap obrolan. Ini menggantikan pengaturan sebelumnya untuk obrolan video.</string>
     <string name="videochat_invitation">Undangan obrolan video</string>

src/main/res/values-it/strings.xml

@@ -56,7 +56,7 @@
     <string name="mark_all_as_read">Segna Tutti come Letti</string>
     <string name="mark_as_read">Segna come Letto</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
-    <string name="mark_as_read_short">Leggi</string>
+    <string name="mark_as_read_short">Segna Letto</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Caricamento in Corso…</string>
     <string name="hide">Nascondi</string>
@@ -341,6 +341,7 @@
     <string name="videochat_tap_to_open">Tocca per Aprire</string>
     <string name="videochat_instance">Istanza Video Chat</string>
     <string name="videochat_instance_placeholder">La Tua Istanza Video Chat</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Esempi: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Se la video chat è abilitata, è possibile avviare una video chat da ogni chat. Le video chat richiedono un\'applicazione compatibile o un browser compatibile da entrambe le parti.</string>
     <string name="videochat_instance_from_qr">Utilizzare \"%1$s\" per invitare altri alla video chat?\n\nUna volta impostato, è possibile avviare una video chat da ogni chat uno a uno. Ciò sostituirà l\'eventuale impostazione precedente per le video chat.</string>
@@ -525,7 +526,7 @@
     <string name="multidevice_title">Aggiungi Secondo Dispositivo</string>
     <string name="multidevice_same_network_hint">Assicurati che entrambi i dispositivi siano sulla stessa rete o Wi-Fi.</string>
     <string name="multidevice_this_creates_a_qr_code">In questo modo si crea un codice QR che il secondo dispositivo può scansionare per copiare l\'account.</string>
-    <string name="multidevice_install_dc_on_other_device">Installa ArcaneChat sull\'altro dispositivo (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Installa ArcaneChat sull\'altro dispositivo (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Avvia ArcaneChat, tocca \"Aggiungi come secondo dispositivo\" e scansiona il codice qui mostrato</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -620,13 +621,25 @@
     <string name="login_smtp_port">Porta SMTP</string>
     <string name="login_smtp_security">Sicurezza SMTP</string>
     <string name="login_auth_method">Metodo di Autorizzazione</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Proxy</string>
+    <string name="proxy_use_proxy">Usa Proxy</string>
+    <string name="proxy_add">Aggiungi Proxy</string>
+    <string name="proxy_add_explain">Tipi di proxy supportati: HTTP(S), SOCKS5 e Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Inserisci qui l\'URL del proxy</string>
+    <string name="proxy_invalid">URL proxy non valido o non supportato</string>
+    <string name="proxy_list_header">Proxy Salvati</string>
+    <string name="proxy_delete">Elimina Proxy</string>
+    <string name="proxy_delete_explain">Sei sicuro di voler eliminare \"%1$s\"?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Usa SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 Host</string>
     <string name="login_socks5_port">SOCKS5 Porta</string>
     <string name="login_socks5_user">SOCKS5 Utente</string>
     <string name="login_socks5_password">SOCKS5 Password</string>
+
     <string name="login_info_oauth2_title">Usare il setup semplificato?</string>
     <string name="login_info_oauth2_text">L\'indirizzo email inserito supporta l\'autenticazione semplificata (OAuth2.0).\n\nContinuando, puoi autorizzare ArcaneChat a operare come app di messaggistica via e-mail.\n\nNon esistono server di ArcaneChat, i tuoi dati restano nel tuo dispositivo!</string>
     <string name="login_certificate_checks">Controlli Certificato</string>
@@ -939,7 +952,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Lo spazio di archiviazione del tuo provider sta per esaurirsi:%1$s%% sono già utilizzati.\n\nPotresti non essere in grado di ricevere messaggi se lo spazio di archiviazione è pieno.\n\n👉 Controlla se puoi eliminare i vecchi dati nell\'interfaccia web del provider e considera di abilitare \"Impostazioni/Chat e Media/Elimina Vecchi Messaggi\". Puoi controllare l\'utilizzo attuale dello spazio di archiviazione in qualsiasi momento in \"Impostazioni/Connettività\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ La data o l\'ora del tuo dispositivo sembrano imprecise (%1$s).\n\nRegola l\'orologio ⏰🔧 per assicurarti che i tuoi messaggi vengano ricevuti correttamente.</string>
-    <string name="devicemsg_update_reminder">⚠️ La tua versione di ArcaneChat potrebbe essere obsoleta.\n\nCiò potrebbe causare problemi perché i tuoi partner di chat utilizzano versioni più recenti - e ti mancano le funzionalità più recenti 😳\nControlla https://get.delta.chat o il tuo app store per gli aggiornamenti. </string>
+    <string name="devicemsg_update_reminder">⚠️ La tua versione di ArcaneChat potrebbe essere obsoleta.\n\nCiò potrebbe causare problemi perché i tuoi partner di chat utilizzano versioni più recenti - e ti mancano le funzionalità più recenti 😳\nControlla https://github.com/ArcaneChat o il tuo app store per gli aggiornamenti. </string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Per favore inserisci il tuo codice segreto definito dal sistema per continuare.</string>
@@ -1006,6 +1019,7 @@
     <string name="mailto_link_could_not_be_decoded">Il link mailto non può essere decodificato: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Ignora</string>
     <string name="notify_reply_button">Rispondi</string>
     <string name="notify_new_message">Nuovo messaggio</string>

src/main/res/values-km/strings.xml

@@ -437,13 +437,14 @@
     <string name="login_smtp_port">ច្រករបស SMTP</string>
     <string name="login_smtp_security">សន្តិសុខ SMTP</string>
     <string name="login_auth_method">ការចុះបញ្ជី</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">ប្រើ SOCKS5</string>
     <string name="login_socks5_host">ម្ចាស់ SOCKS5</string>
     <string name="login_socks5_port">ច្រក SOCKS5</string>
     <string name="login_socks5_user">អ្នកប្រើប្រាស់ SOCKS5</string>
     <string name="login_socks5_password">ពាក្យសម្ងាត់ SOCKS5</string>
+
     <string name="login_info_oauth2_title">បន្តជាមួយការដំឡើងសាមញ្ញ?</string>
     <string name="login_info_oauth2_text">អស័យដ្ឋានអុីម៉េលដែលបានបញ្ចូល គាំទ្រការដំឡើងសាមញ្ញ (OAuth 2.0)\n\nនៅជំហានបន្ទាប់ សូមអនុញ្ញាតឲ្យសាហារីសង្ឃ ដើរតួជាការសន្ទនារបស់អ្នកនៅលើកម្មវិធីអុីម៉េល។\n\nមិនមាន ម៉ាសុីនមេ សាហារីសង្ឃទេ។ ទិន្ន័យរបស់អ្នកស្ថិតនៅលើឧបករណ៍របស់អ្នក។</string>
     <string name="login_certificate_checks">ការត្រួតពិនិត្យលិខិតបញ្ជាក់</string>
@@ -702,7 +703,7 @@
     <string name="devicemsg_storage_exceeding">⚠️️ឃ្លាំងផ្ទុករបស់កម្មវិធីផ្តល់សេវាឲ្យអ្នក ជិតអស់ហើយត្រូវបានប្រើ %1$s%% រួចហើយ។\n\n អ្នកប្រហែលជាមិនអាចទទួលបានសារទេនៅពេលប្រើទំហំផ្ទុក ១០០%% ។\n\n👉 សូមពិនិត្យមើលថាតើ អ្នកអាចលុបទិន្នន័យចាស់នៅក្នុងចំណុចប្រទាក់គេហទំព័ររបស់កម្មវិធីផ្តល់សេវាកម្មហើយពិចារណាបើក \"ការកំណត់ / លុបសារចាស់ \"។ អ្នកអាចពិនិត្យមើលការប្រើប្រាស់ទំហំផ្ទុកបច្ចុប្បន្នរបស់អ្នកបានគ្រប់ពេលនៅ \"ការកំណត់ / ការតភ្ជាប់និងសេវាកម្ម\" ។</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ កាលបរិច្ឆេទ ឬពេលវេលានៃឧបករណ៍របស់អ្នកហាក់ដូចជាមិនត្រឹមត្រូវ (%1$s)។\n\n កែតម្រូវនាឡិការបស់អ្នក ⏰🔧 ដើម្បីធានាថា សាររបស់អ្នកត្រូវបានទទួលត្រឹមត្រូវ។</string>
-    <string name="devicemsg_update_reminder">⚠️កំណែ ArcaneChat របស់អ្នកប្រហែលជាហួសសម័យហើយ។\n\n នេះអាចបណ្តាលឱ្យមានបញ្ហាដោយសារតែដៃគូជជែករបស់អ្នកប្រើកំណែថ្មីជាង - ហើយអ្នកកំពុងបាត់លក្ខណៈពិសេសចុងក្រោយ 😳\n សូមពិនិត្យមើល https://get.delta.chat ឬហាងកម្មវិធីរបស់អ្នកដើម្បីទទួលបានព័ត៌មានថ្មីៗ ។</string>
+    <string name="devicemsg_update_reminder">⚠️កំណែ ArcaneChat របស់អ្នកប្រហែលជាហួសសម័យហើយ។\n\n នេះអាចបណ្តាលឱ្យមានបញ្ហាដោយសារតែដៃគូជជែករបស់អ្នកប្រើកំណែថ្មីជាង - ហើយអ្នកកំពុងបាត់លក្ខណៈពិសេសចុងក្រោយ 😳\n សូមពិនិត្យមើល https://github.com/ArcaneChat ឬហាងកម្មវិធីរបស់អ្នកដើម្បីទទួលបានព័ត៌មានថ្មីៗ ។</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">សូមបញ្ចូល ប្រព័ន្ធកំណត់ដោយសម្ងាត់របស់អ្នក ដើម្បីបន្ត។</string>

src/main/res/values-ko/strings.xml

@@ -279,6 +279,7 @@
     <string name="videochat_tap_to_open">열기 위해 탭하기</string>
     <string name="videochat_instance">비디오 채팅 인스턴스</string>
     <string name="videochat_instance_placeholder">당신의 비디오 채팅 인스턴스</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">예시: https://meet.jit.si/$ROOM 또는 basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">비디오 채팅을 사용할 수 있는 경우 각 채팅에서 비디오 채팅을 시작할 수 있습니다. 화상 채팅을 하려면 호환되는 앱 또는 호환 가능한 브라우저가 양쪽 끝에 필요합니다.</string>
     <string name="videochat_instance_from_qr">\"%1$s\"를 사용하여 다른 사람을 화상 채팅에 초대하시겠습니까?\n\n설정되면 각 채팅에서 비디오 채팅을 시작할 수 있습니다. 이것은 비디오 채팅에 대한 이전 설정을 대체합니다.</string>
@@ -470,13 +471,14 @@
     <string name="login_smtp_port">SMTP 포트</string>
     <string name="login_smtp_security">SMTP 보안</string>
     <string name="login_auth_method">권한 부여 방법</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">SOCKS5 사용</string>
     <string name="login_socks5_host">SOCKS5 호스트</string>
     <string name="login_socks5_port">SOCKS5 포트</string>
     <string name="login_socks5_user">SOCKS5 사용자</string>
     <string name="login_socks5_password">SOCKS5 비밀번호</string>
+
     <string name="login_info_oauth2_title">간소화된 설치를 계속하시겠습니까?</string>
     <string name="login_info_oauth2_text">입력한 이메일 주소는 단순화된 설정(OAuth 2.0)을 지원합니다.\n\n다음 단계에서는 ArcaneChat 이 이메일을 통한 채팅 앱 역할을 하도록 허용하십시오.\n\nDelta 채팅 서버가 없으며 데이터가 장치에 남아 있습니다.</string>
     <string name="login_certificate_checks">인증서 확인</string>
@@ -732,7 +734,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ 공급자의 저장공간이 곧 고갈될 예정입니다. %1$s%%가 이미 사용 중입니다.\n\n저장공간이 가득 찬 경우 메시지를 수신하지 못할 수 있습니다.\n\n👉 공급자의 웹 인터페이스에서 이전 데이터를 삭제할 수 있는지 확인하고 \"설정 / 이전 메시지 삭제\"를 활성화하는 것을 고려하십시오. \"설정/연결\"에서 언제든지 현재 저장공간 사용량을 확인할 수 있습니다.</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ 장치의 날짜 또는 시간이 정확하지 않은 것 같습니다(%1$s).\n\n메시지가 올바르게 수신되도록 시계 ⏰🔧를 조정하세요.</string>
-    <string name="devicemsg_update_reminder">⚠️ 델타 채팅 버전이 오래되었을 수 있습니다.\n\n채팅 파트너가 최신 버전을 사용하기 때문에 문제가 발생할 수 있습니다.  당신은 최신 기능이 없습니다. 😳\n https://get.delta.chat 또는 앱 스토어에서 업데이트를 확인하십시오.</string>
+    <string name="devicemsg_update_reminder">⚠️ 델타 채팅 버전이 오래되었을 수 있습니다.\n\n채팅 파트너가 최신 버전을 사용하기 때문에 문제가 발생할 수 있습니다.  당신은 최신 기능이 없습니다. 😳\n https://github.com/ArcaneChat 또는 앱 스토어에서 업데이트를 확인하십시오.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">계속하려면 시스템 정의 암호를 입력하십시오.</string>
@@ -790,6 +792,7 @@
     <string name="mailto_link_could_not_be_decoded">링크로 보내는 메일을 디코딩할 수 없습니다: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">무시하기</string>
     <string name="notify_reply_button">답장하기</string>
     <string name="notify_new_message">새 메시지</string>

src/main/res/values-lt/strings.xml

@@ -287,6 +287,7 @@
     <string name="videochat_tap_to_open">Bakstelėkite norėdami atverti</string>
     <string name="videochat_instance">Vaizdo pokalbio egzempliorius</string>
     <string name="videochat_instance_placeholder">Jūsų vaizdo pokalbio egzempliorius</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Pavyzdys: https://jūsų-serveris.org/$KAMBARYS</string>
     <string name="videochat_invitation">Pakvietimas į vaizdo pokalbį</string>
     <string name="videochat_invitation_body">Jūs esate kviečiami į vaizdo pokalbį. Spustelėkite %1$s jei norite prisijungti.</string>
@@ -469,13 +470,14 @@
     <string name="login_smtp_port">SMTP prievadas</string>
     <string name="login_smtp_security">SMTP saugumas</string>
     <string name="login_auth_method">Įgaliojimų suteikimo metodas</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Naudoti SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 serveris</string>
     <string name="login_socks5_port">SOCKS5 prievadas</string>
     <string name="login_socks5_user">SOCKS5 naudotojas</string>
     <string name="login_socks5_password">SOCKS5 slaptažodis</string>
+
     <string name="login_info_oauth2_title">Tęsti, naudojant supaprastintą sąranką?</string>
     <string name="login_certificate_checks">Liudijimų patikrinimai</string>
     <string name="login_error_mail">Įveskite teisingą el. pašto adresą.</string>
@@ -754,6 +756,7 @@
     <string name="mailto_link_could_not_be_decoded">nepavyko dekoduoti mailto nuorodos: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Atmesti</string>
     <string name="notify_reply_button">Atsakyti</string>
     <string name="notify_new_message">Nauja žinutė</string>

src/main/res/values-night/colors.xml

@@ -9,4 +9,6 @@
 
     <color name="action_mode_status_bar">@color/gray78</color>
     <color name="dummy_avatar_color">#808080</color>
+
+    <color name="delete_account_item_bg">#222222</color>
 </resources>

src/main/res/values-nl/strings.xml

@@ -331,7 +331,8 @@
     <string name="videochat_tap_to_open">Druk om te openen</string>
     <string name="videochat_instance">Videogespreksinstantie</string>
     <string name="videochat_instance_placeholder">Mijn videogespreksinstantie</string>
-    <string name="videochat_instance_example">Voorbeeld: https://meet.jit.si/$KAMER</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
+    <string name="videochat_instance_example">Voorbeeld: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Schakel in om een videogesprek te starten vanuit een een-op-eengesprek. Zowel jij als je gesprekspartner hebben hiervoor een compatibele app of webbrowser nodig.</string>
     <string name="videochat_instance_from_qr">Wil je ‘%1$s’, gebruiken om anderen uit te nodigen voor videogesprekken?\n\nNa het instellen kun je een videogesprek starten vanuit elk een-op-eengesprek. Deze instelling vervangt de vorige videogespreksinstelling.</string>
     <string name="videochat_invitation">Uitnodiging voor videogesprek</string>
@@ -509,7 +510,7 @@
     <string name="multidevice_title">Secundair apparaat toevoegen</string>
     <string name="multidevice_same_network_hint">Zorg ervoor dat beide apparaten verbonden zijn met hetzelfde (wifi)netwerk</string>
     <string name="multidevice_this_creates_a_qr_code">Hiermee wordt een QR-code samengesteld die door het tweede apparaat kan worden gescand om het account te kopiëren.</string>
-    <string name="multidevice_install_dc_on_other_device">Installeer ArcaneChat op je andere apparaat (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Installeer ArcaneChat op je andere apparaat (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Start ArcaneChat, druk op ‘Ik heb al een profiel → Toevoegen als secundair apparaat’ en scan de hier getoonde code</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -604,13 +605,25 @@
     <string name="login_smtp_port">SMTP-poort</string>
     <string name="login_smtp_security">SMTP-beveiliging</string>
     <string name="login_auth_method">Autorisatiemethode</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Proxy</string>
+    <string name="proxy_use_proxy">Proxy gebruiken</string>
+    <string name="proxy_add">Proxy toevoegen</string>
+    <string name="proxy_add_explain">Ondersteunde proxytypes: http(s), socks5 en shadowsocks.</string>
+    <string name="proxy_add_url_hint">Voer een proxy-url in</string>
+    <string name="proxy_invalid">Ongeldige of niet-ondersteunde proxy-url</string>
+    <string name="proxy_list_header">Bewaarde proxy\'s</string>
+    <string name="proxy_delete">Proxy verwijderen</string>
+    <string name="proxy_delete_explain">Weet je zeker dat je ‘%1$s’ wilt verwijderen?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">SOCKS5 gebruiken</string>
     <string name="login_socks5_host">SOCKS5-host</string>
     <string name="login_socks5_port">SOCKS5-poort</string>
     <string name="login_socks5_user">SOCKS5-gebruiker</string>
     <string name="login_socks5_password">SOCKS5-wachtwoord</string>
+
     <string name="login_info_oauth2_title">Wil je doorgaan met vereenvoudigd instellen?</string>
     <string name="login_info_oauth2_text">Het ingevoerde e-mailadres ondersteunt vereenvoudigd instellen (OAuth2).\n\nTijdens de volgende stap moet je ArcaneChat toestaan te fungeren als je e-mailapp.\n\nArcaneChat heeft geen eigen servers; jóuw gegevens blijven op jóuw apparaat!</string>
     <string name="login_certificate_checks">Certificaatcontrole</string>
@@ -923,7 +936,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ De opslagruimte die je provider biedt is bijna overschreden. Momenteel heb je %1$s%% ervan in gebruik.\n\nAls je geen ruimte meer hebt, kun je mogelijk geen berichten meer ontvangen.\n\n👉 Kijk of je oude gegevens kunt verwijderen in de webclient van je provider. Overweeg ook ‘Instellingen → Oude berichten verwijderen’ in te schakelen. Je kunt je huidige gebruik te allen tijde bekijken via ‘Instellingen → Verbindingen’.</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ De datum en tijd van je apparaat lijken niet te kloppen (%1$s).\n\nVerzet je klok ⏰🔧 om er zeker van te zijn dat je berichten kunt ontvangen.</string>
-    <string name="devicemsg_update_reminder">⚠️ Je versie van ArcaneChat is mogelijk verouderd.\n\nDit kan problemen veroorzaken aangezien je gesprekspartners nieuwe versies gebruiken. Bovendien mis je hierdoor enkele nieuwe functies. 😳\nGa naar https://get.delta.chat of de appwinkel van je apparaat om te controleren op updates.</string>
+    <string name="devicemsg_update_reminder">⚠️ Je versie van ArcaneChat is mogelijk verouderd.\n\nDit kan problemen veroorzaken aangezien je gesprekspartners nieuwe versies gebruiken. Bovendien mis je hierdoor enkele nieuwe functies. 😳\nGa naar https://github.com/ArcaneChat of de appwinkel van je apparaat om te controleren op updates.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Ontgrendelen om verder te gaan</string>
@@ -990,6 +1003,7 @@
     <string name="mailto_link_could_not_be_decoded">De mailto-link kan niet worden ontcijferd: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Verwerpen</string>
     <string name="notify_reply_button">Beantwoorden</string>
     <string name="notify_new_message">Nieuw bericht</string>

src/main/res/values-pl/strings.xml

@@ -283,6 +283,10 @@
     <string name="select_chat">Zaznacz czat</string>
     <string name="select_more">Zaznacz więcej</string>
     <string name="menu_edit_name">Edytuj nazwę</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_explain">Ustaw nazwę, która będzie wyświetlana zamiast „%1$s”. Pozostaw puste pole, aby użyć wybranej nazwy kontaktu.</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_placeholder">Nazwa dla „%1$s”</string>
     <string name="menu_settings">Ustawienia</string>
     <string name="menu_advanced">Zaawansowane</string>
     <string name="menu_view_profile">Pokaż profil</string>
@@ -345,6 +349,7 @@
     <string name="videochat_tap_to_open">Dotknij, aby otworzyć</string>
     <string name="videochat_instance">Instancja czatu wideo</string>
     <string name="videochat_instance_placeholder">Twoja instancja czatu wideo</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Przykład: https://meet.jit.si/$ROOM lub basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">Jeśli czat wideo jest włączony, możesz rozpocząć rozmowę wideo z każdego czatu indywidualnego. Czaty wideo wymagają kompatybilnej aplikacji lub kompatybilnej przeglądarki po obu stronach.</string>
     <string name="videochat_instance_from_qr">Czy użyć „%1$s”, aby zaprosić innych do czatów wideo?\n\nPo ustawieniu możesz rozpocząć czat wideo z każdego czatu indywidualnego. Spowoduje to zastąpienie poprzedniego ustawienia czatów wideo, jeśli takie istnieją.</string>
@@ -535,7 +540,7 @@
     <string name="multidevice_title">Dodaj kolejne urządzenie</string>
     <string name="multidevice_same_network_hint">Upewnij się, że oba urządzenia są połączone z tym samym Wi-Fi lub siecią</string>
     <string name="multidevice_this_creates_a_qr_code">Spowoduje to utworzenie kodu QR, który kolejne urządzenie może zeskanować w celu skopiowania konta.</string>
-    <string name="multidevice_install_dc_on_other_device">Zainstaluj ArcaneChat na swoim kolejnym urządzeniu (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Zainstaluj ArcaneChat na swoim kolejnym urządzeniu (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Uruchom ArcaneChat, dotknij „Mam już profil / Dodaj jako kolejne urządzenie” i zeskanuj pokazany tutaj kod</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -630,13 +635,25 @@
     <string name="login_smtp_port">Port SMTP</string>
     <string name="login_smtp_security">Bezpieczeństwo SMTP</string>
     <string name="login_auth_method">Metoda autoryzacji</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Proxy</string>
+    <string name="proxy_use_proxy">Użyj proxy</string>
+    <string name="proxy_add">Dodaj proxy</string>
+    <string name="proxy_add_explain">Obsługiwane typy serwerów proxy: HTTP(S), SOCKS5 i Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Wpisz tu URL proxy</string>
+    <string name="proxy_invalid">Nieprawidłowy lub nieobsługiwany URL proxy</string>
+    <string name="proxy_list_header">Zapisane proxy</string>
+    <string name="proxy_delete">Usuń proxy</string>
+    <string name="proxy_delete_explain">Na pewno chcesz usunąć „%1$s”?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Użyj SOCKS5</string>
     <string name="login_socks5_host">Host SOCKS5</string>
     <string name="login_socks5_port">Port SOCKS5</string>
     <string name="login_socks5_user">Użytkownik SOCKS5</string>
     <string name="login_socks5_password">Hasło SOCKS5</string>
+
     <string name="login_info_oauth2_title">Kontynuuj w uproszczonej konfiguracji?</string>
     <string name="login_info_oauth2_text">Wprowadzony adres e-mail obsługuje uproszczoną konfigurację (OAuth2.0).\n\nW następnym kroku pozwól, aby ArcaneChat działał jako czat z aplikacją e-mail.\n\nNie ma serwerów ArcaneChat, Twoje dane pozostają na Twoim urządzeniu!</string>
     <string name="login_certificate_checks">Sprawdzanie certyfikatów</string>
@@ -949,7 +966,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Limit pamięci u twojego dostawcy wkrótce zostanie przekroczony, wykorzystano już %1$s%%.\n\nMożesz nie być w stanie otrzymywać wiadomości, gdy pamięć jest pełna.\n\n👉 Sprawdzić, czy możesz usunąć stare dane w interfejsie internetowym dostawcy i rozważyć włączenie opcji \"Ustawienia » Czaty i media » Usuwanie starych wiadomości\". W dowolnym momencie możesz sprawdzić swoje bieżące wykorzystanie pamięci w \"Ustawienia » Łączność\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Data lub godzina urządzenia wydaje się być niedokładna (%1$s).\n\nDostosuj zegar ⏰🔧, aby upewnić się, że wiadomości są prawidłowo odbierane.</string>
-    <string name="devicemsg_update_reminder">⚠️ Twoja wersja ArcaneChat może być nieaktualna.\n\nMoże to powodować problemy, ponieważ Twoi partnerzy czatu korzystają z nowszych wersji, a Ty nie masz najnowszych funkcji 😳\nSprawdź aktualizacje na stronie https://get.delta.chat lub w sklepie z aplikacjami.</string>
+    <string name="devicemsg_update_reminder">⚠️ Twoja wersja ArcaneChat może być nieaktualna.\n\nMoże to powodować problemy, ponieważ Twoi partnerzy czatu korzystają z nowszych wersji, a Ty nie masz najnowszych funkcji 😳\nSprawdź aktualizacje na stronie https://github.com/ArcaneChat lub w sklepie z aplikacjami.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Aby kontynuować, wprowadź swój tajny kod zdefiniowany w systemie.</string>
@@ -1016,6 +1033,7 @@
     <string name="mailto_link_could_not_be_decoded">link mailto nie mógł zostać odszyfrowany: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Odrzuć</string>
     <string name="notify_reply_button">Odpowiedz</string>
     <string name="notify_new_message">Nowa wiadomość</string>

src/main/res/values-pt-rBR/strings.xml

@@ -310,6 +310,7 @@
     <string name="videochat_tap_to_open">Clique para abrir</string>
     <string name="videochat_instance">Instância de conversa de vídeo</string>
     <string name="videochat_instance_placeholder">Sua instância de conversa de vídeo</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Exemplos: https://meet.jit.si/$ROOM o basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">Se o video chat estiver habilitado, você pode iniciar uma ligação de video a partir de cada chat. Os bate-papos de vídeo exigem um aplicativo compatível ou um navegador compatível nos dos lados.</string>
     <string name="videochat_instance_from_qr">Use \"%1$s\" para convidar outros para a conversas de vídeo?\n\nUma vez configurado, você pode iniciar uma conversa de vídeo para cada conversa um-para-um. Isto irá substituir os ajustes prévios para conversas de vídeo, caso existam.</string>
@@ -483,7 +484,7 @@
     <string name="multidevice_title">Adicionar Outro Dispositivo</string>
     <string name="multidevice_same_network_hint">Certifique-se de que ambos os dispositivos estejam na mesma Wi-Fi ou na mesma rede</string>
     <string name="multidevice_this_creates_a_qr_code">Isso cria um código QR que outro dispositivo pode digitalizar para copiar a conta.</string>
-    <string name="multidevice_install_dc_on_other_device">Instalar o ArcaneChat em seu outro dispositivo (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Instalar o ArcaneChat em seu outro dispositivo (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Inicie o ArcaneChat, clique em \"Adicionar como outro dispositivo\" e escaneie o código mostrado aqui</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -550,13 +551,14 @@
     <string name="login_smtp_port">Porta SMTP</string>
     <string name="login_smtp_security">Segurança SMTP</string>
     <string name="login_auth_method">Método de autorização</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Usar SOCKS5</string>
     <string name="login_socks5_host">Servidor SOCKS5 </string>
     <string name="login_socks5_port">Porta SOCKS5</string>
     <string name="login_socks5_user">Usuário SOCKS5</string>
     <string name="login_socks5_password">Senha SOCKS5</string>
+
     <string name="login_info_oauth2_title">Prosseguir pela configuração simplificada?</string>
     <string name="login_info_oauth2_text">Seu servidor de e-mail aceita o método de configuração simplificada (OAuth 2.0).\n\n No próximo passo, por favor, permita que o ArcaneChat seja seu aplicativo de e-mail.\n\nNão há servidor do ArcaneChat. Seus dados ficam no seu aparelho.</string>
     <string name="login_certificate_checks">Verificações de certificado</string>
@@ -829,7 +831,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ O armazenamento em seu provedor está prestes a terminar, %1$s%% já foram utilizados\n\nVocê pode não conseguir receber mensagens quando o armazenamento estiver 100 %% utilizado.\n\n👉 Verifique se você pode excluir dados antigos através da interface da web do provedor e considere habilitar \"Configurações / Excluir Mensagens Antigas\". Você pode verificar o uso de armazenamento atual a qualquer momento em \"Configurações / Conectividade\". </string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ A data ou hora do seu dispositivo parecem imprecisas (%1$s).\n\nAjuste o relógio ⏰🔧 para garantir que suas mensagens sejam recebidas corretamente.</string>
-    <string name="devicemsg_update_reminder">⚠️ Sua versão do ArcaneChat pode estar desatualizada.\n\nIsso pode causar problemas porque seus parceiros de bate-papo usam versões mais recentes - e você está perdendo os recursos mais recentes 😳\nEntre em https://get.delta.chat ou seu verifique com seu provedor de aplicativos por atualizações.</string>
+    <string name="devicemsg_update_reminder">⚠️ Sua versão do ArcaneChat pode estar desatualizada.\n\nIsso pode causar problemas porque seus parceiros de bate-papo usam versões mais recentes - e você está perdendo os recursos mais recentes 😳\nEntre em https://github.com/ArcaneChat ou seu verifique com seu provedor de aplicativos por atualizações.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Desbloquear para continuar. </string>
@@ -889,6 +891,7 @@
     <string name="mailto_link_could_not_be_decoded">link mailto não pôde ser decodificado: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Descartar</string>
     <string name="notify_reply_button">Responder</string>
     <string name="notify_new_message">Nova mensagem</string>

src/main/res/values-ro/strings.xml

@@ -306,6 +306,7 @@
     <string name="videochat_tap_to_open">Atingeți pentru a deschide</string>
     <string name="videochat_instance">Instanță de Videochat</string>
     <string name="videochat_instance_placeholder">Instanța Dumneavoastră de Videochat</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Exemple: https://meet.jit.si/$ROOM ori basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">Dacă este activată, puteți începe un chat video din fiecare chat. Necesită un app compatibil sau un browser la ambele capete.</string>
     <string name="videochat_instance_from_qr">Folosiți \"%1$s\" pentru a invita alte persoane la chat-uri video?\n\nOnce setat, puteți începe un chat video din fiecare chat. Acest lucru înlocuiește orice setare anterioară pentru chat-urile video.</string>
@@ -475,7 +476,7 @@
     <string name="multidevice_title">Adăugați un al doilea dispozitiv</string>
     <string name="multidevice_same_network_hint">Asigurați-vă că ambele dispozitive se află în aceeași rețea Wi-Fi sau în aceeași rețea</string>
     <string name="multidevice_this_creates_a_qr_code">Astfel se creează un cod QR pe care cel de-al doilea dispozitiv îl poate scana pentru a copia contul.</string>
-    <string name="multidevice_install_dc_on_other_device">Instalați ArcaneChat pe celălalt dispozitiv (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Instalați ArcaneChat pe celălalt dispozitiv (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Porniți ArcaneChat, atingeți \" Adăugați ca al doilea dispozitiv\" și scanați codul afișat aici</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -542,13 +543,14 @@
     <string name="login_smtp_port">Portul SMTP </string>
     <string name="login_smtp_security">Securitate SMTP</string>
     <string name="login_auth_method">Metoda de autorizare</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Utilizați SOCKS5</string>
     <string name="login_socks5_host">Gazdă SOCKS5</string>
     <string name="login_socks5_port">Portul SOCKS5</string>
     <string name="login_socks5_user">Utilizator SOCKS5</string>
     <string name="login_socks5_password">Parolă SOCKS5</string>
+
     <string name="login_info_oauth2_title">Continuați cu configurația simplificată?</string>
     <string name="login_info_oauth2_text">Adresa de e-mail introdusă suportă o configurare simplificată (OAuth 2.0).\n\nÎn pasul următor, vă rugăm să permiteți ca ArcaneChat să acționeze ca aplicație de chat prin e-mail.\n\nNu există servere ArcaneChat, datele voastre rămân pe dispozitivul dumneavoastră.</string>
     <string name="login_certificate_checks">Verificări de certificate</string>

src/main/res/values-ru/strings.xml

@@ -14,7 +14,7 @@
     <string name="off">Выкл.</string>
     <string name="def">По умолчанию</string>
     <string name="default_value">По умолчанию (%1$s)</string>
-    <string name="default_value_as_above">По умолчанию (как указано выше)</string>
+    <string name="default_value_as_above">По умолчанию (так же, как выше)</string>
     <string name="custom">Персональная настройка</string>
     <string name="none">Не задано</string>
     <string name="automatic">Автоматически</string>
@@ -32,12 +32,12 @@
     <string name="attachment">Вложение</string>
     <string name="back">Назад</string>
     <string name="close">Закрыть</string>
-    <string name="close_window">Закрыть Окно</string>
+    <string name="close_window">Закрыть окно</string>
     <string name="forward">Переслать</string>
     <string name="create">Создать</string>
     <string name="later">Позже</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
-    <string name="resend">Переотправить</string>
+    <string name="resend">Отправить повторно</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">В архив</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -53,30 +53,31 @@
     <string name="start_chat">Начать чат</string>
     <string name="show_full_message">Показать сообщение полностью…</string>
     <!-- Stay short here, say ~16 characters. The source string could also be "All Read", maybe that hint can make translations easier :) -->
-    <string name="mark_all_as_read">Отметить Все как Прочитанные</string>
+    <string name="mark_all_as_read">Отметить все как прочитанные</string>
+    <string name="mark_as_read">Отметить как прочитанное</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
     <string name="mark_as_read_short">Прочитано</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Загрузка…</string>
     <string name="hide">Скрыть</string>
     <string name="activate">Активировать</string>
-    <string name="load_remote_content">Загружать удалённые изображения</string>
+    <string name="load_remote_content">Загрузка изображений из внешних источников</string>
     <!-- Possible answers to the question are: Never, Always, Once -->
-    <string name="load_remote_content_ask">Удалённые изображения могут использоваться для отслеживания вас.\n\nЭта настройка также позволяет загружать удалённые шрифты и другое содержимое. Даже если она отключена, вы все равно сможете видеть встроенные или кешированные изображения.\n\nЗагружать удалённые изображения?</string>
+    <string name="load_remote_content_ask">Изображения размещенные на внешних источниках можно использовать для слежки за вами.\n\nЭта настройка также позволяет загружать шрифты и другое содержимое. Если она отключена, вы сможете видеть встроенные или кешированные изображения.\n\nРазрешить загрузку из внешних источников?</string>
     <string name="always">Всегда</string>
-    <string name="always_load_remote_images">Всегда Загружать Изображения с Удалённого Сервера</string>
+    <string name="always_load_remote_images">Всегда загружать изображения из внешних источников</string>
     <string name="once">Только сейчас</string>
-    <string name="show_warning">Показывать Предупреждение</string>
+    <string name="show_warning">Показать предупреждение</string>
     <string name="show_password">Показать пароль</string>
     <string name="hide_password">Скрыть пароль</string>
     <string name="not_now">Не сейчас</string>
     <string name="never">Никогда</string>
     <string name="one_moment">Один момент…</string>
-    <string name="done">Выполнено</string>
+    <string name="done">Готово</string>
     <string name="undo">Отмена</string>
     <string name="offline">Не в сети</string>
     <!-- For the next view or as "continue". Should be as short as possible. -->
-    <string name="next">Дальше</string>
+    <string name="next">Далее</string>
     <string name="error">Ошибка</string>
     <string name="error_x">Ошибка: %1$s</string>
     <string name="no_app_to_handle_data">Приложение, позволяющее обрабатывать этот тип данных, не найдено.</string>
@@ -87,10 +88,10 @@
     <string name="email_address">Адрес эл.почты</string>
     <string name="bad_email_address">Неправильный адрес эл.почты.</string>
     <string name="password">Пароль</string>
-    <string name="existing_password">Пароль</string>
+    <string name="existing_password">Текущий пароль</string>
     <string name="now">Сейчас</string>
     <!-- Headline for destructive actions with no undo. Could also be "Caution" or "Warning". -->
-    <string name="danger">Опасность</string>
+    <string name="danger">Внимание</string>
     <string name="today">Сегодня</string>
     <string name="yesterday">Вчера</string>
     <string name="this_week">На этой неделе</string>
@@ -98,10 +99,10 @@
     <string name="last_week">Прошлая неделя</string>
     <string name="last_month">Прошлый месяц</string>
     <!-- Refers to the time a contact was last seen. Shown below contact name in the profile. The placeholder will be replaced by date or time, resulting in "Last seen at 12:13 AM" or "Last seen Nov 12" -->
-    <string name="last_seen_at">Последний раз был(а) в %1$s</string>
+    <string name="last_seen_at">Последнее посещение: %1$s</string>
     <!-- Refers to the time a contact was last seen. Shown below contact name in the profile. The placeholder will be replaced by a relative point in time as "3 minutes ago" (see https://momentjs.com for more examples and languages)-->
-    <string name="last_seen_relative">Был %1$s</string>
-    <string name="last_seen_unknown">Последний раз был(а): Неизвестно</string>
+    <string name="last_seen_relative">Последнее посещение: %1$s</string>
+    <string name="last_seen_unknown">Последнее посещение: Неизвестно</string>
     <!-- Shown beside messages that are "N minutes old". Prefer short strings, or well-known abbreviations. -->
     <plurals name="n_minutes">
         <item quantity="one">%d минуту</item>
@@ -163,8 +164,8 @@
     <!-- "Stickers" as known from other messengers; in some languages, the English "Sticker" is fine. -->
     <string name="sticker">Стикер</string>
     <string name="add_to_sticker_collection">Добавить в Коллекцию Стикеров</string>
-    <string name="add_stickers_instructions">Для добавления стикеров, нажмите \"Открыть Папку со Стикерами\", создайте подпапку для набора ваших стикеров и перетащите туда изображения и файлы стикеров</string>
-    <string name="open_sticker_folder">Открыть Папку со Стикерами</string>
+    <string name="add_stickers_instructions">Для добавления стикеров, нажмите \"Открыть папку стикеров\", создайте подпапку для набора ваших стикеров и перетащите туда изображения и файлы стикеров</string>
+    <string name="open_sticker_folder">Открыть папку стикеров</string>
     <string name="images">Изображения</string>
     <string name="audio">Аудио</string>
     <string name="voice_message">Голосовое сообщение</string>
@@ -175,6 +176,7 @@
     <string name="video">Видео</string>
     <string name="documents">Документы</string>
     <string name="contact">Контакт</string>
+    <string name="bot">Бот</string>
     <string name="camera">Камера</string>
     <!-- As in "start a video recording" or "take a photo"; eg. the description of the "shutter button" in cameras -->
     <string name="capture">Захват</string>
@@ -233,7 +235,7 @@
     <string name="menu_show_global_map">Все Местоположения</string>
     <string name="menu_archive_chat">Архивировать чат</string>
     <string name="menu_unarchive_chat">Разархивировать чат</string>
-    <string name="menu_add_attachment">Прикрепить вложение</string>
+    <string name="menu_add_attachment">Добавить вложение</string>
     <string name="menu_leave_group">Покинуть группу</string>
     <string name="menu_delete_chat">Удалить чат</string>
     <!-- Command to delete all messages in a chat. The chat itself will not be deleted but will be empty afterwards, so make sure to be different from "Delete Chat" here. "Clear" is a verb here, "Empty Chat" would also be fine (eg. in German "Chat leeren") -->
@@ -243,6 +245,10 @@
     <string name="menu_delete_location">Удалить местоположение?</string>
     <string name="menu_message_details">Подробности сообщения</string>
     <string name="menu_copy_to_clipboard">Скопировать в буфер обмена</string>
+    <string name="share_invite_link">Поделиться ссылкой-приглашением</string>
+    <string name="invite_friends">Пригласить друзей</string>
+    <!-- %1$s is replaced by the user's invitation link ("https://i.delta.chat/...") -->
+    <string name="invite_friends_text">Свяжитесь со мной через ArcaneChat:\n%1$s</string>
     <string name="menu_copy_selection_to_clipboard">Копировать выделенное</string>
     <string name="menu_copy_link_to_clipboard">Копировать ссылку</string>
     <string name="menu_copy_text_to_clipboard">Копировать текст</string>
@@ -254,8 +260,8 @@
     <string name="menu_reply">Ответить на сообщение</string>
     <string name="menu_mute">Отключить уведомления</string>
     <string name="menu_unmute">Включить уведомления</string>
-    <string name="menu_export_attachment">Экспортировать вложение</string>
-    <string name="menu_export_attachments">Экспортировать вложения</string>
+    <string name="menu_export_attachment">Экспорт вложения</string>
+    <string name="menu_export_attachments">Экспорт вложений</string>
     <string name="menu_all_media">Все медиафайлы</string>
     <!-- Command to jump to the original message corresponding to a gallery image or document -->
     <string name="show_in_chat">Показать в чате</string>
@@ -277,6 +283,10 @@
     <string name="select_chat">Выбрать Чат</string>
     <string name="select_more">Выбрать больше</string>
     <string name="menu_edit_name">Изменить имя</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_explain">Задайте имя, которое будет отображаться вместо \"%1$s\". Оставьте поле пустым, чтобы использовать выбранное контактом имя.</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_placeholder">Имя для \"%1$s\"</string>
     <string name="menu_settings">Настройки</string>
     <string name="menu_advanced">Дополнительные параметры</string>
     <string name="menu_view_profile">Просмотреть Профиль</string>
@@ -285,7 +295,7 @@
     <string name="menu_save_log">Сохранить журнал</string>
     <string name="menu_more_options">Больше настроек</string>
     <string name="menu_learn_spelling">Запоминать правописание </string>
-    <string name="menu_chat_audit_log">Chat Audit Log</string>
+    <string name="menu_chat_audit_log">Журнал аудита чата</string>
     <string name="jump_to_message">Перейти к сообщению</string>
     <string name="copy_json">Копировать JSON</string>
     <string name="replace_draft">Заменить черновик</string>
@@ -339,6 +349,7 @@
     <string name="videochat_tap_to_open">Нажмите, чтобы открыть.</string>
     <string name="videochat_instance">Инстанс видеочатов</string>
     <string name="videochat_instance_placeholder">Ваш инстанс видеочатов</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Пример: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Если функция видеочата активирована, вы можете запустить видеочат из любого чата. Для видеочата требуется совместимое приложение или браузер у всех участников.</string>
     <string name="videochat_instance_from_qr">Использовать \"%1$s\" чтобы приглашать других в видеочаты?\n\nНастроив один раз, вы можете начинать видеочат из каждого чата. Это заменит предыдущие настройки видеочатов, если они были.</string>
@@ -466,7 +477,7 @@
 
     <!-- chat audit log -->
     <string name="chat_audit_log_empty_message">Здесь будут появляться системные сообщения этого чата</string>
-    <string name="chat_audit_log_title">Chat Audit Log для %1$s</string>
+    <string name="chat_audit_log_title">Журнал аудита чата для %1$s</string>
     <string name="chat_audit_log_description">Здесь отображаются только системные и информационные сообщения. Полезно для поиска последних действий в чате без прокрутки множества обычных сообщений. </string>
 
     <!-- punycode warning / labeled links -->
@@ -624,13 +635,25 @@
     <string name="login_smtp_port">Порт SMTP</string>
     <string name="login_smtp_security">Параметры безопасности SMTP</string>
     <string name="login_auth_method">Метод авторизации</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Прокси</string>
+    <string name="proxy_use_proxy">Использовать прокси</string>
+    <string name="proxy_add">Добавить прокси</string>
+    <string name="proxy_add_explain">Поддерживаемые типы прокси: HTTP(S), SOCKS5 и Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Введите URL прокси</string>
+    <string name="proxy_invalid">Некорректный или неподдерживаемый URL прокси</string>
+    <string name="proxy_list_header">Сохраненные прокси</string>
+    <string name="proxy_delete">Удалить прокси</string>
+    <string name="proxy_delete_explain">Вы уверены, что хотите удалить \"%1$s\"?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Использовать SOCKS5</string>
     <string name="login_socks5_host">Сервер SOCKS5</string>
     <string name="login_socks5_port">Порт SOCKS5</string>
     <string name="login_socks5_user">Пользователь SOCKS5</string>
     <string name="login_socks5_password">Пароль SOCKS5</string>
+
     <string name="login_info_oauth2_title">Продолжить упрощенную настройку?</string>
     <string name="login_info_oauth2_text">Введённый адрес эл. почты поддерживает упрощённую настройку (OAuth 2.0).\n\nНа следующем шаге пожалуйста, разрешите ArcaneChat выступать в качестве Вашего приложения для Чата по Эл. почте.\n\nArcaneChat не собирает данные пользователей, все данные остаются на вашем устройстве.</string>
     <string name="login_certificate_checks">Проверки сертификатов</string>
@@ -726,8 +749,8 @@
     <string name="pref_in_chat_sounds">Звуки в чате</string>
     <string name="pref_message_text_size">Размер шрифта сообщения</string>
     <string name="pref_view_log">Открыть журнал</string>
-    <string name="pref_saved_log">Журнал сохранён в папку «Загрузки»</string>
-    <string name="pref_save_log_failed">Ошибка при сохранении журнала</string>
+    <string name="pref_saved_log">Журнал сохранён в папку \"Загрузки\"</string>
+    <string name="pref_save_log_failed">Не удалось сохранить журнал</string>
     <string name="pref_log_header">Журнал</string>
     <string name="pref_other">Другое</string>
     <string name="pref_backup">Резервное копирование</string>
@@ -825,9 +848,11 @@
     <string name="autodel_server_ask">Вы хотите удалить %1$d сообщений сейчас и все недавно доставленные сообщения \"%2$s\" в будущем?\n\n⚠️ Включая письма, медиафайлы и \"Сохранённые сообщения\"  во всех папках сервера\n\n⚠️ Не используйте эту функцию, если вы хотите сохранить данные на сервере\n\n⚠️ Не используйте эту функцию, если вы используете другие почтовые клиенты помимо ArcaneChat</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">Это включает почту, медиафайлы и \"Сохранённые сообщения\" во всех папках сервера. Не используйте эту функцию, если вы хотите сохранить данные на сервере или если используете другие почтовые клиенты помимо ArcaneChat.</string>
+    <string name="autodel_server_warn_multi_device_title">Включить удаление без запроса</string>
+    <string name="autodel_server_warn_multi_device">Если включить удаление без запроса, вы не сможете использовать этот профиль на нескольких устройствах.</string>
     <string name="autodel_confirm">Я понимаю, удалить все эти сообщения</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
-    <string name="autodel_at_once">Сразу</string>
+    <string name="autodel_at_once">Сразу после загрузки</string>
     <string name="after_30_seconds">Через 30 секунд</string>
     <string name="after_1_minute">Через 1 минуту</string>
     <string name="after_5_minutes">Через 5 минут</string>
@@ -933,6 +958,7 @@
     <string name="chat_protection_broken_explanation">Сквозное шифрование больше не может быть гарантировано, вероятно потому что %1$s переустановил ArcaneChat или отправил сообщение с другого устройства.\n\nВы можете встретиться с ним лично и отсканировать QR-код снова чтобы восстановить гарантированное сквозное шифрование.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s требуется сквозное шифрование, которое ещё не настроено для данного чата. Нажмите, чтобы узнать больше.</string>
     <string name="invalid_unencrypted_explanation">Чтобы установить сквозное шифрование, вы можете встретиться с контактами лично и отсканировать их QR-код, чтобы представиться друг другу.</string>
+    <string name="encryption_required_for_new_contact">Требуется сквозное шифрование, но оно для %1$s еще не настроено.\n\nВы можете поделиться ссылкой-приглашением или встретиться лично и отсканировать QR-код.</string>
     <string name="learn_more">Узнать Больше</string>
 
     <string name="devicemsg_self_deleted">Вы удалили чат \"Сохраненные сообщения\".\n\nℹ️ Чтобы снова использовать функцию \"Сохраненные сообщения\", создайте новый чат с самим собой.</string>
@@ -940,7 +966,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Хранилище вашего провайдера скоро будет превышено, уже использовано %1$s%%.\n\nВозможно, вы не сможете получать сообщения, когда хранилище будет переполнено.\n\n👉 Пожалуйста, проверьте, можете ли вы удалить старые данные в веб-интерфейсе провайдера и подумайте о том, чтобы включить \"Настройки / Чаты и Медиафайлы / Удалить Старые Сообщения\". Вы можете проверить текущее использование хранилища в любое время в \"Настройки / Соединение\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Дата или время вашего устройства кажутся неточными (%1$s).\n\nНастройте свои часы ⏰🔧, чтобы убедиться, что ваши сообщения принимаются правильно.</string>
-    <string name="devicemsg_update_reminder">⚠️ Ваша версия ArcaneChat может быть устаревшей.\n\nЭто может вызвать проблемы, поскольку ваши собеседники используют версии новее - вам не хватает новых функций 😳\nПожалуйста, проверьте https://get.delta.chat или магазин приложений на наличие обновлений.</string>
+    <string name="devicemsg_update_reminder">⚠️ Ваша версия ArcaneChat может быть устаревшей.\n\nЭто может вызвать проблемы, поскольку ваши собеседники используют версии новее - вам не хватает новых функций 😳\nПожалуйста, проверьте https://github.com/ArcaneChat или магазин приложений на наличие обновлений.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Разблокируйте для продолжения</string>
@@ -1007,6 +1033,7 @@
     <string name="mailto_link_could_not_be_decoded">ссылка mailto не может быть декодирована: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Отклонить</string>
     <string name="notify_reply_button">Ответить</string>
     <string name="notify_new_message">Новое сообщение</string>
@@ -1167,4 +1194,5 @@
     <!-- device messages for updates -->
     <string name="update_1_46_android">Новые Объявления 🐣 и другое:\n\n⚡️ Зарегистрируйтесь на защищённых быстрых серверах электронной почты (https://delta.chat/chatmail) или используйте классические почтовые серверы\n\n👉 Push-уведомления для любого почтового сервера чата\n\n👤 Безопасное подключение друзей с помощью функции \"Прикрепить контакты\".\n\n🥰 Реагируйте на сообщения эмоциями\n\n📌 Закрепляйте чаты прямо из поиска … и ещё МНОГОЕ на %1$s</string>
     <string name="update_1_46_ios">Новые Объявления 🐣 и Многое другое:\n\n⚡️ Зарегистрируйтесь на одном из безопасных и быстрых среверов chatmail (https://delta.chat/chatmail) или используйте классические сервера эл.почты\n\n👉 PUSH уведомления на любом из chatmail серверов\n\n👤 Получите \"Прикреплённые контакты\" и присоединяйтесь к вашим друзья\n\n🥰 Выбор быстрой реакции … и Многое другое на %1$s</string>
-    </resources>
+    <string name="update_switch_profile_placement">ℹ️ \"Сменить профиль\" перемещено: Нажмите на изображение вашего профиля в верхнем углу главного экрана, чтобы добавить или переключить профили. 💡</string>
+</resources>

src/main/res/values-sk/strings.xml

@@ -307,7 +307,8 @@
     <string name="videochat_tap_to_open">Otvoríte klepnutím</string>
     <string name="videochat_instance">Inštancia videohovoru</string>
     <string name="videochat_instance_placeholder">Vaša inštancia videohovoru</string>
-    <string name="videochat_instance_example">Príklady: https://meet.jit.si/$MIESTNOST alebo basicwebrtc:https://vas-server</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
+    <string name="videochat_instance_example">Príklady: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Ak to zapnete, môžete začať video rozhovor z každej konverzácie. Vyžaduje kompatibilnú aplikáciu alebo prehliadač na oboch stranách.</string>
     <string name="videochat_instance_from_qr">Použiť „%1$s“ na odoslanie pozvánky na videohovor?\n\nPo nastavení môžete začať videohovor z každej jednotlivej konverzácie. Toto nahradí predchádzajúce nastavenie pre videohovory, ak existujú.</string>
     <string name="videochat_invitation">Pozvánka na videohovor</string>
@@ -517,13 +518,14 @@
     <string name="login_smtp_port">Port SMTP</string>
     <string name="login_smtp_security">Zabezpečenie SMTP</string>
     <string name="login_auth_method">Metóda autorizácie</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Použiť SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 Host</string>
     <string name="login_socks5_port">SOCKS5 Port</string>
     <string name="login_socks5_user">SOCKS5 Používateľ</string>
     <string name="login_socks5_password">SOCKS5 Heslo</string>
+
     <string name="login_info_oauth2_title">Pokračovať v zjednodušenom nastavovaní?</string>
     <string name="login_info_oauth2_text">Zadaná e-mailová adresa podporuje zjednodušené nastavenie (OAuth 2.0).\n\nV ďalšom kroku povoľte aplikácii ArcaneChat, aby fungovala ako vaša aplikácia Chat cez e-mail.\n\nNie sú k dispozícii servery ArcaneChat, vaše dáta zostanú vo vašom zariadení .</string>
     <string name="login_certificate_checks">Osvedčovacie kontroly</string>
@@ -796,7 +798,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Úložisko vašeho poskytovateľa čoskoro prekročí limit, už%1$s%%  sú využité.\n\n Je možné, že nebudete môcť prijímať správy, ak bude úložisko 100 %% využité.\n\n👉 Prosím skontrolujte, či môžete vo webovom rozhraní poskytovateľa vymazať staré údaje, a zvážte aktiváciu „Nastavenia / Odstrániť Staré Správy“. Aktuálne využitie úložiska si môžete kedykoľvek skontrolovať v časti „Nastavenia / Pripojenie“. </string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">Zdá sa, že dátum alebo čas vášho zariadenia je nepresný (%1$s).\n\nUpravte si hodiny ⏰🔧, aby ste zaistili správne prijímanie správ. </string>
-    <string name="devicemsg_update_reminder">⚠️ Vaša verzia ArcaneChat-u môže byť zastaraná.\n\nMôže to spôsobiť problémy, pretože vaši chatový partneri používajú novšie verzie – a vám chýbajú najnovšie funkcie 😳\nAktualizácie nájdete na https://get.delta.chat alebo obchode s aplikáciami . </string>
+    <string name="devicemsg_update_reminder">⚠️ Vaša verzia ArcaneChat-u môže byť zastaraná.\n\nMôže to spôsobiť problémy, pretože vaši chatový partneri používajú novšie verzie – a vám chýbajú najnovšie funkcie 😳\nAktualizácie nájdete na https://github.com/ArcaneChat alebo obchode s aplikáciami . </string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Ak chcete pokračovať, zadajte heslo do systému.</string>
@@ -852,6 +854,7 @@
     <string name="mailto_link_could_not_be_decoded">prepojenie mailto sa nepodarilo dekódovať: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Odmietnuť</string>
     <string name="notify_reply_button">Odpovedať</string>
     <string name="notify_new_message">Nová správa</string>

src/main/res/values-sq/strings.xml

@@ -328,6 +328,7 @@
     <string name="videochat_tap_to_open">Prekeni që të Hapet</string>
     <string name="videochat_instance">Instancë Fjalosjeje me Video</string>
     <string name="videochat_instance_placeholder">Instanca juaj e Fjalosjes me Video</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Shembull: https://shërbyesi-juaj.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Nëse është aktivizuar, mund të nisni një fjalosje me video prej secilës fjalosje. Kjo lyp në të dy skajet një aplikacion të përputhshëm, ose një shfletues të përputhshëm.</string>
     <string name="videochat_instance_from_qr">Të përdoret “%1$s” për të ftuar të tjerë në fjalosje me video?\n\nPasi të ujdiset kjo, mund të filloni një fjalosje me video që prej një fjalosjeje tek-për-tek. Kështu do të zëvendësohet rregullimi i mëparshëm për fjalosje video, në pastë.</string>
@@ -503,7 +504,7 @@
     <string name="multidevice_title">Shtoni Pajisje të Dytë</string>
     <string name="multidevice_same_network_hint">Sigurohuni se të dy pajisjet janë në të njëjtin rrjet Wi-Fi ose klasik</string>
     <string name="multidevice_this_creates_a_qr_code">Kjo krijon një kod QR që pajisja e dytë mund ta skanojë për të kopjuar llogarinë.</string>
-    <string name="multidevice_install_dc_on_other_device">Instaloni ArcaneChat-in në pajisjen tuaj tjetër (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Instaloni ArcaneChat-in në pajisjen tuaj tjetër (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Nisni ArcaneChat-in, prekni mbi “Shtoje si Pajisje të Dytë” dhe skanoni kodin e treguar këtu</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -598,13 +599,25 @@
     <string name="login_smtp_port">Portë SMTP</string>
     <string name="login_smtp_security">Siguri SMTP</string>
     <string name="login_auth_method">Metodë Autorizimi</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Ndërmjetës</string>
+    <string name="proxy_use_proxy">Përdor Ndërmjetës</string>
+    <string name="proxy_add">Shtoni Ndërmjetës</string>
+    <string name="proxy_add_explain">Lloje ndërmjetësish që mbulohen: HTTP(S), SOCKS5 dhe Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Jepni këtu URL-në e ndërmjetësit</string>
+    <string name="proxy_invalid">URL ndërmjetësi e pavlefshme, ose që s’mbulohet</string>
+    <string name="proxy_list_header">Ndërmjetës të Ruajtur</string>
+    <string name="proxy_delete">Fshije Ndërmjetësin</string>
+    <string name="proxy_delete_explain">Jeni i sigurt se doni të fshihet “%1$s”?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Përdor SOCKS5</string>
     <string name="login_socks5_host">Strehë SOCKS5</string>
     <string name="login_socks5_port">Portë SOCKS5</string>
     <string name="login_socks5_user">Përdorues SOCKS5</string>
     <string name="login_socks5_password">Fjalëkalim SOCKS5</string>
+
     <string name="login_info_oauth2_title">Të vazhdohet me rregullimin e thjeshtuar?</string>
     <string name="login_info_oauth2_text">Adresa email e dhënë mbulon një ujdisje të thjeshtuar (OAuth 2.0).\n\nNë hapin pasues, ju lutemi, lejojeni ArcaneChat-in të veprojë si aplikacioni juaj për Fjalosje Përmes Email-i.\n\nS\’ka shërbyes ArcaneChat, të dhënat tuaja rrinë në pajisjen tuaj!</string>
     <string name="login_certificate_checks">Kontrolle Dëshmish</string>
@@ -915,7 +928,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Po mbaron depozita e shërbimit tuaj, përdoren tashmë %1$s%%.\n\nKur depozita është 100%% e përdorur, mund të mos jeni në gjendje të merrni mesazhe.\n\n👉 Ju lutemi, shihni se mos mund të fshini të dhëna të vjetra që nga ndërfaqja web e furnizuesit të shërbimit dhe shihni mundësinë të aktivizoni “Rregullime / Fshi Mesazhe të Vjetër”. Se sa depozitë është aktualisht e përdorur mund ta kontrolloni kurdo, që nga \"Rregullime / Lidhje\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Data ose koha e pajisjes tuaj duket të jetë e pasaktë (%1$s).\n\nRregulloni sahatin tuaj ⏰🔧 që të garantohet se mesazhet tuaj merren saktë.</string>
-    <string name="devicemsg_update_reminder">⚠️ Versioni juaj i ArcaneChat-it duket të jetë i vjetruar.\n\nKjo mund të shkaktojë probleme, ngaqë partnerët tuaj të fjalosjes përdorin versione të rinj - dhe ju mungojnë veçoritë më të reja 😳\nPër përditësime, ju lutemi, shihni te https://get.delta.chat ose te shitorja juaj e aplikacioneve.</string>
+    <string name="devicemsg_update_reminder">⚠️ Versioni juaj i ArcaneChat-it duket të jetë i vjetruar.\n\nKjo mund të shkaktojë probleme, ngaqë partnerët tuaj të fjalosjes përdorin versione të rinj - dhe ju mungojnë veçoritë më të reja 😳\nPër përditësime, ju lutemi, shihni te https://github.com/ArcaneChat ose te shitorja juaj e aplikacioneve.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Që të vazhdohet, shkyçeni</string>
@@ -982,6 +995,7 @@
     <string name="mailto_link_could_not_be_decoded">s’u shkodua dot lidhje mailto: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Hidhe tej</string>
     <string name="notify_reply_button">Përgjigjuni</string>
     <string name="notify_new_message">Mesazh i ri</string>

src/main/res/values-sr/strings.xml

@@ -309,6 +309,7 @@
     <string name="videochat_tap_to_open">Додирни да отвориш</string>
     <string name="videochat_instance">Инстанца видео ћаскања</string>
     <string name="videochat_instance_placeholder">Ваша инстанца видео ћаскања</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Примери: https://meet.jit.si/$ROOM или basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">Ако је омогућено, можете започети видео ћаскање из сваког ћаскања. Ово захтева компатибилну апликацију или прегледач на оба краја.</string>
     <string name="videochat_instance_from_qr">Да ли желите да користите „%1$s“ да позовете друге у видео ћаскање?\n\nКада ово поставите, можете да започнете видео ћаскање из сваког ћаскања. Ово замењује све претходне поставке за видео ћаскање.</string>
@@ -517,13 +518,14 @@
     <string name="login_smtp_port">СМТП порт</string>
     <string name="login_smtp_security">СМТП безбедност</string>
     <string name="login_auth_method">Начин овлашћења</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Користи SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 сервер</string>
     <string name="login_socks5_port">SOCKS5 порт</string>
     <string name="login_socks5_user">SOCKS5 корисник</string>
     <string name="login_socks5_password">SOCKS5 лозинка</string>
+
     <string name="login_info_oauth2_title">Наставите са поједностављеним поставкама?</string>
     <string name="login_info_oauth2_text">Унета е-адреса подржава поједностављено подешавање (OAuth 2.0).\n\nУ следећем кораку, дозволите ArcaneChat-у да  да дејствује као ваша апликација за ћаскање преко е-поште.\n\nArcaneChat нема сервере и ваши подаци остају на вашем уређају.</string>
     <string name="login_certificate_checks">Провери сертификате</string>
@@ -796,7 +798,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Складишни простор вашег имејл провајдера ће ускоро да понестане: %1$s%% већ се користи.\n\nМожда нећете моћи да примате поруке ако је складиште пунo.\n\n👉 Проверите да ли можете да избришете старе податке у веб интерфејсу провајдера и размислите да омогућите „Подешавања / Избриши старе поруке“ опцију. Можете да проверите тренутну употребу меморијског простора у било ком тренутку у „Подешавања / Повезивање“.</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Изгледа да датум или време на вашем уређају нису тачни (%1$s).\n\nПодесите сат ⏰🔧 да бисте били сигурни да ће ваше поруке бити правилно примљене.</string>
-    <string name="devicemsg_update_reminder">⚠️ Ваша ArcaneChat верзија је можда застарела.\n\nОво може да изазове проблеме јер ваши контакти за ћаскање користе новије верзије - а вама недостају најновије функционалности 😳\nДа би ажурирали апликацију проверите https://get.delta.chat или продавницу за апликација.</string>
+    <string name="devicemsg_update_reminder">⚠️ Ваша ArcaneChat верзија је можда застарела.\n\nОво може да изазове проблеме јер ваши контакти за ћаскање користе новије верзије - а вама недостају најновије функционалности 😳\nДа би ажурирали апликацију проверите https://github.com/ArcaneChat или продавницу за апликација.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Унесите своју системску тајну да бисте наставили.</string>
@@ -856,6 +858,7 @@
     <string name="mailto_link_could_not_be_decoded">mailto веза не може бити декодирана: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Одбаци</string>
     <string name="notify_reply_button">Одговори</string>
     <string name="notify_new_message">Нова порука</string>

src/main/res/values-sv/strings.xml

@@ -327,6 +327,7 @@
     <string name="videochat_tap_to_open">Tryck för att öppna</string>
     <string name="videochat_instance">Videochattinstans</string>
     <string name="videochat_instance_placeholder">Din videochattinstans</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Exempel: https://din-server.org/$RUM</string>
     <string name="videochat_instance_explain_2">Om det är aktiverat kan du starta en videochatt från varje chatt. Kräver en kompatibel app eller en webbläsare på båda sidor.</string>
     <string name="videochat_instance_from_qr">Vill du använda \"%1$s\" för att bjuda in andra till videochattar?\n\nNär det väl är inställt kan du starta en videochatt från vilken en-till-en-chatt som helst. Detta ersätter den tidigare inställningen för eventuella videochattar.</string>
@@ -505,7 +506,7 @@
     <string name="multidevice_title">Lägg till en andra enhet</string>
     <string name="multidevice_same_network_hint">Tillse att bägge enheterna är på samma WiFi eller nätverk</string>
     <string name="multidevice_this_creates_a_qr_code">Detta skapar en QR-kod som den andra enheten kan skanna för att kopiera profilen.</string>
-    <string name="multidevice_install_dc_on_other_device">Installera ArcaneChat på din andra enhet (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Installera ArcaneChat på din andra enhet (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Starta ArcaneChat, tryck på \"Jag har redan en profil / Lägg till som andra enhet\" och skanna koden som visas här.</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -600,13 +601,14 @@
     <string name="login_smtp_port">SMTP port</string>
     <string name="login_smtp_security">SMTP säkerhet</string>
     <string name="login_auth_method">Auktoriseringsmetod</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Använd SOCKS5</string>
     <string name="login_socks5_host">SOCKS5-värd</string>
     <string name="login_socks5_port">SOCKS5-port</string>
     <string name="login_socks5_user">SOCKS5-användare</string>
     <string name="login_socks5_password">SOCKS5-lösenord</string>
+
     <string name="login_info_oauth2_title">Fortsätta med förenklad installation?</string>
     <string name="login_info_oauth2_text">Den angivna e-postadressen stödjer förenklad inställning (OAuth 2.0).\n\nLåt ArcaneChat agera som ditt chatt-över-epost-program, i nästa steg.\n\nDet finns ingen ArcaneChat-server, din data stannar på din enhet.</string>
     <string name="login_certificate_checks">Certifikatkontroller</string>
@@ -919,7 +921,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Din leverantörs lagringsutrymme är snart slut: %1$s%% är redan använt.\n\nDu kanske inte kan ta emot meddelanden om lagringsutrymmet är fullt.\n\n👉 Kontrollera om du kan radera gammal data i leverantörens webbgränssnitt och överväg att aktivera \"Inställningar / Chattar och media / Ta bort gamla meddelanden\". Du kan kontrollera din aktuella lagringsanvändning när som helst under \"Inställningar / Anslutning\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Datum eller tid på din enhet verkar vara felaktigt (%1$s).\n\nJustera din klocka ⏰🔧 för att säkerställa att dina meddelanden tas emot korrekt.</string>
-    <string name="devicemsg_update_reminder">⚠️ Din ArcaneChat-version kan vara föråldrad.\n\nDetta kan orsaka problem eftersom dina chattpartners använder nyare versioner - och du saknar de senaste funktionerna 😳\nSök efter uppdateringar på https://get.delta.chat eller i din appbutik.</string>
+    <string name="devicemsg_update_reminder">⚠️ Din ArcaneChat-version kan vara föråldrad.\n\nDetta kan orsaka problem eftersom dina chattpartners använder nyare versioner - och du saknar de senaste funktionerna 😳\nSök efter uppdateringar på https://github.com/ArcaneChat eller i din appbutik.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Lås upp för att fortsätta</string>
@@ -986,6 +988,7 @@
     <string name="mailto_link_could_not_be_decoded">mailto-länken kunde inte avkodas: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Avvisa</string>
     <string name="notify_reply_button">Svara</string>
     <string name="notify_new_message">Nytt meddelande</string>

src/main/res/values-tr/strings.xml

@@ -56,7 +56,7 @@
     <string name="mark_all_as_read">Tümünü Okundu Olarak İmle</string>
     <string name="mark_as_read">Okundu Olarak İmle</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
-    <string name="mark_as_read_short">Okundu</string>
+    <string name="mark_as_read_short">Okundu İmi</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Yükleniyor…</string>
     <string name="hide">Gizle</string>
@@ -331,6 +331,7 @@
     <string name="videochat_tap_to_open">Açmak için Dokunun</string>
     <string name="videochat_instance">Video Sohbeti Örneği</string>
     <string name="videochat_instance_placeholder">Video Sohbeti Örneğiniz</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Örnek: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Etkinleştirilirse, her sohbetten video sohbeti başlatabilirsiniz. Her iki uçta da uyumlu bir uygulama ya da bir tarayıcı gerektirir.</string>
     <string name="videochat_instance_from_qr">\"%1$s\" diğerlerini video sohbetlerine çağırmak için kullanılsın mı?\n\nBir kez ayarlandığında, her sohbetten video sohbeti başlatabilirsiniz. Bu, video sohbetleri için herhangi bir önceki ayarın yerini alır.</string>
@@ -400,7 +401,7 @@
     <string name="chat_new_group_hint">Diğerleri, yalnızca siz bir ilk ileti gönderdikten sonra bu öbeği görecek.</string>
     <string name="chat_record_slide_to_cancel">İptal etmek için kaydırın</string>
     <string name="chat_record_explain">Bir sesli ileti kaydetmek için dokunun ve basılı tutun, göndermek için bırakın</string>
-    <string name="chat_no_chats_yet_title">Sohbet yok.\nYeni bir sohbet başlatmak için \"+\" tuşuna basın.</string>
+    <string name="chat_no_chats_yet_title">Sohbet yok.\nYeni bir sohbet başlatmak için \"+\" simgesine basın.</string>
     <string name="chat_all_archived">Tüm sohbetler arşivlendi.\nYeni bir sohbet başlatmak için \"+\" simgesine basın.</string>
     <string name="chat_share_with_title">Paylaş</string>
     <string name="chat_input_placeholder">İleti</string>
@@ -509,7 +510,7 @@
     <string name="multidevice_title">İkinci Aygıt Ekle</string>
     <string name="multidevice_same_network_hint">Her iki aygıtın da aynı Wi-Fi\'da ya da ağda olduğundan emin olun</string>
     <string name="multidevice_this_creates_a_qr_code">Bu, ikinci aygıtın profili kopyalamak için tarayabileceği bir QR kodu oluşturur.</string>
-    <string name="multidevice_install_dc_on_other_device">ArcaneChat\'i diğer aygıtınıza kurun (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">ArcaneChat\'i diğer aygıtınıza kurun (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">ArcaneChat\'i başlatın, “Zaten Bir Profilim Var / İkinci Aygıt Olarak Ekle”ye dokunun ve burada gösterilen kodu tarayın</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -579,7 +580,7 @@
     <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by contact name and/or address -->
     <string name="instant_onboarding_contact_info">%1$s ile sohbet etmek için bir profil oluşturun.</string>
     <!-- Question shown when another user's QR code is scanned from onboarding screen -->
-    <string name="instant_onboarding_confirm_contact">Yeni bir profil oluşturmak ve %1$s ile sohbet etmeye başlamak istiyor musunuz?</string>
+    <string name="instant_onboarding_confirm_contact">Yeni bir profil oluşturmak ve %1$s ile sohbet başlatmak istiyor musunuz?</string>
     <!-- Question shown when group's QR code is scanned from onboarding screen -->
     <string name="instant_onboarding_confirm_group">Yeni bir profil oluşturmak ve \"%1$s\" sohbet öbeğine katılmak istiyor musunuz?</string>
 
@@ -604,13 +605,25 @@
     <string name="login_smtp_port">SMTP Bağlantı Noktası</string>
     <string name="login_smtp_security">SMTP Güvenliği</string>
     <string name="login_auth_method">Yetkilendirme Yöntemi</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Proxy</string>
+    <string name="proxy_use_proxy">Proxy Kullan</string>
+    <string name="proxy_add">Proxy Ekle</string>
+    <string name="proxy_add_explain">Desteklenen proxy türleri: HTTP(S), SOCKS5 ve Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Buraya proxy URL\'sini girin</string>
+    <string name="proxy_invalid">Geçersiz ya da desteklenmeyen proxy URL\'si</string>
+    <string name="proxy_list_header">Kaydedilen Proxy\'ler</string>
+    <string name="proxy_delete">Proxy\'yi Sil</string>
+    <string name="proxy_delete_explain">\"%1$s\" proxy\'sini silmek istediğinizden emin misiniz?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">SOCKS5\'i Kullan</string>
     <string name="login_socks5_host">SOCKS5 Ana Bilgisayarı</string>
     <string name="login_socks5_port">SOCKS5 Bağlantı Noktası</string>
     <string name="login_socks5_user">SOCKS5 Kullanıcısı</string>
     <string name="login_socks5_password">SOCKS5 Parolası</string>
+
     <string name="login_info_oauth2_title">Basitleştirilen ayarlamayla sürdürülsün mü?</string>
     <string name="login_info_oauth2_text">Girilen e-posta adresi basitleştirilen bir ayarlamayı (OAuth 2.0) destekliyor.\n\nSonraki adımda, lütfen ArcaneChat\'in E-posta Üzerinden Sohbet uygulamanız olarak davranmasına izin verin.\n\nArcaneChat kullanıcı verisi toplamaz; her şey aygıtınızda kalır.</string>
     <string name="login_certificate_checks">Sertifika Denetimleri</string>
@@ -620,7 +633,7 @@
     <string name="login_error_required_fields">Lütfen geçerli bir e-posta adresi ve bir parola girin</string>
     <string name="import_backup_title">Yedekten Geri Yükle</string>
     <string name="import_backup_ask">\"%1$s\" üzerinde yedek bulundu.\n\nİçe aktarmak ve ondan gelen tüm verileri ve ayarları kullanmak istiyor musunuz?</string>
-    <string name="import_backup_no_backup_found">Yedek bulunamadı.\n\nYedeği \"%1$s\" üzerine kopyalayın ve yeniden deneyin. Ek olarak, normal ayarlama işlemiyle sürdürmek için \"İletileşmeyi başlat\"a basın.</string>
+    <string name="import_backup_no_backup_found">Yedek bulunamadı.\n\nYedeği \"%1$s\" üzerine kopyalayın ve yeniden deneyin. Ek olarak, normal ayarlama işlemiyle sürdürmek için \"İletileşmeye başla\"ya basın.</string>
     <!-- Translators: %1$s will be replaced by the e-mail address -->
     <string name="login_error_cannot_login">\"%1$s\" olarak giriş yapılamıyor. Lütfen e-posta adresinin ve parolanın doğru olup olmadığını denetleyin.</string>
     <!-- TLS certificate checks -->
@@ -667,7 +680,7 @@
     <string name="pref_vibrate">Titret</string>
     <string name="pref_screen_security">Ekran Güvenliği</string>
     <!-- Translators: Must indicate that there is no guarantee as the system may not honor our request. -->
-    <string name="pref_screen_security_explain">En yeniler listesinde ve uygulamanın içinde ekran görüntülerinin engellenmesini iste</string>
+    <string name="pref_screen_security_explain">Son listesinde ve uygulamanın içinde ekran görüntülerinin engellenmesini iste</string>
     <string name="pref_screen_security_please_restart_hint">Ekran güvenliği ayarını uygulamak için lütfen uygulamayı yeniden başlatın.</string>
     <string name="pref_notifications">Bildirimler</string>
     <string name="pref_notifications_show">Göster</string>
@@ -739,7 +752,7 @@
     <string name="pref_auto_folder_moves">DeltaChat Klasörüne Otomatik Olarak Taşı</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 yoksayar. Sunucunuzun sohbet iletilerini DeltaChat klasörüne taşımasını gerektirir.</string>
+    <string name="pref_only_fetch_mvbox_explain">Diğer klasörleri yok sayar. 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>
@@ -809,7 +822,7 @@
     <string name="autodel_server_warn_multi_device">Bir kerede silmeyi etkinleştirirseniz, bu profilde çoklu aygıtları kullanamazsınız.</string>
     <string name="autodel_confirm">Anladım, tüm bu iletileri sil</string>
     <!-- "At once" in the meaning of "Immediately", without any intervening time. -->
-    <string name="autodel_at_once">İndirdikten Sonra Bir Kerede</string>
+    <string name="autodel_at_once">İndirdikten sonra bir kerede</string>
     <string name="after_30_seconds">30 saniye sonra</string>
     <string name="after_1_minute">1 dakika sonra</string>
     <string name="after_5_minutes">5 dakika sonra</string>
@@ -923,7 +936,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Sağlayıcınızın depolaması dolmak üzere: %1$s%% zaten kullanımda.\n\nDepolama tam dolduğunda iletileri alamayabilirsiniz.\n\n👉 Lütfen sağlayıcınızın web arabiriminden eski verileri silip silemeyeceğinizi denetleyin ve \"Ayarlar / Sohbetler ve Ortamlar / Eski İletileri Sil\"i etkinleştirmeyi düşünün. Herhangi bir zamanda şu anki depolama kullanımınızı \"Ayarlar / Bağlanabilirlik\"ten denetleyebilirsiniz.</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Aygıtınızdaki tarih ya da saat yanlış görünüyor (%1$s).\n\nİletilerinizin doğru şekilde alınmasını sağlamak için saatinizi ⏰🔧 ayarlayın.</string>
-    <string name="devicemsg_update_reminder">⚠️ ArcaneChat sürümünüz eski olabilir.\n\nBu, sorunlara neden olabilir; çünkü sohbet ortaklarınız daha yeni sürümleri kullanıyor - ve en yeni özellikleri kaybediyorsunuz 😳\nGüncelleştirmeler için lütfen https://get.delta.chat ya da uygulama mağazanızı denetleyin.</string>
+    <string name="devicemsg_update_reminder">⚠️ ArcaneChat sürümünüz eski olabilir.\n\nBu, sorunlara neden olabilir; çünkü sohbet ortaklarınız daha yeni sürümleri kullanıyor - ve en yeni özellikleri kaybediyorsunuz 😳\nGüncelleştirmeler için lütfen https://github.com/ArcaneChat ya da uygulama mağazanızı denetleyin.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Sürdürmek için kilidi açın</string>
@@ -990,6 +1003,7 @@
     <string name="mailto_link_could_not_be_decoded">mailto bağlantısının kodu çözülemedi: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Kapat</string>
     <string name="notify_reply_button">Yanıtla</string>
     <string name="notify_new_message">Yeni ileti</string>
@@ -1137,11 +1151,11 @@
     <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->
     <string name="pref_instant_delivery">Anında Teslimat</string>
     <string name="pref_background_notifications">Arka Plan Bağlantısı Kullan</string>
-    <string name="pref_background_notifications_explain">Pil iyileştirmelerinin yoksayılmasını gerektirir, bildirimler zamanında gelmezse kullanın</string>
+    <string name="pref_background_notifications_explain">Pil iyileştirmelerinin yok sayılmasını gerektirir, bildirimler zamanında gelmezse kullanın</string>
     <string name="pref_reliable_service">Arka Plan Bağlantısını Zorla</string>
     <string name="pref_reliable_service_explain">Kalıcı bir bildirime neden olur</string>
 
-    <string name="pref_background_notifications_rationale">E-posta sunucunuza bağlantıyı sürdürmek ve arka planda iletileri almak için sonraki adımda pil iyileştirmelerini yoksayın.\n\nArcaneChat, az kaynak kullanır ve pilinizi boşaltmamaya özen gösterir.</string>
+    <string name="pref_background_notifications_rationale">E-posta sunucunuza bağlantıyı sürdürmek ve arka planda iletileri almak için sonraki adımda pil iyileştirmelerini yok sayın.\n\nArcaneChat, az kaynak kullanır ve pilinizi boşaltmamaya özen gösterir.</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
     <string name="perm_enable_bg_reminder_title">ArcaneChat arka plandayken iletileri almak için buraya dokunun.</string>
     <string name="perm_enable_bg_already_done">ArcaneChat\'in arka planda iletileri almasına zaten izin verdiniz.\n\nİletiler arka planda hâlâ gelmiyorsa, lütfen sistem ayarlarınızı da denetleyin.</string>

src/main/res/values-uk/strings.xml

@@ -56,7 +56,7 @@
     <string name="mark_all_as_read">Позначити все як прочитане</string>
     <string name="mark_as_read">Позначити як прочитане</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
-    <string name="mark_as_read_short">Прочитане</string>
+    <string name="mark_as_read_short">Позначити прочитаним</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Завантаження...</string>
     <string name="hide">Приховати</string>
@@ -176,6 +176,7 @@
     <string name="video">Відео</string>
     <string name="documents">Документи</string>
     <string name="contact">Контакт</string>
+    <string name="bot">Бот</string>
     <string name="camera">Камера</string>
     <!-- As in "start a video recording" or "take a photo"; eg. the description of the "shutter button" in cameras -->
     <string name="capture">Захопити</string>
@@ -244,6 +245,10 @@
     <string name="menu_delete_location">Видалити це місце?</string>
     <string name="menu_message_details">Інформація про повідомлення</string>
     <string name="menu_copy_to_clipboard">Копіювати в буфер обміну</string>
+    <string name="share_invite_link">Поділитися посиланням на запрошення</string>
+    <string name="invite_friends">Запросити друзів</string>
+    <!-- %1$s is replaced by the user's invitation link ("https://i.delta.chat/...") -->
+    <string name="invite_friends_text">Зв\'яжіться зі мною в ArcaneChat:\n%1$s</string>
     <string name="menu_copy_selection_to_clipboard">Скопіювати позначене</string>
     <string name="menu_copy_link_to_clipboard">Скопіювати посилання</string>
     <string name="menu_copy_text_to_clipboard">Копіювати текст</string>
@@ -278,6 +283,10 @@
     <string name="select_chat">Оберіть чат</string>
     <string name="select_more">Вибрати ще</string>
     <string name="menu_edit_name">Редагувати ім\'я</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_explain">Задайте нікнейм, який буде відображатись для вас замість \"%1$s\". Залиште порожнім, щоб використовувати вибране ім\'я контакту.</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_placeholder">Нік для \"%1$s\"</string>
     <string name="menu_settings">Налаштування</string>
     <string name="menu_advanced">Додатково</string>
     <string name="menu_view_profile">Переглянути профіль</string>
@@ -340,6 +349,7 @@
     <string name="videochat_tap_to_open">Торкніться, щоб відкрити</string>
     <string name="videochat_instance">Відео чат</string>
     <string name="videochat_instance_placeholder">Ваш відео чат</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Приклади: https://meet.jit.si/$ROOM або basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">Якщо ввімкнено, Ви можете почати відеочат із кожного чату. Обидві сторони повинні встановити сумісний додаток або браузер.</string>
     <string name="videochat_instance_from_qr">Використовувати \"%1$s\" аби запросити інших у відеочат?\n\nПісля встановлення Ви можете розпочати відеочат із кожного індивідуального чату. Це замінить попереднє налаштування для відеочату, якщо воно є.</string>
@@ -354,7 +364,7 @@
         <item quantity="many">Видалити %d чатів? Вони більше не будуть відображатися у списку чатів, їх повідомлення залишаться на сервері.</item>
         <item quantity="other">Видалити %d чатів? Вони більше не будуть відображатися у списку чатів, їх повідомлення залишаться на сервері.</item>
     </plurals>
-    <string name="ask_delete_named_chat">Ви впевнені, що хочете видалити \"%1$s\"?</string>
+    <string name="ask_delete_named_chat">Видалити чат \"%1$s\"? Він більше не буде відображатися у списку чату, але його повідомлення залишаться на сервері.</string>
     <string name="ask_delete_message">Ви впевнені, що хочете видалити це повідомлення?</string>
     <plurals name="ask_delete_messages">
         <item quantity="one">Видалити %d повідомлення тут і на сервері?</item>
@@ -530,7 +540,7 @@
     <string name="multidevice_title">Додати другий пристрій</string>
     <string name="multidevice_same_network_hint">Переконайтеся, що обидва пристрої підключено до однієї мережі Wi-Fi</string>
     <string name="multidevice_this_creates_a_qr_code">Це створить QR-код, який другий пристрій може сканувати, щоб скопіювати обліковий запис.</string>
-    <string name="multidevice_install_dc_on_other_device">Установіть ArcaneChat на Ваш інший пристрій (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Установіть ArcaneChat на Ваш інший пристрій (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Запустіть ArcaneChat, торкніться \"Я вже маю профіль / Додати як другий пристрій\" і відскануйте код, показаний тут</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -625,13 +635,25 @@
     <string name="login_smtp_port">SMTP-порт</string>
     <string name="login_smtp_security">Налаштування безпеки SMTP</string>
     <string name="login_auth_method">Метод авторизації</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Проксі</string>
+    <string name="proxy_use_proxy">Використовувати проксі</string>
+    <string name="proxy_add">Додати проксі-сервер</string>
+    <string name="proxy_add_explain">Підтримувані типи проксі: HTTP(S), SOCKS5 і Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Введіть URL проксі-сервера тут</string>
+    <string name="proxy_invalid">Невірний або непідтримуваний URL проксі-сервера</string>
+    <string name="proxy_list_header">Збережені проксі-сервери</string>
+    <string name="proxy_delete">Видалити проксі-сервер</string>
+    <string name="proxy_delete_explain">Ви дійсно хочете видалити \"%1$s\"?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Використовувати SOCKS5</string>
     <string name="login_socks5_host">Хост SOCKS5</string>
     <string name="login_socks5_port">Порт SOCKS5</string>
     <string name="login_socks5_user">Ім\'я користувача SOCKS5</string>
     <string name="login_socks5_password">Пароль SOCKS5</string>
+
     <string name="login_info_oauth2_title">Продовжити спрощене налаштування?</string>
     <string name="login_info_oauth2_text">Введена адреса електронної пошти підтримує спрощене налаштування (OAuth 2.0).\n\nНа наступному кроці дозвольте, будь ласка, ArcaneChat виступати в якості Вашого додатку для чату за допомогою електронної пошти.\n\nУ ArcaneChat немає серверів, Ваші дані залишаються на Вашому пристрої!</string>
     <string name="login_certificate_checks">Перевірки сертифікатів</string>
@@ -936,6 +958,7 @@
     <string name="chat_protection_broken_explanation">Наскрізне шифрування більше не гарантується, імовірно, через те, що %1$s перевстановив (-ла) ArcaneChat або надіслав (-ла) повідомлення з іншого пристрою.\n\nВи можете зустрітися з ним (нею) особисто та знову відсканувати його (її) QR-код, щоб відновити гарантоване наскрізне шифрування.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s вимагає наскрізного шифрування, яке ще не налаштоване для цього чату. Натисніть, щоб дізнатися більше.</string>
     <string name="invalid_unencrypted_explanation">Щоб установити наскрізне шифрування, Ви можете зустрітися з контактами особисто та відсканувати їхній QR-код, щоб додати їх.</string>
+    <string name="encryption_required_for_new_contact">Потрібне наскрізне шифрування, але воно ще не налаштоване на %1$s.\n\nВи можете поділитися з ними посиланням на запрошення або зустрітися особисто і відсканувати їхній QR-код.</string>
     <string name="learn_more">Дізнатися більше</string>
 
     <string name="devicemsg_self_deleted">Ви видалили чат \"Збережені повідомлення\".\n\nℹ️ Аби використовувати функцію \"Збережені повідомлення\" знову, створіть новий чат самі із собою.</string>
@@ -943,7 +966,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Сховище вашого провайдера електронної пошти майже заповнено, уже використовується %1$s%%.\n\nМожливо, Ви не зможете отримувати повідомлення, коли сховище буде заповнене.\n\n👉 Перевірте, чи можна видалити старі дані у веб-інтерфейсі провайдера та ввімкніть \"Налаштування / Видалити старі повідомлення\". Ви можете будь-коли перевірити своє поточне використання сховища в \"Налаштування / Підключення\". </string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Дата й час на вашому пристрої видаються неточними (%1$s).\n\nНалаштуйте свій годинник ⏰🔧 для правильного отримання повідомлень.</string>
-    <string name="devicemsg_update_reminder">⚠️ Ваша версія ArcaneChat може бути застарілою.\n\nЦе може спричинити проблеми, оскільки Ваші співрозмовники в чаті використовують новіші версії, а Вам не вистачає найновіших функцій 😳 \nПеревірте оновлення на https://get.delta.chat або в магазині додатків. </string>
+    <string name="devicemsg_update_reminder">⚠️ Ваша версія ArcaneChat може бути застарілою.\n\nЦе може спричинити проблеми, оскільки Ваші співрозмовники в чаті використовують новіші версії, а Вам не вистачає найновіших функцій 😳 \nПеревірте оновлення на https://github.com/ArcaneChat або в магазині додатків. </string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Введіть захисний код, щоб продовжити.</string>
@@ -1010,6 +1033,7 @@
     <string name="mailto_link_could_not_be_decoded">неможливо декодувати посилання mailto: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Відхилити</string>
     <string name="notify_reply_button">Відповісти</string>
     <string name="notify_new_message">Нове повідомлення</string>
@@ -1169,4 +1193,5 @@
     <!-- device messages for updates -->
     <string name="update_1_46_android">Новий онбордінг 🐣 та багато іншого:\n\n⚡️ Підпишіться на безпечні сервери швидкої пошти (https://delta.chat/chatmail) або використовуйте класичні сервери електронної пошти\n\n👉 PUSH-сповіщення для будь-якого сервера чату\n\n👤 Безпечно підключайте друзів через \"Прикріпити контакти\"\n\n🥰 Реагуйте будь-якими емодзі\n\n📌 Прикріплюйте чати прямо з пошуку ... та багато іншого на %1$s</string>
     <string name="update_1_46_ios">Новий онбордінг 🐣 та багато іншого:\n\n⚡️ Підпишіться на безпечні швидкі chatmail-сервери (https://delta.chat/chatmail) або використовуйте класичні сервери електронної пошти\n\n👉 PUSH-повідомлення для будь-якого сервера чату\n\n👤 Отримуйте \"Прикріплені контакти\" та з\'єднуйтеся з друзями\n\n🥰 Швидший вибір реакції ... та багато іншого на %1$s</string>
-    </resources>
+    <string name="update_switch_profile_placement">ℹ️ Опцію \"Переключити профіль\" переміщено: Торкніться зображення свого профілю у верхньому кутку головного екрану, щоб додати або переключити профіль 💡.</string>
+</resources>

src/main/res/values-vi/strings.xml

@@ -309,6 +309,7 @@
     <string name="videochat_tap_to_open">Nhấn để mở</string>
     <string name="videochat_instance">Phiên bản trò chuyện video</string>
     <string name="videochat_instance_placeholder">Phiên bản trò chuyện video của bạn</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Ví dụ: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">Nếu được bật, bạn có thể bắt đầu trò chuyện video từ mỗi cuộc trò chuyện. Yêu cầu ứng dụng tương thích hoặc trình duyệt ở cả hai đầu.</string>
     <string name="videochat_instance_from_qr">Sử dụng \"%1$s\" để mời người khác trò chuyện video?\n\nSau khi thiết lập, bạn có thể bắt đầu trò chuyện video từ mỗi cuộc trò chuyện. Điều này sẽ thay thế mọi cài đặt trước đó cho trò chuyện video.</string>
@@ -478,7 +479,7 @@
     <string name="multidevice_title">Thêm thiết bị thứ hai</string>
     <string name="multidevice_same_network_hint">Đảm bảo cả hai thiết bị đều sử dụng cùng một Wi-Fi hoặc mạng</string>
     <string name="multidevice_this_creates_a_qr_code">Thao tác này sẽ tạo mã QR mà thiết bị thứ hai có thể quét để sao chép tài khoản.</string>
-    <string name="multidevice_install_dc_on_other_device">Cài đặt ArcaneChat trên thiết bị khác của bạn (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Cài đặt ArcaneChat trên thiết bị khác của bạn (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Bắt đầu ArcaneChat, nhấn vào “Thêm làm thiết bị thứ hai” và quét mã được hiển thị ở đây</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -545,13 +546,14 @@
     <string name="login_smtp_port">Cổng SMTP</string>
     <string name="login_smtp_security">Bảo mật SMTP</string>
     <string name="login_auth_method">Phương thức ủy quyền</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Sử dụng SOCKS5</string>
     <string name="login_socks5_host">Máy chủ SOCKS5</string>
     <string name="login_socks5_port">Cổng SOCKS5</string>
     <string name="login_socks5_user">Người dùng SOCKS5</string>
     <string name="login_socks5_password">Mật khẩu SOCKS5</string>
+
     <string name="login_info_oauth2_title">Tiếp tục với thiết lập đơn giản hóa?</string>
     <string name="login_info_oauth2_text">Địa chỉ e-mail đã nhập hỗ trợ thiết lập đơn giản hóa (OAuth 2.0).\n\nTrong bước tiếp theo, vui lòng cho phép ArcaneChat hoạt động như ứng dụng Trò chuyện qua E-mail của bạn.\n\nKhông có máy chủ ArcaneChat, dữ liệu của bạn vẫn ở trên thiết bị của bạn.</string>
     <string name="login_certificate_checks">Kiểm tra chứng chỉ</string>
@@ -845,7 +847,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Bộ nhớ nhà cung cấp của bạn sắp hết: %1$s%% đã được sử dụng.\n\nBạn có thể không nhận được tin nhắn nếu bộ nhớ đầy.\n\n 👉 Vui lòng kiểm tra xem bạn có thể xóa không dữ liệu cũ trong giao diện web của nhà cung cấp và cân nhắc bật \"Cài đặt / Xóa tin nhắn cũ\". Bạn có thể kiểm tra mức sử dụng bộ nhớ hiện tại của mình bất kỳ lúc nào tại \"Cài đặt / Kết nối\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Ngày hoặc giờ trên thiết bị của bạn có vẻ không chính xác (%1$s).\n\nĐiều chỉnh đồng hồ của bạn ⏰🔧 để đảm bảo tin nhắn của bạn được nhận chính xác.</string>
-    <string name="devicemsg_update_reminder">⚠️ Phiên bản ArcaneChat của bạn có thể đã lỗi thời.\n\nĐiều này có thể gây ra sự cố vì đối tác trò chuyện của bạn sử dụng các phiên bản mới hơn - và bạn đang thiếu các tính năng mới nhất 😳\nVui lòng kiểm tra https://get.delta.chat hoặc cửa hàng ứng dụng của bạn để biết thông tin cập nhật .</string>
+    <string name="devicemsg_update_reminder">⚠️ Phiên bản ArcaneChat của bạn có thể đã lỗi thời.\n\nĐiều này có thể gây ra sự cố vì đối tác trò chuyện của bạn sử dụng các phiên bản mới hơn - và bạn đang thiếu các tính năng mới nhất 😳\nVui lòng kiểm tra https://github.com/ArcaneChat hoặc cửa hàng ứng dụng của bạn để biết thông tin cập nhật .</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Mở khóa để tiếp tục</string>
@@ -907,6 +909,7 @@
     <string name="mailto_link_could_not_be_decoded">không thể giải mã được liên kết mailto: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Loại bỏ</string>
     <string name="notify_reply_button">Trả lời</string>
     <string name="notify_new_message">Tin nhắn mới</string>

src/main/res/values-zh-rCN/strings.xml

@@ -322,6 +322,7 @@
     <string name="videochat_tap_to_open">点击来打开</string>
     <string name="videochat_instance">视频聊天实例</string>
     <string name="videochat_instance_placeholder">您的视频聊天实例</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">示例： https://meet.jit.si/$ROOM 或 basicwebrtc:https://your-server</string>
     <string name="videochat_instance_explain_2">启用视频聊天后，您便可以在所有聊天中发起视频聊天。需要双方均装有兼容的应用或浏览器。</string>
     <string name="videochat_instance_from_qr">使用“%1$s”邀请其他人参加视频聊天吗？\n\n设置好后，您就可以在聊天里发起视频聊天了。 这会取代之前的视频聊天设置。</string>
@@ -494,7 +495,7 @@
     <string name="multidevice_title">添加第二台设备</string>
     <string name="multidevice_same_network_hint">让两台设备连接相同的 Wi-Fi 或网络</string>
     <string name="multidevice_this_creates_a_qr_code">这将创建第二台设备可以扫描用于复制此账号的二维码。</string>
-    <string name="multidevice_install_dc_on_other_device">在你的其他设备上安装 ArcaneChat (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">在你的其他设备上安装 ArcaneChat (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">启动 ArcaneChat，点击“我已有账号/添加为第二台设备”，扫描此处显示的二维码</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -589,13 +590,25 @@
     <string name="login_smtp_port">SMTP 端口</string>
     <string name="login_smtp_security">SMTP 安全类型</string>
     <string name="login_auth_method">认证方法</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">代理</string>
+    <string name="proxy_use_proxy">使用代理</string>
+    <string name="proxy_add">添加代理</string>
+    <string name="proxy_add_explain">支持的代理类型：HTTP(S)、SOCKS5 和 Shadowsocks.</string>
+    <string name="proxy_add_url_hint">在此输入代理 URL</string>
+    <string name="proxy_invalid">无效或不受支持的代理 URL</string>
+    <string name="proxy_list_header">已保存的代理</string>
+    <string name="proxy_delete">删除代理</string>
+    <string name="proxy_delete_explain">你确定要删除 \"%1$s\"吗？</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">使用 SOCKS5 代理</string>
     <string name="login_socks5_host">SOCKS5 主机</string>
     <string name="login_socks5_port">SOCKS5 端口</string>
     <string name="login_socks5_user">SOCKS5 用户名</string>
     <string name="login_socks5_password">SOCKS5 密码</string>
+
     <string name="login_info_oauth2_title">使用简易设置继续？</string>
     <string name="login_info_oauth2_text">输入的电子邮件地址支持简化设置（OAuth 2.0）。\n\n在下一步中，请允许 ArcaneChat 充当您的“通过电子邮件聊天”应用程序。\n\n不存在 ArcaneChat 服务器，您的数据保留于您的设备！</string>
     <string name="login_certificate_checks">证书检查</string>
@@ -908,7 +921,7 @@
     <string name="devicemsg_storage_exceeding">⚠️邮件服务商提供的存储空间快满了，已使用 %1$s%%。\n\n如果存储空间用光，您可能无法接收消息。\n\n👉请检查是否可以在提供商的网页界面上删除旧数据，或考虑启用“设置/删除旧消息”。您可以在“设置/连接状态”中查看当前的存储使用情况。</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️设备的日期或时间似乎不准确 （%1$s）。\n\n请调整时钟⏰🔧以确保能够正确接收消息。</string>
-    <string name="devicemsg_update_reminder">⚠️您的 ArcaneChat 版本可能过时了。\n\n这可能会在您的聊天伙伴使用更新的版本时造成问题。并且您缺失了最新功能😳\n请浏览 https://get.delta.chat 或应用商店来获取更新。</string>
+    <string name="devicemsg_update_reminder">⚠️您的 ArcaneChat 版本可能过时了。\n\n这可能会在您的聊天伙伴使用更新的版本时造成问题。并且您缺失了最新功能😳\n请浏览 https://github.com/ArcaneChat 或应用商店来获取更新。</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">解锁以继续</string>
@@ -975,6 +988,7 @@
     <string name="mailto_link_could_not_be_decoded">无法解码 mailto 链接：%1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">不予理会</string>
     <string name="notify_reply_button">回复</string>
     <string name="notify_new_message">新消息</string>

src/main/res/values-zh-rTW/strings.xml

@@ -308,6 +308,7 @@
     <string name="videochat_tap_to_open">點擊以開啟</string>
     <string name="videochat_instance">視訊通話服務商</string>
     <string name="videochat_instance_placeholder">你的視訊通話服務商</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">範例：https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">如果啟用，你可以在每個對話中開始視訊聊天。兩端都需要相容的應用程式或瀏覽器。</string>
     <string name="videochat_instance_from_qr">要使用\"%1$s\"來邀請其他人加入視訊通話嗎？\n\n一旦設定完成，你可以在每個聊天室內開啟視訊通話。這將會取代先前的視訊通話設定。</string>
@@ -498,13 +499,14 @@
     <string name="login_smtp_port">SMTP 埠</string>
     <string name="login_smtp_security">SMTP 安全</string>
     <string name="login_auth_method">授權方式</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">使用 SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 主機</string>
     <string name="login_socks5_port">SOCKS5 通訊埠</string>
     <string name="login_socks5_user">SOCKS5 使用者</string>
     <string name="login_socks5_password">SOCKS5 密碼</string>
+
     <string name="login_info_oauth2_title">繼續使用簡易設定?</string>
     <string name="login_info_oauth2_text">輸入的電子郵件地址支援簡化設定（OAuth 2.0）。\n\n在下一步中，請允許 ArcaneChat 充當你的電子郵件對話應用程式。\n\nArcaneChat 不會收集使用者資料，所有內容都保留在你的裝置上。</string>
     <string name="login_certificate_checks">憑證檢查</string>
@@ -714,6 +716,7 @@
     <string name="qrshow_join_contact_hint">掃描 QRCode 以新增 %1$s</string>
     <string name="please_enter_name">請輸入名稱。</string>
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">忽視</string>
     <string name="notify_reply_button">回覆</string>
     <string name="notify_new_message">新訊息</string>

src/main/res/values/colors.xml

@@ -133,4 +133,6 @@
     <color name="reaction_pill_background_selected">@color/reaction_pill_background</color>
     <color name="reaction_pill_border_selected">?attr/colorPrimary</color>
     <color name="reaction_pill_text_color_selected">@color/reaction_pill_text_color</color>
+
+    <color name="delete_account_item_bg">#eeeeee</color>
 </resources>

src/main/res/values/strings.xml

@@ -61,7 +61,7 @@
     <string name="mark_all_as_read">Mark All as Read</string>
     <string name="mark_as_read">Mark as Read</string>
     <!-- Shortest text for "Mark as being read". In english, this could be "Read" (past tense of "to read"), in german, this could be "Gelesen". -->
-    <string name="mark_as_read_short">Read</string>
+    <string name="mark_as_read_short">Mark Read</string>
     <!-- Placeholder text when something is loading -->
     <string name="loading">Loading…</string>
     <string name="hide">Hide</string>
@@ -341,6 +341,7 @@
     <string name="videochat_tap_to_open">Tap to Open</string>
     <string name="videochat_instance">Video Chat Instance</string>
     <string name="videochat_instance_placeholder">Your Video Chat Instance</string>
+    <!-- Do not translate "$ROOM", since it is a fixed token ArcaneChat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Example: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">If enabled, you can start a video chat from each chat. Requires a compatible app or a browser on both ends.</string>
     <string name="videochat_instance_from_qr">Use \"%1$s\" to invite others to video chats?\n\nOnce set, you can start a video chat from each chat. This replaces any previous setting for video chats.</string>
@@ -527,7 +528,7 @@
     <string name="multidevice_title">Add Second Device</string>
     <string name="multidevice_same_network_hint">Make sure both devices are on the same Wi-Fi or network</string>
     <string name="multidevice_this_creates_a_qr_code">This creates a QR code that the second device can scan to copy the profile.</string>
-    <string name="multidevice_install_dc_on_other_device">Install ArcaneChat on your other device (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Install ArcaneChat on your other device (https://github.com/ArcaneChat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
     <string name="multidevice_tap_scan_on_other_device">Start ArcaneChat, tap “I Already Have a Profile / Add as Second Device” and scan the code shown here</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
@@ -622,13 +623,25 @@
     <string name="login_smtp_port">SMTP Port</string>
     <string name="login_smtp_security">SMTP Security</string>
     <string name="login_auth_method">Authorization Method</string>
-    <!-- the word "SOCKS5" here and in the following strings should not be translated in most cases -->
+    <!-- the word "Proxy" might be left untranslated unless the destination language has a well-known term for a "Proxy Server", acting intermediary between the app and the chatmail or email server -->
+    <string name="proxy_settings">Proxy</string>
+    <string name="proxy_use_proxy">Use Proxy</string>
+    <string name="proxy_add">Add Proxy</string>
+    <string name="proxy_add_explain">Supported proxy types: HTTP(S), SOCKS5 and Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Enter proxy URL here</string>
+    <string name="proxy_invalid">Invalid or unsupported proxy URL</string>
+    <string name="proxy_list_header">Saved Proxies</string>
+    <string name="proxy_delete">Delete Proxy</string>
+    <string name="proxy_delete_explain">Are you sure you want to delete \"%1$s\"?</string>
+
+    <!-- deprecated -->
     <string name="login_socks5">SOCKS5</string>
     <string name="login_socks5_use_socks5">Use SOCKS5</string>
     <string name="login_socks5_host">SOCKS5 Host</string>
     <string name="login_socks5_port">SOCKS5 Port</string>
     <string name="login_socks5_user">SOCKS5 User</string>
     <string name="login_socks5_password">SOCKS5 Password</string>
+
     <string name="login_info_oauth2_title">Continue with simplified setup?</string>
     <string name="login_info_oauth2_text">The entered e-mail address supports a simplified setup (OAuth 2.0).\n\nIn the next step, please allow ArcaneChat to act as your Chat over E-mail app.\n\nArcaneChat does not collect user data, everything stays on your device.</string>
     <string name="login_certificate_checks">Certificate Checks</string>
@@ -943,7 +956,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Your provider\'s storage is about to run out: %1$s%% are already used.\n\nYou may not be able to receive messages if storage is full.\n\n👉 Please check if you can delete old data in the provider\'s web interface and consider enabling \"Settings / Chats and Media / Delete Old Messages\". You can check your current storage usage anytime at \"Settings / Connectivity\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Date or time on your device seems to be inaccurate (%1$s).\n\nAdjust your clock ⏰🔧 to ensure your messages are received correctly.</string>
-    <string name="devicemsg_update_reminder">⚠️ Your ArcaneChat version might be outdated.\n\nThis may cause problems because your chat partners use newer versions - and you are missing the latest features 😳\nPlease check https://get.delta.chat or your app store for updates.</string>
+    <string name="devicemsg_update_reminder">⚠️ Your ArcaneChat version might be outdated.\n\nThis may cause problems because your chat partners use newer versions - and you are missing the latest features 😳\nPlease check https://github.com/ArcaneChat or your app store for updates.</string>
 
     <!-- Some options as "Add Second Device" 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 "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Unlock to continue</string>
@@ -1011,6 +1024,7 @@
     <string name="mailto_link_could_not_be_decoded">mailto link could not be decoded: %1$s</string>
 
     <!-- notifications  -->
+    <!-- deprecated, use mark_as_read or mark_as_read_short -->
     <string name="notify_dismiss">Dismiss</string>
     <string name="notify_reply_button">Reply</string>
     <string name="notify_new_message">New message</string>

src/main/res/xml/preferences_advanced.xml

@@ -55,6 +55,9 @@
         <Preference android:key="password_account_settings_button"
             android:title="@string/pref_password_and_account_settings"/>
 
+        <Preference android:key="proxy_settings_button"
+            android:title="@string/proxy_settings"/>
+
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_bcc_self"