diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj
index 84e68c912..9d27b44d5 100644
--- a/Session.xcodeproj/project.pbxproj
+++ b/Session.xcodeproj/project.pbxproj
@@ -161,6 +161,7 @@
7BFD1A8A2745C4F000FB91B9 /* Permissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A892745C4F000FB91B9 /* Permissions.swift */; };
7BFD1A8C2747150E00FB91B9 /* TurnServerInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A8B2747150E00FB91B9 /* TurnServerInfo.swift */; };
7BFD1A972747689000FB91B9 /* Session-Turn-Server in Resources */ = {isa = PBXBuildFile; fileRef = 7BFD1A962747689000FB91B9 /* Session-Turn-Server */; };
+ 9422EE2B2B8C3A97004C740D /* String+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */; };
943C6D822B75E061004ACE64 /* Message+DisappearingMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */; };
9593A1E796C9E6BE2352EA6F /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionSnodeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B0BA5257C58DC6FF797278 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionSnodeKit.framework */; };
99978E3F7A80275823CA9014 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29E827FDF6C1032BB985740C /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionNotificationServiceExtension.framework */; };
@@ -1308,6 +1309,7 @@
8E946CB54A221018E23599DE /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig"; sourceTree = "<group>"; };
92E8569C96285EE3CDB5960D /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SignalUtilitiesKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SignalUtilitiesKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
93359C81CF2660040B7CD106 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionUtilitiesKit_SessionUtilitiesKitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionUtilitiesKit_SessionUtilitiesKitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Utilities.swift"; sourceTree = "<group>"; };
943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Message+DisappearingMessages.swift"; sourceTree = "<group>"; };
A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
A163E8AA16F3F6A90094D68B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
@@ -2980,6 +2982,7 @@
C33100272559000A00070591 /* UIView+Utilities.swift */,
FD71161F28D97ABC00B47552 /* UIImage+Tinting.swift */,
FDBB25E62988BBBD00F1508E /* UIContextualAction+Theming.swift */,
+ 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */,
);
path = Utilities;
sourceTree = "<group>";
@@ -5674,6 +5677,7 @@
FD37E9D528A1FCE8003AE748 /* Theme+OceanLight.swift in Sources */,
FDF848F129406A30007DCAE5 /* Format.swift in Sources */,
FD37E9C828A1D73F003AE748 /* Theme+Colors.swift in Sources */,
+ 9422EE2B2B8C3A97004C740D /* String+Utilities.swift in Sources */,
FD37EA0128A60473003AE748 /* UIKit+Theme.swift in Sources */,
FD37E9CF28A1EB1B003AE748 /* Theme.swift in Sources */,
C331FFB92558FA8D00070591 /* UIView+Constraints.swift in Sources */,
diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
index 895e1873e..90ee3271c 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
@@ -88,7 +88,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
let title: String = "DISAPPEARING_MESSAGES".localized()
lazy var subtitle: String? = {
guard Features.useNewDisappearingMessagesConfig else {
- return (isNoteToSelf ? nil : "DISAPPERING_MESSAGES_SUBTITLE_CONTACTS".localized())
+ return (isNoteToSelf ? nil : "DISAPPERING_MESSAGES_SUBTITLE_LEGACY".localized())
}
if threadVariant == .contact && !isNoteToSelf {
diff --git a/Session/Meta/Translations/ar.lproj/Localizable.strings b/Session/Meta/Translations/ar.lproj/Localizable.strings
index 8b5a0dd9a..d7a8aa7e5 100644
--- a/Session/Meta/Translations/ar.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ar.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/be.lproj/Localizable.strings b/Session/Meta/Translations/be.lproj/Localizable.strings
index eb697d1e0..1c6cb193d 100644
--- a/Session/Meta/Translations/be.lproj/Localizable.strings
+++ b/Session/Meta/Translations/be.lproj/Localizable.strings
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/bg.lproj/Localizable.strings b/Session/Meta/Translations/bg.lproj/Localizable.strings
index 009024775..6801378d8 100644
--- a/Session/Meta/Translations/bg.lproj/Localizable.strings
+++ b/Session/Meta/Translations/bg.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/bn.lproj/Localizable.strings b/Session/Meta/Translations/bn.lproj/Localizable.strings
index 3fe748b31..c431f6c40 100644
--- a/Session/Meta/Translations/bn.lproj/Localizable.strings
+++ b/Session/Meta/Translations/bn.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/cs.lproj/Localizable.strings b/Session/Meta/Translations/cs.lproj/Localizable.strings
index 0f5b234d0..b8ad420a1 100644
--- a/Session/Meta/Translations/cs.lproj/Localizable.strings
+++ b/Session/Meta/Translations/cs.lproj/Localizable.strings
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/da.lproj/Localizable.strings b/Session/Meta/Translations/da.lproj/Localizable.strings
index 1071fa7ff..272339000 100644
--- a/Session/Meta/Translations/da.lproj/Localizable.strings
+++ b/Session/Meta/Translations/da.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings
index df91a539d..c8809f7af 100644
--- a/Session/Meta/Translations/de.lproj/Localizable.strings
+++ b/Session/Meta/Translations/de.lproj/Localizable.strings
@@ -782,7 +782,7 @@ Anhänge senden, sobald der Empfänger diese Nachrichtenanfrage angenommen hat";
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1051,3 +1051,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/el.lproj/Localizable.strings b/Session/Meta/Translations/el.lproj/Localizable.strings
index ccb325011..128eb2421 100644
--- a/Session/Meta/Translations/el.lproj/Localizable.strings
+++ b/Session/Meta/Translations/el.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings
index e24961f67..21f0cd6d8 100644
--- a/Session/Meta/Translations/en.lproj/Localizable.strings
+++ b/Session/Meta/Translations/en.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/eo.lproj/Localizable.strings b/Session/Meta/Translations/eo.lproj/Localizable.strings
index 1ff910383..8d3a4b5b8 100644
--- a/Session/Meta/Translations/eo.lproj/Localizable.strings
+++ b/Session/Meta/Translations/eo.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/es-ES.lproj/Localizable.strings b/Session/Meta/Translations/es-ES.lproj/Localizable.strings
index 8ac6cb464..046618473 100644
--- a/Session/Meta/Translations/es-ES.lproj/Localizable.strings
+++ b/Session/Meta/Translations/es-ES.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings
index 63cba5c7f..febc6aa66 100644
--- a/Session/Meta/Translations/fa.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fa.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings
index c97d600fe..89a85c3d2 100644
--- a/Session/Meta/Translations/fi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fi.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/fil.lproj/Localizable.strings b/Session/Meta/Translations/fil.lproj/Localizable.strings
index 75b58dfe4..213044334 100644
--- a/Session/Meta/Translations/fil.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fil.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings
index 57ac5e03c..e83fea11d 100644
--- a/Session/Meta/Translations/fr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fr.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings
index 77ea99eef..132645b0c 100644
--- a/Session/Meta/Translations/hi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hi.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings
index 1f5374c15..63c3e4943 100644
--- a/Session/Meta/Translations/hr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hr.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/hu.lproj/Localizable.strings b/Session/Meta/Translations/hu.lproj/Localizable.strings
index 2246bd3e9..a42f810ac 100644
--- a/Session/Meta/Translations/hu.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hu.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/id.lproj/Localizable.strings b/Session/Meta/Translations/id.lproj/Localizable.strings
index b68e4e285..177515d2d 100644
--- a/Session/Meta/Translations/id.lproj/Localizable.strings
+++ b/Session/Meta/Translations/id.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings
index 559f256f0..d814a9bb0 100644
--- a/Session/Meta/Translations/it.lproj/Localizable.strings
+++ b/Session/Meta/Translations/it.lproj/Localizable.strings
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings
index fd40b4c1b..c2e3c4e58 100644
--- a/Session/Meta/Translations/ja.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ja.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/ko.lproj/Localizable.strings b/Session/Meta/Translations/ko.lproj/Localizable.strings
index b3cb7cb17..ab9ae5000 100644
--- a/Session/Meta/Translations/ko.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ko.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/ku.lproj/Localizable.strings b/Session/Meta/Translations/ku.lproj/Localizable.strings
index feee268ec..3b0e0134d 100644
--- a/Session/Meta/Translations/ku.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ku.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/lt.lproj/Localizable.strings b/Session/Meta/Translations/lt.lproj/Localizable.strings
index e649b4582..b7b7dc935 100644
--- a/Session/Meta/Translations/lt.lproj/Localizable.strings
+++ b/Session/Meta/Translations/lt.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/lv.lproj/Localizable.strings b/Session/Meta/Translations/lv.lproj/Localizable.strings
index 8d45c19d6..521e37fe0 100644
--- a/Session/Meta/Translations/lv.lproj/Localizable.strings
+++ b/Session/Meta/Translations/lv.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings
index be6dcffa1..7be9832b6 100644
--- a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings
index 0b8a78f38..b3db93a52 100644
--- a/Session/Meta/Translations/nl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/nl.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/no.lproj/Localizable.strings b/Session/Meta/Translations/no.lproj/Localizable.strings
index 499ece01c..481158d85 100644
--- a/Session/Meta/Translations/no.lproj/Localizable.strings
+++ b/Session/Meta/Translations/no.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings
index 5a6feb983..7393ee1ff 100644
--- a/Session/Meta/Translations/pl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pl.lproj/Localizable.strings
@@ -1051,3 +1051,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings
index ce38ad7ef..34bc31e82 100644
--- a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings
index 95005ef99..94ade7901 100644
--- a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings
@@ -1056,3 +1056,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/ro.lproj/Localizable.strings b/Session/Meta/Translations/ro.lproj/Localizable.strings
index 53ea27458..d6172d5af 100644
--- a/Session/Meta/Translations/ro.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ro.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings
index 5ccc6b8a3..5b4c20cec 100644
--- a/Session/Meta/Translations/ru.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ru.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/si-LK.lproj/Localizable.strings b/Session/Meta/Translations/si-LK.lproj/Localizable.strings
index c1a19d607..b783568cc 100644
--- a/Session/Meta/Translations/si-LK.lproj/Localizable.strings
+++ b/Session/Meta/Translations/si-LK.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings
index 79b75e505..90d70c07a 100644
--- a/Session/Meta/Translations/sk.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sk.lproj/Localizable.strings
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/sl.lproj/Localizable.strings b/Session/Meta/Translations/sl.lproj/Localizable.strings
index aa8e0eccb..10bded509 100644
--- a/Session/Meta/Translations/sl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sl.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings
index 22b52b1f4..b06f0e169 100644
--- a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings
index bb81435ca..d6890be6b 100644
--- a/Session/Meta/Translations/th.lproj/Localizable.strings
+++ b/Session/Meta/Translations/th.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/tr.lproj/Localizable.strings b/Session/Meta/Translations/tr.lproj/Localizable.strings
index eaf2d3996..544172ca1 100644
--- a/Session/Meta/Translations/tr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/tr.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/uk.lproj/Localizable.strings b/Session/Meta/Translations/uk.lproj/Localizable.strings
index fe6cb4c65..3f87d5cdc 100644
--- a/Session/Meta/Translations/uk.lproj/Localizable.strings
+++ b/Session/Meta/Translations/uk.lproj/Localizable.strings
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/vi.lproj/Localizable.strings b/Session/Meta/Translations/vi.lproj/Localizable.strings
index 7bebee599..9e7d1b419 100644
--- a/Session/Meta/Translations/vi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/vi.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings
index 757624bb9..f4ed299b6 100644
--- a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings
+++ b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings
index 5f993548a..c15c09f52 100644
--- a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings
+++ b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings
@@ -781,7 +781,7 @@
"database_inaccessible_error" = "There is an issue opening the database. Please restart the app and try again.";
/* A message indicating how the disappearing messages setting applies in a one-to-one conversation */
-"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to everyone in this conversation.";
+"DISAPPERING_MESSAGES_SUBTITLE_CONTACTS" = "This setting applies to messages you send in this conversation.";
/* A message indicating how the disappearing messages setting applies in a group conversation */
"DISAPPERING_MESSAGES_SUBTITLE_GROUPS" = "Messages disappear after they have been sent.";
@@ -1050,3 +1050,6 @@ The point that a message will disappear in a disappearing message update message
/* The subtitle of delete action in long press menu screen indicating the time that a message will disappear */
"DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN" = "Auto-deletes in %@";
+
+/* A message indicating how the disappearing messages setting applies in a one-to-one conversation for legacy mode */
+"DISAPPERING_MESSAGES_SUBTITLE_LEGACY" = "This setting applies to everyone in this conversation.";
diff --git a/Session/Shared/SessionTableViewTitleView.swift b/Session/Shared/SessionTableViewTitleView.swift
index 422cdccc3..189c85da4 100644
--- a/Session/Shared/SessionTableViewTitleView.swift
+++ b/Session/Shared/SessionTableViewTitleView.swift
@@ -6,6 +6,7 @@ import SessionMessagingKit
import SessionUtilitiesKit
final class SessionTableViewTitleView: UIView {
+ private static let maxWidth: CGFloat = UIScreen.main.bounds.width - 44 * 2 - 16 * 2
private var oldSize: CGSize = .zero
override var frame: CGRect {
@@ -37,7 +38,10 @@ final class SessionTableViewTitleView: UIView {
let result: UILabel = UILabel()
result.font = .systemFont(ofSize: Values.miniFontSize)
result.themeTextColor = .textPrimary
- result.lineBreakMode = .byTruncatingTail
+ result.lineBreakMode = .byWordWrapping
+ result.numberOfLines = 0
+ result.textAlignment = .center
+ result.set(.width, lessThanOrEqualTo: Self.maxWidth)
return result
}()
@@ -49,6 +53,8 @@ final class SessionTableViewTitleView: UIView {
return result
}()
+
+ private lazy var subtitleLabelHeightConstraint: NSLayoutConstraint = subtitleLabel.set(.height, to: 0)
// MARK: - Initialization
@@ -87,6 +93,12 @@ final class SessionTableViewTitleView: UIView {
)
)
- self.subtitleLabel.text = subtitle
+ if let subtitle: String = subtitle {
+ subtitleLabelHeightConstraint.constant = subtitle.heightWithConstrainedWidth(width: Self.maxWidth, font: self.subtitleLabel.font)
+ self.subtitleLabel.text = subtitle
+ self.subtitleLabel.isHidden = false
+ } else {
+ self.subtitleLabel.isHidden = true
+ }
}
}
diff --git a/SessionUIKit/Utilities/String+Utilities.swift b/SessionUIKit/Utilities/String+Utilities.swift
new file mode 100644
index 000000000..ac6449b59
--- /dev/null
+++ b/SessionUIKit/Utilities/String+Utilities.swift
@@ -0,0 +1,11 @@
+// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved.
+
+import UIKit
+
+extension String {
+ public func heightWithConstrainedWidth(width: CGFloat, font: UIFont) -> CGFloat {
+ let constraintRect = CGSize(width: width, height: .greatestFiniteMagnitude)
+ let boundingBox = self.boundingRect(with: constraintRect, options: [.usesLineFragmentOrigin, .usesFontLeading], attributes: [NSAttributedString.Key.font: font], context: nil)
+ return boundingBox.height
+ }
+}