diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f500f27aff..1af49c35dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -628,11 +628,6 @@
-
-
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestMegaphoneActivity.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestMegaphoneActivity.java
deleted file mode 100644
index 5f03cff43f..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestMegaphoneActivity.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.thoughtcrime.securesms.messagerequests;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.airbnb.lottie.LottieAnimationView;
-
-import org.thoughtcrime.securesms.PassphraseRequiredActivity;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.profiles.ProfileName;
-import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-
-public class MessageRequestMegaphoneActivity extends PassphraseRequiredActivity {
-
- public static final short EDIT_PROFILE_REQUEST_CODE = 24563;
-
- private DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
-
- @Override
- public void onCreate(@Nullable Bundle savedInstanceState, boolean isReady) {
- dynamicTheme.onCreate(this);
-
- setContentView(R.layout.message_requests_megaphone_activity);
-
-
- LottieAnimationView lottie = findViewById(R.id.message_requests_lottie);
- TextView profileNameButton = findViewById(R.id.message_requests_confirm_profile_name);
-
- lottie.setAnimation(R.raw.lottie_message_requests_splash);
- lottie.playAnimation();
-
- profileNameButton.setOnClickListener(v -> {
- final Intent profile = new Intent(this, EditProfileActivity.class);
-
- profile.putExtra(EditProfileActivity.SHOW_TOOLBAR, false);
- profile.putExtra(EditProfileActivity.NEXT_BUTTON_TEXT, R.string.save);
-
- startActivityForResult(profile, EDIT_PROFILE_REQUEST_CODE);
- });
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
-
- if (requestCode == EDIT_PROFILE_REQUEST_CODE &&
- resultCode == RESULT_OK &&
- Recipient.self().getProfileName() != ProfileName.EMPTY) {
- setResult(RESULT_OK);
- finish();
- }
- }
-
- @Override
- public void onBackPressed() {
- }
-
- @Override
- protected void onResume() {
- super.onResume();
-
- dynamicTheme.onResume(this);
- }
-}
diff --git a/app/src/main/res/layout/message_requests_megaphone_activity.xml b/app/src/main/res/layout/message_requests_megaphone_activity.xml
deleted file mode 100644
index 70759f3063..0000000000
--- a/app/src/main/res/layout/message_requests_megaphone_activity.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a447bd789..43df93a065 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -183,7 +183,7 @@
Recent contactsSignal contactsSignal groups
- You can share with a maximum of %d conversations.
+ You can share with a maximum of %d chats.Select Signal recipientsNo Signal contactsYou can only use the camera button to send photos to Signal contacts.
@@ -369,9 +369,9 @@
New! Say it with stickersCancel
- Delete conversation?
+ Delete chat?Delete and leave group?
- This conversation will be deleted from all of your devices.
+ This chat will be deleted from all of your devices.You will leave this group, and it will be deleted from all your devices.DeleteDelete and leave
@@ -452,7 +452,7 @@
Delete on this deviceDelete everywhere
- This message will be deleted for everyone in the conversation if they’re on a recent version of Signal. They will be able to see that you deleted a message.
+ This message will be deleted for everyone in the chat if they’re on a recent version of Signal. They will be able to see that you deleted a message.Original message not foundOriginal message no longer availableFailed to open message
@@ -460,7 +460,7 @@
You can swipe to the left on any message to quickly replyOutgoing view-once media files are automatically removed after they are sentYou already viewed this message
- You can add notes for yourself in this conversation.\nIf your account has any linked devices, new notes will be synced.
+ You can add notes for yourself in this chat.\nIf your account has any linked devices, new notes will be synced.%1$d group members have the same name.Tap to reviewReview requests carefully
@@ -487,23 +487,23 @@
No unread chats
- Delete selected conversation?
- Delete selected conversations?
+ Delete selected chat?
+ Delete selected chats?
- This will permanently delete the selected conversation.
- This will permanently delete all %1$d selected conversations.
+ This will permanently delete the selected chat.
+ This will permanently delete all %1$d selected chats.Deleting
- Deleting selected conversations…
+ Deleting selected chats…
- Conversation archived
- %d conversations archived
+ Chat archived
+ %d chats archivedUndo
- Moved conversation to inbox
- Moved %d conversations to inbox
+ Moved chat to inbox
+ Moved %d chats to inboxRead
@@ -538,7 +538,7 @@
Key exchange message
- Archived conversations (%d)
+ Archived chats (%d)Verified
@@ -1504,10 +1504,10 @@
Let %1$s message you? You won\'t receive any messages until you unblock them.Get updates and news from %1$s? You won\'t receive any updates until you unblock them.
- Continue your conversation with this group and share your name and photo with its members?
+ Continue your chat with this group and share your name and photo with its members?Upgrade this group to activate new features like @mentions and admins. Members who have not shared their name or photo in this group will be invited to join.This Legacy Group can no longer be used because it is too large. The maximum group size is %1$d.
- Continue your conversation with %1$s and share your name and photo with them?
+ Continue your chat with %1$s and share your name and photo with them?Join this group and share your name and photo with its members? They won\'t know you\'ve seen their messages until you accept.Join this group and share your name and photo with its members? You won\'t see their messages until you accept.Join this group? They won’t know you’ve seen their messages until you accept.
@@ -1888,7 +1888,7 @@
No results found for \'%s\'
- Conversations
+ ChatsContactsMessages
@@ -2156,7 +2156,7 @@
Read More
- %1$d new messages in %2$d conversations
+ %1$d new messages in %2$d chatsMost recent from: %1$sLocked messageMessage delivery failed.
@@ -2226,7 +2226,7 @@
SearchSearch unread chats
- Search for conversations, contacts, and messages
+ Search for chats, contacts, and messagesClose
@@ -2564,7 +2564,7 @@
- See full conversation
+ See full chatLoading
@@ -2686,14 +2686,9 @@
Message detailsLinked devicesInvite friends
- Archived conversations
+ Archived chatsRemove photo
-
- Message requests
- Users can now choose to accept a new conversation. Profile names let people know who\'s messaging them.
- Add profile name
-
Have you read our FAQ yet?Next
@@ -2848,7 +2843,7 @@
Payment lockPayments (Beta)
- Conversation length limit
+ Chat length limitKeep messagesClear message historyLinked devices
@@ -2892,7 +2887,7 @@
Delete older messages?Clear message history?This will permanently delete all message history and media from your device that are older than %1$s.
- This will permanently trim all conversations to the %1$s most recent messages.
+ This will permanently trim all chats to the %1$s most recent messages.This will permanently delete all message history and media from your device.Are you sure you want to delete all message history?All message history will be permanently removed. This action cannot be undone.
@@ -3242,7 +3237,7 @@
- New conversation
+ New chatOpen CameraNo chats yet.\nGet started by messaging a friend.
@@ -3259,7 +3254,7 @@
Group settingsLeave groupAll media
- Conversation settings
+ Chat settingsAdd to home screenCreate bubble
@@ -3282,7 +3277,7 @@
Recipients listDelivery
- Conversation
+ ChatBroadcast
@@ -3332,11 +3327,11 @@
%InsightsInsights
- Signal Protocol automatically protected %1$d%% of your outgoing messages over the past %2$d days. Conversations between Signal users are always end-to-end encrypted.
+ Signal Protocol automatically protected %1$d%% of your outgoing messages over the past %2$d days. Chats between Signal users are always end-to-end encrypted.Spread the wordNot enough dataYour Insights percentage is calculated based on outgoing messages within the past %1$d days that have not disappeared or been deleted.
- Start a conversation
+ Start a chatStart communicating securely and enable new features that go beyond the limitations of unencrypted SMS messages by inviting more contacts to join Signal.These statistics were locally generated on your device and can only be seen by you. They are never transmitted anywhere.Encrypted messages
@@ -4373,8 +4368,8 @@
Group linkAdd as a contactUnmute
- Conversation muted until %1$s
- Conversation muted forever
+ Chat muted until %1$s
+ Chat muted foreverCopied phone number to clipboard.Phone numberGet badges for your profile by supporting Signal. Tap on a badge to learn more.
@@ -5106,7 +5101,7 @@
Signal Connections are people you\'ve chosen to trust, either by:
- Starting a conversation
+ Starting a chatAccepting a message request