Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show a chat event when two threads are merged.

Browse Source 
* Add internal button to split contacts for debugging.
* Show a chat event when two threads are merged.
This commit is contained in:
Greyson Parrelli
2022-09-21 09:02:10 -04:00
committed by Cody Henthorne
parent bc7b0b40b0
commit 80a6e0f781
11 changed files with 142 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/values/strings.xml
View File

@@ -1345,6 +1345,10 @@
<string name="MessageRecord_s_changed_their_phone_number">%1$s changed their phone number.</string>
<!-- Update item message shown in the release channel when someone is already a sustainer so we ask them if they want to boost. -->
<string name="MessageRecord_like_this_new_feature_help_support_signal_with_a_one_time_donation">Like this new feature? Help support Signal with a one-time donation.</string>
<!-- Update item message shown when we merge two threads together -->
<string name="MessageRecord_your_message_history_with_s_and_their_number_s_has_been_merged">Your message history with %1$s and their number %2$s has been merged.</string>
<!-- Update item message shown when we merge two threads together and we don't know the phone number of the other thread -->
<string name="MessageRecord_your_message_history_with_s_and_another_chat_has_been_merged">Your message history with %1$s and another chat that belonged to them has been merged.</string>
<!-- Group Calling update messages -->
<string name="MessageRecord_s_started_a_group_call_s">%1$s started a group call · %2$s</string>