Merge branch 'stable' into stable-android

This commit is contained in:
Evgeny Poberezkin committed 2026-06-17 15:16:11 +01:00
commit 3642d8b2ea
8 files changed
+62 -40

No files matched your search

@@ -3103,8 +3103,8 @@
<string name="tray_quit">Quit SimpleX</string>
<string name="tray_tooltip">SimpleX</string>
<string name="tray_tooltip_unread">SimpleX — %d unread</string>
<string name="appearance_minimize_to_tray">Minimize to tray when closing window</string>
<string name="appearance_minimize_to_tray_desc">Keep SimpleX running in the background to receive messages.</string>
<string name="appearance_minimize_to_tray">Close to tray</string>
<string name="appearance_minimize_to_tray_desc">Runs in background to receive messages</string>
<string name="badge_supports_simplex">%s supports SimpleX Chat.</string>
<string name="badge_supported_simplex">%1$s supported SimpleX Chat. The badge expired on %2$s.</string>
<string name="badge_support_from_v7">You can support SimpleX starting from v7 of the app.</string>
+4 -4
View File
@@ -24,13 +24,13 @@ android.nonTransitiveRClass=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.jvm.target=11
android.version_name=6.5.4
android.version_code=353
android.version_name=6.5.5
android.version_code=355
android.bundle=false
desktop.version_name=6.5.4
desktop.version_code=145
desktop.version_name=6.5.5
desktop.version_code=146
kotlin.version=2.1.20
gradle.plugin.version=8.7.0