Merge remote-tracking branch 'origin/main'

This commit is contained in:
Hosted Weblate
2024-08-10 16:35:44 +00:00
2 changed files with 14 additions and 0 deletions
@@ -128,6 +128,19 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
}
Prefs.setStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, deviceMsgLabel);
}
// add info about moved "switch profile" option; added 2024-08, can be removed after ~3 months
if (!Prefs.getBooleanPreference(this, "info_about_switch_profile_added", false)) {
final DcAccounts dcAccounts = DcHelper.getAccounts(this);
if (dcAccounts.getAll().length >= 2) {
DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
msg.setText(getString(R.string.update_switch_profile_placement));
dcContext.addDeviceMsg("info_about_switch_profile", msg);
}
Prefs.setBooleanPreference(this, "info_about_switch_profile_added", true);
}
// /add info
} catch(Exception e) {
e.printStackTrace();
}
+1
View File
@@ -1171,4 +1171,5 @@
<string name="update_1_44_ios">What\'s new:\n\n❤️ Yeah! This was long-awaited: Long tap a message to react\n\n🫸 PUSH notifications if supported by providers as https://nine.testrun.org\n\n🔗 If you cannot scan QR codes, share them as invite links\n\n… and TONS of bugfixes … %1$s</string>
<string name="update_1_46_android">New Onboarding 🐣 and More:\n\n⚡️ Sign up to secure fast chatmail servers (https://delta.chat/chatmail) or use classic e-mail servers\n\n👉 PUSH notifications for any chatmail server\n\n👤 Connect your friends securely via \"Attach contacts\"\n\n🥰 React with any emoji\n\n📌 Pin chats directly from search … and MORE at %1$s</string>
<string name="update_1_46_ios">New Onboarding 🐣 and More:\n\n⚡️ Sign up to secure fast chatmail servers (https://delta.chat/chatmail) or use classic e-mail servers\n\n👉 PUSH notifications for any chatmail server\n\n👤 Receive \"Attached contacts\" and connect to your friends\n\n🥰 Faster reaction selection … and MORE at %1$s</string>
<string name="update_switch_profile_placement">ℹ️ \"Switch Profile\" option moved: Tap your profile image in the upper corner of the main screen to add or switch profiles 💡</string>
</resources>