add allow to enable location streaming again, remove dead code

- say in the timespans explicitly that it is _latest after fetch_;
  this matches better to server-side settings on chatmail -
  but also when you have different (non-dc)-clients with different settings.

- do not show the alarming confirmation dialog for chatmail -
  other, non-dc clients is usually not fitting,
  and also there is anyways an auto-deletion

- the default for chatmail becomes 'automatic',
  'never' is just wrong for chatmail

.github/workflows/release.yml

@@ -0,0 +1,65 @@
+name: Upload Release APK
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    outputs:
+      match: ${{ steps.check-tag.outputs.match }}
+    steps:
+      - id: check-tag
+        run: |
+          if [[ "${{ github.event.ref }}" =~ ^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
+              echo ::set-output name=match::true
+          fi
+
+  build:
+    needs: check
+    if: needs.check.outputs.match == 'true'
+    name: Upload Release APK
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - uses: Swatinem/rust-cache@v1
+        with:
+          working-directory: jni/deltachat-core-rust
+      - uses: actions/setup-java@v1.4.3
+        with:
+          java-version: 11
+      - uses: android-actions/setup-android@v2
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r23c
+
+      - name: Compile core
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}"
+          ./scripts/install-toolchains.sh && ./scripts/ndk-make.sh
+
+      - name: Build APK
+        run: |
+          mkdir -p ~/.gradle
+          echo -n ${{ secrets.SIGNING_KEY }} | base64 -d >> ~/app.keystore
+          echo "DC_RELEASE_STORE_FILE=$HOME/app.keystore" >> ~/.gradle/gradle.properties
+          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
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          token: "${{ secrets.GITHUB_TOKEN }}"
+          body: "WARNING: DeltaChat Lite is not DeltaLab! it is a lightweight version of Delta Chat"
+          prerelease: ${{ contains(github.event.ref, '-beta') }}
+          fail_on_unmatched_files: true
+          files: build/outputs/apk/foss/release/*.apk

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "jni/deltachat-core-rust"]
 	path = jni/deltachat-core-rust
-	url = https://github.com/deltachat/deltachat-core-rust
+	url = https://github.com/adbenitez/deltalab-core

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Delta Chat Android Changelog
 
+## v1.46.5
+2024-06
+
+* support webxdc apps with experimental realtime channels ("Settings / Advanced / Realtime Webxdc Channels")
+* fewer traffic in larger chatmail groups by allowing more than 50 recipients per time
+* log debug level (mostly foreign modules) only if "Settings / Advanced / Developer Mode" is enabled
+* fix: avoid asking to disable battery optimisations when creating the second profile
+* fix hangs on low/no network during onboarding
+* fix: cancel muting does not cancel selection in chatlist
+* fix migrated address losing verified status and key on experimental AEAP
+* fix: allow creation of groups by outgoing messages without recipients
+* fix: avoid group splits by preferring ID from encrypted header over references for new groups
+* fix: do not fail to send images with wrong extensions
+* fix: retry sending MDNs on temporary error
+* fix: do not miss new messages while expunging the folder
+* fix missing logging info lines
+* fix: remove group member locally even if sending fails
+* fix: revert group member addition if the corresponding message couldn't be sent
+* update translations and local help
+* update to core 1.140.2
+
+
 ## v1.46.3
 2024-06
 

RELEASE.md

@@ -109,6 +109,16 @@ on <https://developer.amazon.com/dashboard>:
     f) on "Step 4" page: "Submit app"
 
 
+## Release on Huawei AppGallery
+
+on <https://developer.huawei.com/consumer/en/appgallery>:
+
+13. a) go to "Upload your app / Android / Delta Chat / Update", again "Update" upper right
+    b) "Manage Packages / Upload", upload the APK from above, hit "Save"
+    c) Update "App Information / New Features", hit "Save", then "Next"
+    d) Hit "Submit"; on the next page, confirm version and language
+
+
 ## Releases on Apklis, Passkoocheh
 
 These stores are not under our control.

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application' version '8.1.4'
-    id 'com.google.gms.google-services' version '4.4.1'
+//    id 'com.google.gms.google-services' version '4.4.1'
 }
 
 repositories {
@@ -29,8 +29,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 686
-        versionName "1.46.3"
+        versionCode 688
+        versionName "1.46.5"
 
         applicationId "com.b44t.messenger"
         multiDexEnabled true
@@ -45,10 +45,6 @@ android {
 
         buildConfigField "boolean", "DEV_BUILD", "false"
 
-        ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "TEST_ADDR", buildConfigProperty("TEST_ADDR"))
@@ -89,11 +85,8 @@ android {
     }
 
     buildTypes {
-        debug {
-            minifyEnabled false
-            applicationIdSuffix ".beta"
-        }
         release {
+	        applicationIdSuffix ".lite2"
             // minification and proguard disabled for now.
             //
             // when enabled, it can cut down apk size about 6%,
@@ -103,29 +96,50 @@ android {
             //
             // nb: it is highly recommended to use the same settings in debug+release -
             // otherwise problems might be noticed delayed only
-            minifyEnabled false
-            signingConfig signingConfigs.release
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+                          'proguard-rules.pro'
+
+	    if(project.hasProperty("DC_RELEASE_STORE_FILE")) {
+                signingConfig signingConfigs.release
+	    }
         }
     }
 
     productFlavors {
-        fat {
+        foss {
             dimension "none"
             buildConfigField "boolean", "USE_PLAY_SERVICES", "false"
         }
         gplay {
             dimension "none"
             applicationId "chat.delta"
-            apply plugin: "com.google.gms.google-services"
+            //apply plugin: "com.google.gms.google-services"
             buildConfigField "boolean", "USE_PLAY_SERVICES", "true"
         }
     }
 
+    splits {
+        abi {
+            enable true
+            reset()
+            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            universalApk true
+        }
+    }
+
+    project.ext.versionCodes = ['armeabi': 1, 'armeabi-v7a': 2, 'arm64-v8a': 3, 'mips': 5, 'mips64': 6, 'x86': 8, 'x86_64': 9]
+
     android.applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = outputFileName
-                .replace("deltachat-android", "deltachat")
+        variant.outputs.all { output ->
+            output.outputFileName = output.outputFileName
+                .replace("deltalab-android", "deltachat-lite")
+		.replace("-gplay", "")
+		.replace("-release", "")
                 .replace(".apk", "-${variant.versionName}.apk")
+            output.versionCodeOverride =
+                project.ext.versionCodes.get(output.getFilter(
+                    com.android.build.OutputFile.ABI), 0) * 10000000 + android.defaultConfig.versionCode
         }
     }
 
@@ -181,7 +195,7 @@ dependencies {
     implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles
     implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity.
     implementation 'com.soundcloud.android:android-crop:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19
-    implementation 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera.
+    //implementation 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera.
     implementation 'mobi.upod:time-duration-picker:1.1.3' // Used to pick the time for inactivity.
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'  // number of unread messages,
     // the one-letter circle for the contacts (when there is not avatar) and a white background.
@@ -197,11 +211,11 @@ dependencies {
     // <https://github.com/cketti/SafeContentResolver>
     implementation 'de.cketti.safecontentresolver:safe-content-resolver-v14:1.0.0'
 
-    gplayImplementation('com.google.firebase:firebase-messaging:23.4.1') { // for PUSH notifications
-        exclude group: 'com.google.firebase', module: 'firebase-core'
-        exclude group: 'com.google.firebase', module: 'firebase-analytics'
-        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
-    }
+//    gplayImplementation('com.google.firebase:firebase-messaging:23.4.1') { // for PUSH notifications
+//        exclude group: 'com.google.firebase', module: 'firebase-core'
+//        exclude group: 'com.google.firebase', module: 'firebase-analytics'
+//        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
+//    }
 
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.assertj:assertj-core:1.7.1'

docs/f-droid.md

@@ -2,22 +2,22 @@
 
 - <https://f-droid.org/en/packages/com.b44t.messenger/>
   is the Delta Chat page on F-Droid.org,
-  the F-Droid-app will show similar information.
+  the F-Droid app will show similar information.
 
-- <https://github.com/deltachat/deltachat-android/tree/master/metadata>
+- <https://github.com/deltachat/deltachat-android/tree/main/metadata>
   contains the description, icon, screenshots and all meta data shown for Delta Chat on F-Droid
   in the [fastlane format](https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#fastlane-structure).
 
-- <https://gitlab.com/fdroid/fdroiddata/blob/master/metadata/com.b44t.messenger.yml> and
-  <https://gitlab.com/fdroid/fdroiddata/-/tree/master/metadata/com.b44t.messenger>
-  contain [additional F-Droid-specific metadata](https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#in-the-f-droid-repo)
+- <https://gitlab.com/fdroid/fdroiddata/blob/master/metadata/com.b44t.messenger.yml>
+  contains [additional F-Droid-specific metadata](https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#in-the-f-droid-repo)
   and build instructions that do not fit the fastlane format.
   F-Droid adds new versions automatically to the end of `.yml` file.
 
-- new versions are recognized by tags in the form `v1.2.3` -
-  before adding tags like that, have a look at `docs/release-checklist.md`
-  the build and distribution is expected to take
-  [up to 5 days](https://gitlab.com/fdroid/wiki/-/wikis/FAQ#how-long-does-it-take-for-my-app-to-show-up-on-website-and-client).
+- New versions are recognized by tags in the form `v1.2.3` -
+  before adding tags like that, have a look at
+  <https://github.com/deltachat/deltachat-android/blob/main/RELEASE.md#release-on-f-droid>.
+  The build and distribution is expected to take
+  [up to 7 days](https://gitlab.com/fdroid/wiki/-/wikis/FAQ#how-long-does-it-take-for-my-app-to-show-up-on-website-and-client).
 
 
 # F-Droid Build status
@@ -25,7 +25,7 @@
 - <https://monitor.f-droid.org/builds>
   shows F-Droid's overall build status,
   if Delta Chat shows up at "Need updating" or "Running",
-  things are working as expected :)
+  things are working as expected. :)
 
 - <https://f-droid.org/repo/com.b44t.messenger_VERSIONCODE.apk>  
   (with VERSIONCODE = 537 or so) links to successfully built apk
@@ -41,22 +41,22 @@ $ git clone https://gitlab.com/fdroid/fdroiddata
 $ git clone https://gitlab.com/fdroid/fdroidserver  
 $ cd fdroiddata  
 
-now, metadata/com.b44t.messenger.yml can be modified.
-for testing, one can change the repo to a branch
+Now, metadata/com.b44t.messenger.yml can be modified.
+For testing, one can change the repo to a branch
 by adding the line `Update Check Mode:RepoManifest/BRANCH` to the file.
 
-set some path to ndk etc:  
+Set some path to ndk etc:  
 $ cp ../fdroidserver/examples/config.py .  # adapt file as needed
 
-checkout repo as f-droid would do:  
+Checkout repo as F-Droid would do:  
 $ ../fdroidserver/fdroid checkupdates -v com.b44t.messenger  
 (for testing with uncommitted changes, add --allow-dirty)
 
-build repo as f-droid would do:  
+Build repo as F-Droid would do:  
 $ ../froidserver/fdroid build -v com.b44t.messenger:<versionCode>
 
-(via https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools/ 
-and https://f-droid.org/docs/Building_Applications/ -
+(via <https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools/> 
+and <https://f-droid.org/docs/Building_Applications/> -
 might require `pip install pyasn1 pyasn1_modules pyaml requests`)
 
 
@@ -66,14 +66,14 @@ might require `pip install pyasn1 pyasn1_modules pyaml requests`)
   and `metadata/en-US/full_description.txt`
   in <https://github.com/deltachat/deltachat-android/> repository.
 
-- make sure there is a "newline" at the end of the description
-  (see <https://gitlab.com/fdroid/fdroiddata/merge_requests/3580>)
+- Make sure there is a "newline" at the end of the description
+  (see <https://gitlab.com/fdroid/fdroiddata/merge_requests/3580>).
 
 
 # Changing F-Droid metadata
 
-- the file `com.b44t.messenger.yml` can be changed via a PR to the <https://gitlab.com/fdroid/fdroiddata/> repository
+- The file `com.b44t.messenger.yml` can be changed via a PR to the <https://gitlab.com/fdroid/fdroiddata/> repository.
 
-- reformat the metadata using  
+- Reformat the metadata using  
   $ ../fdroidserver/fdroid rewritemeta com.b44t.messenger  # called from fdroiddata dir
  

metadata/es/full_description.txt

@@ -0,0 +1,19 @@
+Delta Chat es una aplicación de mensajería totalmente compatible con
+infraestructura de correo electrónico.
+
+Por lo tanto, con Delta Chat se obtiene la facilidad de conocidos mensajeros con el alcance de
+e-mail. Además, eres independiente de otras empresas o servicios, ya que tu
+Los datos no están relacionados con Delta Chat, ni siquiera agregará nuevas dependencias aquí.
+
+Algunas características de un vistazo:
+
+* Seguro con cifrado automático de extremo a extremo, compatible con el nuevo estándar <a href="https://autocrypt.org">Autocrypt</a>
+* Rápido mediante el uso de Push-IMAP
+* Mayor base de usuarios -- también se puede llegar a los receptores que no usan Delta Chat
+* Compatible -- no sólo consigo mismo
+* Interfaz de usuario elegante y sencilla
+* Sistema distribuido
+* Sin spam -- sólo los mensajes de usuarios conocidos se muestran por defecto
+* Fiable -- seguro para uso profesional
+* Confiable -- incluso se puede utilizar para mensajes de negocios
+* Totalmente OpenSource y basado en estándares

metadata/it/short_description.txt

@@ -1 +1 @@
-Chatta via e-mail. Elegantemente Retrò, Decentralizzato e Aperto. Privacy da Progettazione.
+Chatta via e-mail. Elegantemente Retrò, Decentralizzato e Aperto. Riservatezza da Progettazione.

metadata/zh-CN/changelogs/6444.txt

@@ -0,0 +1,10 @@
+当传统电子邮件用户向群组发送邮件并添加新收件人时，这些新收件人将成为群组成员。
+将来自传统电子邮件用户的附带PGP密钥视为倾向于互相加密的信号。
+将来自传统电子邮件用户的加密或签名消息视为倾向于互相加密的信号。
+修复旧数据库的迁移问题。
+修复：仅在聊天已被其他成员知晓的情况下发送临时计时器变更消息。
+修复：使用相对路径访问数据库，以避免在迁移到其他设备或路径时出现问题。
+修复通过SOCKS5的IMAP连接的读写超时问题。
+修复：如果没有修改任何字符，则不发送“群组名称变更”信息。
+新增希腊语翻译，更新其他语言翻译。
+更新至core104版本。

metadata/zh-CN/changelogs/6464.txt

@@ -0,0 +1,13 @@
+修复：使归档的对话可见，这些对话不会自动解除归档（静音的对话）：添加未读计数器并将归档移至顶部
+修复：直接发送AVIF、HEIC、TXT、PPT、XLS、XML等格式的文件，不进行转换
+修复：当获取现有消息失败时触发重新连接
+修复：在消息获取失败后不再重试，以防止无限重新连接循环
+修复：如果消息已加密但未签名，不再添加错误提示
+修复：不再从消息行首删除前导空格
+修复发送引用文本时的边缘情况问题
+修复STARTTLS连接问题
+修复：不将无效的电子邮件地址视为异常处理
+修复：及时清理在1.34.8版本中引入的相对数据库路径问题
+加快聊天列表和联系人列表的更新速度
+更新翻译
+更新至core106版本

metadata/zh-CN/changelogs/6494.txt

@@ -0,0 +1,5 @@
+* 在“添加账户”和“配置”中增加SOCKS5代理选项
+* 引入DNS缓存功能：如果网络中的DNS服务停止工作，Delta Chat仍能通过使用先前的IP地址成功连接到IMAP服务器
+* 显示完整邮件内容：不自动加载远程内容以请求
+* 修复多种错误并增强日志记录功能
+* 更新翻译内容

metadata/zh-CN/changelogs/6504.txt

@@ -0,0 +1,8 @@
+* 添加第二台设备到账号的新简便方法：安装后选择“作为第二台设备添加”，然后扫描第一台设备上的二维码
+* 查看所有聊天中的“所有媒体”
+* 新增“清空聊天”选项
+* 为所有账号显示通知
+* 在“显示完整消息”中更好地利用深色/浅色模式
+* 在应用信息消息旁显示图标
+* 通过缓存SMTP和IMAP连接的DNS结果以提高对解析中断的处理能力
+* 加速并提升了可靠性的改进与修复

metadata/zh-CN/changelogs/6514.txt

@@ -0,0 +1,8 @@
+* 在使用“设置/添加第二台设备”设置好第二台设备后，添加一条设备添加消息
+* 显著加快“作为第二台设备添加”在接收端的连接时间
+* 如有可能，在扫描“添加第二台设备”二维码后直接显示Wi-Fi名称
+* 修复“添加第二台设备”立即重启的问题
+* 修复：在“所有媒体”视图中不只显示已删除的媒体
+* 修复：在“添加第二台设备”后如有需要则更新数据库
+* 更新翻译内容和本地帮助文档
+* 更新至core112.6版本

metadata/zh-CN/changelogs/6534.txt

@@ -0,0 +1,6 @@
+* 根据系统主题自动选择浅色/深色模式启动
+* 修复一对一聊天中的验证图标问题
+* 修正因在长IMAP响应中错误的EOF检测导致的获取错误
+* 更多错误修复
+* 更新翻译内容和本地帮助文档
+* 更新至core112.7版本

metadata/zh-CN/changelogs/6544.txt

@@ -0,0 +1,4 @@
+* 将SOCKS5配置来也用来加载HTML邮件中的远程图片
+* 错误修复
+* 更新翻译内容和本地帮助文档
+* 更新至core112.8版本

metadata/zh-CN/changelogs/6584.txt

@@ -0,0 +1,6 @@
+* 新的Webxdc API：importFiles()和sendToChat()
+* 移除附件的大小限制
+* 节省流量和存储空间：对大的PNG及其他受支持的图像格式进行重新编码（大的JPEG文件一直都会被重新编码；以“文件”形式发送的图像仍不会被重新编码或以其他方式改变）
+* 节省本地存储空间：对数据库中的HTML邮件进行压缩
+* 提升群组成员身份一致性
+* 大量错误修复

metadata/zh-CN/changelogs/6594.txt

@@ -0,0 +1,5 @@
+* 在可能的情况下，使用图像编辑器来选择头像
+* 改进深色模式下的加载屏幕显示效果
+* 更新“已验证图标”
+* 添加卢尔语(Luri) 巴克提尔利语(Bakhtiari)语翻译，更新其他语言翻译
+* 大量错误修复

metadata/zh-CN/changelogs/6600.txt

@@ -0,0 +1,5 @@
+* 在可能的情况下，使用图像编辑器来选择头像
+* 改进深色模式下的加载屏幕显示效果
+* 更新“已验证图标”
+* 添加卢尔语(Luri) 巴克提尔利语(Bakhtiari)语翻译，更新其他语言翻译
+* 大量错误修复

metadata/zh-CN/changelogs/6744.txt

@@ -0,0 +1,6 @@
+- 现在一对一聊天为保证了端到端的加密的联系人使用绿色对勾标记
+- 为了简化每个人的体验，我们也用绿色对勾标记这些聊天
+- 如有可能，群聊会自动创建并尽可能保证端到端的加密
+- 接受/屏蔽、已存档、置顶、静音状态在您所有设备间同步
+- 相机、语音消息、备份全部、屏幕阅读器、每个账户单独的壁纸、相册全选、Webxdc横屏模式等方面有更多的改进
+- 大量的错误修复

metadata/zh-CN/changelogs/6754.txt

@@ -0,0 +1,6 @@
+- 现在一对一聊天为保证了端到端的加密的联系人使用绿色对勾标记
+- 为了简化每个人的体验，我们也用绿色对勾标记这些聊天
+- 如有可能，群聊会自动创建并尽可能保证端到端的加密
+- 接受/屏蔽、已存档、置顶、静音状态在您所有设备间同步
+- 相机、语音消息、备份全部、屏幕阅读器、每个账户单独的壁纸、相册全选、Webxdc横屏模式等方面有更多的改进
+- 大量的错误修复

metadata/zh-CN/changelogs/6774.txt

@@ -0,0 +1,6 @@
+- 在设备间同步“您的个人资料名称”、“显示组邮件”和“阅读回执”选项的更改
+- 取消对.xdc文件大小的接收方限制
+- 修复针对如163.com等提供商的登录错误
+- 修复在使用多个私钥时的解密错误
+- 修复在webxdc更新时的数据库锁定错误
+- 更新翻译内容

metadata/zh-CN/changelogs/6804.txt

@@ -0,0 +1,8 @@
+- "反应功能"：长按消息以作出回应
+- 如果无法扫描二维码，可以将它们分享为“邀请链接”
+- 现在，所有账户的未读消息会被计数并在标题中显示
+- 移除了Webxdc的发送限制
+- 长按聊天列表项现在可以直接使聊天静音/取消静音
+- 在打开“密码与账户”前，会要求输入系统解锁密码
+- 新选项：“设置/高级/读取系统通讯录”
+- 大量错误修复

metadata/zh-CN/full_description.txt

@@ -0,0 +1,16 @@
+Delta Chat 是一款完全兼容现有电子邮件基础设施的即时通讯应用程序。
+
+因此，使用 Delta Chat，您既能享受到知名即时通讯软件的便捷性，又能拥有电子邮件的广泛可达性。此外，您将独立于其他公司或服务——因为您的数据不依赖于 Delta Chat，您在这里也不会增加新的依赖关系。
+
+部分功能亮点包括：
+
+* 安全性：自动端到端加密，并支持最新的<a href="https://autocrypt.org">Autocrypt</a>标准
+* 速度：通过Push-IMAP技术实现快速通信
+* 最大用户基数：未使用 Delta Chat 的接收者也能顺利接收到信息
+* 兼容性强：不仅限于 Delta Chat 用户之间的交流
+* 优雅且简单的用户界面
+* 分布式系统
+* 无垃圾邮件：默认仅显示已知联系人的消息
+* 可靠性高：适合专业用途
+* 值得信赖：可用于商业信息交流
+* 完全开源且基于标准构建

metadata/zh-CN/short_description.txt

@@ -1 +1 @@
-通过电子邮件进行即时通信
+通过电子邮件进行即时通信。经典优雅，去中心化且开源。保护隐私。

metadata/zh-TW/short_description.txt

@@ -1 +1 @@
-通過電子郵件即時通信
+透過電子郵件聊天。優雅復古、去中心化而且開源。隱私設計。

metadata/zh-TW/title.txt

@@ -0,0 +1 @@
+Delta Chat

proguard-rules.pro

@@ -0,0 +1,9 @@
+# native methods
+-keep class com.b44t.messenger.** { *; }
+-keep class org.thoughtcrime.securesms.util.FileUtils* { *; }
+
+# bug with video recoder
+-keep class com.coremedia.iso.** { *; }
+
+# unused SealedData constructor needed by JsonUtils
+-keep class org.thoughtcrime.securesms.crypto.KeyStoreHelper* { *; }

scripts/ndk-make.sh

@@ -33,7 +33,7 @@
 # deploy DeltaChat from the jni/deltachat-core-rust directory by
 # typing `nmake`:
 #
-# nmake() {(cd ../..; scripts/ndk-make.sh arm64-v8a && ./gradlew installFatDebug; notify-send "install finished")}
+# nmake() {(cd ../..; scripts/ndk-make.sh arm64-v8a && ./gradlew installFossDebug; notify-send "install finished")}
 #
 #
 # If anything doesn't work, please open an issue!!

scripts/upload-beta.sh

@@ -15,7 +15,7 @@ if [[ ${VERSION:0:1} == "v" ]]; then
 fi
 
 APKGPLAY="gplay/release/deltachat-gplay-release-$VERSION.apk"
-APKDEV="build/outputs/apk/fat/debug/deltachat-fat-debug-$VERSION.apk"
+APKDEV="build/outputs/apk/foss/debug/deltachat-foss-debug-$VERSION.apk"
 ls -l $APKGPLAY
 ls -l $APKDEV
 read -p "upload these apks to download.delta.chat/android/beta? ENTER to continue, CTRL-C to abort."
@@ -28,7 +28,7 @@ echo "upload done."
 echo ""
 echo "and now: here is Delta Chat $VERSION - choose your flavour and mind your backups:"
 echo "- 🍋 https://download.delta.chat/android/beta/deltachat-gplay-release-$VERSION.apk (android, overwrites existing gplay installs, should keep data)"
-echo "- 🍉 https://download.delta.chat/android/beta/deltachat-fat-debug-$VERSION.apk (android, can be installed beside gplay)"
+echo "- 🍉 https://download.delta.chat/android/beta/deltachat-foss-debug-$VERSION.apk (android, fully FOSS, can be installed beside gplay)"
 echo "- 🍏 https://testflight.apple.com/join/uEMc1NxS (ios, update to $VERSION may take a day or so)"
 echo ""
 echo "what to test: PLEASE_FILL_OUT"

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

@@ -545,7 +545,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1214,7 +1214,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>2023 April, we fixed security and privacy issues with the “web

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

@@ -507,7 +507,7 @@ anstelle von proprietärem Google-Code auf dem Telefon.</p>
 Und nein, es gibt für Apple-Telefonen keine Alternative, Push-Benachrichten zuzustellen;
 Apple-Geräte erlauben es Delta Chat nicht, Daten im Hintergrund abzurufen.
 Push-Benachrichtigungen werden für iOS-Nutzer automatisch aktiviert, da
-<a href="#privacy-notifications">Delta Chats datenschutzminimierendes Push-Benachrichtigungssystem</a>
+<a href="#privacy-notifications">Delta Chats datenschutzwahrendes Push-Benachrichtigungssystem</a>
 keine Daten an Apple weitergibt, die Apple nicht bereits hat.</p>
     
       <h3 id="android-push">
@@ -556,47 +556,46 @@ können sicher ausprobiert werden, wenn Sie feststellen, dass Nachrichten nur mi
         
       </h3>
 
-<p>Delta Chat Push Notification support avoids leakage of private information.
-It does not leak e-mail, IP address or message content (not even encrypted)
-to any system involved in the delivery of Push Notifications.</p>
+<p>Delta Chats Vorgehensweise, Push-Benachrichtigungen zu verwenden, vermeidet die Weitergabe privater Informationen.
+Es werden keine E-Mail- oder IP-Adressen oder Nachrichteninhalte (auch nicht verschlüsselt)
+an irgendein System, das an der Zustellung von Push-Benachrichtigungen beteiligt ist, weitergegeben.</p>
 
-<p>Here is how Delta Chat apps perform Push Notification delivery:</p>
+<p>So verwendet Delta Chat Push-Benachrichtigungen:</p>
 
 <ul>
   <li>
-    <p>A Delta Chat app obtains a “device token” locally and stores it
-on the <a href="https://delta.chat/chatmail">chatmail</a> server.</p>
+    <p>Eine Delta-Chat-Anwendung erhält lokal ein „Geräte-Token“ (eine zufällige Zahl) und speichert es
+auf dem <a href="https://delta.chat/chatmail">Chatmail</a>-Server.</p>
   </li>
   <li>
-    <p>When a <a href="https://delta.chat/chatmail">chatmail</a> server receives an e-mail for a Delta Chat user
-it forwards the “device token” to the central Delta Chat notification proxy.</p>
+    <p>Wenn ein <a href="https://delta.chat/chatmail">Chatmail</a>-Server eine E-Mail für einen Delta Chat-Benutzer erhält
+erhält, leitet er den „Geräte-Token“ an den zentralen Delta-Chat-Benachrichtigungs-Proxy weiter.</p>
   </li>
   <li>
-    <p>The central Delta Chat notification proxy forwards
-the “device token” to the respective Push service (Apple, Google, etc.),
-without ever knowing the IP or e-mail address of Delta Chat users.</p>
+    <p>Der zentrale Delta-Chat-Benachrichtigungs-Proxy leitet
+das „Geräte-Token“ an den jeweiligen Push-Dienst (Apple, Google, etc.) weiter,
+ohne jemals die IP- oder E-Mail-Adresse des Delta-Chat-Benutzers zu kennen.</p>
   </li>
   <li>
-    <p>The central Push Service (Apple, Google, etc.)
-wakes up the Delta Chat app on your device
-to check for new messages in the background.
-It does not know about the chatmail or e-mail address of the device it wakes up.
-The central Apple/Google Push services never see an e-mail address (sender or receiver)
-and also never see any message content (also not in encrypted forms).</p>
+    <p>Der zentrale Push-Dienst (Apple, Google, etc.)
+weckt die Delta-Chat-App auf Ihrem Gerät auf
+um im Hintergrund nach neuen Nachrichten zu suchen.
+Der zentrale Push-Dienst weiß nichts über die Chatmail- oder E-Mail-Adresse des Geräts, das er aufweckt und sieht nie eine E-Mail-Adresse (Absender oder Empfänger)
+und auch nie den Inhalt einer Nachricht (auch nicht in verschlüsselter Form).</p>
   </li>
 </ul>
 
-<p>As of May 2024, chatmail servers know about “device tokens”
-but we plan to encrypt this information to the notification proxy
-such that the chatmail server never learns the device token.</p>
+<p>Stand Mai 2024 kennen die Chatmail-Server die Geräte-Token,
+aber wir planen, diese Informationen an den Benachrichtigungs-Proxy zu verschlüsseln
+zu verschlüsseln, so dass der Chatmail-Server niemals das „Geräte-Token“ erfährt.</p>
 
-<p>The central Delta Chat notification proxy <a href="https://github.com/deltachat/notifiers">is small and fully implemented in Rust</a>
-and forgets about device-tokens as soon as Apple/Google/etc processed them,
-usually in a matter of milliseconds.</p>
+<p>Der zentrale Delta-Chat-Benachrichtigungs-Proxy <a href="https://github.com/deltachat/notifiers">ist klein und vollständig in Rust implementiert</a>
+und vergisst die Geräte-Token, sobald Apple/Google/etc. sie verarbeitet hat,
+normalerweise innerhalb weniger Millisekunden.</p>
 
-<p>Resulting from this overall privacy design, even the seizure of a chatmail server,
-or the full seizure of the central Delta Chat notification proxy
-would not reveal private information that Push services do not already have.</p>
+<p>Aufgrund dieses umfassenden Datenschutzkonzepts würde sogar die Beschlagnahmung eines Chatmail-Servers,
+oder die vollständige Beschlagnahmung des zentralen Delta-Chat-Benachrichtigungsproxys
+keine privaten Informationen preisgeben, die den zentralen Push-Diensten nicht bereits vorliegen.</p>
     
       <h3 id="warum-integriert-sich-delta-chat-in-zentralisierte-proprietäre-applegoogle-push-dienste">
         
@@ -1151,7 +1150,7 @@ Für andere Programme können Sie online eine Lösung finden.</p>
 <ul>
   <li>
     <p>Im März 2024 erhielten wir von der Forschungsgruppe “Applied Cryptography” der ETH Zürich eine umfassende Sicherheitsanalyse und haben alle aufgeworfenen Fragen adressiert. 
-Weitere Informationen finden Sie in unserem Blogbeitrag über <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-End encryption</a>.</p>
+Weitere Informationen finden Sie in unserem Blogbeitrag über <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-End encryption</a> und in der hinterher publizierten <a href="https://eprint.iacr.org/2024/918.pdf">Kryptografischen Analyse von Delta Chat</a></p>
   </li>
   <li>
     <p>Im April 2023 haben wir Sicherheits- und Datenschutzprobleme mit den “In Chats geteilten Apps”-Feature behoben, die mit Fehlern beim Sandboxing, insbesondere mit Chromium zusammenhängen. Wir haben daraufhin eine unabhängige Sicherheitsprüfung von Cure53 durchführen lassen, und alle gefundenen Probleme wurden mit den im April 2023 veröffentlichten 1.36 Releases behoben. Siehe <a href="https://delta.chat/en/2023-05-22-webxdc-security">hier für die vollständige Hintergrundgeschichte</a>.</p>

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

@@ -549,7 +549,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1220,7 +1220,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>2023 April, we fixed security and privacy issues with the “web

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

@@ -542,7 +542,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1182,7 +1182,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>2023 April, we fixed security and privacy issues with the “web

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

@@ -523,7 +523,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1186,7 +1186,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>Début 2023, nous avons réparé les failles de sécurité et de confidentialité de la fonctionnalité “partage d’appli web dans une discussion” liées à des dysfonctionnements en mode bac à sable, en particulier avec Chromium. Après quoi, nous avons soumis Delta Chat à un nouvel audit de sécurité indépendant par Cure53, puis effectué les réparations de toutes les failles découvertes pour la version 1.36 de nos applications, publiée en avril 2023. 

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

@@ -549,7 +549,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1220,7 +1220,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>2023 April, we fixed security and privacy issues with the “web

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

@@ -538,11 +538,11 @@ per gli utenti di Delta Chat.</p>
         
       </h3>
 
-<p>Sì, Delta Chat utilizza automaticamente le Notifiche Push per i profili <a href="https://delta.chat/chatmail">chatmail</a>.
+<p>Sì, Delta Chat utilizza automaticamente le notifiche push per i profili <a href="https://delta.chat/chatmail">chatmail</a>.
 E no, non esiste alcuna alternativa sui telefoni Apple per ottenere la consegna dei messaggi istantanei
 perché i dispositivi Apple non consentono a Delta Chat di recuperare i dati in background.
-Le Notifiche Push vengono attivate automaticamente per gli utenti iOS perché
-<a href="#privacy-notifications">Sistema di Notifiche Push per ridurre al minimo la privacy di Delta Chat</a>
+Le notifiche push vengono attivate automaticamente per gli utenti iOS perché
+<a href="#privacy-notifications">Sistema di notifiche push che tutela la privacy di Delta Chat</a>
 non espone ad Apple i dati che non possiede già.</p>
     
       <h3 id="android-push">
@@ -1205,9 +1205,11 @@ un’analisi di sicurezza indipendente, dal più recente al più vecchio:</p>
 
 <ul>
   <li>
-    <p>Marzo 2024, abbiamo ricevuto un’analisi approfondita della sicurezza dalla Crittografia Applicata
-gruppo di ricerca dell’ETH di Zurigo e ha affrontato tutte i problemi emersi.
-Consulta il nostro post sul blog sul <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">rafforzamento della crittografia end-to-end garantita</a> per informazioni più dettagliate.</p>
+    <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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>A partire dal 2023, abbiamo risolto i problemi di sicurezza e privacy con il servizio “web

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

@@ -542,7 +542,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1212,7 +1212,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>Sinds begin 2023 hebben we diverse beveiligings- en privacyproblemen met ‘webapps

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

@@ -459,7 +459,7 @@ nadal będziesz mógł pisać, ale nie będziesz już powiadamiany o żadnych no
       </h3>
 
 <p>Tak, Delta Chat automatycznie korzysta z powiadomień push dla profili <a href="https://delta.chat/chatmail">chatmail</a>
-. I nie, w telefonach Apple nie ma alternatywy umożliwiającej natychmiastowe dostarczanie wiadomości, ponieważ urządzenia Apple nie pozwalają Delta Chat na pobieranie danych w tle. Powiadomienia push są automatycznie aktywowane dla użytkowników iOS, ponieważ <a href="#privacy-notifications">minimalizujący prywatność system powiadomień push Delta Chat</a> nie udostępnia Apple danych, których jeszcze nie posiada.</p>
+. I nie, w telefonach Apple nie ma alternatywy umożliwiającej natychmiastowe dostarczanie wiadomości, ponieważ urządzenia Apple nie pozwalają Delta Chat na pobieranie danych w tle. Powiadomienia push są automatycznie aktywowane dla użytkowników iOS, ponieważ <a href="#privacy-notifications">system prywatności powiadomień Delta Chat</a> nie udostępnia Apple danych, których jeszcze nie posiada.</p>
     
       <h3 id="android-push">
         
@@ -575,32 +575,22 @@ nadal będziesz mógł pisać, ale nie będziesz już powiadamiany o żadnych no
         
       </h3>
 
-<p>If you have a second communication channel with your chat partner,
-like a video chat or a different messenger,
-you can generate an invite link.</p>
+<p>Jeśli masz drugi kanał komunikacji ze swoim partnerem na czacie, np. czat wideo lub inny komunikator, możesz wygenerować link zaproszenia.</p>
 
-<p>If you are together in person,
-you can show a QR code to your chat partner.</p>
+<p>Jeśli jesteście razem osobiście, możesz pokazać kod QR swojemu rozmówcy.</p>
 
 <ul>
   <li>
-    <p>For <strong>Group invitations</strong>,
-tap the chat group title to see its member list,
-and select “QR Invite code”.</p>
+    <p>W przypadku <strong>zaproszeń grupowych</strong> dotknij tytułu czatu grupy, aby wyświetlić listę jej członków, i wybierz „Kod QR zaproszenia”.</p>
   </li>
   <li>
-    <p>For <strong>direct 1:1 chat invitations</strong>,
-tap the QR Code icon <img style="vertical-align:middle; width:1.8em; margin:1px" src="../qr-icon.png" />
-on the Delta Chat app main screen.</p>
+    <p>Aby uzyskać <strong>bezpośrednie zaproszenia na czat 1:1</strong>, dotknij ikony kodu QR <img style="vertical-align:middle; width:1.8em; margin:1px" src="../qr-icon.png" /> na ekranie głównym aplikacji Delta Chat.</p>
   </li>
 </ul>
 
-<p>Let your chat partner scan the QR image
-with their Delta Chat app,
-or click “Copy” or “Share” to create an invite link
-and share it with your chat partner.</p>
+<p>Pozwól swojemu partnerowi czatu zeskanować obraz QR za pomocą aplikacji Delta Chat lub dotknij „Kopiuj” lub „Udostępnij”, aby utworzyć link zaproszenia i udostępnić go swojemu partnerowi czatu.</p>
 
-<p>Now wait while <a href="https://securejoin.delta.chat/en/latest/new.html#setup-contact-protocol">Secure-Join network messages are exchanged</a> between both devices.</p>
+<p>Teraz poczekaj, aż między obydwoma urządzeniami <a href="https://securejoin.delta.chat/en/latest/new.html#setup-contact-protocol">nastąpi wymiana wiadomości sieciowych Secure-Join</a>.</p>
 
 <ul>
   <li>
@@ -886,9 +876,14 @@ W przypadku innych programów można znaleźć rozwiązanie online.</p>
 
 <p>Projekt Delta Chat przeszedł cztery niezależne audyty bezpieczeństwa i jedną niezależną analizę bezpieczeństwa, od najnowszego do najstarszego:</p>
 
-<p>W marcu 2024 r. otrzymaliśmy dogłębną analizę bezpieczeństwa od grupy badawczej ds. kryptografii stosowanej w ETH Zuerich i zajęliśmy się wszystkimi poruszonymi kwestiami. Bardziej szczegółowe informacje można znaleźć w naszym poście na blogu na temat <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">szyfrowania typu „end-to-end” z gwarancją hartowania</a>.</p>
-
 <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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
+  </li>
   <li>
     <p>W kwietniu 2023 r. naprawiliśmy problemy z bezpieczeństwem i prywatnością w funkcji „aplikacje internetowe udostępniane na czacie”, związane z awariami piaskownicy, szczególnie w przypadku Chromium. Następnie przeprowadziliśmy niezależny audyt bezpieczeństwa od Cure53 i wszystkie wykryte problemy zostały naprawione w aplikacji z serii 1.36 wydanej w kwietniu 2023 r. <a href="https://delta.chat/en/2023-05-22-webxdc-security">Pełną historię bezpieczeństwa end-to-end w sieci można znaleźć tutaj</a>.</p>
   </li>

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

@@ -543,7 +543,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1214,7 +1214,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>2023 April, we fixed security and privacy issues with the “web

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

@@ -549,7 +549,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1220,7 +1220,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>2023 April, we fixed security and privacy issues with the “web

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

@@ -550,7 +550,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1221,7 +1221,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>Në fillim të 2023-shit, ndreqëm probleme sigurie dhe privatësie me

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

@@ -457,7 +457,12 @@
         
       </h3>
 
-<p>Так, Delta Chat автоматично використовує push-повідомлення для <a href="https://delta.chat/chatmail">chatmail</a>-профілів. І ні, на телефонах Apple немає альтернативи миттєвій доставці повідомлень тому що пристрої Apple не дозволяють Delta Chat отримувати дані у фоновому режимі. Push-сповіщення автоматично активуються для користувачів iOS, тому що <a href="#privacy-notifications">система push-сповіщень Delta Chat, що мінімізує конфіденційність</a> не передає Apple дані, яких у неї ще немає.</p>
+<p>Yes, Delta Chat 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 Delta Chat to fetch data in the background.
+Push notifications are automatically activated for iOS users because
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
+does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
         
@@ -877,7 +882,11 @@ Look for something like <strong>Start Autocrypt Setup Transfer</strong> in the s
 
 <ul>
   <li>
-    <p>2024 березня ми отримали глибокий аналіз безпеки від дослідницької групи Applied Cryptography з прикладної криптографії в ETH Zuerich і вирішили всі порушені питання. Більш детальну інформацію можна знайти в нашому блозі в статті <a href="https://delta.chat/en/2024-03-25-crypto-analysis-securejoin">Hardening Guaranteed End-to-end encryption</a>.</p>
+    <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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>Починаючи з 2023 року, ми виправили проблеми з безпекою та конфіденційністю у функції “веб застосунків, що поширені у чаті”, пов’язані зі збоями в роботі пісочниці особливо в Chromium. Згодом ми отримали незалежний аудит безпеки аудит безпеки від Cure53, і всі знайдені проблеми були виправлені в серії додатків 1.36, випущених у квітні 2023 року. Повну історію про наскрізну безпеку в Інтернеті дивіться <a href="https://delta.chat/en/2023-05-22-webxdc-security">тут</a>.</p>

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

@@ -6,7 +6,7 @@
       <li><a href="#与其他通信软件相比delta-chat-有哪些优势">与其他通信软件相比，Delta Chat 有哪些优势？</a></li>
       <li><a href="#如果希望收到我从未发送过消息的人的消息该怎么办">如果希望收到我从未发送过消息的人的消息，该怎么办?</a></li>
       <li><a href="#delta-chat-支持图像视频和其他附件吗">Delta Chat 支持图像、视频和其他附件吗？</a></li>
-      <li><a href="#multiple-accounts">What are profiles? How can I switch between them?</a></li>
+      <li><a href="#multiple-accounts">什么是账户资料？如何在它们之间切换？</a></li>
       <li><a href="#谁会看见我的个人资料图片">谁会看见我的个人资料图片？</a></li>
       <li><a href="#signature">我可以为 Delta Chat 设置签名文本/状态/格言吗？</a></li>
       <li><a href="#固定静音归档是什么意思">固定、静音、归档是什么意思？</a></li>
@@ -115,14 +115,14 @@
         
       </h2>
 
-<p>Delta Chat is a reliable, decentralized and secure messaging app, 
-available for mobile and desktop platforms.</p>
+<p>Delta Chat 是一款可靠、去中心化和安全的消息应用程序、 
+适用于移动和桌面平台。</p>
 
-<p>Delta Chat feels like Whatsapp or Telegram but you can also use and regard it as an e-mail app. 
-You can signup anonymously to a variety of <a href="https://delta.chat/chatmail">interoperable chatmail servers</a>
-which are minimal e-mail servers optimized for fast and secure operations. 
-Or you may use classic e-mail servers and an existing e-mail account
-in which case Delta Chat acts as an e-mail app.</p>
+<p>Delta Chat 感觉就像 Whatsapp 或 Telegram，但你也可以把它当作电子邮件应用程序来使用。 
+你可以匿名注册到各种<a href="https://delta.chat/chatmail">可互操作的聊天邮件服务器</a>
+这些都是为快速安全运行而优化的最小电子邮件服务器。 
+您也可以使用传统的电子邮件服务器和现有的电子邮件账户
+在这种情况下， Delta Chat 可充当邮件客户端。</p>
 
 <p><img style="float:right; width:50%; max-width:360%; margin:1em;" src="../delta-what-optim.png" /></p>
     
@@ -134,15 +134,15 @@ in which case Delta Chat acts as an e-mail app.</p>
         
       </h3>
 
-<p>To securely setup contact with others <a href="#howtoe2ee">scan an invite QR code 
-or share an invite link</a>. 
-This is required when using a (default) chatmail-based chat profile 
-because chatmail servers reject un-encrypted outgoing messages.</p>
+<p>要安全地与他人建立联系[扫描邀请二维码 
+或分享邀请链接]（#howtoe2ee）。 
+使用（默认的）基于chatmail的聊天账户时需要这样做 
+因为chatmail会拒绝未加密的发送信息。</p>
 
-<p>If you create a chat profile with a classic e-mail address 
-you may manually create a contact if you know their e-mail address
-and then write a message to them 
-even if the recipient is not using Delta Chat.</p>
+<p>当使用经典电子邮件地址创建聊天配置文件时 
+如果您知道联系人的电子邮件地址，您可以手动创建联系人
+然后给他们写信息 
+即使收件人没有使用Delta Chat 。</p>
     
       <h3 id="与其他通信软件相比delta-chat-有哪些优势">
         
@@ -154,23 +154,23 @@ even if the recipient is not using Delta Chat.</p>
 
 <ul>
   <li>
-    <p>Anonymous chat profiles with fast, secure and interoperable <a href="https://delta.chat/chatmail">chatmail servers</a>
-which offer instant Push Notifications for iOS and Android devices.</p>
+    <p>使用快速、安全、可互操作的 <a href="https://delta.chat/chatmail">chatmail 服务器</a> 创建匿名聊天账户
+为 iOS 和 Android 设备提供即时推送通知。</p>
   </li>
   <li>
-    <p>Pervasive <a href="#multiple-accounts">multi-profile</a> and multi-device support on all platforms.</p>
+    <p>跨平台支持 [多配置文件]（#多账户）和多设备。</p>
   </li>
   <li>
-    <p>Interactive <a href="https://webxdc.org/apps">web apps in chats</a> for gaming and collaboration</p>
+    <p>交互性 <a href="https://webxdc.org/apps">聊天中的网页小程序</a></p>
   </li>
   <li>
-    <p><a href="#security-audits">Audited end-to-end encryption</a> 
-safe against network and server attacks.</p>
+    <p><a href="#security-audits">经审计的端到端加密</a> 
+安全地抵御网络和服务器攻击。</p>
   </li>
   <li>
-    <p>Free and Open Source software, both app and server side. 
-Built on <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md">E-mail and Web Internet Standards</a>, 
-<a href="https://xkcd.com/927/">to avoid “yet another standard syndrome (xkcd 927)”</a></p>
+    <p>免费开源软件，包括应用程序和服务器端。 
+基于<a href="https://github.com/deltachat/deltachat-core-rust/blob/master/standards.md">电子邮件和网络互联网标准</a>、 
+<a href="https://xkcd.com/927/">避免 “又一个标准综合症（xkcd 927）”</a></p>
   </li>
 </ul>
     
@@ -208,25 +208,25 @@ Built on <a href="https://github.com/deltachat/deltachat-core-rust/blob/master/s
       <h3 id="multiple-accounts">
         
         
-          What are profiles? How can I switch between them? <a href="#multiple-accounts" class="anchor"></a>
+          什么是账户资料？如何在它们之间切换？ <a href="#multiple-accounts" class="anchor"></a>
         
         
       </h3>
 
-<p>A profile is <strong>a name, a picture</strong> and some additional information for encrypting messages.
-A profile lives on your device(s) only
-and uses a chatmail or a classic e-mail server to transport messages.</p>
+<p>一份账户资料包括<strong>姓名、照片</strong>和一些额外的加密信息。
+个人配置只存在于您的设备(们)中
+并使用聊天邮件或传统电子邮件服务器传输信息。</p>
 
-<p>On first installation of Delta Chat a first profile is created.</p>
+<p>首次安装Delta Chat 时，会创建第一个账户资料文件。</p>
 
-<p>Later, you can tap your profile image in the upper left corner to <strong>Add Profiles</strong>
-or to <strong>Switch Profiles</strong>.</p>
+<p>之后，您可以点击左上角的个人资料图像，<strong>添加个人账户</strong>
+或<strong>切换账户</strong>。</p>
 
-<p>You may want to use separate profiles for political, family or work related activities,
-or e. g. for a dedicated “spam-profile” with which you register at websites and platforms
-that tend to cause unsolicited messages (“spam”) sooner or later.</p>
+<p>您可能希望为政治、家庭或工作相关的活动使用不同的账户资料,
+或者例如，为专门用于注册网站和平台的“垃圾邮件账户资料”,
+这些网站和平台往往会早晚导致未经请求的消息（即“垃圾邮件”）</p>
 
-<p>You may also wish to learn <a href="#multiclient">how to use the same profile on multiple devices</a>.</p>
+<p>您可能还想了解 <a href="#multiclient">如何在多台设备上使用同一账户资料</a>。</p>
     
       <h3 id="谁会看见我的个人资料图片">
         
@@ -438,16 +438,18 @@ They will most likely also not be decryptable anymore
 
 <ul>
   <li>
-    <p>默认情况下，Delta Chat 会在本地设备上存储您的所有消息。如果您，例如，想要节省邮件提供商处的存储空间，那么可以选择开启自动删除旧消息。这些消息还将保存在您的设备上（除非您在设备上删除它们）。</p>
+    <p>默认情况下，Delta Chat 会在本地设备上存储您的所有消息。
+ 如果您，例如，想要节省邮件提供商处的存储空间，
+那么可以选择配置Delta Chat 以开启服务端自动删除旧消息。
+这些消息还将保存在您的设备上,除非您在设备上删除它们。</p>
   </li>
   <li>
-    <p>To turn it on, go to <strong>Delete Old Messages → Delete Messages from Server</strong>
-in the “Chats and Media” settings.
-You can set a timeframe between “At once” and “After 1 year”.
-All e-mails received by Delta Chat will be deleted from the server after this timeframe.</p>
+    <p>要打开它，请转到 “聊天和媒体 “设置中的<strong>删除旧信息 → 从服务器删除信息</strong>。
+您可以在 “立即 “和 “1 年后 “之间设置时限。
+Delta Chat 收到的所有电子邮件都将在此期限后从服务器中删除。</p>
   </li>
   <li>
-    <p>注意：如果在多台设备上使用 Delta Chat，请将消息在服务器上保存足够长的时间，以便其他设备能够下载消息。在这种情况下，您应当根据其他设备的使用频率，将自动删除设置到“一天后”或相似的选项上。</p>
+    <p>注意：如果在多台设备上使用 Delta Chat，请将消息在服务器上保存足够长的时间，以便其他设备能够下载消息。在这种情况下，您应当根据其他设备(们)的使用频率，将自动删除设置到“一天后”或相似的选项上。</p>
   </li>
 </ul>
     
@@ -512,7 +514,7 @@ for Delta Chat users.</p>
 And no, there is no alternative on Apple’s phones to achieve instant message delivery
 because Apple devices do not allow Delta Chat to fetch data in the background.
 Push notifications are automatically activated for iOS users because
-<a href="#privacy-notifications">Delta Chat’s privacy-minimizing Push Notification system</a>
+<a href="#privacy-notifications">Delta Chat’s privacy-preserving Push Notification system</a>
 does not expose data to Apple that it doesn’t already have.</p>
     
       <h3 id="android-push">
@@ -1173,7 +1175,9 @@ independent security analysis, from most recent to older:</p>
   <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.</p>
+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
+<a href="https://eprint.iacr.org/2024/918.pdf">Cryptographic Analysis of Delta Chat</a> 
+research paper published afterwards.</p>
   </li>
   <li>
     <p>2023 April, we fixed security and privacy issues with the “web
@@ -1725,7 +1729,7 @@ if you set a <a href="#signature">signature text</a>.</p>
 
 <p>副本会被发送到收件箱，然后会被移动到 DeltaChat 文件夹；它不会被放到“已发送”文件夹里。Delta Chat <em>从不</em> 将东西上传到已发送文件夹，因为这意味着上传一条消息两次（一次通过 SMTP，一次通过 IMAP 到已发送文件夹）。</p>
 
-<p>The default setting for “Send Copy to Self” is “on”.</p>
+<p>“给自己发送副本”的默认设置为 “开”。</p>
     
       <h3 id="为什么我可以选择监视已发送文件夹">
         
@@ -1735,7 +1739,7 @@ if you set a <a href="#signature">signature text</a>.</p>
         
       </h3>
 
-<p>监视已发送文件夹的唯一原因是：您在同时使用其他的邮件应用程序（比如 Thunderbird），并且想让邮件分发代理参与聊天对话。</p>
+<p>监视已发送文件夹的唯一原因是：您在使用Delta Chat软件的同时也使用其他的邮件应用程序（比如 Thunderbird），并且想让邮件分发代理参与聊天对话。</p>
 
 <p>不过，我们推荐使用 Delta Chat 桌面客户端；您可以在 <a href="https://get.delta.chat">get.delta.chat</a> 下载它。监视“已发送”文件夹的选项是在还没有 Delta Chat 桌面客户端的时候引入的，这个选项可能会在未来消失。</p>
     
@@ -1807,48 +1811,31 @@ it is recommended to leave any group chat before uninstalling Delta Chat.</p>
         
       </h3>
 
-<p>Delta Chat 没有接受风险投资，也没有负债累累，更没有承受产生巨额利润或将用户及其朋友和家人卖给广告商（或更糟）的压力。我们宁愿使用（目前来自欧盟和美国的）公共资金，来帮助我们努力建立一个基于自由开源社区开发的、去中心化的、多样化的聊天消息（软件）生态系统。</p>
+<p>Delta Chat 没有接受风险投资，也没有负债累累，更没有承受产生巨额利润或将用户及其朋友和家人卖给广告商（或更糟）的压力。我们宁愿使用目前来自欧盟和美国的公共资金，来帮助我们努力建立一个基于自由开源社区开发的、去中心化的、多样化的聊天消息软件生态系统。</p>
 
 <p>具体来说，到目前为止，对 Delta Chat 开发的资助有这些来源：</p>
 
 <ul>
   <li>
-    <p>The <a href="https://nextleap.eu">NEXTLEAP</a> EU project funded the research
-and implementation of verified groups and setup contact protocols
-in 2017 and 2018 and also helped to integrate end-to-end Encryption
-through <a href="https://autocrypt.org">Autocrypt</a>.</p>
+    <p><a href="https://nextleap.eu">NEXTLEAP</a>欧盟项目资助了以下研究和实施工作：在 2017 年和 2018 年实施的验证组和设置联系协议和通过 <a href="https://autocrypt.org">Autocrypt</a>整合了端到端加密。</p>
   </li>
   <li>
     <p>在<a href="https://opentechfund.org">开放技术基金</a> 2018/2019 年提供的第一笔赠款（约 20 万美元）期间，我们显著改善了安卓应用，发布了第一个桌面测试版，并根据人权方面的用户体验研究进行了功能开发，请参阅我们的结论<a href="https://delta.chat/en/2019-07-19-uxreport">《需求发现与用户体验报告》</a>。2019/2020 年的第二笔赠款（约 30 万美元）对发布 Delta/iOS 版本，将核心库转换到 Rust ，以及为所有平台开发新功能提供了帮助。</p>
   </li>
   <li>
-    <p>The <a href="https://nlnet.nl/">NLnet foundation</a> granted in 2019/2020 EUR 46K for
-completing Rust/Python bindings and instigating a Chat-bot eco-system.</p>
+    <p><a href="https://nlnet.nl/">NLnet 基金会</a> 2019/2020 年拨款 4.6 万欧元，用于完成 Rust/Python 绑定并建立聊天机器人生态系统。</p>
   </li>
   <li>
     <p>在 2021 年，我们从两项下一代互联网提案收到了欧盟的进一步资助，即 <a href="https://dapsi.ngi.eu/hall-of-fame/eppd/">EPPD - 电子邮件提供商可移植性目录</a>（约 9.7 万欧元）和 <a href="https://nlnet.nl/project/EmailPorting/">AEAP - 电子邮件地址移植</a>（约 9 万欧元）。这带来了更好的多账户支持，改进的二维码联系人和群组设置，和所有平台上的多处网络改进。</p>
   </li>
   <li>
-    <p>From End 2021 till March 2023 we received <em>Internet Freedom</em> funding (500K USD) from the
-U.S. Bureau of Democracy, Human Rights and Labor (DRL). 
-This funding supported our long-running goals to make Delta Chat more usable 
-and compatible with a wide range of e-mail servers world-wide, and more resilient and secure
-in places often affected by internet censorship and shutdowns.</p>
+    <p>从 2021 年底到 2023 年 3 月，我们从美国民主、人权和劳工局（DRL）获得了<em>互联网自由</em>资金（50 万美元）。这笔资金支持了我们的长期目标，即让Delta Chat 更好用，并与全球范围内的各种电子邮件服务器兼容，而且在经常受到互联网审查制度影响的地方更具弹性和安全性。</p>
   </li>
   <li>
-    <p>Beginning 2023 we got accepted in the Next Generation Internet (NGI)
-Entrust program for our “Private Decentralized Apps” proposals. 
-Exact amount is to be determined (around 100K EUR). 
-This funding supports further developments of <a href="https://webxdc.org">webxdc “apps shared in a chat”</a>.</p>
+    <p>从 2023 年开始，我们的 “私有去中心化应用程序 “提案获得了 下一代互联网(NGI)托付计划的青睐。 具体金额待定（约 10 万欧元）。这笔资金将支持<a href="https://webxdc.org">webxdc “聊天共享应用程序”</a>的进一步开发。</p>
   </li>
   <li>
-    <p>Sometimes we receive one-time donations from private individuals. 
-For example, in 2021 a generous individual bank-wired us 4K EUR 
-with the subject “keep up the good developments!”. 💜 
-We use such money to fund development gatherings or to care for ad-hoc expenses 
-that can not easily be predicted for, or reimbursed from, public funding grants. 
-Receiving more donations also helps us to become more independent and long-term viable
-as a contributor community.</p>
+    <p>我们有时会收到个人的一次性捐款。 例如，2021 年，一位慷慨的人士以 “继续保持良好的发展态势！”为主题通过银行向我们捐赠了4千欧元💜。 我们用这些钱来资助发展活动或支付不容易预测或从公共基金中报销的临时费用。收到更多的捐款也有助于我们作为一个贡献者社区变得更加独立和长期可持续。</p>
 
     
   </li>
@@ -1859,8 +1846,8 @@ as a contributor community.</p>
 
 <p>上面提到的钱款资助主要是由在弗赖堡（德国）的 merlinux GmbH 组织的，分发给了来自世界各地的十多位贡献者。</p>
 
-<p>Please see <a href="https://delta.chat/zh_CN/contribute">Delta Chat Contribution channels</a>
-for both monetary and and other contribution possibilities.</p>
+<p>请参阅 [Delta Chat 捐款渠道]（捐款）
+以了解货币捐款和其他捐款的可能性。</p>