From c0a5a6143154c810ce236ed3c0213a544c15915d Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 10 Aug 2021 09:36:20 +1000
Subject: [PATCH 01/43] add unsend request proto

---
 .../messages/control/UnsendRequest.kt         |   55 +
 libsignal/protobuf/SignalService.proto        |    8 +
 .../libsignal/protos/SignalServiceProtos.java | 1047 +++++++++++++++--
 3 files changed, 1019 insertions(+), 91 deletions(-)
 create mode 100644 libsession/src/main/java/org/session/libsession/messaging/messages/control/UnsendRequest.kt

diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/UnsendRequest.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/UnsendRequest.kt
new file mode 100644
index 000000000..a22dd9334
--- /dev/null
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/UnsendRequest.kt
@@ -0,0 +1,55 @@
+package org.session.libsession.messaging.messages.control
+
+import org.session.libsignal.protos.SignalServiceProtos
+import org.session.libsignal.utilities.Log
+
+class UnsendRequest(): ControlMessage() {
+    var timestamp: Long? = null
+    var author: String? = null
+
+    override val isSelfSendValid: Boolean = true
+
+    // region Validation
+    override fun isValid(): Boolean {
+        if (!super.isValid()) return false
+        return timestamp != null && author != null
+    }
+    // endregion
+
+    companion object {
+        const val TAG = "UnsendRequest"
+
+        fun fromProto(proto: SignalServiceProtos.Content): UnsendRequest? {
+            val unsendRequestProto = if (proto.hasUnsendRequest()) proto.unsendRequest else return null
+            val timestamp = unsendRequestProto.timestamp
+            val author = unsendRequestProto.author
+            return UnsendRequest(timestamp, author)
+        }
+    }
+
+    constructor(timestamp: Long, author: String) : this() {
+        this.timestamp = timestamp
+        this.author = author
+    }
+
+    override fun toProto(): SignalServiceProtos.Content? {
+        val timestamp = timestamp
+        val author = author
+        if (timestamp == null || author == null) {
+            Log.w(TAG, "Couldn't construct unsend request proto from: $this")
+            return null
+        }
+        val unsendRequestProto = SignalServiceProtos.UnsendRequest.newBuilder()
+        unsendRequestProto.timestamp = timestamp
+        unsendRequestProto.author = author
+        val contentProto = SignalServiceProtos.Content.newBuilder()
+        try {
+            contentProto.unsendRequest = unsendRequestProto.build()
+            return contentProto.build()
+        } catch (e: Exception) {
+            Log.w(TAG, "Couldn't construct unsend request proto from: $this")
+            return null
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/libsignal/protobuf/SignalService.proto b/libsignal/protobuf/SignalService.proto
index 7ee8dc994..390a67a1a 100644
--- a/libsignal/protobuf/SignalService.proto
+++ b/libsignal/protobuf/SignalService.proto
@@ -35,12 +35,20 @@ message TypingMessage {
     required Action action    = 2;
 }
 
+message UnsendRequest {
+  // @required
+  required uint64 timestamp = 1;
+  // @required
+  required string author    = 2;
+}
+
 message Content {
   optional DataMessage                dataMessage                = 1;
   optional ReceiptMessage             receiptMessage             = 5;
   optional TypingMessage              typingMessage              = 6;
   optional ConfigurationMessage       configurationMessage       = 7;
   optional DataExtractionNotification dataExtractionNotification = 8;
+  optional UnsendRequest              unsendRequest              = 9;
 }
 
 message KeyPair {
diff --git a/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
index 0ca46d3a9..4dce0ba51 100644
--- a/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
+++ b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
@@ -1706,6 +1706,654 @@ public final class SignalServiceProtos {
     // @@protoc_insertion_point(class_scope:signalservice.TypingMessage)
   }
 
+  public interface UnsendRequestOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // required uint64 timestamp = 1;
+    /**
+     * <code>required uint64 timestamp = 1;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    boolean hasTimestamp();
+    /**
+     * <code>required uint64 timestamp = 1;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    long getTimestamp();
+
+    // required string author = 2;
+    /**
+     * <code>required string author = 2;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    boolean hasAuthor();
+    /**
+     * <code>required string author = 2;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    java.lang.String getAuthor();
+    /**
+     * <code>required string author = 2;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    com.google.protobuf.ByteString
+        getAuthorBytes();
+  }
+  /**
+   * Protobuf type {@code signalservice.UnsendRequest}
+   */
+  public static final class UnsendRequest extends
+      com.google.protobuf.GeneratedMessage
+      implements UnsendRequestOrBuilder {
+    // Use UnsendRequest.newBuilder() to construct.
+    private UnsendRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private UnsendRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final UnsendRequest defaultInstance;
+    public static UnsendRequest getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public UnsendRequest getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private UnsendRequest(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              timestamp_ = input.readUInt64();
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              author_ = input.readBytes();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_UnsendRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_UnsendRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.class, org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<UnsendRequest> PARSER =
+        new com.google.protobuf.AbstractParser<UnsendRequest>() {
+      public UnsendRequest parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new UnsendRequest(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<UnsendRequest> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // required uint64 timestamp = 1;
+    public static final int TIMESTAMP_FIELD_NUMBER = 1;
+    private long timestamp_;
+    /**
+     * <code>required uint64 timestamp = 1;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    public boolean hasTimestamp() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>required uint64 timestamp = 1;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    public long getTimestamp() {
+      return timestamp_;
+    }
+
+    // required string author = 2;
+    public static final int AUTHOR_FIELD_NUMBER = 2;
+    private java.lang.Object author_;
+    /**
+     * <code>required string author = 2;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    public boolean hasAuthor() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>required string author = 2;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    public java.lang.String getAuthor() {
+      java.lang.Object ref = author_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          author_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>required string author = 2;</code>
+     *
+     * <pre>
+     * @required
+     * </pre>
+     */
+    public com.google.protobuf.ByteString
+        getAuthorBytes() {
+      java.lang.Object ref = author_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        author_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    private void initFields() {
+      timestamp_ = 0L;
+      author_ = "";
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+
+      if (!hasTimestamp()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasAuthor()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeUInt64(1, timestamp_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeBytes(2, getAuthorBytes());
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(1, timestamp_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(2, getAuthorBytes());
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(org.session.libsignal.protos.SignalServiceProtos.UnsendRequest prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code signalservice.UnsendRequest}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.session.libsignal.protos.SignalServiceProtos.UnsendRequestOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_UnsendRequest_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_UnsendRequest_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.class, org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.Builder.class);
+      }
+
+      // Construct using org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        timestamp_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        author_ = "";
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.session.libsignal.protos.SignalServiceProtos.internal_static_signalservice_UnsendRequest_descriptor;
+      }
+
+      public org.session.libsignal.protos.SignalServiceProtos.UnsendRequest getDefaultInstanceForType() {
+        return org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.getDefaultInstance();
+      }
+
+      public org.session.libsignal.protos.SignalServiceProtos.UnsendRequest build() {
+        org.session.libsignal.protos.SignalServiceProtos.UnsendRequest result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public org.session.libsignal.protos.SignalServiceProtos.UnsendRequest buildPartial() {
+        org.session.libsignal.protos.SignalServiceProtos.UnsendRequest result = new org.session.libsignal.protos.SignalServiceProtos.UnsendRequest(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.timestamp_ = timestamp_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.author_ = author_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.session.libsignal.protos.SignalServiceProtos.UnsendRequest) {
+          return mergeFrom((org.session.libsignal.protos.SignalServiceProtos.UnsendRequest)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(org.session.libsignal.protos.SignalServiceProtos.UnsendRequest other) {
+        if (other == org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.getDefaultInstance()) return this;
+        if (other.hasTimestamp()) {
+          setTimestamp(other.getTimestamp());
+        }
+        if (other.hasAuthor()) {
+          bitField0_ |= 0x00000002;
+          author_ = other.author_;
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        if (!hasTimestamp()) {
+          
+          return false;
+        }
+        if (!hasAuthor()) {
+          
+          return false;
+        }
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.session.libsignal.protos.SignalServiceProtos.UnsendRequest parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.session.libsignal.protos.SignalServiceProtos.UnsendRequest) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // required uint64 timestamp = 1;
+      private long timestamp_ ;
+      /**
+       * <code>required uint64 timestamp = 1;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public boolean hasTimestamp() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>required uint64 timestamp = 1;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public long getTimestamp() {
+        return timestamp_;
+      }
+      /**
+       * <code>required uint64 timestamp = 1;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public Builder setTimestamp(long value) {
+        bitField0_ |= 0x00000001;
+        timestamp_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required uint64 timestamp = 1;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public Builder clearTimestamp() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        timestamp_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      // required string author = 2;
+      private java.lang.Object author_ = "";
+      /**
+       * <code>required string author = 2;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public boolean hasAuthor() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>required string author = 2;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public java.lang.String getAuthor() {
+        java.lang.Object ref = author_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          author_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>required string author = 2;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public com.google.protobuf.ByteString
+          getAuthorBytes() {
+        java.lang.Object ref = author_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          author_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>required string author = 2;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public Builder setAuthor(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        author_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required string author = 2;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public Builder clearAuthor() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        author_ = getDefaultInstance().getAuthor();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required string author = 2;</code>
+       *
+       * <pre>
+       * @required
+       * </pre>
+       */
+      public Builder setAuthorBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        author_ = value;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:signalservice.UnsendRequest)
+    }
+
+    static {
+      defaultInstance = new UnsendRequest(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:signalservice.UnsendRequest)
+  }
+
   public interface ContentOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
@@ -1778,6 +2426,20 @@ public final class SignalServiceProtos {
      * <code>optional .signalservice.DataExtractionNotification dataExtractionNotification = 8;</code>
      */
     org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder();
+
+    // optional .signalservice.UnsendRequest unsendRequest = 9;
+    /**
+     * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+     */
+    boolean hasUnsendRequest();
+    /**
+     * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+     */
+    org.session.libsignal.protos.SignalServiceProtos.UnsendRequest getUnsendRequest();
+    /**
+     * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+     */
+    org.session.libsignal.protos.SignalServiceProtos.UnsendRequestOrBuilder getUnsendRequestOrBuilder();
   }
   /**
    * Protobuf type {@code signalservice.Content}
@@ -1895,6 +2557,19 @@ public final class SignalServiceProtos {
               bitField0_ |= 0x00000010;
               break;
             }
+            case 74: {
+              org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000020) == 0x00000020)) {
+                subBuilder = unsendRequest_.toBuilder();
+              }
+              unsendRequest_ = input.readMessage(org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(unsendRequest_);
+                unsendRequest_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000020;
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2045,12 +2720,35 @@ public final class SignalServiceProtos {
       return dataExtractionNotification_;
     }
 
+    // optional .signalservice.UnsendRequest unsendRequest = 9;
+    public static final int UNSENDREQUEST_FIELD_NUMBER = 9;
+    private org.session.libsignal.protos.SignalServiceProtos.UnsendRequest unsendRequest_;
+    /**
+     * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+     */
+    public boolean hasUnsendRequest() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
+    }
+    /**
+     * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+     */
+    public org.session.libsignal.protos.SignalServiceProtos.UnsendRequest getUnsendRequest() {
+      return unsendRequest_;
+    }
+    /**
+     * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+     */
+    public org.session.libsignal.protos.SignalServiceProtos.UnsendRequestOrBuilder getUnsendRequestOrBuilder() {
+      return unsendRequest_;
+    }
+
     private void initFields() {
       dataMessage_ = org.session.libsignal.protos.SignalServiceProtos.DataMessage.getDefaultInstance();
       receiptMessage_ = org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.getDefaultInstance();
       typingMessage_ = org.session.libsignal.protos.SignalServiceProtos.TypingMessage.getDefaultInstance();
       configurationMessage_ = org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.getDefaultInstance();
       dataExtractionNotification_ = org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.getDefaultInstance();
+      unsendRequest_ = org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2087,6 +2785,12 @@ public final class SignalServiceProtos {
           return false;
         }
       }
+      if (hasUnsendRequest()) {
+        if (!getUnsendRequest().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -2109,6 +2813,9 @@ public final class SignalServiceProtos {
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeMessage(8, dataExtractionNotification_);
       }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeMessage(9, unsendRequest_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -2138,6 +2845,10 @@ public final class SignalServiceProtos {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(8, dataExtractionNotification_);
       }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, unsendRequest_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -2251,6 +2962,7 @@ public final class SignalServiceProtos {
           getTypingMessageFieldBuilder();
           getConfigurationMessageFieldBuilder();
           getDataExtractionNotificationFieldBuilder();
+          getUnsendRequestFieldBuilder();
         }
       }
       private static Builder create() {
@@ -2289,6 +3001,12 @@ public final class SignalServiceProtos {
           dataExtractionNotificationBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000010);
+        if (unsendRequestBuilder_ == null) {
+          unsendRequest_ = org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.getDefaultInstance();
+        } else {
+          unsendRequestBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -2357,6 +3075,14 @@ public final class SignalServiceProtos {
         } else {
           result.dataExtractionNotification_ = dataExtractionNotificationBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        if (unsendRequestBuilder_ == null) {
+          result.unsendRequest_ = unsendRequest_;
+        } else {
+          result.unsendRequest_ = unsendRequestBuilder_.build();
+        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -2388,6 +3114,9 @@ public final class SignalServiceProtos {
         if (other.hasDataExtractionNotification()) {
           mergeDataExtractionNotification(other.getDataExtractionNotification());
         }
+        if (other.hasUnsendRequest()) {
+          mergeUnsendRequest(other.getUnsendRequest());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -2423,6 +3152,12 @@ public final class SignalServiceProtos {
             return false;
           }
         }
+        if (hasUnsendRequest()) {
+          if (!getUnsendRequest().isInitialized()) {
+            
+            return false;
+          }
+        }
         return true;
       }
 
@@ -3030,6 +3765,123 @@ public final class SignalServiceProtos {
         return dataExtractionNotificationBuilder_;
       }
 
+      // optional .signalservice.UnsendRequest unsendRequest = 9;
+      private org.session.libsignal.protos.SignalServiceProtos.UnsendRequest unsendRequest_ = org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          org.session.libsignal.protos.SignalServiceProtos.UnsendRequest, org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.Builder, org.session.libsignal.protos.SignalServiceProtos.UnsendRequestOrBuilder> unsendRequestBuilder_;
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      public boolean hasUnsendRequest() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
+      }
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      public org.session.libsignal.protos.SignalServiceProtos.UnsendRequest getUnsendRequest() {
+        if (unsendRequestBuilder_ == null) {
+          return unsendRequest_;
+        } else {
+          return unsendRequestBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      public Builder setUnsendRequest(org.session.libsignal.protos.SignalServiceProtos.UnsendRequest value) {
+        if (unsendRequestBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          unsendRequest_ = value;
+          onChanged();
+        } else {
+          unsendRequestBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      public Builder setUnsendRequest(
+          org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.Builder builderForValue) {
+        if (unsendRequestBuilder_ == null) {
+          unsendRequest_ = builderForValue.build();
+          onChanged();
+        } else {
+          unsendRequestBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      public Builder mergeUnsendRequest(org.session.libsignal.protos.SignalServiceProtos.UnsendRequest value) {
+        if (unsendRequestBuilder_ == null) {
+          if (((bitField0_ & 0x00000020) == 0x00000020) &&
+              unsendRequest_ != org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.getDefaultInstance()) {
+            unsendRequest_ =
+              org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.newBuilder(unsendRequest_).mergeFrom(value).buildPartial();
+          } else {
+            unsendRequest_ = value;
+          }
+          onChanged();
+        } else {
+          unsendRequestBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      public Builder clearUnsendRequest() {
+        if (unsendRequestBuilder_ == null) {
+          unsendRequest_ = org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.getDefaultInstance();
+          onChanged();
+        } else {
+          unsendRequestBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000020);
+        return this;
+      }
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      public org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.Builder getUnsendRequestBuilder() {
+        bitField0_ |= 0x00000020;
+        onChanged();
+        return getUnsendRequestFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      public org.session.libsignal.protos.SignalServiceProtos.UnsendRequestOrBuilder getUnsendRequestOrBuilder() {
+        if (unsendRequestBuilder_ != null) {
+          return unsendRequestBuilder_.getMessageOrBuilder();
+        } else {
+          return unsendRequest_;
+        }
+      }
+      /**
+       * <code>optional .signalservice.UnsendRequest unsendRequest = 9;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          org.session.libsignal.protos.SignalServiceProtos.UnsendRequest, org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.Builder, org.session.libsignal.protos.SignalServiceProtos.UnsendRequestOrBuilder> 
+          getUnsendRequestFieldBuilder() {
+        if (unsendRequestBuilder_ == null) {
+          unsendRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              org.session.libsignal.protos.SignalServiceProtos.UnsendRequest, org.session.libsignal.protos.SignalServiceProtos.UnsendRequest.Builder, org.session.libsignal.protos.SignalServiceProtos.UnsendRequestOrBuilder>(
+                  unsendRequest_,
+                  getParentForChildren(),
+                  isClean());
+          unsendRequest_ = null;
+        }
+        return unsendRequestBuilder_;
+      }
+
       // @@protoc_insertion_point(builder_scope:signalservice.Content)
     }
 
@@ -21254,6 +22106,11 @@ public final class SignalServiceProtos {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_signalservice_TypingMessage_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_signalservice_UnsendRequest_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_signalservice_UnsendRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_signalservice_Content_descriptor;
   private static
@@ -21357,88 +22214,90 @@ public final class SignalServiceProtos {
       "SSAGE\020\007\"{\n\rTypingMessage\022\021\n\ttimestamp\030\001 " +
       "\002(\004\0223\n\006action\030\002 \002(\0162#.signalservice.Typi" +
       "ngMessage.Action\"\"\n\006Action\022\013\n\007STARTED\020\000\022" +
-      "\013\n\007STOPPED\020\001\"\270\002\n\007Content\022/\n\013dataMessage\030",
-      "\001 \001(\0132\032.signalservice.DataMessage\0225\n\016rec" +
-      "eiptMessage\030\005 \001(\0132\035.signalservice.Receip" +
-      "tMessage\0223\n\rtypingMessage\030\006 \001(\0132\034.signal" +
-      "service.TypingMessage\022A\n\024configurationMe" +
-      "ssage\030\007 \001(\0132#.signalservice.Configuratio" +
-      "nMessage\022M\n\032dataExtractionNotification\030\010" +
-      " \001(\0132).signalservice.DataExtractionNotif" +
-      "ication\"0\n\007KeyPair\022\021\n\tpublicKey\030\001 \002(\014\022\022\n" +
-      "\nprivateKey\030\002 \002(\014\"\226\001\n\032DataExtractionNoti" +
-      "fication\022<\n\004type\030\001 \002(\0162..signalservice.D",
-      "ataExtractionNotification.Type\022\021\n\ttimest" +
-      "amp\030\002 \001(\004\"\'\n\004Type\022\016\n\nSCREENSHOT\020\001\022\017\n\013MED" +
-      "IA_SAVED\020\002\"\245\014\n\013DataMessage\022\014\n\004body\030\001 \001(\t" +
-      "\0225\n\013attachments\030\002 \003(\0132 .signalservice.At" +
-      "tachmentPointer\022*\n\005group\030\003 \001(\0132\033.signals" +
-      "ervice.GroupContext\022\r\n\005flags\030\004 \001(\r\022\023\n\013ex" +
-      "pireTimer\030\005 \001(\r\022\022\n\nprofileKey\030\006 \001(\014\022\021\n\tt" +
-      "imestamp\030\007 \001(\004\022/\n\005quote\030\010 \001(\0132 .signalse" +
-      "rvice.DataMessage.Quote\0223\n\007preview\030\n \003(\013" +
-      "2\".signalservice.DataMessage.Preview\0227\n\007",
-      "profile\030e \001(\0132&.signalservice.DataMessag" +
-      "e.LokiProfile\022K\n\023openGroupInvitation\030f \001" +
-      "(\0132..signalservice.DataMessage.OpenGroup" +
-      "Invitation\022W\n\031closedGroupControlMessage\030" +
-      "h \001(\01324.signalservice.DataMessage.Closed" +
-      "GroupControlMessage\022\022\n\nsyncTarget\030i \001(\t\032" +
-      "\225\002\n\005Quote\022\n\n\002id\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\022\014\n" +
-      "\004text\030\003 \001(\t\022F\n\013attachments\030\004 \003(\01321.signa" +
-      "lservice.DataMessage.Quote.QuotedAttachm" +
-      "ent\032\231\001\n\020QuotedAttachment\022\023\n\013contentType\030",
-      "\001 \001(\t\022\020\n\010fileName\030\002 \001(\t\0223\n\tthumbnail\030\003 \001" +
-      "(\0132 .signalservice.AttachmentPointer\022\r\n\005" +
-      "flags\030\004 \001(\r\"\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\032" +
-      "V\n\007Preview\022\013\n\003url\030\001 \002(\t\022\r\n\005title\030\002 \001(\t\022/" +
-      "\n\005image\030\003 \001(\0132 .signalservice.Attachment" +
-      "Pointer\032:\n\013LokiProfile\022\023\n\013displayName\030\001 " +
-      "\001(\t\022\026\n\016profilePicture\030\002 \001(\t\0320\n\023OpenGroup" +
-      "Invitation\022\013\n\003url\030\001 \002(\t\022\014\n\004name\030\003 \002(\t\032\374\003" +
-      "\n\031ClosedGroupControlMessage\022G\n\004type\030\001 \002(" +
-      "\01629.signalservice.DataMessage.ClosedGrou",
-      "pControlMessage.Type\022\021\n\tpublicKey\030\002 \001(\014\022" +
-      "\014\n\004name\030\003 \001(\t\0221\n\021encryptionKeyPair\030\004 \001(\013" +
-      "2\026.signalservice.KeyPair\022\017\n\007members\030\005 \003(" +
-      "\014\022\016\n\006admins\030\006 \003(\014\022U\n\010wrappers\030\007 \003(\0132C.si" +
-      "gnalservice.DataMessage.ClosedGroupContr" +
-      "olMessage.KeyPairWrapper\022\027\n\017expirationTi" +
-      "mer\030\010 \001(\r\032=\n\016KeyPairWrapper\022\021\n\tpublicKey" +
-      "\030\001 \002(\014\022\030\n\020encryptedKeyPair\030\002 \002(\014\"r\n\004Type" +
-      "\022\007\n\003NEW\020\001\022\027\n\023ENCRYPTION_KEY_PAIR\020\003\022\017\n\013NA" +
-      "ME_CHANGE\020\004\022\021\n\rMEMBERS_ADDED\020\005\022\023\n\017MEMBER",
-      "S_REMOVED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n" +
-      "\027EXPIRATION_TIMER_UPDATE\020\002\"\347\003\n\024Configura" +
-      "tionMessage\022E\n\014closedGroups\030\001 \003(\0132/.sign" +
-      "alservice.ConfigurationMessage.ClosedGro" +
-      "up\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013displayName\030\003 " +
-      "\001(\t\022\026\n\016profilePicture\030\004 \001(\t\022\022\n\nprofileKe" +
-      "y\030\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+.signalservic" +
-      "e.ConfigurationMessage.Contact\032\233\001\n\013Close" +
-      "dGroup\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\022" +
-      "1\n\021encryptionKeyPair\030\003 \001(\0132\026.signalservi",
-      "ce.KeyPair\022\017\n\007members\030\004 \003(\014\022\016\n\006admins\030\005 " +
-      "\003(\014\022\027\n\017expirationTimer\030\006 \001(\r\032V\n\007Contact\022" +
-      "\021\n\tpublicKey\030\001 \002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016prof" +
-      "ilePicture\030\003 \001(\t\022\022\n\nprofileKey\030\004 \001(\014\"u\n\016" +
-      "ReceiptMessage\0220\n\004type\030\001 \002(\0162\".signalser" +
-      "vice.ReceiptMessage.Type\022\021\n\ttimestamp\030\002 " +
-      "\003(\004\"\036\n\004Type\022\014\n\010DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021" +
-      "AttachmentPointer\022\n\n\002id\030\001 \002(\006\022\023\n\013content" +
-      "Type\030\002 \001(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n" +
-      "\tthumbnail\030\005 \001(\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010file",
-      "Name\030\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r\n\005width\030\t \001(\r" +
-      "\022\016\n\006height\030\n \001(\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url" +
-      "\030e \001(\t\"\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014G" +
-      "roupContext\022\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 ." +
-      "signalservice.GroupContext.Type\022\014\n\004name\030" +
-      "\003 \001(\t\022\017\n\007members\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 " +
-      ".signalservice.AttachmentPointer\022\016\n\006admi" +
-      "ns\030\006 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020" +
-      "\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO" +
-      "\020\004B3\n\034org.session.libsignal.protosB\023Sign",
-      "alServiceProtos"
+      "\013\n\007STOPPED\020\001\"2\n\rUnsendRequest\022\021\n\ttimesta",
+      "mp\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\"\355\002\n\007Content\022/\n\013" +
+      "dataMessage\030\001 \001(\0132\032.signalservice.DataMe" +
+      "ssage\0225\n\016receiptMessage\030\005 \001(\0132\035.signalse" +
+      "rvice.ReceiptMessage\0223\n\rtypingMessage\030\006 " +
+      "\001(\0132\034.signalservice.TypingMessage\022A\n\024con" +
+      "figurationMessage\030\007 \001(\0132#.signalservice." +
+      "ConfigurationMessage\022M\n\032dataExtractionNo" +
+      "tification\030\010 \001(\0132).signalservice.DataExt" +
+      "ractionNotification\0223\n\runsendRequest\030\t \001" +
+      "(\0132\034.signalservice.UnsendRequest\"0\n\007KeyP",
+      "air\022\021\n\tpublicKey\030\001 \002(\014\022\022\n\nprivateKey\030\002 \002" +
+      "(\014\"\226\001\n\032DataExtractionNotification\022<\n\004typ" +
+      "e\030\001 \002(\0162..signalservice.DataExtractionNo" +
+      "tification.Type\022\021\n\ttimestamp\030\002 \001(\004\"\'\n\004Ty" +
+      "pe\022\016\n\nSCREENSHOT\020\001\022\017\n\013MEDIA_SAVED\020\002\"\245\014\n\013" +
+      "DataMessage\022\014\n\004body\030\001 \001(\t\0225\n\013attachments" +
+      "\030\002 \003(\0132 .signalservice.AttachmentPointer" +
+      "\022*\n\005group\030\003 \001(\0132\033.signalservice.GroupCon" +
+      "text\022\r\n\005flags\030\004 \001(\r\022\023\n\013expireTimer\030\005 \001(\r" +
+      "\022\022\n\nprofileKey\030\006 \001(\014\022\021\n\ttimestamp\030\007 \001(\004\022",
+      "/\n\005quote\030\010 \001(\0132 .signalservice.DataMessa" +
+      "ge.Quote\0223\n\007preview\030\n \003(\0132\".signalservic" +
+      "e.DataMessage.Preview\0227\n\007profile\030e \001(\0132&" +
+      ".signalservice.DataMessage.LokiProfile\022K" +
+      "\n\023openGroupInvitation\030f \001(\0132..signalserv" +
+      "ice.DataMessage.OpenGroupInvitation\022W\n\031c" +
+      "losedGroupControlMessage\030h \001(\01324.signals" +
+      "ervice.DataMessage.ClosedGroupControlMes" +
+      "sage\022\022\n\nsyncTarget\030i \001(\t\032\225\002\n\005Quote\022\n\n\002id" +
+      "\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\022\014\n\004text\030\003 \001(\t\022F\n\013",
+      "attachments\030\004 \003(\01321.signalservice.DataMe" +
+      "ssage.Quote.QuotedAttachment\032\231\001\n\020QuotedA" +
+      "ttachment\022\023\n\013contentType\030\001 \001(\t\022\020\n\010fileNa" +
+      "me\030\002 \001(\t\0223\n\tthumbnail\030\003 \001(\0132 .signalserv" +
+      "ice.AttachmentPointer\022\r\n\005flags\030\004 \001(\r\"\032\n\005" +
+      "Flags\022\021\n\rVOICE_MESSAGE\020\001\032V\n\007Preview\022\013\n\003u" +
+      "rl\030\001 \002(\t\022\r\n\005title\030\002 \001(\t\022/\n\005image\030\003 \001(\0132 " +
+      ".signalservice.AttachmentPointer\032:\n\013Loki" +
+      "Profile\022\023\n\013displayName\030\001 \001(\t\022\026\n\016profileP" +
+      "icture\030\002 \001(\t\0320\n\023OpenGroupInvitation\022\013\n\003u",
+      "rl\030\001 \002(\t\022\014\n\004name\030\003 \002(\t\032\374\003\n\031ClosedGroupCo" +
+      "ntrolMessage\022G\n\004type\030\001 \002(\01629.signalservi" +
+      "ce.DataMessage.ClosedGroupControlMessage" +
+      ".Type\022\021\n\tpublicKey\030\002 \001(\014\022\014\n\004name\030\003 \001(\t\0221" +
+      "\n\021encryptionKeyPair\030\004 \001(\0132\026.signalservic" +
+      "e.KeyPair\022\017\n\007members\030\005 \003(\014\022\016\n\006admins\030\006 \003" +
+      "(\014\022U\n\010wrappers\030\007 \003(\0132C.signalservice.Dat" +
+      "aMessage.ClosedGroupControlMessage.KeyPa" +
+      "irWrapper\022\027\n\017expirationTimer\030\010 \001(\r\032=\n\016Ke" +
+      "yPairWrapper\022\021\n\tpublicKey\030\001 \002(\014\022\030\n\020encry",
+      "ptedKeyPair\030\002 \002(\014\"r\n\004Type\022\007\n\003NEW\020\001\022\027\n\023EN" +
+      "CRYPTION_KEY_PAIR\020\003\022\017\n\013NAME_CHANGE\020\004\022\021\n\r" +
+      "MEMBERS_ADDED\020\005\022\023\n\017MEMBERS_REMOVED\020\006\022\017\n\013" +
+      "MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n\027EXPIRATION_TIM" +
+      "ER_UPDATE\020\002\"\347\003\n\024ConfigurationMessage\022E\n\014" +
+      "closedGroups\030\001 \003(\0132/.signalservice.Confi" +
+      "gurationMessage.ClosedGroup\022\022\n\nopenGroup" +
+      "s\030\002 \003(\t\022\023\n\013displayName\030\003 \001(\t\022\026\n\016profileP" +
+      "icture\030\004 \001(\t\022\022\n\nprofileKey\030\005 \001(\014\022=\n\010cont" +
+      "acts\030\006 \003(\0132+.signalservice.Configuration",
+      "Message.Contact\032\233\001\n\013ClosedGroup\022\021\n\tpubli" +
+      "cKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\0221\n\021encryptionKe" +
+      "yPair\030\003 \001(\0132\026.signalservice.KeyPair\022\017\n\007m" +
+      "embers\030\004 \003(\014\022\016\n\006admins\030\005 \003(\014\022\027\n\017expirati" +
+      "onTimer\030\006 \001(\r\032V\n\007Contact\022\021\n\tpublicKey\030\001 " +
+      "\002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016profilePicture\030\003 \001(" +
+      "\t\022\022\n\nprofileKey\030\004 \001(\014\"u\n\016ReceiptMessage\022" +
+      "0\n\004type\030\001 \002(\0162\".signalservice.ReceiptMes" +
+      "sage.Type\022\021\n\ttimestamp\030\002 \003(\004\"\036\n\004Type\022\014\n\010" +
+      "DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021AttachmentPoint",
+      "er\022\n\n\002id\030\001 \002(\006\022\023\n\013contentType\030\002 \001(\t\022\013\n\003k" +
+      "ey\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthumbnail\030\005 \001(" +
+      "\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r\n\005f" +
+      "lags\030\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006height\030\n \001(" +
+      "\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Flags" +
+      "\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014GroupContext\022\n\n\002" +
+      "id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signalservice.G" +
+      "roupContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007member" +
+      "s\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .signalservice." +
+      "AttachmentPointer\022\016\n\006admins\030\006 \003(\t\"H\n\004Typ",
+      "e\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002\022" +
+      "\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004B3\n\034org.sessi" +
+      "on.libsignal.protosB\023SignalServiceProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -21457,26 +22316,32 @@ public final class SignalServiceProtos {
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_TypingMessage_descriptor,
               new java.lang.String[] { "Timestamp", "Action", });
-          internal_static_signalservice_Content_descriptor =
+          internal_static_signalservice_UnsendRequest_descriptor =
             getDescriptor().getMessageTypes().get(2);
+          internal_static_signalservice_UnsendRequest_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_signalservice_UnsendRequest_descriptor,
+              new java.lang.String[] { "Timestamp", "Author", });
+          internal_static_signalservice_Content_descriptor =
+            getDescriptor().getMessageTypes().get(3);
           internal_static_signalservice_Content_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_Content_descriptor,
-              new java.lang.String[] { "DataMessage", "ReceiptMessage", "TypingMessage", "ConfigurationMessage", "DataExtractionNotification", });
+              new java.lang.String[] { "DataMessage", "ReceiptMessage", "TypingMessage", "ConfigurationMessage", "DataExtractionNotification", "UnsendRequest", });
           internal_static_signalservice_KeyPair_descriptor =
-            getDescriptor().getMessageTypes().get(3);
+            getDescriptor().getMessageTypes().get(4);
           internal_static_signalservice_KeyPair_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_KeyPair_descriptor,
               new java.lang.String[] { "PublicKey", "PrivateKey", });
           internal_static_signalservice_DataExtractionNotification_descriptor =
-            getDescriptor().getMessageTypes().get(4);
+            getDescriptor().getMessageTypes().get(5);
           internal_static_signalservice_DataExtractionNotification_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_DataExtractionNotification_descriptor,
               new java.lang.String[] { "Type", "Timestamp", });
           internal_static_signalservice_DataMessage_descriptor =
-            getDescriptor().getMessageTypes().get(5);
+            getDescriptor().getMessageTypes().get(6);
           internal_static_signalservice_DataMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_DataMessage_descriptor,
@@ -21524,7 +22389,7 @@ public final class SignalServiceProtos {
               internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor,
               new java.lang.String[] { "PublicKey", "EncryptedKeyPair", });
           internal_static_signalservice_ConfigurationMessage_descriptor =
-            getDescriptor().getMessageTypes().get(6);
+            getDescriptor().getMessageTypes().get(7);
           internal_static_signalservice_ConfigurationMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_ConfigurationMessage_descriptor,
@@ -21542,19 +22407,19 @@ public final class SignalServiceProtos {
               internal_static_signalservice_ConfigurationMessage_Contact_descriptor,
               new java.lang.String[] { "PublicKey", "Name", "ProfilePicture", "ProfileKey", });
           internal_static_signalservice_ReceiptMessage_descriptor =
-            getDescriptor().getMessageTypes().get(7);
+            getDescriptor().getMessageTypes().get(8);
           internal_static_signalservice_ReceiptMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_ReceiptMessage_descriptor,
               new java.lang.String[] { "Type", "Timestamp", });
           internal_static_signalservice_AttachmentPointer_descriptor =
-            getDescriptor().getMessageTypes().get(8);
+            getDescriptor().getMessageTypes().get(9);
           internal_static_signalservice_AttachmentPointer_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_AttachmentPointer_descriptor,
               new java.lang.String[] { "Id", "ContentType", "Key", "Size", "Thumbnail", "Digest", "FileName", "Flags", "Width", "Height", "Caption", "Url", });
           internal_static_signalservice_GroupContext_descriptor =
-            getDescriptor().getMessageTypes().get(9);
+            getDescriptor().getMessageTypes().get(10);
           internal_static_signalservice_GroupContext_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_GroupContext_descriptor,

From 2cb91c3a0e5b4a2faae8b338446a77f8a846a9fd Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 10 Aug 2021 12:52:01 +1000
Subject: [PATCH 02/43] add delete endpoint call in snode api

---
 .../org/session/libsession/snode/SnodeAPI.kt  | 44 +++++++++++++++++++
 .../org/session/libsignal/utilities/Snode.kt  |  1 +
 2 files changed, 45 insertions(+)

diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
index 4da3409d0..d297ba588 100644
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
@@ -329,6 +329,50 @@ object SnodeAPI {
         }
     }
 
+    fun deleteMessage(publicKey: String, serverHashes: List<String>): Promise<Map<String,Boolean>, Exception> {
+        return retryIfNeeded(maxRetryCount) {
+            val module = MessagingModuleConfiguration.shared
+            val userED25519KeyPair = module.getUserED25519KeyPair() ?: return@retryIfNeeded Promise.ofFail(Error.NoKeyPair)
+            val userPublicKey = module.storage.getUserPublicKey() ?: return@retryIfNeeded Promise.ofFail(Error.NoKeyPair)
+            getSingleTargetSnode(publicKey).bind { snode ->
+                retryIfNeeded(maxRetryCount) {
+                    val signature = ByteArray(Sign.BYTES)
+                    val verificationData = (Snode.Method.DeleteMessage.rawValue + serverHashes.fold("") { a, v -> a + v }).toByteArray()
+                    sodium.cryptoSignDetached(signature, verificationData, verificationData.size.toLong(), userED25519KeyPair.secretKey.asBytes)
+                    val deleteMessageParams = mapOf(
+                        "pubkey" to userPublicKey,
+                        "pubkey_ed25519" to userED25519KeyPair.publicKey.asHexString,
+                        "messages" to serverHashes,
+                        "signature" to Base64.encodeBytes(signature)
+                    )
+                    invoke(Snode.Method.DeleteMessage, snode, publicKey, deleteMessageParams).map { rawResponse ->
+                        val swarms = rawResponse["swarm"] as? Map<String, Any> ?: return@map mapOf()
+                        val result = swarms.mapNotNull { (hexSnodePublicKey, rawJSON) ->
+                            val json = rawJSON as? Map<String, Any> ?: return@mapNotNull null
+                            val isFailed = json["failed"] as? Boolean ?: false
+                            val statusCode = json["code"] as? String
+                            val reason = json["reason"] as? String
+                            hexSnodePublicKey to if (isFailed) {
+                                Log.e("Loki", "Failed to delete messages from: $hexSnodePublicKey due to error: $reason ($statusCode).")
+                                false
+                            } else {
+                                val hashes = json["deleted"] as List<String> // Hashes of deleted messages
+                                val signature = json["signature"] as String
+                                val snodePublicKey = Key.fromHexString(hexSnodePublicKey)
+                                // The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] )
+                                val message = (userPublicKey + serverHashes.fold("") { a, v -> a + v } + hashes.fold("") { a, v -> a + v }).toByteArray()
+                                sodium.cryptoSignVerifyDetached(Base64.decode(signature), message, message.size, snodePublicKey.asBytes)
+                            }
+                        }
+                        return@map result.toMap()
+                    }.fail { e ->
+                        Log.e("Loki", "Failed to delete messages", e)
+                    }
+                }
+            }
+        }
+    }
+
     // Parsing
     private fun parseSnodes(rawResponse: Any): List<Snode> {
         val json = rawResponse as? Map<*, *>
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt
index 7b1592a52..cfbedb733 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt
@@ -7,6 +7,7 @@ class Snode(val address: String, val port: Int, val publicKeySet: KeySet?) {
         GetSwarm("get_snodes_for_pubkey"),
         GetMessages("retrieve"),
         SendMessage("store"),
+        DeleteMessage("delete"),
         OxenDaemonRPCCall("oxend_request"),
         Info("info"),
         DeleteAll("delete_all")

From bf83f9b3917fa518efcb1c412f84cd20c87760a3 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 10 Aug 2021 16:00:06 +1000
Subject: [PATCH 03/43] WIP: message receiver handler for unsend request

---
 .../attachments/DatabaseAttachmentProvider.kt |  8 ++++++++
 .../database/model/MessageRecord.java         |  6 +++++-
 .../database/MessageDataProvider.kt           |  2 ++
 .../sending_receiving/MessageReceiver.kt      |  1 +
 .../ReceivedMessageHandler.kt                 | 20 +++++++++++++++++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index 5a13830bd..93ad37e32 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -177,6 +177,14 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         DatabaseFactory.getLokiMessageDatabase(context).deleteMessage(messageID, isSms)
     }
 
+    override fun updateMessageAsDeleted(messageID: Long) {
+        TODO("Not yet implemented")
+    }
+
+    override fun getServerHashForMessage(messageID: Long): String? {
+        TODO("Not yet implemented")
+    }
+
     override fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment? {
         val attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context)
         return attachmentDatabase.getAttachment(AttachmentId(attachmentId, 0))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
index 31db5b451..6c1d5784e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -49,6 +49,7 @@ public abstract class MessageRecord extends DisplayRecord {
   private final long                      expireStarted;
   private final boolean                   unidentified;
   public  final long                      id;
+  public  final boolean                   deleted;
 
   public abstract boolean isMms();
   public abstract boolean isMmsNotification();
@@ -71,6 +72,7 @@ public abstract class MessageRecord extends DisplayRecord {
     this.expiresIn           = expiresIn;
     this.expireStarted       = expireStarted;
     this.unidentified        = unidentified;
+    this.deleted             = false;
   }
 
   public long getId() {
@@ -103,7 +105,9 @@ public abstract class MessageRecord extends DisplayRecord {
 
   @Override
   public SpannableString getDisplayBody(@NonNull Context context) {
-    if (isGroupUpdateMessage()) {
+    if (this.deleted) {
+      return new SpannableString("This message has been deleted."); // TODO: localize
+    } else if (isGroupUpdateMessage()) {
       UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(getBody());
       return new SpannableString(UpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
     } else if (isExpirationTimerUpdate()) {
diff --git a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
index 94f59c4b4..86534bb9a 100644
--- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
+++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
@@ -13,6 +13,8 @@ interface MessageDataProvider {
     fun getMessageID(serverID: Long): Long?
     fun getMessageID(serverId: Long, threadId: Long): Pair<Long, Boolean>?
     fun deleteMessage(messageID: Long, isSms: Boolean)
+    fun updateMessageAsDeleted(messageID: Long)
+    fun getServerHashForMessage(messageID: Long): String?
     fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment?
     fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream?
     fun getAttachmentPointer(attachmentId: Long): SessionServiceAttachmentPointer?
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt
index 99ad38bd5..0a0089210 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt
@@ -94,6 +94,7 @@ object MessageReceiver {
             DataExtractionNotification.fromProto(proto) ?:
             ExpirationTimerUpdate.fromProto(proto) ?:
             ConfigurationMessage.fromProto(proto) ?:
+            UnsendRequest.fromProto(proto) ?:
             VisibleMessage.fromProto(proto) ?: throw Error.UnknownMessage
         // Ignore self send if needed
         if (!message.isSelfSendValid && sender == userPublicKey) throw Error.SelfSend
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
index cfbd5605b..b514d9672 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -14,6 +14,7 @@ import org.session.libsession.messaging.sending_receiving.link_preview.LinkPrevi
 import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
+import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupRecord
 import org.session.libsession.utilities.recipients.Recipient
@@ -49,6 +50,7 @@ fun MessageReceiver.handle(message: Message, proto: SignalServiceProtos.Content,
         is ExpirationTimerUpdate -> handleExpirationTimerUpdate(message)
         is DataExtractionNotification -> handleDataExtractionNotification(message)
         is ConfigurationMessage -> handleConfigurationMessage(message)
+        is UnsendRequest -> handleUnsendRequest(message)
         is VisibleMessage -> handleVisibleMessage(message, proto, openGroupID)
     }
 }
@@ -145,6 +147,24 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) {
     }
     storage.addContacts(message.contacts)
 }
+
+fun MessageReceiver.handleUnsendRequest(message: UnsendRequest) {
+    if (message.sender != message.author) { return }
+    val context = MessagingModuleConfiguration.shared.context
+    val storage = MessagingModuleConfiguration.shared.storage
+    val messageDataProvider = MessagingModuleConfiguration.shared.messageDataProvider
+    val timestamp = message.timestamp ?: return
+    val author = message.author ?: return
+    val messageIdToDelete = storage.getMessageIdInDatabase(timestamp, author) ?: return
+    if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
+        // TODO: Mark this message as read
+        // TODO: Cancel the notification of this message
+    }
+    messageDataProvider.getServerHashForMessage(messageIdToDelete)?.let { serverHash ->
+        SnodeAPI.deleteMessage(author, listOf(serverHash))
+    }
+    messageDataProvider.updateMessageAsDeleted(messageIdToDelete)
+}
 //endregion
 
 // region Visible Messages

From c3e45a308a727965e8eb8a953bf92fe1eb762f79 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 10 Aug 2021 16:42:15 +1000
Subject: [PATCH 04/43] store server hash

---
 .../attachments/DatabaseAttachmentProvider.kt |  3 ++-
 .../securesms/database/LokiMessageDatabase.kt | 19 +++++++++++++++++++
 .../securesms/database/Storage.kt             |  4 ++++
 .../database/helpers/SQLCipherOpenHelper.java |  6 ++++++
 .../libsession/database/StorageProtocol.kt    |  1 +
 .../libsession/messaging/messages/Message.kt  |  1 +
 .../sending_receiving/MessageSender.kt        |  8 ++++++++
 7 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index 93ad37e32..51835fc88 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -182,7 +182,8 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
     }
 
     override fun getServerHashForMessage(messageID: Long): String? {
-        TODO("Not yet implemented")
+        val messageDB = DatabaseFactory.getLokiMessageDatabase(context)
+        return messageDB.getMessageServerHash(messageID)
     }
 
     override fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment? {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
index c36c197cb..85b345e3f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
@@ -12,12 +12,14 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         private val messageIDTable = "loki_message_friend_request_database"
         private val messageThreadMappingTable = "loki_message_thread_mapping_database"
         private val errorMessageTable = "loki_error_message_database"
+        private val messageHashTable = "loki_message_hash_database"
         private val messageID = "message_id"
         private val serverID = "server_id"
         private val friendRequestStatus = "friend_request_status"
         private val threadID = "thread_id"
         private val errorMessage = "error_message"
         private val messageType = "message_type"
+        private val serverHash = "server_hash"
         @JvmStatic
         val createMessageIDTableCommand = "CREATE TABLE $messageIDTable ($messageID INTEGER PRIMARY KEY, $serverID INTEGER DEFAULT 0, $friendRequestStatus INTEGER DEFAULT 0);"
         @JvmStatic
@@ -28,6 +30,8 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         val updateMessageIDTableForType = "ALTER TABLE $messageIDTable ADD COLUMN $messageType INTEGER DEFAULT 0; ALTER TABLE $messageIDTable ADD CONSTRAINT PK_$messageIDTable PRIMARY KEY ($messageID, $serverID);"
         @JvmStatic
         val updateMessageMappingTable = "ALTER TABLE $messageThreadMappingTable ADD COLUMN $serverID INTEGER DEFAULT 0; ALTER TABLE $messageThreadMappingTable ADD CONSTRAINT PK_$messageThreadMappingTable PRIMARY KEY ($messageID, $serverID);"
+        @JvmStatic
+        val createMessageHashTableCommand = "CREATE TABLE IF NOT EXISTS $messageHashTable ($messageID INTEGER PRIMARY KEY, $serverHash STRING);"
 
         const val SMS_TYPE = 0
         const val MMS_TYPE = 1
@@ -150,4 +154,19 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
             database.endTransaction()
         }
     }
+
+    fun getMessageServerHash(messageID: Long): String? {
+        val database = databaseHelper.readableDatabase
+        return database.get(messageHashTable, "${Companion.messageID} = ?", arrayOf(messageID.toString())) { cursor ->
+            cursor.getString(serverHash)
+        }
+    }
+
+    fun setMessageServerHash(messageID: Long, serverHash: String) {
+        val database = databaseHelper.writableDatabase
+        val contentValues = ContentValues(2)
+        contentValues.put(Companion.messageID, messageID)
+        contentValues.put(Companion.serverHash, serverHash)
+        database.insertOrUpdate(messageHashTable, contentValues, "${Companion.messageID} = ?", arrayOf(messageID.toString()))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index fe9327a13..66332bed6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -358,6 +358,10 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         }
     }
 
+    override fun setMessageServerHash(messageID: Long, serverHash: String) {
+        DatabaseFactory.getLokiMessageDatabase(context).setMessageServerHash(messageID, serverHash)
+    }
+
     override fun getGroup(groupID: String): GroupRecord? {
         val group = DatabaseFactory.getGroupDatabase(context).getGroup(groupID)
         return if (group.isPresent) { group.get() } else null
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index 106528ee2..a7fa86cb5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -59,6 +59,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
   private static final int lokiV25                          = 46;
   private static final int lokiV26                          = 47;
   private static final int lokiV27                          = 48;
+  private static final int lokiV28                          = 49;
 
   // Loki - onUpgrade(...) must be updated to use Loki version numbers if Signal makes any database changes
   private static final int    DATABASE_VERSION = lokiV27;
@@ -123,6 +124,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
     db.execSQL(LokiMessageDatabase.getCreateMessageIDTableCommand());
     db.execSQL(LokiMessageDatabase.getCreateMessageToThreadMappingTableCommand());
     db.execSQL(LokiMessageDatabase.getCreateErrorMessageTableCommand());
+    db.execSQL(LokiMessageDatabase.getCreateMessageHashTableCommand());
     db.execSQL(LokiThreadDatabase.getCreateSessionResetTableCommand());
     db.execSQL(LokiThreadDatabase.getCreatePublicChatTableCommand());
     db.execSQL(LokiUserDatabase.getCreateDisplayNameTableCommand());
@@ -302,6 +304,10 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
         db.execSQL(RecipientDatabase.getCreateNotificationTypeCommand());
       }
 
+      if (oldVersion < lokiV28) {
+        db.execSQL(LokiMessageDatabase.getCreateMessageHashTableCommand());
+      }
+
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();
diff --git a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
index bc7324d21..3c8e0c712 100644
--- a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
+++ b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
@@ -93,6 +93,7 @@ interface StorageProtocol {
     fun markAsSent(timestamp: Long, author: String)
     fun markUnidentified(timestamp: Long, author: String)
     fun setErrorMessage(timestamp: Long, author: String, error: Exception)
+    fun setMessageServerHash(messageID: Long, serverHash: String)
 
     // Closed Groups
     fun getGroup(groupID: String): GroupRecord?
diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt
index 56779795e..d201daa98 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt
@@ -13,6 +13,7 @@ abstract class Message {
     var sender: String? = null
     var groupPublicKey: String? = null
     var openGroupServerMessageID: Long? = null
+    var serverHash: String? = null
 
     open val ttl: Long = 14 * 24 * 60 * 60 * 1000
     open val isSelfSendValid: Boolean = false
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
index 4758525ab..aa78074ed 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
@@ -161,6 +161,8 @@ object MessageSender {
                         if (destination is Destination.Contact && message is VisibleMessage && !isSelfSend) {
                             SnodeModule.shared.broadcaster.broadcast("messageSent", message.sentTimestamp!!)
                         }
+                        val hash = it["hash"] as? String
+                        message.serverHash = hash
                         handleSuccessfulMessageSend(message, destination, isSyncMessage)
                         var shouldNotify = (message is VisibleMessage && !isSyncMessage)
                         /*
@@ -259,6 +261,12 @@ object MessageSender {
             storage.updateSentTimestamp(messageID, message.isMediaMessage(), openGroupSentTimestamp, message.threadID!!)
             message.sentTimestamp = openGroupSentTimestamp
         }
+        // When the sync message is successfully sent, the hash value of this TSOutgoingMessage
+        // will be replaced by the hash value of the sync message. Since the hash value of the
+        // real message has no use when we delete a message. It is OK to let it be.
+        message.serverHash?.let {
+            storage.setMessageServerHash(messageID, it)
+        }
         // Track the open group server message ID
         if (message.openGroupServerMessageID != null && destination is Destination.OpenGroupV2) {
             val encoded = GroupUtil.getEncodedOpenGroupID("${destination.server}.${destination.room}".toByteArray())

From 0ebb87ef6fcb82135f51bfc983d7ec958f7b5a11 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 10 Aug 2021 16:47:52 +1000
Subject: [PATCH 05/43] allow self send and notify for unsend requests

---
 .../libsession/messaging/sending_receiving/MessageSender.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
index aa78074ed..0de835076 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
@@ -11,6 +11,7 @@ import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.messages.control.ClosedGroupControlMessage
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
+import org.session.libsession.messaging.messages.control.UnsendRequest
 import org.session.libsession.messaging.messages.visible.*
 import org.session.libsession.messaging.open_groups.*
 import org.session.libsession.messaging.utilities.MessageWrapper
@@ -94,7 +95,7 @@ object MessageSender {
             // • a closed group control message of type `new`
             var isNewClosedGroupControlMessage = false
             if (message is ClosedGroupControlMessage && message.kind is ClosedGroupControlMessage.Kind.New) isNewClosedGroupControlMessage = true
-            if (isSelfSend && message !is ConfigurationMessage && !isSyncMessage && !isNewClosedGroupControlMessage) {
+            if (isSelfSend && message !is ConfigurationMessage && !isSyncMessage && !isNewClosedGroupControlMessage && message !is UnsendRequest) {
                 handleSuccessfulMessageSend(message, destination)
                 deferred.resolve(Unit)
                 return promise
@@ -164,7 +165,7 @@ object MessageSender {
                         val hash = it["hash"] as? String
                         message.serverHash = hash
                         handleSuccessfulMessageSend(message, destination, isSyncMessage)
-                        var shouldNotify = (message is VisibleMessage && !isSyncMessage)
+                        var shouldNotify = ((message is VisibleMessage || message is UnsendRequest) && !isSyncMessage)
                         /*
                         if (message is ClosedGroupControlMessage && message.kind is ClosedGroupControlMessage.Kind.New) {
                             shouldNotify = true

From 5264d4e2f857bea8dda7d7cd60875b25417b3a5a Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Wed, 11 Aug 2021 15:12:10 +1000
Subject: [PATCH 06/43] remove weird white space

---
 .../src/main/java/org/session/libsession/snode/SnodeAPI.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
index d297ba588..3bc826970 100644
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
@@ -52,7 +52,7 @@ object SnodeAPI {
         if (useTestnet) {
             setOf( "http://public.loki.foundation:38157" )
         } else {
-            setOf( "https://storage.seed1.loki.network:$seedNodePort ", "https://storage.seed3.loki.network:$seedNodePort ", "https://public.loki.foundation:$seedNodePort" )
+            setOf( "https://storage.seed1.loki.network:$seedNodePort", "https://storage.seed3.loki.network:$seedNodePort", "https://public.loki.foundation:$seedNodePort" )
         }
     }
     private val snodeFailureThreshold = 3

From af6c19690bf76ebac20c7e24a23d005d501771ad Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Wed, 11 Aug 2021 15:17:53 +1000
Subject: [PATCH 07/43] send unsend request & delete remotely

---
 .../attachments/DatabaseAttachmentProvider.kt |  1 +
 .../conversation/v2/ConversationActivityV2.kt | 78 +++++++++++++------
 .../securesms/database/LokiMessageDatabase.kt |  5 ++
 .../database/helpers/SQLCipherOpenHelper.java |  2 +-
 4 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index 51835fc88..076a1e5c0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -175,6 +175,7 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
             db.delete(messageID)
         }
         DatabaseFactory.getLokiMessageDatabase(context).deleteMessage(messageID, isSms)
+        DatabaseFactory.getLokiMessageDatabase(context).deleteMessageServerHash(messageID)
     }
 
     override fun updateMessageAsDeleted(messageID: Long) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 4a86d5edc..e90dc830a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -50,6 +50,7 @@ import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.mentions.Mention
 import org.session.libsession.messaging.mentions.MentionsManager
 import org.session.libsession.messaging.messages.control.DataExtractionNotification
+import org.session.libsession.messaging.messages.control.UnsendRequest
 import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage
 import org.session.libsession.messaging.messages.signal.OutgoingTextMessage
 import org.session.libsession.messaging.messages.visible.OpenGroupInvitation
@@ -59,6 +60,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
+import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.fromSerialized
 import org.session.libsession.utilities.MediaTypes
@@ -1114,38 +1116,64 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         stopAudioHandler.removeCallbacks(stopVoiceMessageRecordingTask)
     }
 
-    override fun deleteMessages(messages: Set<MessageRecord>) {
-        val messageCount = messages.size
+    private fun buildUsendRequest(message: MessageRecord): UnsendRequest? {
+        if (this.thread.isOpenGroupRecipient) return null
+        val messageDataProvider = MessagingModuleConfiguration.shared.messageDataProvider
+        messageDataProvider.getServerHashForMessage(message.id) ?: return null
+        val unsendRequest = UnsendRequest()
+        if (message.isOutgoing) {
+            unsendRequest.author = TextSecurePreferences.getLocalNumber(this)
+        } else {
+            unsendRequest.author = message.individualRecipient.address.contactIdentifier()
+        }
+        unsendRequest.timestamp = message.timestamp
+
+        return unsendRequest
+    }
+
+    private fun deleteLocally(message: MessageRecord) {
+        buildUsendRequest(message)?.let { unsendRequest ->
+            MessageSender.send(unsendRequest, thread.address)
+        }
+        MessagingModuleConfiguration.shared.messageDataProvider.deleteMessage(message.id, !message.isMms)
+    }
+
+    private fun deleteForEveryone(message: MessageRecord) {
+        buildUsendRequest(message)?.let { unsendRequest ->
+            MessageSender.send(unsendRequest, thread.address)
+        }
         val messageDataProvider = MessagingModuleConfiguration.shared.messageDataProvider
         val messageDB = DatabaseFactory.getLokiMessageDatabase(this@ConversationActivityV2)
+        val openGroup = DatabaseFactory.getLokiThreadDatabase(this).getOpenGroupChat(threadID)
+        if (openGroup != null) {
+            messageDB.getServerID(message.id, !message.isMms)?.let { messageServerID ->
+                OpenGroupAPIV2.deleteMessage(messageServerID, openGroup.room, openGroup.server)
+                    .success {
+                        messageDataProvider.deleteMessage(message.id, !message.isMms)
+                    }.failUi { error ->
+                        Toast.makeText(this@ConversationActivityV2, "Couldn't delete message due to error: $error", Toast.LENGTH_LONG).show()
+                    }
+            }
+        } else {
+            messageDataProvider.getServerHashForMessage(message.id)?.let { serverHash ->
+                SnodeAPI.deleteMessage(thread.address.serialize(), listOf(serverHash))
+                    .failUi { error ->
+                        Toast.makeText(this@ConversationActivityV2, "Couldn't delete message due to error: $error", Toast.LENGTH_LONG).show()
+                    }
+            }
+            messageDataProvider.deleteMessage(message.id, !message.isMms)
+        }
+    }
+
+    override fun deleteMessages(messages: Set<MessageRecord>) {
+        val messageCount = messages.size
         val builder = AlertDialog.Builder(this)
         builder.setTitle(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
         builder.setMessage(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
         builder.setCancelable(true)
-        val openGroup = DatabaseFactory.getLokiThreadDatabase(this).getOpenGroupChat(threadID)
         builder.setPositiveButton(R.string.delete) { _, _ ->
-            if (openGroup != null) {
-                val messageServerIDs = mutableMapOf<Long, MessageRecord>()
-                for (message in messages) {
-                    val messageServerID = messageDB.getServerID(message.id, !message.isMms) ?: continue
-                    messageServerIDs[messageServerID] = message
-                }
-                for ((messageServerID, message) in messageServerIDs) {
-                    OpenGroupAPIV2.deleteMessage(messageServerID, openGroup.room, openGroup.server)
-                        .success {
-                            messageDataProvider.deleteMessage(message.id, !message.isMms)
-                        }.failUi { error ->
-                            Toast.makeText(this@ConversationActivityV2, "Couldn't delete message due to error: $error", Toast.LENGTH_LONG).show()
-                        }
-                }
-            } else {
-                for (message in messages) {
-                    if (message.isMms) {
-                        DatabaseFactory.getMmsDatabase(this@ConversationActivityV2).delete(message.id)
-                    } else {
-                        DatabaseFactory.getSmsDatabase(this@ConversationActivityV2).deleteMessage(message.id)
-                    }
-                }
+            for (message in messages) {
+                this.deleteForEveryone(message)
             }
             endActionMode()
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
index 85b345e3f..07513ec32 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LokiMessageDatabase.kt
@@ -169,4 +169,9 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         contentValues.put(Companion.serverHash, serverHash)
         database.insertOrUpdate(messageHashTable, contentValues, "${Companion.messageID} = ?", arrayOf(messageID.toString()))
     }
+
+    fun deleteMessageServerHash(messageID: Long) {
+        val database = databaseHelper.writableDatabase
+        database.delete(messageHashTable, "${Companion.messageID} = ?", arrayOf(messageID.toString()))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index a7fa86cb5..ccf5c9e77 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -62,7 +62,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
   private static final int lokiV28                          = 49;
 
   // Loki - onUpgrade(...) must be updated to use Loki version numbers if Signal makes any database changes
-  private static final int    DATABASE_VERSION = lokiV27;
+  private static final int    DATABASE_VERSION = lokiV28;
   private static final String DATABASE_NAME    = "signal.db";
 
   private final Context        context;

From 0000aa0d13b39b2d3863d300900a0d8428ef746f Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Wed, 11 Aug 2021 15:24:33 +1000
Subject: [PATCH 08/43] delete locally after successfully delete remotely

---
 .../securesms/conversation/v2/ConversationActivityV2.kt      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index e90dc830a..7abe4a704 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1157,11 +1157,12 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         } else {
             messageDataProvider.getServerHashForMessage(message.id)?.let { serverHash ->
                 SnodeAPI.deleteMessage(thread.address.serialize(), listOf(serverHash))
-                    .failUi { error ->
+                    .success {
+                        messageDataProvider.deleteMessage(message.id, !message.isMms)
+                    }.failUi { error ->
                         Toast.makeText(this@ConversationActivityV2, "Couldn't delete message due to error: $error", Toast.LENGTH_LONG).show()
                     }
             }
-            messageDataProvider.deleteMessage(message.id, !message.isMms)
         }
     }
 

From 77b5b3ab01e144375a371654b05e22ff65c3a8e8 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Wed, 11 Aug 2021 15:36:13 +1000
Subject: [PATCH 09/43] deleted message bubble ui

---
 .../v2/messages/DeletedMessageView.kt         | 35 +++++++++++++++++++
 .../main/res/layout/view_deleted_message.xml  | 30 ++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
 create mode 100644 app/src/main/res/layout/view_deleted_message.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
new file mode 100644
index 000000000..3adfc125f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
@@ -0,0 +1,35 @@
+package org.thoughtcrime.securesms.conversation.v2.messages
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import androidx.annotation.ColorInt
+import kotlinx.android.synthetic.main.fragment_conversation_bottom_sheet.view.*
+import kotlinx.android.synthetic.main.view_deleted_message.view.*
+import kotlinx.android.synthetic.main.view_document.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.database.model.MmsMessageRecord
+
+class DeletedMessageView : LinearLayout {
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) { initialize() }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { initialize() }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { initialize() }
+
+    private fun initialize() {
+        LayoutInflater.from(context).inflate(R.layout.view_deleted_message, this)
+    }
+    // endregion
+
+    // region Updating
+    fun bind(message: MessageRecord, @ColorInt textColor: Int) {
+        deleteTextView.text = "This message has been deleted"
+        deleteTextView.setTextColor(textColor)
+        deletedMessageViewIconImageView.imageTintList = ColorStateList.valueOf(textColor)
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_deleted_message.xml b/app/src/main/res/layout/view_deleted_message.xml
new file mode 100644
index 000000000..20b6e6104
--- /dev/null
+++ b/app/src/main/res/layout/view_deleted_message.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:padding="@dimen/medium_spacing"
+    android:gravity="center">
+
+    <ImageView
+        android:id="@+id/deletedMessageViewIconImageView"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="?menu_trash_icon"
+        app:tint="@color/text" />
+
+    <TextView
+        android:id="@+id/documentTitleTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:textSize="@dimen/very_small_font_size"
+        android:textColor="@color/text"
+        tools:text="This message has been deleted"
+        android:maxLines="2"
+        android:ellipsize="end" />
+
+</LinearLayout>
\ No newline at end of file

From 23a61299aca3a9d8ed0915fa878fecfb1af7b7f0 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Wed, 11 Aug 2021 16:35:48 +1000
Subject: [PATCH 10/43] bind deleted message view

---
 .../conversation/v2/messages/DeletedMessageView.kt          | 4 +++-
 .../conversation/v2/messages/VisibleMessageContentView.kt   | 6 +++++-
 app/src/main/res/values/strings.xml                         | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
index 3adfc125f..96091428e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
@@ -12,6 +12,7 @@ import kotlinx.android.synthetic.main.view_document.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
+import java.util.*
 
 class DeletedMessageView : LinearLayout {
 
@@ -27,7 +28,8 @@ class DeletedMessageView : LinearLayout {
 
     // region Updating
     fun bind(message: MessageRecord, @ColorInt textColor: Int) {
-        deleteTextView.text = "This message has been deleted"
+        assert(message.deleted)
+        deleteTextView.text = context.getString(R.string.deleted_message)
         deleteTextView.setTextColor(textColor)
         deletedMessageViewIconImageView.imageTintList = ColorStateList.valueOf(textColor)
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
index 8f2410652..dea9122a1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
@@ -76,7 +76,11 @@ class VisibleMessageContentView : LinearLayout {
         mainContainer.removeAllViews()
         onContentClick = null
         onContentDoubleTap = null
-        if (message is MmsMessageRecord && message.linkPreviews.isNotEmpty()) {
+        if (message.deleted) {
+            val deletedMessageView = DeletedMessageView(context)
+            deletedMessageView.bind(message, VisibleMessageContentView.getTextColor(context,message))
+            mainContainer.addView(deletedMessageView)
+        } else if (message is MmsMessageRecord && message.linkPreviews.isNotEmpty()) {
             val linkPreviewView = LinkPreviewView(context)
             linkPreviewView.bind(message, glide, isStartOfMessageCluster, isEndOfMessageCluster, searchQuery)
             mainContainer.addView(linkPreviewView)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9fa0283ac..360bd4bec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -893,4 +893,9 @@
     <string name="dialog_send_seed_send_button_title">Send</string>
     <string name="notify_type_all">All</string>
     <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
+
 </resources>

From 8b6b02911f895ab8463b733e355ad7f343ec6434 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Thu, 12 Aug 2021 11:43:33 +1000
Subject: [PATCH 11/43] handle database for message deleted by unsend request

---
 .../attachments/DatabaseAttachmentProvider.kt    |  5 ++++-
 .../v2/messages/DeletedMessageView.kt            |  6 +++---
 .../v2/messages/VisibleMessageContentView.kt     |  2 +-
 .../securesms/database/MessagingDatabase.java    |  2 ++
 .../securesms/database/MmsDatabase.java          | 16 ++++++++++++++++
 .../securesms/database/MmsSmsColumns.java        |  3 +++
 .../securesms/database/SmsDatabase.java          | 10 ++++++++++
 .../securesms/database/model/DisplayRecord.java  |  1 +
 .../securesms/database/model/MessageRecord.java  |  6 +-----
 app/src/main/res/layout/view_deleted_message.xml | 10 ++++++----
 10 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index 076a1e5c0..99153ae67 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -179,7 +179,10 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
     }
 
     override fun updateMessageAsDeleted(messageID: Long) {
-        TODO("Not yet implemented")
+        val smsDatabase = DatabaseFactory.getSmsDatabase(context)
+        val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
+        smsDatabase.markAsDeleted(messageID)
+        mmsDatabase.markAsDeleted(messageID)
     }
 
     override fun getServerHashForMessage(messageID: Long): String? {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
index 96091428e..a91473352 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt
@@ -28,9 +28,9 @@ class DeletedMessageView : LinearLayout {
 
     // region Updating
     fun bind(message: MessageRecord, @ColorInt textColor: Int) {
-        assert(message.deleted)
-        deleteTextView.text = context.getString(R.string.deleted_message)
-        deleteTextView.setTextColor(textColor)
+        assert(message.isDeleted)
+        deleteTitleTextView.text = context.getString(R.string.deleted_message)
+        deleteTitleTextView.setTextColor(textColor)
         deletedMessageViewIconImageView.imageTintList = ColorStateList.valueOf(textColor)
     }
     // endregion
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
index dea9122a1..558bc1361 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
@@ -76,7 +76,7 @@ class VisibleMessageContentView : LinearLayout {
         mainContainer.removeAllViews()
         onContentClick = null
         onContentDoubleTap = null
-        if (message.deleted) {
+        if (message.isDeleted) {
             val deletedMessageView = DeletedMessageView(context)
             deletedMessageView.bind(message, VisibleMessageContentView.getTextColor(context,message))
             mainContainer.addView(deletedMessageView)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
index 0fcb61d74..d6dd09764 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
@@ -38,6 +38,8 @@ public abstract class MessagingDatabase extends Database implements MmsSmsColumn
   public abstract void markAsSent(long messageId, boolean secure);
   public abstract void markUnidentified(long messageId, boolean unidentified);
 
+  public abstract void markAsDeleted(long messageId);
+
   public void addMismatchedIdentity(long messageId, Address address, IdentityKey identityKey) {
     try {
       addToDocument(messageId, MISMATCHED_IDENTITIES,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
index 38e9eeccc..597d14f09 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -391,6 +391,22 @@ public class MmsDatabase extends MessagingDatabase {
     db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
   }
 
+  @Override
+  public void markAsDeleted(long messageId) {
+    SQLiteDatabase database     = databaseHelper.getWritableDatabase();
+    ContentValues contentValues = new ContentValues();
+    contentValues.put(READ, 1);
+    contentValues.put(BODY, "");
+    database.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
+
+    AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+    ThreadUtils.queue(() -> attachmentDatabase.deleteAttachmentsForMessage(messageId));
+
+    long threadId = getThreadIdForMessage(messageId);
+    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_DELETED_TYPE, Optional.of(threadId));
+    notifyConversationListeners(threadId);
+  }
+
   @Override
   public void markExpireStarted(long messageId) {
     markExpireStarted(messageId, System.currentTimeMillis());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java
index 81ec17bd0..52642b5d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java
@@ -40,6 +40,7 @@ public interface MmsSmsColumns {
     protected static final long BASE_PENDING_SECURE_SMS_FALLBACK   = 25;
     protected static final long BASE_PENDING_INSECURE_SMS_FALLBACK = 26;
     public    static final long BASE_DRAFT_TYPE                    = 27;
+    protected static final long BASE_DELETED_TYPE                  = 28;
 
     protected static final long[] OUTGOING_MESSAGE_TYPES = {BASE_OUTBOX_TYPE, BASE_SENT_TYPE,
                                                             BASE_SENDING_TYPE, BASE_SENT_FAILED_TYPE,
@@ -152,6 +153,8 @@ public interface MmsSmsColumns {
       return (type & BASE_TYPE_MASK) == BASE_INBOX_TYPE;
     }
 
+    public static boolean isDeletedMessage(long type) { return (type & BASE_TYPE_MASK) == BASE_DELETED_TYPE; }
+
     public static boolean isJoinedType(long type) {
       return (type & BASE_TYPE_MASK) == JOINED_TYPE;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index c148f8ebc..eaa289807 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -183,6 +183,16 @@ public class SmsDatabase extends MessagingDatabase {
     db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(id)});
   }
 
+  @Override
+  public void markAsDeleted(long messageId) {
+    SQLiteDatabase database     = databaseHelper.getWritableDatabase();
+    ContentValues contentValues = new ContentValues();
+    contentValues.put(READ, 1);
+    contentValues.put(BODY, "");
+    database.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
+    updateTypeBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_DELETED_TYPE);
+  }
+
   @Override
   public void markExpireStarted(long id) {
     markExpireStarted(id, System.currentTimeMillis());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index 3adb9cbda..10e4cb753 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -117,6 +117,7 @@ public abstract class DisplayRecord {
   public boolean isMissedCall() {
     return SmsDatabase.Types.isMissedCall(type);
   }
+  public boolean isDeleted() { return  MmsSmsColumns.Types.isDeletedMessage(type); }
 
   public boolean isControlMessage() {
     return isGroupUpdateMessage() || isExpirationTimerUpdate() || isDataExtractionNotification();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
index 6c1d5784e..31db5b451 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -49,7 +49,6 @@ public abstract class MessageRecord extends DisplayRecord {
   private final long                      expireStarted;
   private final boolean                   unidentified;
   public  final long                      id;
-  public  final boolean                   deleted;
 
   public abstract boolean isMms();
   public abstract boolean isMmsNotification();
@@ -72,7 +71,6 @@ public abstract class MessageRecord extends DisplayRecord {
     this.expiresIn           = expiresIn;
     this.expireStarted       = expireStarted;
     this.unidentified        = unidentified;
-    this.deleted             = false;
   }
 
   public long getId() {
@@ -105,9 +103,7 @@ public abstract class MessageRecord extends DisplayRecord {
 
   @Override
   public SpannableString getDisplayBody(@NonNull Context context) {
-    if (this.deleted) {
-      return new SpannableString("This message has been deleted."); // TODO: localize
-    } else if (isGroupUpdateMessage()) {
+    if (isGroupUpdateMessage()) {
       UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(getBody());
       return new SpannableString(UpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
     } else if (isExpirationTimerUpdate()) {
diff --git a/app/src/main/res/layout/view_deleted_message.xml b/app/src/main/res/layout/view_deleted_message.xml
index 20b6e6104..aed760259 100644
--- a/app/src/main/res/layout/view_deleted_message.xml
+++ b/app/src/main/res/layout/view_deleted_message.xml
@@ -6,21 +6,23 @@
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
-    android:padding="@dimen/medium_spacing"
+    android:padding="@dimen/small_spacing"
     android:gravity="center">
 
     <ImageView
         android:id="@+id/deletedMessageViewIconImageView"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="@dimen/small_spacing"
         android:src="?menu_trash_icon"
         app:tint="@color/text" />
 
     <TextView
-        android:id="@+id/documentTitleTextView"
+        android:id="@+id/deleteTitleTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
+        android:layout_marginEnd="@dimen/small_spacing"
         android:textSize="@dimen/very_small_font_size"
         android:textColor="@color/text"
         tools:text="This message has been deleted"

From 9ab285c3be252b1a3c0e19024a4f45679d6e8722 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Thu, 12 Aug 2021 14:14:37 +1000
Subject: [PATCH 12/43] handle home screen update for unsend request

---
 .../attachments/DatabaseAttachmentProvider.kt | 17 ++++++++++++-----
 .../securesms/database/MessagingDatabase.java |  2 +-
 .../securesms/database/MmsDatabase.java       |  3 ++-
 .../securesms/database/MmsSmsDatabase.java    |  4 +++-
 .../securesms/database/SmsDatabase.java       |  4 +++-
 .../securesms/database/ThreadDatabase.java    | 19 ++++++++++++++++---
 .../database/MessageDataProvider.kt           |  2 +-
 .../ReceivedMessageHandler.kt                 |  3 +--
 8 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index 99153ae67..aa1fe66f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -178,11 +178,18 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         DatabaseFactory.getLokiMessageDatabase(context).deleteMessageServerHash(messageID)
     }
 
-    override fun updateMessageAsDeleted(messageID: Long) {
-        val smsDatabase = DatabaseFactory.getSmsDatabase(context)
-        val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
-        smsDatabase.markAsDeleted(messageID)
-        mmsDatabase.markAsDeleted(messageID)
+    override fun updateMessageAsDeleted(timestamp: Long, author: String) {
+        val database = DatabaseFactory.getMmsSmsDatabase(context)
+        val address = Address.fromSerialized(author)
+        val message = database.getMessageFor(timestamp, address)!!
+        if (message.isMms) {
+            val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
+            mmsDatabase.markAsDeleted(message.id, message.isRead)
+        } else {
+            val smsDatabase = DatabaseFactory.getSmsDatabase(context)
+            smsDatabase.markAsDeleted(message.id, message.isRead)
+        }
+
     }
 
     override fun getServerHashForMessage(messageID: Long): String? {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
index d6dd09764..f542058c7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
@@ -38,7 +38,7 @@ public abstract class MessagingDatabase extends Database implements MmsSmsColumn
   public abstract void markAsSent(long messageId, boolean secure);
   public abstract void markUnidentified(long messageId, boolean unidentified);
 
-  public abstract void markAsDeleted(long messageId);
+  public abstract void markAsDeleted(long messageId, boolean read);
 
   public void addMismatchedIdentity(long messageId, Address address, IdentityKey identityKey) {
     try {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
index 597d14f09..1fa26000a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -392,7 +392,7 @@ public class MmsDatabase extends MessagingDatabase {
   }
 
   @Override
-  public void markAsDeleted(long messageId) {
+  public void markAsDeleted(long messageId, boolean read) {
     SQLiteDatabase database     = databaseHelper.getWritableDatabase();
     ContentValues contentValues = new ContentValues();
     contentValues.put(READ, 1);
@@ -403,6 +403,7 @@ public class MmsDatabase extends MessagingDatabase {
     ThreadUtils.queue(() -> attachmentDatabase.deleteAttachmentsForMessage(messageId));
 
     long threadId = getThreadIdForMessage(messageId);
+    if (!read) { DatabaseFactory.getThreadDatabase(context).decrementUnread(threadId, 1); }
     updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_DELETED_TYPE, Optional.of(threadId));
     notifyConversationListeners(threadId);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index 42284a4ff..150f7f4c5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -129,7 +129,9 @@ public class MmsSmsDatabase extends Database {
     String order     = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
     String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
 
-    return queryTables(PROJECTION, selection, order, "1");
+    // FIXME: Not sure if this will cause any performance issues
+    // return queryTables(PROJECTION, selection, order, "1");
+    return queryTables(PROJECTION, selection, order, null);
   }
 
   public long getLastMessageID(long threadId) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index eaa289807..5b7503763 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -184,12 +184,14 @@ public class SmsDatabase extends MessagingDatabase {
   }
 
   @Override
-  public void markAsDeleted(long messageId) {
+  public void markAsDeleted(long messageId, boolean read) {
     SQLiteDatabase database     = databaseHelper.getWritableDatabase();
     ContentValues contentValues = new ContentValues();
     contentValues.put(READ, 1);
     contentValues.put(BODY, "");
     database.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
+    long threadId = getThreadIdForMessage(messageId);
+    if (!read) { DatabaseFactory.getThreadDatabase(context).decrementUnread(threadId, 1); }
     updateTypeBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_DELETED_TYPE);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index c9fa010e8..3d894a046 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -294,6 +294,14 @@ public class ThreadDatabase extends Database {
                              String.valueOf(threadId)});
   }
 
+  public void decrementUnread(long threadId, int amount) {
+    SQLiteDatabase db = databaseHelper.getWritableDatabase();
+    db.execSQL("UPDATE " + TABLE_NAME + " SET " + READ + " = 0, " +
+                    UNREAD_COUNT + " = " + UNREAD_COUNT + " - ? WHERE " + ID + " = ?",
+            new String[] {String.valueOf(amount),
+                    String.valueOf(threadId)});
+  }
+
   public void setDistributionType(long threadId, int distributionType) {
     ContentValues contentValues = new ContentValues(1);
     contentValues.put(TYPE, distributionType);
@@ -536,9 +544,14 @@ public class ThreadDatabase extends Database {
 
     try {
       reader = mmsSmsDatabase.readerFor(mmsSmsDatabase.getConversationSnippet(threadId));
-      MessageRecord record;
-
-      if (reader != null && (record = reader.getNext()) != null) {
+      MessageRecord record = null;
+      if (reader != null) {
+        record = reader.getNext();
+        while (record != null && record.isDeleted()) {
+          record = reader.getNext();
+        }
+      }
+      if (record != null && !record.isDeleted()) {
         updateThread(threadId, count, getFormattedBodyFor(record), getAttachmentUriFor(record),
                      record.getTimestamp(), record.getDeliveryStatus(), record.getDeliveryReceiptCount(),
                      record.getType(), unarchive, record.getExpiresIn(), record.getReadReceiptCount());
diff --git a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
index 86534bb9a..356307d1d 100644
--- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
+++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
@@ -13,7 +13,7 @@ interface MessageDataProvider {
     fun getMessageID(serverID: Long): Long?
     fun getMessageID(serverId: Long, threadId: Long): Pair<Long, Boolean>?
     fun deleteMessage(messageID: Long, isSms: Boolean)
-    fun updateMessageAsDeleted(messageID: Long)
+    fun updateMessageAsDeleted(timestamp: Long, author: String)
     fun getServerHashForMessage(messageID: Long): String?
     fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment?
     fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream?
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
index b514d9672..1d5a797b7 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -157,13 +157,12 @@ fun MessageReceiver.handleUnsendRequest(message: UnsendRequest) {
     val author = message.author ?: return
     val messageIdToDelete = storage.getMessageIdInDatabase(timestamp, author) ?: return
     if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
-        // TODO: Mark this message as read
         // TODO: Cancel the notification of this message
     }
     messageDataProvider.getServerHashForMessage(messageIdToDelete)?.let { serverHash ->
         SnodeAPI.deleteMessage(author, listOf(serverHash))
     }
-    messageDataProvider.updateMessageAsDeleted(messageIdToDelete)
+    messageDataProvider.updateMessageAsDeleted(timestamp, author)
 }
 //endregion
 

From 9dcc5dd848943a141abc1a6e1229e90715c0d78d Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Thu, 12 Aug 2021 15:01:48 +1000
Subject: [PATCH 13/43] disable interaction for deleted messages

---
 .../securesms/conversation/v2/ConversationAdapter.kt      | 8 +++++---
 .../conversation/v2/messages/VisibleMessageView.kt        | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 15de18a60..59e9f4d6f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -73,9 +73,11 @@ class ConversationAdapter(context: Context, cursor: Cursor, private val onItemPr
                 val position = viewHolder.adapterPosition
                 view.indexInAdapter = position
                 view.bind(message, getMessageBefore(position, cursor), getMessageAfter(position, cursor), glide, searchQuery)
-                view.onPress = { event -> onItemPress(message, viewHolder.adapterPosition, view, event) }
-                view.onSwipeToReply = { onItemSwipeToReply(message, viewHolder.adapterPosition) }
-                view.onLongPress = { onItemLongPress(message, viewHolder.adapterPosition) }
+                if (!message.isDeleted) {
+                    view.onPress = { event -> onItemPress(message, viewHolder.adapterPosition, view, event) }
+                    view.onSwipeToReply = { onItemSwipeToReply(message, viewHolder.adapterPosition) }
+                    view.onLongPress = { onItemLongPress(message, viewHolder.adapterPosition) }
+                }
                 view.contentViewDelegate = visibleMessageContentViewDelegate
             }
             is ControlMessageViewHolder -> viewHolder.view.bind(message)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index ad1864d05..5e5b1da22 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -266,6 +266,7 @@ class VisibleMessageView : LinearLayout {
 
     // region Interaction
     override fun onTouchEvent(event: MotionEvent): Boolean {
+        if (onPress == null || onSwipeToReply == null || onLongPress == null) { return false }
         when (event.action) {
             MotionEvent.ACTION_DOWN -> onDown(event)
             MotionEvent.ACTION_MOVE -> onMove(event)

From 7e791d63dc004fd29b391c1892a2f31b8d5dfbd8 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Thu, 12 Aug 2021 15:36:08 +1000
Subject: [PATCH 14/43] fix: other view types have clickable links, clickable
 links in the long message. Ordering of highlight mentions before getting
 clickable spans

fixes #664
---
 .../v2/components/AlbumThumbnailView.kt       | 15 ++++++++--
 .../v2/messages/VisibleMessageContentView.kt  | 30 ++++++++++++-------
 .../longmessage/LongMessageActivity.java      | 15 +++-------
 .../main/res/layout/album_thumbnail_view.xml  |  2 +-
 .../main/res/layout/longmessage_activity.xml  |  2 ++
 5 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt
index 7cd78cda2..b1283e1a2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt
@@ -21,13 +21,14 @@ import org.session.libsession.utilities.ViewUtil
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.MediaPreviewActivity
 import org.thoughtcrime.securesms.components.CornerMask
+import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageContentView
 import org.thoughtcrime.securesms.conversation.v2.utilities.KThumbnailView
+import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities.getIntersectedModalSpans
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.util.ActivityDispatcher
 import org.thoughtcrime.securesms.longmessage.LongMessageActivity
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.mms.Slide
-import org.thoughtcrime.securesms.video.exo.AttachmentDataSource
+import org.thoughtcrime.securesms.util.ActivityDispatcher
 import kotlin.math.roundToInt
 
 class AlbumThumbnailView : FrameLayout {
@@ -80,6 +81,13 @@ class AlbumThumbnailView : FrameLayout {
             }
             return
         }
+        val intersectedSpans = albumCellBodyText.getIntersectedModalSpans(eventRect)
+        if (intersectedSpans.isNotEmpty()) {
+            intersectedSpans.forEach { span ->
+                span.onClick(albumCellBodyText)
+            }
+            return
+        }
         // test each album child
         albumCellContainer.findViewById<ViewGroup>(R.id.album_thumbnail_root)?.children?.forEachIndexed { index, child ->
             child.getGlobalVisibleRect(testRect)
@@ -130,7 +138,8 @@ class AlbumThumbnailView : FrameLayout {
             thumbnailView.setImageResource(glideRequests, slide, isPreview = false, mms = message)
         }
         albumCellBodyParent.isVisible = message.body.isNotEmpty()
-        albumCellBodyText.text = message.body
+        val body = VisibleMessageContentView.getBodySpans(context, message, null)
+        albumCellBodyText.text = body
         post {
             // post to await layout of text
             albumCellBodyText.layout?.let { layout ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
index 8f2410652..8db00031f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
+import android.text.Spannable
 import android.text.style.BackgroundColorSpan
 import android.text.style.ForegroundColorSpan
 import android.text.style.URLSpan
@@ -28,21 +29,21 @@ import okhttp3.HttpUrl
 import org.session.libsession.utilities.ThemeUtil
 import org.session.libsession.utilities.ViewUtil
 import org.session.libsession.utilities.recipients.Recipient
-import org.thoughtcrime.securesms.conversation.v2.components.AlbumThumbnailView
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
+import org.thoughtcrime.securesms.conversation.v2.components.AlbumThumbnailView
 import org.thoughtcrime.securesms.conversation.v2.dialogs.OpenURLDialog
 import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities
 import org.thoughtcrime.securesms.conversation.v2.utilities.ModalURLSpan
 import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities.getIntersectedModalSpans
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.util.*
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.util.SearchUtil
 import org.thoughtcrime.securesms.util.SearchUtil.StyleFactory
 import org.thoughtcrime.securesms.util.UiModeUtilities
-import java.net.IDN
+import org.thoughtcrime.securesms.util.getColorWithID
+import org.thoughtcrime.securesms.util.toPx
 import java.util.*
 import kotlin.math.roundToInt
 
@@ -106,6 +107,10 @@ class VisibleMessageContentView : LinearLayout {
                 quoteView.getGlobalVisibleRect(r)
                 if (r.contains(event.rawX.roundToInt(), event.rawY.roundToInt())) {
                     delegate?.scrollToMessageIfPossible(quote.id)
+                } else {
+                    bodyTextView.getIntersectedModalSpans(event).forEach { span ->
+                        span.onClick(bodyTextView)
+                    }
                 }
             }
         } else if (message is MmsMessageRecord && message.slideDeck.audioSlide != null) {
@@ -209,7 +214,18 @@ class VisibleMessageContentView : LinearLayout {
             val color = getTextColor(context, message)
             result.setTextColor(color)
             result.setLinkTextColor(color)
+            val body = getBodySpans(context, message, searchQuery)
+            result.text = body
+            return result
+        }
+
+        fun getBodySpans(context: Context, message: MessageRecord, searchQuery: String?): Spannable {
             var body = message.body.toSpannable()
+
+            body = MentionUtilities.highlightMentions(body, message.isOutgoing, message.threadId, context)
+            body = SearchUtil.getHighlightedSpan(Locale.getDefault(), StyleFactory { BackgroundColorSpan(Color.WHITE) }, body, searchQuery)
+            body = SearchUtil.getHighlightedSpan(Locale.getDefault(), StyleFactory { ForegroundColorSpan(Color.BLACK) }, body, searchQuery)
+
             Linkify.addLinks(body, Linkify.WEB_URLS)
 
             // replace URLSpans with ModalURLSpans
@@ -225,13 +241,7 @@ class VisibleMessageContentView : LinearLayout {
                 body.removeSpan(urlSpan)
                 body.setSpan(replacementSpan, start, end, flags)
             }
-            
-            body = MentionUtilities.highlightMentions(body, message.isOutgoing, message.threadId, context)
-            body = SearchUtil.getHighlightedSpan(Locale.getDefault(), StyleFactory { BackgroundColorSpan(Color.WHITE) }, body, searchQuery)
-            body = SearchUtil.getHighlightedSpan(Locale.getDefault(), StyleFactory { ForegroundColorSpan(Color.BLACK) }, body, searchQuery)
-
-            result.text = body
-            return result
+            return body
         }
 
         @ColorInt
diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
index 04edf1194..68c568bb3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.longmessage;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.view.MenuItem;
 import android.widget.TextView;
@@ -15,7 +16,7 @@ import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
-import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities;
+import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageContentView;
 
 import network.loki.messenger.R;
 
@@ -81,18 +82,10 @@ public class LongMessageActivity extends PassphraseRequiredActionBarActivity {
         String    name      = Util.getFirstNonEmpty(recipient.getName(), recipient.getProfileName(), recipient.getAddress().serialize());
         getSupportActionBar().setTitle(getString(R.string.LongMessageActivity_message_from_s, name));
       }
-
-      String trimmedBody = getTrimmedBody(message.get().getFullBody());
-      String mentionBody = MentionUtilities.highlightMentions(trimmedBody, message.get().getMessageRecord().getThreadId(), this);
-
-      textBody.setText(mentionBody);
+      Spannable bodySpans = VisibleMessageContentView.Companion.getBodySpans(this, message.get().getMessageRecord(), null);
+      textBody.setText(bodySpans);
       textBody.setMovementMethod(LinkMovementMethod.getInstance());
     });
   }
 
-  private String getTrimmedBody(@NonNull String text) {
-    return text.length() <= MAX_DISPLAY_LENGTH ? text
-                                               : text.substring(0, MAX_DISPLAY_LENGTH);
-  }
-
 }
diff --git a/app/src/main/res/layout/album_thumbnail_view.xml b/app/src/main/res/layout/album_thumbnail_view.xml
index 9c7ed0221..706964a20 100644
--- a/app/src/main/res/layout/album_thumbnail_view.xml
+++ b/app/src/main/res/layout/album_thumbnail_view.xml
@@ -52,7 +52,7 @@
                 android:layout_width="@dimen/accent_line_thickness"
                 android:layout_height="match_parent"
                 android:background="@color/accent"/>
-            <TextView
+            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:maxLines="4"
                 android:ellipsize="end"
                 android:id="@+id/albumCellBodyText"
diff --git a/app/src/main/res/layout/longmessage_activity.xml b/app/src/main/res/layout/longmessage_activity.xml
index ed933b235..58abb1077 100644
--- a/app/src/main/res/layout/longmessage_activity.xml
+++ b/app/src/main/res/layout/longmessage_activity.xml
@@ -12,6 +12,8 @@
 
         <TextView
             android:textSize="@dimen/text_size"
+            android:focusable="true"
+            android:textColorLink="@color/text"
             android:id="@+id/longmessage_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>

From 4f89c336766e8cd3fdb2adbca90c2b5ada6b5203 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Thu, 12 Aug 2021 16:37:53 +1000
Subject: [PATCH 15/43] fix a issue that the unread count can be negative

---
 .../org/thoughtcrime/securesms/database/ThreadDatabase.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 3d894a046..361d1449e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -297,7 +297,7 @@ public class ThreadDatabase extends Database {
   public void decrementUnread(long threadId, int amount) {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     db.execSQL("UPDATE " + TABLE_NAME + " SET " + READ + " = 0, " +
-                    UNREAD_COUNT + " = " + UNREAD_COUNT + " - ? WHERE " + ID + " = ?",
+                    UNREAD_COUNT + " = " + UNREAD_COUNT + " - ? WHERE " + ID + " = ? AND " + UNREAD_COUNT + " > 0",
             new String[] {String.valueOf(amount),
                     String.valueOf(threadId)});
   }

From 266ed2fa78d696c6bcf039ff54333f5debd41334 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Thu, 12 Aug 2021 17:50:35 +1000
Subject: [PATCH 16/43] feat: allow opening conversation thread from
 UserDetailsBottomSheet.kt

refactor the copy button logic to occur when long pressing the Session ID text to fix #517
---
 .../securesms/home/UserDetailsBottomSheet.kt    | 17 ++++++++++++++++-
 .../fragment_user_details_bottom_sheet.xml      |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
index f6010bb53..f13c2824d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -14,9 +15,11 @@ import android.widget.Toast
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.fragment_user_details_bottom_sheet.*
 import network.loki.messenger.R
+import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.util.UiModeUtilities
@@ -63,11 +66,23 @@ class UserDetailsBottomSheet : BottomSheetDialogFragment() {
         }
         nameTextView.text = recipient.name ?: publicKey // Uses the Contact API internally
         publicKeyTextView.text = publicKey
-        copyButton.setOnClickListener {
+        publicKeyTextView.setOnLongClickListener {
             val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             val clip = ClipData.newPlainText("Session ID", publicKey)
             clipboard.setPrimaryClip(clip)
             Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
+            true
+        }
+        messageButton.setOnClickListener {
+            val threadId = MessagingModuleConfiguration.shared.storage.getThreadId(recipient)
+            val intent = Intent(
+                context,
+                ConversationActivityV2::class.java
+            )
+            intent.putExtra(ConversationActivityV2.ADDRESS, recipient.address)
+            intent.putExtra(ConversationActivityV2.THREAD_ID, threadId ?: -1)
+            startActivity(intent)
+            dismiss()
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
index 985de78a6..4b46e134c 100644
--- a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
@@ -111,12 +111,12 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"
-        android:id="@+id/copyButton"
+        android:id="@+id/messageButton"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginTop="@dimen/medium_spacing"
         android:paddingLeft="@dimen/large_spacing"
         android:paddingRight="@dimen/large_spacing"
-        android:text="@string/copy" />
+        android:text="@string/ConversationActivity_message" />
 
 </LinearLayout>

From aad58043d361e034892130f99d12a4c97300c50b Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Fri, 13 Aug 2021 15:30:26 +1000
Subject: [PATCH 17/43] add UI options for delete messages

---
 .../conversation/v2/ConversationActivityV2.kt | 47 ++++++++++++-----
 .../v2/DeleteOptionsBottomSheet.kt            | 52 +++++++++++++++++++
 .../fragment_delete_message_bottom_sheet.xml  | 29 +++++++++++
 3 files changed, 114 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DeleteOptionsBottomSheet.kt
 create mode 100644 app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 7abe4a704..a6e242635 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1167,22 +1167,41 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun deleteMessages(messages: Set<MessageRecord>) {
-        val messageCount = messages.size
-        val builder = AlertDialog.Builder(this)
-        builder.setTitle(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
-        builder.setMessage(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
-        builder.setCancelable(true)
-        builder.setPositiveButton(R.string.delete) { _, _ ->
-            for (message in messages) {
-                this.deleteForEveryone(message)
+        if (thread.isOpenGroupRecipient) {
+            val messageCount = messages.size
+            val builder = AlertDialog.Builder(this)
+            builder.setTitle(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
+            builder.setMessage(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
+            builder.setCancelable(true)
+            builder.setPositiveButton(R.string.delete) { _, _ ->
+                for (message in messages) {
+                    this.deleteForEveryone(message)
+                }
+                endActionMode()
             }
-            endActionMode()
+            builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
+                dialog.dismiss()
+                endActionMode()
+            }
+            builder.show()
+        } else {
+            val bottomSheet = DeleteOptionsBottomSheet()
+            bottomSheet.recipient = thread
+            bottomSheet.onDeleteForMeTapped = {
+                for (message in messages) {
+                    this.deleteLocally(message)
+                }
+                bottomSheet.dismiss()
+            }
+            bottomSheet.onDeleteForEveryoneTapped = {
+                for (message in messages) {
+                    this.deleteForEveryone(message)
+                }
+                bottomSheet.dismiss()
+            }
+            bottomSheet.onCancelTapped = { bottomSheet.dismiss() }
+            bottomSheet.show(supportFragmentManager, bottomSheet.tag)
         }
-        builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
-            dialog.dismiss()
-            endActionMode()
-        }
-        builder.show()
     }
 
     override fun banUser(messages: Set<MessageRecord>) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DeleteOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DeleteOptionsBottomSheet.kt
new file mode 100644
index 000000000..4d84f7c0f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DeleteOptionsBottomSheet.kt
@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.conversation.v2
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import kotlinx.android.synthetic.main.fragment_conversation_bottom_sheet.*
+import kotlinx.android.synthetic.main.fragment_delete_message_bottom_sheet.*
+import network.loki.messenger.R
+import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.util.UiModeUtilities
+
+class DeleteOptionsBottomSheet: BottomSheetDialogFragment(), View.OnClickListener {
+
+    lateinit var recipient: Recipient
+
+    var onDeleteForMeTapped: (() -> Unit?)? = null
+    var onDeleteForEveryoneTapped: (() -> Unit)? = null
+    var onCancelTapped: (() -> Unit)? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_delete_message_bottom_sheet, container, false)
+    }
+
+    override fun onClick(v: View?) {
+        when (v) {
+            deleteForMeTextView -> onDeleteForMeTapped?.invoke()
+            deleteForEveryoneTextView -> onDeleteForEveryoneTapped?.invoke()
+            cancelTextView -> onCancelTapped?.invoke()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        if (!this::recipient.isInitialized) { return dismiss() }
+        if (!recipient.isGroupRecipient) {
+            deleteForEveryoneTextView.text = resources.getString(R.string.delete_message_for_me_and_recipient, recipient.name)
+        }
+        deleteForMeTextView.setOnClickListener(this)
+        deleteForEveryoneTextView.setOnClickListener(this)
+        cancelTextView.setOnClickListener(this)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val window = dialog?.window ?: return
+        val isLightMode = UiModeUtilities.isDayUiMode(requireContext())
+        window.setDimAmount(if (isLightMode) 0.1f else 0.75f)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml b/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
new file mode 100644
index 000000000..592701ae0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    app:behavior_hideable="true"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+    <TextView
+        android:id="@+id/deleteForMeTextView"
+        style="@style/BottomSheetActionItem"
+        android:text="@string/delete_message_for_me"
+        android:textColor="@color/core_red"/>
+
+    <TextView
+        android:id="@+id/deleteForEveryoneTextView"
+        style="@style/BottomSheetActionItem"
+        android:text="@string/delete_message_for_everyone"
+        android:textColor="@color/core_red"/>
+
+    <TextView
+        android:id="@+id/cancelTextView"
+        style="@style/BottomSheetActionItem"
+        android:text="@string/cancel" />
+
+</LinearLayout>

From cb59a1af2d5a22607a965ee74429594eef0f80a8 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Fri, 13 Aug 2021 15:49:05 +1000
Subject: [PATCH 18/43] minor fix

---
 .../conversation/v2/ConversationActivityV2.kt        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index a6e242635..1ac56afd9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1155,7 +1155,10 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                     }
             }
         } else {
-            messageDataProvider.getServerHashForMessage(message.id)?.let { serverHash ->
+            val serverHash = messageDataProvider.getServerHashForMessage(message.id)
+            if (serverHash == null) {
+                messageDataProvider.deleteMessage(message.id, !message.isMms)
+            } else {
                 SnodeAPI.deleteMessage(thread.address.serialize(), listOf(serverHash))
                     .success {
                         messageDataProvider.deleteMessage(message.id, !message.isMms)
@@ -1192,14 +1195,19 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                     this.deleteLocally(message)
                 }
                 bottomSheet.dismiss()
+                endActionMode()
             }
             bottomSheet.onDeleteForEveryoneTapped = {
                 for (message in messages) {
                     this.deleteForEveryone(message)
                 }
                 bottomSheet.dismiss()
+                endActionMode()
+            }
+            bottomSheet.onCancelTapped = {
+                bottomSheet.dismiss()
+                endActionMode()
             }
-            bottomSheet.onCancelTapped = { bottomSheet.dismiss() }
             bottomSheet.show(supportFragmentManager, bottomSheet.tag)
         }
     }

From 064e5099924af0b4a67c8e3f28bbd123c00b084f Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Fri, 13 Aug 2021 16:33:30 +1000
Subject: [PATCH 19/43] fix a minor issue for closed group

---
 .../conversation/v2/ConversationActivityV2.kt    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 1ac56afd9..234ee65c3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -63,6 +63,7 @@ import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.fromSerialized
+import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.MediaTypes
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.concurrent.SimpleTask
@@ -72,6 +73,7 @@ import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.ListenableFuture
 import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.utilities.hexEncodedPrivateKey
+import org.session.libsignal.utilities.toHexString
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.audio.AudioRecorder
@@ -1155,14 +1157,12 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                     }
             }
         } else {
-            val serverHash = messageDataProvider.getServerHashForMessage(message.id)
-            if (serverHash == null) {
-                messageDataProvider.deleteMessage(message.id, !message.isMms)
-            } else {
-                SnodeAPI.deleteMessage(thread.address.serialize(), listOf(serverHash))
-                    .success {
-                        messageDataProvider.deleteMessage(message.id, !message.isMms)
-                    }.failUi { error ->
+            messageDataProvider.deleteMessage(message.id, !message.isMms)
+            messageDataProvider.getServerHashForMessage(message.id)?.let { serverHash ->
+                var publicKey = thread.address.serialize()
+                if (thread.isClosedGroupRecipient) { publicKey = GroupUtil.doubleDecodeGroupID(publicKey).toHexString() }
+                SnodeAPI.deleteMessage(publicKey, listOf(serverHash))
+                    .failUi { error ->
                         Toast.makeText(this@ConversationActivityV2, "Couldn't delete message due to error: $error", Toast.LENGTH_LONG).show()
                     }
             }

From ee3e9ae17fcbea73d42c6c8e35001f01cd9be9a2 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Mon, 16 Aug 2021 09:58:28 +1000
Subject: [PATCH 20/43] delete outgoing message for linked device

---
 .../attachments/DatabaseAttachmentProvider.kt | 23 ++++++++-----------
 .../securesms/database/MessagingDatabase.java |  2 ++
 .../securesms/database/MmsDatabase.java       |  7 +++---
 .../securesms/database/SmsDatabase.java       |  1 +
 .../service/ExpiringMessageManager.java       |  2 +-
 .../securesms/util/AttachmentUtil.java        |  2 +-
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index aa1fe66f3..2ed700cb3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -19,6 +19,7 @@ import org.session.libsignal.utilities.guava.Optional
 import org.thoughtcrime.securesms.database.AttachmentDatabase
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.MessagingDatabase
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.events.PartProgressEvent
 import org.thoughtcrime.securesms.mms.MediaConstraints
@@ -167,13 +168,9 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
     }
 
     override fun deleteMessage(messageID: Long, isSms: Boolean) {
-        if (isSms) {
-            val db = DatabaseFactory.getSmsDatabase(context)
-            db.deleteMessage(messageID)
-        } else {
-            val db = DatabaseFactory.getMmsDatabase(context)
-            db.delete(messageID)
-        }
+        val messagingDatabase: MessagingDatabase = if (isSms)  DatabaseFactory.getSmsDatabase(context)
+                                                   else DatabaseFactory.getMmsDatabase(context)
+        messagingDatabase.deleteMessage(messageID)
         DatabaseFactory.getLokiMessageDatabase(context).deleteMessage(messageID, isSms)
         DatabaseFactory.getLokiMessageDatabase(context).deleteMessageServerHash(messageID)
     }
@@ -182,14 +179,12 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         val database = DatabaseFactory.getMmsSmsDatabase(context)
         val address = Address.fromSerialized(author)
         val message = database.getMessageFor(timestamp, address)!!
-        if (message.isMms) {
-            val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
-            mmsDatabase.markAsDeleted(message.id, message.isRead)
-        } else {
-            val smsDatabase = DatabaseFactory.getSmsDatabase(context)
-            smsDatabase.markAsDeleted(message.id, message.isRead)
+        val messagingDatabase: MessagingDatabase = if (message.isMms)  DatabaseFactory.getMmsDatabase(context)
+                                                   else DatabaseFactory.getSmsDatabase(context)
+        messagingDatabase.markAsDeleted(message.id, message.isRead)
+        if (message.isOutgoing) {
+            messagingDatabase.deleteMessage(message.id)
         }
-
     }
 
     override fun getServerHashForMessage(messageID: Long): String? {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
index f542058c7..a3906d287 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
@@ -40,6 +40,8 @@ public abstract class MessagingDatabase extends Database implements MmsSmsColumn
 
   public abstract void markAsDeleted(long messageId, boolean read);
 
+  public abstract boolean deleteMessage(long messageId);
+
   public void addMismatchedIdentity(long messageId, Address address, IdentityKey identityKey) {
     try {
       addToDocument(messageId, MISMATCHED_IDENTITIES,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
index 1fa26000a..f56792aa7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -923,7 +923,8 @@ public class MmsDatabase extends MessagingDatabase {
     reader.close();
   }
 
-  public boolean delete(long messageId) {
+  @Override
+  public boolean deleteMessage(long messageId) {
     long threadId = getThreadIdForMessage(messageId);
     AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
     ThreadUtils.queue(() -> attachmentDatabase.deleteAttachmentsForMessage(messageId));
@@ -1050,7 +1051,7 @@ public class MmsDatabase extends MessagingDatabase {
       cursor = db.query(TABLE_NAME, new String[] {ID}, where, null, null, null, null);
 
       while (cursor != null && cursor.moveToNext()) {
-        delete(cursor.getLong(0));
+        deleteMessage(cursor.getLong(0));
       }
 
     } finally {
@@ -1076,7 +1077,7 @@ public class MmsDatabase extends MessagingDatabase {
 
       while (cursor != null && cursor.moveToNext()) {
         Log.i("MmsDatabase", "Trimming: " + cursor.getLong(0));
-        delete(cursor.getLong(0));
+        deleteMessage(cursor.getLong(0));
       }
 
     } finally {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index 5b7503763..17a836477 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -529,6 +529,7 @@ public class SmsDatabase extends MessagingDatabase {
     return cursor;
   }
 
+  @Override
   public boolean deleteMessage(long messageId) {
     Log.i("MessageDatabase", "Deleting: " + messageId);
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
index c2c4834cd..59cd5cc0c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
@@ -229,7 +229,7 @@ public class ExpiringMessageManager implements SSKEnvironment.MessageExpirationM
         }
 
         if (expiredMessage != null) {
-          if (expiredMessage.mms) mmsDatabase.delete(expiredMessage.id);
+          if (expiredMessage.mms) mmsDatabase.deleteMessage(expiredMessage.id);
           else                    smsDatabase.deleteMessage(expiredMessage.id);
         }
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
index 13cdcc6d6..2697a634c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
@@ -66,7 +66,7 @@ public class AttachmentUtil {
         .size();
 
     if (attachmentCount <= 1) {
-      DatabaseFactory.getMmsDatabase(context).delete(mmsId);
+      DatabaseFactory.getMmsDatabase(context).deleteMessage(mmsId);
     } else {
       DatabaseFactory.getAttachmentDatabase(context).deleteAttachment(attachmentId);
     }

From f10ddb8e3a7cdc79f36b99aa8e93eb5d237231ce Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Mon, 16 Aug 2021 10:34:28 +1000
Subject: [PATCH 21/43] cancel notification for unsend request

---
 .../messaging/sending_receiving/ReceivedMessageHandler.kt      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
index 1d5a797b7..82ac2139d 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -157,7 +157,8 @@ fun MessageReceiver.handleUnsendRequest(message: UnsendRequest) {
     val author = message.author ?: return
     val messageIdToDelete = storage.getMessageIdInDatabase(timestamp, author) ?: return
     if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
-        // TODO: Cancel the notification of this message
+        // FIXME: Not sure if there is any performance issue here
+        SSKEnvironment.shared.notificationManager.updateNotification(context)
     }
     messageDataProvider.getServerHashForMessage(messageIdToDelete)?.let { serverHash ->
         SnodeAPI.deleteMessage(author, listOf(serverHash))

From feff1c83938b5b921d0aabe122907d8850287500 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Mon, 16 Aug 2021 10:58:07 +1000
Subject: [PATCH 22/43] fix cancel notification

---
 .../messaging/sending_receiving/ReceivedMessageHandler.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
index 82ac2139d..dbea3687f 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -156,14 +156,14 @@ fun MessageReceiver.handleUnsendRequest(message: UnsendRequest) {
     val timestamp = message.timestamp ?: return
     val author = message.author ?: return
     val messageIdToDelete = storage.getMessageIdInDatabase(timestamp, author) ?: return
-    if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
-        // FIXME: Not sure if there is any performance issue here
-        SSKEnvironment.shared.notificationManager.updateNotification(context)
-    }
     messageDataProvider.getServerHashForMessage(messageIdToDelete)?.let { serverHash ->
         SnodeAPI.deleteMessage(author, listOf(serverHash))
     }
     messageDataProvider.updateMessageAsDeleted(timestamp, author)
+    if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
+        // FIXME: Not sure if there is any performance issue here
+        SSKEnvironment.shared.notificationManager.updateNotification(context)
+    }
 }
 //endregion
 

From 4ce1bd6875cd7c4fdc9cf4dd01d233dbb8aef4c9 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Mon, 16 Aug 2021 11:59:52 +1000
Subject: [PATCH 23/43] clean

---
 .../org/thoughtcrime/securesms/database/MmsSmsDatabase.java   | 4 +---
 .../messaging/sending_receiving/ReceivedMessageHandler.kt     | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index 150f7f4c5..6ba77ce83 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -128,9 +128,7 @@ public class MmsSmsDatabase extends Database {
   public Cursor getConversationSnippet(long threadId) {
     String order     = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
     String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
-
-    // FIXME: Not sure if this will cause any performance issues
-    // return queryTables(PROJECTION, selection, order, "1");
+    
     return queryTables(PROJECTION, selection, order, null);
   }
 
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
index dbea3687f..de2b8a349 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -161,7 +161,6 @@ fun MessageReceiver.handleUnsendRequest(message: UnsendRequest) {
     }
     messageDataProvider.updateMessageAsDeleted(timestamp, author)
     if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
-        // FIXME: Not sure if there is any performance issue here
         SSKEnvironment.shared.notificationManager.updateNotification(context)
     }
 }

From e8551a354534f59c02ca25f35aaec8fbab3d9ea8 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Mon, 16 Aug 2021 12:08:35 +1000
Subject: [PATCH 24/43] improve delete option ui

---
 .../conversation/v2/ConversationActivityV2.kt | 20 ++++++++++++++++++-
 .../menus/ConversationActionModeCallback.kt   |  3 ++-
 .../securesms/database/MmsSmsDatabase.java    |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 234ee65c3..a4e50fb6c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1170,6 +1170,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun deleteMessages(messages: Set<MessageRecord>) {
+        val allSentByCurrentUser = messages.all { it.isOutgoing }
         if (thread.isOpenGroupRecipient) {
             val messageCount = messages.size
             val builder = AlertDialog.Builder(this)
@@ -1187,7 +1188,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 endActionMode()
             }
             builder.show()
-        } else {
+        } else if (allSentByCurrentUser) {
             val bottomSheet = DeleteOptionsBottomSheet()
             bottomSheet.recipient = thread
             bottomSheet.onDeleteForMeTapped = {
@@ -1209,6 +1210,23 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 endActionMode()
             }
             bottomSheet.show(supportFragmentManager, bottomSheet.tag)
+        } else {
+            val messageCount = messages.size
+            val builder = AlertDialog.Builder(this)
+            builder.setTitle(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
+            builder.setMessage(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
+            builder.setCancelable(true)
+            builder.setPositiveButton(R.string.delete) { _, _ ->
+                for (message in messages) {
+                    this.deleteLocally(message)
+                }
+                endActionMode()
+            }
+            builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
+                dialog.dismiss()
+                endActionMode()
+            }
+            builder.show()
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index 237265775..e1bde23e4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -34,8 +34,9 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
         val thread = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(threadID)!!
         val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
         fun userCanDeleteSelectedItems(): Boolean {
-            if (openGroup == null) { return true }
             val allSentByCurrentUser = selectedItems.all { it.isOutgoing }
+            val allReceivedByByCurrentUser = selectedItems.all { !it.isOutgoing }
+            if (openGroup == null) { return allSentByCurrentUser || allReceivedByByCurrentUser }
             if (allSentByCurrentUser) { return true }
             return OpenGroupAPIV2.isUserModerator(userPublicKey, openGroup.room, openGroup.server)
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index 6ba77ce83..86b523164 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -128,7 +128,7 @@ public class MmsSmsDatabase extends Database {
   public Cursor getConversationSnippet(long threadId) {
     String order     = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
     String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
-    
+
     return queryTables(PROJECTION, selection, order, null);
   }
 

From 29e355c6abef244a33c4625b0453e791ff13b05f Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Mon, 16 Aug 2021 14:03:06 +1000
Subject: [PATCH 25/43] send unsend request as sync message

---
 .../sending_receiving/MessageSender.kt        | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
index 0de835076..1cb041e91 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
@@ -254,34 +254,35 @@ object MessageSender {
     fun handleSuccessfulMessageSend(message: Message, destination: Destination, isSyncMessage: Boolean = false, openGroupSentTimestamp: Long = -1) {
         val storage = MessagingModuleConfiguration.shared.storage
         val userPublicKey = storage.getUserPublicKey()!!
-        val messageID = storage.getMessageIdInDatabase(message.sentTimestamp!!, message.sender?:userPublicKey) ?: return
         // Ignore future self-sends
         storage.addReceivedMessageTimestamp(message.sentTimestamp!!)
-        if (openGroupSentTimestamp != -1L && message is VisibleMessage) {
-            storage.addReceivedMessageTimestamp(openGroupSentTimestamp)
-            storage.updateSentTimestamp(messageID, message.isMediaMessage(), openGroupSentTimestamp, message.threadID!!)
-            message.sentTimestamp = openGroupSentTimestamp
-        }
-        // When the sync message is successfully sent, the hash value of this TSOutgoingMessage
-        // will be replaced by the hash value of the sync message. Since the hash value of the
-        // real message has no use when we delete a message. It is OK to let it be.
-        message.serverHash?.let {
-            storage.setMessageServerHash(messageID, it)
-        }
-        // Track the open group server message ID
-        if (message.openGroupServerMessageID != null && destination is Destination.OpenGroupV2) {
-            val encoded = GroupUtil.getEncodedOpenGroupID("${destination.server}.${destination.room}".toByteArray())
-            val threadID = storage.getThreadId(Address.fromSerialized(encoded))
-            if (threadID != null && threadID >= 0) {
-                storage.setOpenGroupServerMessageID(messageID, message.openGroupServerMessageID!!, threadID, !(message as VisibleMessage).isMediaMessage())
+        storage.getMessageIdInDatabase(message.sentTimestamp!!, message.sender?:userPublicKey)?.let { messageID ->
+            if (openGroupSentTimestamp != -1L && message is VisibleMessage) {
+                storage.addReceivedMessageTimestamp(openGroupSentTimestamp)
+                storage.updateSentTimestamp(messageID, message.isMediaMessage(), openGroupSentTimestamp, message.threadID!!)
+                message.sentTimestamp = openGroupSentTimestamp
+            }
+            // When the sync message is successfully sent, the hash value of this TSOutgoingMessage
+            // will be replaced by the hash value of the sync message. Since the hash value of the
+            // real message has no use when we delete a message. It is OK to let it be.
+            message.serverHash?.let {
+                storage.setMessageServerHash(messageID, it)
+            }
+            // Track the open group server message ID
+            if (message.openGroupServerMessageID != null && destination is Destination.OpenGroupV2) {
+                val encoded = GroupUtil.getEncodedOpenGroupID("${destination.server}.${destination.room}".toByteArray())
+                val threadID = storage.getThreadId(Address.fromSerialized(encoded))
+                if (threadID != null && threadID >= 0) {
+                    storage.setOpenGroupServerMessageID(messageID, message.openGroupServerMessageID!!, threadID, !(message as VisibleMessage).isMediaMessage())
+                }
+            }
+            // Mark the message as sent
+            storage.markAsSent(message.sentTimestamp!!, message.sender?:userPublicKey)
+            storage.markUnidentified(message.sentTimestamp!!, message.sender?:userPublicKey)
+            // Start the disappearing messages timer if needed
+            if (message is VisibleMessage && !isSyncMessage) {
+                SSKEnvironment.shared.messageExpirationManager.startAnyExpiration(message.sentTimestamp!!, message.sender?:userPublicKey)
             }
-        }
-        // Mark the message as sent
-        storage.markAsSent(message.sentTimestamp!!, message.sender?:userPublicKey)
-        storage.markUnidentified(message.sentTimestamp!!, message.sender?:userPublicKey)
-        // Start the disappearing messages timer if needed
-        if (message is VisibleMessage && !isSyncMessage) {
-            SSKEnvironment.shared.messageExpirationManager.startAnyExpiration(message.sentTimestamp!!, message.sender?:userPublicKey)
         }
         // Sync the message if:
         // • it's a visible message

From dbec5ad53cdeb07ae71759b85ca64a8a9c1b2e11 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Mon, 16 Aug 2021 14:05:49 +1000
Subject: [PATCH 26/43] fix: fixing the message dismissal of notifications for
 threads upon activity resume. using media send activity's camera intent for
 consistency

---
 .../conversation/v2/ConversationActivityV2.kt | 14 +++-----
 .../v2/utilities/AttachmentManager.java       | 36 +++++--------------
 .../mediasend/MediaSendActivity.java          | 13 ++++---
 .../notifications/DefaultMessageNotifier.java |  3 +-
 .../utilities/TextSecurePreferences.kt        |  2 +-
 5 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 4a86d5edc..58e969741 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -241,7 +241,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         searchBottomBar.setEventListener(this)
         setUpSearchResultObserver()
         scrollToFirstUnreadMessageIfNeeded()
-        markAllAsRead()
         showOrHideInputIfNeeded()
         if (this.thread.isOpenGroupRecipient) {
             val openGroup = DatabaseFactory.getLokiThreadDatabase(this).getOpenGroupChat(threadID)
@@ -255,6 +254,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     override fun onResume() {
         super.onResume()
         ApplicationContext.getInstance(this).messageNotifier.setVisibleThread(threadID)
+        markAllAsRead()
     }
 
     override fun onPause() {
@@ -498,7 +498,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         } else {
             MarkReadReceiver.process(this, messages)
         }
-        ApplicationContext.getInstance(this).messageNotifier.updateNotification(this, threadID)
+        ApplicationContext.getInstance(this).messageNotifier.updateNotification(this, false, 0)
     }
 
     override fun inputBarHeightChanged(newValue: Int) {
@@ -977,7 +977,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     private fun showCamera() {
-        attachmentManager.capturePhoto(this, ConversationActivityV2.TAKE_PHOTO)
+        attachmentManager.capturePhoto(this, ConversationActivityV2.TAKE_PHOTO, thread);
     }
 
     override fun onAttachmentChanged() {
@@ -1006,11 +1006,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 val uri = intent?.data ?: return
                 prepMediaForSending(uri, AttachmentManager.MediaType.DOCUMENT).addListener(mediaPreppedListener)
             }
-            TAKE_PHOTO -> {
-                if (resultCode != RESULT_OK) { return }
-                val uri = attachmentManager.captureUri ?: return
-                prepMediaForSending(uri, AttachmentManager.MediaType.IMAGE).addListener(mediaPreppedListener)
-            }
             PICK_GIF -> {
                 intent ?: return
                 val uri = intent.data ?: return
@@ -1019,7 +1014,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 val height = intent.getIntExtra(GiphyActivity.EXTRA_HEIGHT, 0)
                 prepMediaForSending(uri, type, width, height).addListener(mediaPreppedListener)
             }
-            PICK_FROM_LIBRARY -> {
+            PICK_FROM_LIBRARY,
+            TAKE_PHOTO -> {
                 intent ?: return
                 val body = intent.getStringExtra(MediaSendActivity.EXTRA_MESSAGE)
                 val media = intent.getParcelableArrayListExtra<Media>(MediaSendActivity.EXTRA_MEDIA) ?: return
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
index d1d7e0b81..dd90b699e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
@@ -25,7 +25,6 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.provider.MediaStore;
 import android.provider.OpenableColumns;
 import android.text.TextUtils;
 import android.util.Pair;
@@ -34,9 +33,12 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.session.libsignal.utilities.NoExternalStorageException;
-import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
+import org.session.libsession.utilities.recipients.Recipient;
+import org.session.libsignal.utilities.ListenableFuture;
 import org.session.libsignal.utilities.Log;
+import org.session.libsignal.utilities.SettableFuture;
+import org.session.libsignal.utilities.guava.Optional;
+import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
@@ -50,16 +52,8 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.providers.BlobProvider;
-import org.session.libsignal.utilities.ExternalStorageUtil;
-import org.thoughtcrime.securesms.util.FileProviderUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.session.libsignal.utilities.guava.Optional;
 
-import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsignal.utilities.ListenableFuture;
-import org.session.libsignal.utilities.SettableFuture;
-
-import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -67,8 +61,6 @@ import java.util.List;
 
 import network.loki.messenger.R;
 
-import static android.provider.MediaStore.EXTRA_OUTPUT;
-
 public class AttachmentManager {
 
   private final static String TAG = AttachmentManager.class.getSimpleName();
@@ -278,25 +270,15 @@ public class AttachmentManager {
     return captureUri;
   }
 
-  public void capturePhoto(Activity activity, int requestCode) {
+  public void capturePhoto(Activity activity, int requestCode, Recipient recipient) {
     Permissions.with(activity)
         .request(Manifest.permission.CAMERA)
         .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied))
         .withRationaleDialog(activity.getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera),R.drawable.ic_baseline_photo_camera_24)
         .onAllGranted(() -> {
-          try {
-            File captureFile = File.createTempFile("conversation-capture", ".jpg", ExternalStorageUtil.getImageDir(activity));
-            Uri captureUri = FileProviderUtil.getUriFor(context, captureFile);
-            Intent captureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-            captureIntent.putExtra(EXTRA_OUTPUT, captureUri);
-            captureIntent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-            if (captureIntent.resolveActivity(activity.getPackageManager()) != null) {
-              Log.d(TAG, "captureUri path is " + captureUri.getPath());
-              this.captureUri = captureUri;
-              activity.startActivityForResult(captureIntent, requestCode);
-            }
-          } catch (IOException | NoExternalStorageException e) {
-            throw new RuntimeException("Error creating image capture intent.", e);
+          Intent captureIntent = MediaSendActivity.buildCameraIntent(activity, recipient);
+          if (captureIntent.resolveActivity(activity.getPackageManager()) != null) {
+            activity.startActivityForResult(captureIntent, requestCode);
           }
         })
         .execute();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index d2b36a689..3e9fd7905 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -20,19 +20,18 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
 
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.MediaTypes;
+import org.session.libsession.utilities.Util;
+import org.session.libsession.utilities.concurrent.SimpleTask;
+import org.session.libsession.utilities.recipients.Recipient;
+import org.session.libsignal.utilities.Log;
 import org.session.libsignal.utilities.guava.Optional;
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
-import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.scribbles.ImageEditorFragment;
 
-import org.session.libsession.utilities.Address;
-import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.utilities.concurrent.SimpleTask;
-import org.session.libsession.utilities.Util;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -87,7 +86,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
   }
 
   /**
-   * Get an intent to launch the media send flow starting with the picker.
+   * Get an intent to launch the media send flow starting with the camera.
    */
   public static Intent buildCameraIntent(@NonNull Context context, @NonNull Recipient recipient) {
     Intent intent = buildGalleryIntent(context, recipient, "");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index e7f8e8e5c..616b17799 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -90,8 +90,9 @@ public class DefaultMessageNotifier implements MessageNotifier {
 
   private static final String TAG = DefaultMessageNotifier.class.getSimpleName();
 
-  public static final  String EXTRA_REMOTE_REPLY = "extra_remote_reply";
+  public static final  String EXTRA_REMOTE_REPLY        = "extra_remote_reply";
   public static final  String LATEST_MESSAGE_ID_TAG     = "extra_latest_message_id";
+  public static final  String EXTRA_THREAD_ID           = "extra_thread_id";
 
   private static final  int   FOREGROUND_ID             = 313399;
   private static final  int   SUMMARY_NOTIFICATION_ID   = 1338;
diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
index 7ac0feae6..cef0b9315 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
@@ -380,7 +380,7 @@ object TextSecurePreferences {
 
     @JvmStatic
     fun isInThreadNotifications(context: Context): Boolean {
-        return getBooleanPreference(context, IN_THREAD_NOTIFICATION_PREF, true)
+        return getBooleanPreference(context, IN_THREAD_NOTIFICATION_PREF, false)
     }
 
     @JvmStatic

From b9dd22920743ee8b182235f4bf1fdf4b86fc561e Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Mon, 16 Aug 2021 15:09:12 +1000
Subject: [PATCH 27/43] add a flag to disable unsend requests

---
 .../conversation/v2/ConversationActivityV2.kt | 50 +++++++++++++++++++
 .../menus/ConversationActionModeCallback.kt   |  9 ++++
 2 files changed, 59 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index a4e50fb6c..bff0a2121 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -209,6 +209,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         const val PICK_GIF = 10
         const val PICK_FROM_LIBRARY = 12
         const val INVITE_CONTACTS = 124
+
+        //flag
+        val isUnsendRequestsEnabled = false
     }
     // endregion
 
@@ -1169,7 +1172,54 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         }
     }
 
+    // Remove this after the unsend request is enabled
+    fun deleteMessagesWithoutUnsendRequest(messages: Set<MessageRecord>) {
+        val messageCount = messages.size
+        val messageDataProvider = MessagingModuleConfiguration.shared.messageDataProvider
+        val messageDB = DatabaseFactory.getLokiMessageDatabase(this@ConversationActivityV2)
+        val builder = AlertDialog.Builder(this)
+        builder.setTitle(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
+        builder.setMessage(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
+        builder.setCancelable(true)
+        val openGroup = DatabaseFactory.getLokiThreadDatabase(this).getOpenGroupChat(threadID)
+        builder.setPositiveButton(R.string.delete) { _, _ ->
+            if (openGroup != null) {
+                val messageServerIDs = mutableMapOf<Long, MessageRecord>()
+                for (message in messages) {
+                    val messageServerID = messageDB.getServerID(message.id, !message.isMms) ?: continue
+                    messageServerIDs[messageServerID] = message
+                }
+                for ((messageServerID, message) in messageServerIDs) {
+                    OpenGroupAPIV2.deleteMessage(messageServerID, openGroup.room, openGroup.server)
+                        .success {
+                            messageDataProvider.deleteMessage(message.id, !message.isMms)
+                        }.failUi { error ->
+                            Toast.makeText(this@ConversationActivityV2, "Couldn't delete message due to error: $error", Toast.LENGTH_LONG).show()
+                        }
+                }
+            } else {
+                for (message in messages) {
+                    if (message.isMms) {
+                        DatabaseFactory.getMmsDatabase(this@ConversationActivityV2).deleteMessage(message.id)
+                    } else {
+                        DatabaseFactory.getSmsDatabase(this@ConversationActivityV2).deleteMessage(message.id)
+                    }
+                }
+            }
+            endActionMode()
+        }
+        builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
+            dialog.dismiss()
+            endActionMode()
+        }
+        builder.show()
+    }
+
     override fun deleteMessages(messages: Set<MessageRecord>) {
+        if (!isUnsendRequestsEnabled) {
+            deleteMessagesWithoutUnsendRequest(messages)
+            return
+        }
         val allSentByCurrentUser = messages.all { it.isOutgoing }
         if (thread.isOpenGroupRecipient) {
             val messageCount = messages.size
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index e1bde23e4..f9603f935 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -7,6 +7,7 @@ import android.view.MenuItem
 import network.loki.messenger.R
 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
 import org.session.libsession.utilities.TextSecurePreferences
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.conversation.v2.ConversationAdapter
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
@@ -35,6 +36,14 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
         val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
         fun userCanDeleteSelectedItems(): Boolean {
             val allSentByCurrentUser = selectedItems.all { it.isOutgoing }
+
+            // Remove this after the unsend request is enabled
+            if (!ConversationActivityV2.isUnsendRequestsEnabled) {
+                if (openGroup == null) { return true }
+                if (allSentByCurrentUser) { return true }
+                return OpenGroupAPIV2.isUserModerator(userPublicKey, openGroup.room, openGroup.server)
+            }
+
             val allReceivedByByCurrentUser = selectedItems.all { !it.isOutgoing }
             if (openGroup == null) { return allSentByCurrentUser || allReceivedByByCurrentUser }
             if (allSentByCurrentUser) { return true }

From c4a346341694a9e99eac82125153dadee7967a5a Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 17 Aug 2021 12:17:40 +1000
Subject: [PATCH 28/43] send unsend request to self only for delete locally

---
 .../securesms/conversation/v2/ConversationActivityV2.kt       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index bff0a2121..0d37e0ac5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1138,7 +1138,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
 
     private fun deleteLocally(message: MessageRecord) {
         buildUsendRequest(message)?.let { unsendRequest ->
-            MessageSender.send(unsendRequest, thread.address)
+            TextSecurePreferences.getLocalNumber(this)?.let {
+                MessageSender.send(unsendRequest, Address.fromSerialized(it))
+            }
         }
         MessagingModuleConfiguration.shared.messageDataProvider.deleteMessage(message.id, !message.isMms)
     }

From ecc881bc7cb758a38e34b2f2ca6db6e220847fdf Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 17 Aug 2021 14:34:49 +1000
Subject: [PATCH 29/43] store server hash value for incoming messages

---
 .../securesms/conversation/v2/ConversationActivityV2.kt   | 2 +-
 .../java/org/thoughtcrime/securesms/database/Storage.kt   | 5 +++++
 .../securesms/notifications/BackgroundPollWorker.kt       | 4 ++--
 .../libsession/messaging/jobs/MessageReceiveJob.kt        | 6 +++++-
 .../sending_receiving/pollers/ClosedGroupPollerV2.kt      | 4 ++--
 .../messaging/sending_receiving/pollers/Poller.kt         | 4 ++--
 .../main/java/org/session/libsession/snode/SnodeAPI.kt    | 8 ++++----
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 0d37e0ac5..fec9dcc55 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1138,7 +1138,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
 
     private fun deleteLocally(message: MessageRecord) {
         buildUsendRequest(message)?.let { unsendRequest ->
-            TextSecurePreferences.getLocalNumber(this)?.let {
+            TextSecurePreferences.getLocalNumber(this@ConversationActivityV2)?.let {
                 MessageSender.send(unsendRequest, Address.fromSerialized(it))
             }
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 66332bed6..950b6d823 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -148,6 +148,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         if (openGroupID.isNullOrEmpty() && threadID != null && threadID >= 0) {
             JobQueue.shared.add(TrimThreadJob(threadID))
         }
+        message.serverHash?.let { serverHash ->
+            messageID?.let { id ->
+                DatabaseFactory.getLokiMessageDatabase(context).setMessageServerHash(id, serverHash)
+            }
+        }
         return messageID
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt
index afd4ad74a..d6b126752 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt
@@ -49,9 +49,9 @@ class BackgroundPollWorker(val context: Context, params: WorkerParameters) : Wor
             // DMs
             val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
             val dmsPromise = SnodeAPI.getMessages(userPublicKey).map { envelopes ->
-                envelopes.map { envelope ->
+                envelopes.map { (envelope, serverHash) ->
                     // FIXME: Using a job here seems like a bad idea...
-                    MessageReceiveJob(envelope.toByteArray()).executeAsync()
+                    MessageReceiveJob(envelope.toByteArray(), serverHash).executeAsync()
                 }
             }
             promises.addAll(dmsPromise.get())
diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
index 923e48a83..0601c670a 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
@@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.handle
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsignal.utilities.Log
 
-class MessageReceiveJob(val data: ByteArray, val openGroupMessageServerID: Long? = null, val openGroupID: String? = null) : Job {
+class MessageReceiveJob(val data: ByteArray, val serverHash: String? = null, val openGroupMessageServerID: Long? = null, val openGroupID: String? = null) : Job {
     override var delegate: JobDelegate? = null
     override var id: String? = null
     override var failureCount: Int = 0
@@ -21,6 +21,7 @@ class MessageReceiveJob(val data: ByteArray, val openGroupMessageServerID: Long?
 
         // Keys used for database storage
         private val DATA_KEY = "data"
+        private val SERVER_HASH_KEY = "serverHash"
         private val OPEN_GROUP_MESSAGE_SERVER_ID_KEY = "openGroupMessageServerID"
         private val OPEN_GROUP_ID_KEY = "open_group_id"
     }
@@ -34,6 +35,7 @@ class MessageReceiveJob(val data: ByteArray, val openGroupMessageServerID: Long?
         try {
             val isRetry: Boolean = failureCount != 0
             val (message, proto) = MessageReceiver.parse(this.data, this.openGroupMessageServerID)
+            message.serverHash = serverHash
             synchronized(RECEIVE_LOCK) { // FIXME: Do we need this?
                 MessageReceiver.handle(message, proto, this.openGroupID)
             }
@@ -67,6 +69,7 @@ class MessageReceiveJob(val data: ByteArray, val openGroupMessageServerID: Long?
 
     override fun serialize(): Data {
         val builder = Data.Builder().putByteArray(DATA_KEY, data)
+        serverHash?.let { builder.putString(SERVER_HASH_KEY, it) }
         openGroupMessageServerID?.let { builder.putLong(OPEN_GROUP_MESSAGE_SERVER_ID_KEY, it) }
         openGroupID?.let { builder.putString(OPEN_GROUP_ID_KEY, it) }
         return builder.build();
@@ -81,6 +84,7 @@ class MessageReceiveJob(val data: ByteArray, val openGroupMessageServerID: Long?
         override fun create(data: Data): MessageReceiveJob {
             return MessageReceiveJob(
                 data.getByteArray(DATA_KEY),
+                data.getString(SERVER_HASH_KEY),
                 data.getLong(OPEN_GROUP_MESSAGE_SERVER_ID_KEY),
                 data.getString(OPEN_GROUP_ID_KEY)
             )
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt
index 62e39b40f..f165c9754 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt
@@ -102,8 +102,8 @@ class ClosedGroupPollerV2 {
         }
         promise.success { envelopes ->
             if (!isPolling(groupPublicKey)) { return@success }
-            envelopes.forEach { envelope ->
-                val job = MessageReceiveJob(envelope.toByteArray())
+            envelopes.forEach { (envelope, serverHash) ->
+                val job = MessageReceiveJob(envelope.toByteArray(), serverHash)
                 JobQueue.shared.add(job)
             }
         }
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
index bbf2620f9..be472874d 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
@@ -91,8 +91,8 @@ class Poller {
                 task { Unit } // The long polling connection has been canceled; don't recurse
             } else {
                 val messages = SnodeAPI.parseRawMessagesResponse(rawResponse, snode, userPublicKey)
-                messages.forEach { envelope ->
-                    val job = MessageReceiveJob(envelope.toByteArray())
+                messages.forEach { (envelope, serverHash) ->
+                    val job = MessageReceiveJob(envelope.toByteArray(), serverHash)
                     JobQueue.shared.add(job)
                 }
                 poll(snode, deferred)
diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
index 3bc826970..dfbc6c34d 100644
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
@@ -426,7 +426,7 @@ object SnodeAPI {
         }
     }
 
-    fun parseRawMessagesResponse(rawResponse: RawResponse, snode: Snode, publicKey: String): List<SignalServiceProtos.Envelope> {
+    fun parseRawMessagesResponse(rawResponse: RawResponse, snode: Snode, publicKey: String): List<Pair<SignalServiceProtos.Envelope, String?>> {
         val messages = rawResponse["messages"] as? List<*>
         return if (messages != null) {
             updateLastMessageHashValueIfPossible(snode, publicKey, messages)
@@ -465,14 +465,14 @@ object SnodeAPI {
         return result
     }
 
-    private fun parseEnvelopes(rawMessages: List<*>): List<SignalServiceProtos.Envelope> {
+    private fun parseEnvelopes(rawMessages: List<*>): List<Pair<SignalServiceProtos.Envelope, String?>> {
         return rawMessages.mapNotNull { rawMessage ->
             val rawMessageAsJSON = rawMessage as? Map<*, *>
             val base64EncodedData = rawMessageAsJSON?.get("data") as? String
             val data = base64EncodedData?.let { Base64.decode(it) }
             if (data != null) {
                 try {
-                    MessageWrapper.unwrap(data)
+                    Pair(MessageWrapper.unwrap(data), rawMessageAsJSON.get("hash") as? String)
                 } catch (e: Exception) {
                     Log.d("Loki", "Failed to unwrap data for message: ${rawMessage.prettifiedDescription()}.")
                     null
@@ -568,5 +568,5 @@ object SnodeAPI {
 
 // Type Aliases
 typealias RawResponse = Map<*, *>
-typealias MessageListPromise = Promise<List<SignalServiceProtos.Envelope>, Exception>
+typealias MessageListPromise = Promise<List<Pair<SignalServiceProtos.Envelope, String?>>, Exception>
 typealias RawResponsePromise = Promise<RawResponse, Exception>

From d9eb2c75852f1ddbd4c9c9bf0a738e82dc54555a Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 17 Aug 2021 15:11:53 +1000
Subject: [PATCH 30/43] don't show delete options for old messages

---
 .../securesms/conversation/v2/ConversationActivityV2.kt        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index fec9dcc55..f8772bff4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1223,6 +1223,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             return
         }
         val allSentByCurrentUser = messages.all { it.isOutgoing }
+        val allHasHash = messages.all { DatabaseFactory.getLokiMessageDatabase(this@ConversationActivityV2).getMessageServerHash(it.id) != null }
         if (thread.isOpenGroupRecipient) {
             val messageCount = messages.size
             val builder = AlertDialog.Builder(this)
@@ -1240,7 +1241,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 endActionMode()
             }
             builder.show()
-        } else if (allSentByCurrentUser) {
+        } else if (allSentByCurrentUser && allHasHash) {
             val bottomSheet = DeleteOptionsBottomSheet()
             bottomSheet.recipient = thread
             bottomSheet.onDeleteForMeTapped = {

From b03ba5bfa7ac3c122ac399f59b276a20e59b23c6 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 17 Aug 2021 16:16:17 +1000
Subject: [PATCH 31/43] clean

---
 .../attachments/DatabaseAttachmentProvider.kt          |  2 +-
 .../conversation/v2/ConversationActivityV2.kt          | 10 +++++-----
 .../v2/menus/ConversationActionModeCallback.kt         |  6 +++---
 .../layout/fragment_delete_message_bottom_sheet.xml    |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
index 2ed700cb3..e2f78eecc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -178,7 +178,7 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
     override fun updateMessageAsDeleted(timestamp: Long, author: String) {
         val database = DatabaseFactory.getMmsSmsDatabase(context)
         val address = Address.fromSerialized(author)
-        val message = database.getMessageFor(timestamp, address)!!
+        val message = database.getMessageFor(timestamp, address) ?: return
         val messagingDatabase: MessagingDatabase = if (message.isMms)  DatabaseFactory.getMmsDatabase(context)
                                                    else DatabaseFactory.getSmsDatabase(context)
         messagingDatabase.markAsDeleted(message.id, message.isRead)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index f8772bff4..b5aa6a1ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -211,7 +211,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         const val INVITE_CONTACTS = 124
 
         //flag
-        val isUnsendRequestsEnabled = false
+        const val IS_UNSEND_REQUESTS_ENABLED = false
     }
     // endregion
 
@@ -1121,7 +1121,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         stopAudioHandler.removeCallbacks(stopVoiceMessageRecordingTask)
     }
 
-    private fun buildUsendRequest(message: MessageRecord): UnsendRequest? {
+    private fun buildUnsendRequest(message: MessageRecord): UnsendRequest? {
         if (this.thread.isOpenGroupRecipient) return null
         val messageDataProvider = MessagingModuleConfiguration.shared.messageDataProvider
         messageDataProvider.getServerHashForMessage(message.id) ?: return null
@@ -1137,7 +1137,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     private fun deleteLocally(message: MessageRecord) {
-        buildUsendRequest(message)?.let { unsendRequest ->
+        buildUnsendRequest(message)?.let { unsendRequest ->
             TextSecurePreferences.getLocalNumber(this@ConversationActivityV2)?.let {
                 MessageSender.send(unsendRequest, Address.fromSerialized(it))
             }
@@ -1146,7 +1146,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     private fun deleteForEveryone(message: MessageRecord) {
-        buildUsendRequest(message)?.let { unsendRequest ->
+        buildUnsendRequest(message)?.let { unsendRequest ->
             MessageSender.send(unsendRequest, thread.address)
         }
         val messageDataProvider = MessagingModuleConfiguration.shared.messageDataProvider
@@ -1218,7 +1218,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun deleteMessages(messages: Set<MessageRecord>) {
-        if (!isUnsendRequestsEnabled) {
+        if (!IS_UNSEND_REQUESTS_ENABLED) {
             deleteMessagesWithoutUnsendRequest(messages)
             return
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index f9603f935..48772f8ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -38,14 +38,14 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
             val allSentByCurrentUser = selectedItems.all { it.isOutgoing }
 
             // Remove this after the unsend request is enabled
-            if (!ConversationActivityV2.isUnsendRequestsEnabled) {
+            if (!ConversationActivityV2.IS_UNSEND_REQUESTS_ENABLED) {
                 if (openGroup == null) { return true }
                 if (allSentByCurrentUser) { return true }
                 return OpenGroupAPIV2.isUserModerator(userPublicKey, openGroup.room, openGroup.server)
             }
 
-            val allReceivedByByCurrentUser = selectedItems.all { !it.isOutgoing }
-            if (openGroup == null) { return allSentByCurrentUser || allReceivedByByCurrentUser }
+            val allReceivedByCurrentUser = selectedItems.all { !it.isOutgoing }
+            if (openGroup == null) { return allSentByCurrentUser || allReceivedByCurrentUser }
             if (allSentByCurrentUser) { return true }
             return OpenGroupAPIV2.isUserModerator(userPublicKey, openGroup.room, openGroup.server)
         }
diff --git a/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml b/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
index 592701ae0..031813a7c 100644
--- a/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
@@ -13,13 +13,13 @@
         android:id="@+id/deleteForMeTextView"
         style="@style/BottomSheetActionItem"
         android:text="@string/delete_message_for_me"
-        android:textColor="@color/core_red"/>
+        android:textColor="@color/destructive"/>
 
     <TextView
         android:id="@+id/deleteForEveryoneTextView"
         style="@style/BottomSheetActionItem"
         android:text="@string/delete_message_for_everyone"
-        android:textColor="@color/core_red"/>
+        android:textColor="@color/destructive"/>
 
     <TextView
         android:id="@+id/cancelTextView"

From 1f3db80d369a2770ace7a7c47889195f62e84b0b Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Wed, 18 Aug 2021 12:15:49 +1000
Subject: [PATCH 32/43] fix: only show notification settings if the contact is
 not muted and a group

---
 .../securesms/conversation/v2/menus/ConversationMenuHelper.kt  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index 70e473784..395d68bf3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -92,6 +92,9 @@ object ConversationMenuHelper {
             inflater.inflate(R.menu.menu_conversation_muted, menu)
         } else {
             inflater.inflate(R.menu.menu_conversation_unmuted, menu)
+        }
+
+        if (thread.isGroupRecipient && !thread.isMuted) {
             inflater.inflate(R.menu.menu_conversation_notification_settings, menu)
         }
 

From 975076cb5cdaef0739cf3aa2c8755144eb62317b Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Thu, 19 Aug 2021 12:14:21 +1000
Subject: [PATCH 33/43] fix: bundled notification no longer notifies on
 mentions only

---
 .../notifications/DefaultMessageNotifier.java      | 14 +++++++++++++-
 .../MultipleRecipientNotificationBuilder.java      |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 616b17799..a8257a240 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -315,7 +315,7 @@ public class DefaultMessageNotifier implements MessageNotifier {
     List<NotificationItem>             notifications  = notificationState.getNotifications();
     Recipient                          recipient      = notifications.get(0).getRecipient();
     int                                notificationId = (int) (SUMMARY_NOTIFICATION_ID + (bundled ? notifications.get(0).getThreadId() : 0));
-    String                             messageIdTag   = String.valueOf(notifications.get(0).getId());
+    String                             messageIdTag   = String.valueOf(notifications.get(0).getTimestamp());
 
     NotificationManager notificationManager = ServiceUtil.getNotificationManager(context);
     for (StatusBarNotification notification: notificationManager.getActiveNotifications()) {
@@ -402,6 +402,16 @@ public class DefaultMessageNotifier implements MessageNotifier {
     builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
     builder.setAutoCancel(true);
 
+    String messageIdTag = String.valueOf(notifications.get(0).getTimestamp());
+
+    NotificationManager notificationManager = ServiceUtil.getNotificationManager(context);
+    for (StatusBarNotification notification: notificationManager.getActiveNotifications()) {
+      if (notification.getId() == SUMMARY_NOTIFICATION_ID
+              && messageIdTag.equals(notification.getNotification().extras.getString(LATEST_MESSAGE_ID_TAG))) {
+        return;
+      }
+    }
+
     long timestamp = notifications.get(0).getTimestamp();
     if (timestamp != 0) builder.setWhen(timestamp);
 
@@ -421,6 +431,8 @@ public class DefaultMessageNotifier implements MessageNotifier {
                         MentionUtilities.highlightMentions(notifications.get(0).getText(), notifications.get(0).getThreadId(), context));
     }
 
+    builder.putStringExtra(LATEST_MESSAGE_ID_TAG, messageIdTag);
+
     Notification notification = builder.build();
     NotificationManagerCompat.from(context).notify(SUMMARY_NOTIFICATION_ID, builder.build());
     Log.i(TAG, "Posted notification. " + notification.toString());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
index 24374ddd0..15b62df3c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
@@ -16,8 +16,8 @@ import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.home.HomeActivity;
 import org.thoughtcrime.securesms.database.SessionContactDatabase;
+import org.thoughtcrime.securesms.home.HomeActivity;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -72,6 +72,10 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
     extend(new NotificationCompat.WearableExtender().addAction(markAllAsReadAction));
   }
 
+  public void putStringExtra(String key, String value) {
+    extras.putString(key,value);
+  }
+
   public void addMessageBody(@NonNull Recipient sender, Recipient threadRecipient, @Nullable CharSequence body) {
     String displayName = sender.toShortString();
     if (threadRecipient.isOpenGroupRecipient()) {

From ef8cdf312778eb32d54cc265dced08c4fb355b6d Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Thu, 19 Aug 2021 12:24:28 +1000
Subject: [PATCH 34/43] fix: handle bundling properly with the messageIdTag
 check

---
 .../securesms/notifications/DefaultMessageNotifier.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index a8257a240..577c3af5c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -319,8 +319,8 @@ public class DefaultMessageNotifier implements MessageNotifier {
 
     NotificationManager notificationManager = ServiceUtil.getNotificationManager(context);
     for (StatusBarNotification notification: notificationManager.getActiveNotifications()) {
-
-      if (messageIdTag.equals(notification.getNotification().extras.getString(LATEST_MESSAGE_ID_TAG))) {
+      if ( (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && notification.isAppGroup() == bundled)
+              && messageIdTag.equals(notification.getNotification().extras.getString(LATEST_MESSAGE_ID_TAG))) {
         return;
       }
     }

From 7ac340b3cae9304d6aacbff429915f78444fbdf2 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Thu, 19 Aug 2021 13:44:38 +1000
Subject: [PATCH 35/43] refactor: remove unused constant

---
 .../securesms/notifications/DefaultMessageNotifier.java          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 577c3af5c..32745723e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -92,7 +92,6 @@ public class DefaultMessageNotifier implements MessageNotifier {
 
   public static final  String EXTRA_REMOTE_REPLY        = "extra_remote_reply";
   public static final  String LATEST_MESSAGE_ID_TAG     = "extra_latest_message_id";
-  public static final  String EXTRA_THREAD_ID           = "extra_thread_id";
 
   private static final  int   FOREGROUND_ID             = 313399;
   private static final  int   SUMMARY_NOTIFICATION_ID   = 1338;

From 021d81ab98c6e2319e6884cb3f3915914678ed24 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Thu, 19 Aug 2021 13:45:57 +1000
Subject: [PATCH 36/43] refactor: alignment

---
 .../securesms/notifications/DefaultMessageNotifier.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 32745723e..552f7200e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -93,8 +93,8 @@ public class DefaultMessageNotifier implements MessageNotifier {
   public static final  String EXTRA_REMOTE_REPLY        = "extra_remote_reply";
   public static final  String LATEST_MESSAGE_ID_TAG     = "extra_latest_message_id";
 
-  private static final  int   FOREGROUND_ID             = 313399;
-  private static final  int   SUMMARY_NOTIFICATION_ID   = 1338;
+  private static final int    FOREGROUND_ID              = 313399;
+  private static final int    SUMMARY_NOTIFICATION_ID    = 1338;
   private static final int    PENDING_MESSAGES_ID       = 1111;
   private static final String NOTIFICATION_GROUP        = "messages";
   private static final long   MIN_AUDIBLE_PERIOD_MILLIS = TimeUnit.SECONDS.toMillis(2);

From b7ead5778ee35ee9b6aed21f1a2365da17696856 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Thu, 19 Aug 2021 14:16:54 +1000
Subject: [PATCH 37/43] refactor: revert inThreadNotification pref to default
 true

---
 .../org/session/libsession/utilities/TextSecurePreferences.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
index cef0b9315..7ac0feae6 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
@@ -380,7 +380,7 @@ object TextSecurePreferences {
 
     @JvmStatic
     fun isInThreadNotifications(context: Context): Boolean {
-        return getBooleanPreference(context, IN_THREAD_NOTIFICATION_PREF, false)
+        return getBooleanPreference(context, IN_THREAD_NOTIFICATION_PREF, true)
     }
 
     @JvmStatic

From 873fb6b57888bf16164763971dd3059d75772876 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Fri, 20 Aug 2021 15:01:09 +1000
Subject: [PATCH 38/43] fix: clear notifications properly on muted groups

---
 .../securesms/notifications/DefaultMessageNotifier.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 552f7200e..936548ecc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -284,8 +284,9 @@ public class DefaultMessageNotifier implements MessageNotifier {
         sendMultipleThreadNotification(context, notificationState, signal);
       } else if (notificationState.getMessageCount() > 0){
         sendSingleThreadNotification(context, notificationState, signal, false);
+      } else {
+        cancelActiveNotifications(context);
       }
-
       cancelOrphanedNotifications(context, notificationState);
       updateBadge(context, notificationState.getMessageCount());
 

From 5936efea53b0c0c328e1928e3f5abb5305e8784d Mon Sep 17 00:00:00 2001
From: Warrick Corfe-Tan <warrickct@gmail.com>
Date: Thu, 26 Aug 2021 10:38:05 +1000
Subject: [PATCH 39/43] Fixing quote cutoff when font is too large.

---
 .../securesms/conversation/v2/messages/QuoteView.kt       | 7 +++++--
 .../securesms/conversation/v2/utilities/TextUtilities.kt  | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
index 0f6fe2773..65af5edce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
@@ -78,11 +78,14 @@ class QuoteView : LinearLayout {
         }
         val body = quoteViewBodyTextView.text
         val bodyTextViewIntrinsicHeight = TextUtilities.getIntrinsicHeight(body, quoteViewBodyTextView.paint, maxContentWidth)
+        val staticLayout = TextUtilities.getIntrinsicLayout(body, quoteViewBodyTextView.paint, maxContentWidth)
         result += bodyTextViewIntrinsicHeight
         if (!quoteViewAuthorTextView.isVisible) {
             // We want to at least be as high as the cancel button, and no higher than 56 DP (that's
             // approximately the height of 3 lines.
-            return min(max(result, toPx(32, resources)), toPx(56, resources))
+
+            // Calculating height based on proportion of the static layout.
+            return min((result / staticLayout.lineCount) * 3, result)
         } else {
             // Because we're showing the author text view, we should have a height of at least 32 DP
             // anyway, so there's no need to constrain to that. We constrain to a max height of 56 DP
@@ -97,7 +100,7 @@ class QuoteView : LinearLayout {
         // and then center everything inside vertically. This effectively means we're applying padding.
         // Applying padding the regular way results in a clipping issue though due to a bug in
         // RelativeLayout.
-        return getIntrinsicContentHeight(maxContentWidth) + 2 * vPadding
+        return getIntrinsicContentHeight(maxContentWidth)  + (2 * vPadding )
     }
     // endregion
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/TextUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/TextUtilities.kt
index b7ced4abb..800ace54c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/TextUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/TextUtilities.kt
@@ -20,6 +20,14 @@ object TextUtilities {
         return layout.height
     }
 
+    fun getIntrinsicLayout(text: CharSequence, paint: TextPaint, width: Int): StaticLayout {
+        val builder = StaticLayout.Builder.obtain(text, 0, text.length, paint, width)
+                .setAlignment(Layout.Alignment.ALIGN_NORMAL)
+                .setLineSpacing(0.0f, 1.0f)
+                .setIncludePad(false)
+        return builder.build()
+    }
+
     fun TextView.getIntersectedModalSpans(event: MotionEvent): List<ModalURLSpan> {
         val xInt = event.rawX.toInt()
         val yInt = event.rawY.toInt()

From 0539ca412df2a44eb460a8a4b2af76daef50404a Mon Sep 17 00:00:00 2001
From: Warrick Corfe-Tan <warrickct@gmail.com>
Date: Thu, 26 Aug 2021 15:18:13 +1000
Subject: [PATCH 40/43] constrain min size for cancel button when drafting a
 quote reply.

---
 .../securesms/conversation/v2/messages/QuoteView.kt      | 9 ++++-----
 app/src/main/res/layout/view_quote.xml                   | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
index 65af5edce..d873978ca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
@@ -81,11 +81,10 @@ class QuoteView : LinearLayout {
         val staticLayout = TextUtilities.getIntrinsicLayout(body, quoteViewBodyTextView.paint, maxContentWidth)
         result += bodyTextViewIntrinsicHeight
         if (!quoteViewAuthorTextView.isVisible) {
-            // We want to at least be as high as the cancel button, and no higher than 56 DP (that's
-            // approximately the height of 3 lines.
-
-            // Calculating height based on proportion of the static layout.
-            return min((result / staticLayout.lineCount) * 3, result)
+            // We want to at least be as high as the cancel button 36DP, and no higher than 3 lines of text.
+            // Height from intrinsic layout is the height of the text before truncation so we shorten
+            // proportionally to our max lines setting.
+            return max(toPx(32, resources) ,min((result / staticLayout.lineCount) * 3, result))
         } else {
             // Because we're showing the author text view, we should have a height of at least 32 DP
             // anyway, so there's no need to constrain to that. We constrain to a max height of 56 DP
diff --git a/app/src/main/res/layout/view_quote.xml b/app/src/main/res/layout/view_quote.xml
index d2835c8fb..32112435a 100644
--- a/app/src/main/res/layout/view_quote.xml
+++ b/app/src/main/res/layout/view_quote.xml
@@ -67,11 +67,11 @@
             android:id="@+id/quoteViewBodyTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Yo, I need your help here!"
-            android:textSize="@dimen/small_font_size"
-            android:textColor="@color/text"
+            android:ellipsize="end"
             android:maxLines="3"
-            android:ellipsize="end" />
+            android:text="Yo, I need your help here!"
+            android:textColor="@color/text"
+            android:textSize="@dimen/small_font_size" />
 
     </LinearLayout>
 

From 7c3dc7e7bc089576390f88d403d6c8f8d5b240da Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Tue, 31 Aug 2021 14:21:48 +1000
Subject: [PATCH 41/43] refactor: instrumentation for clipboard test was
 failing on smaller screen devices running the tests

---
 .../java/network/loki/messenger/HomeActivityTests.kt   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt b/app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt
index 43652b09e..46db01b13 100644
--- a/app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt
+++ b/app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt
@@ -55,11 +55,15 @@ class HomeActivityTests {
         onView(newConversationButtonWithDrawable(R.drawable.ic_plus)).perform(ViewActions.click())
         onView(newConversationButtonWithDrawable(R.drawable.ic_message)).perform(ViewActions.click())
         // new chat
+        onView(withId(R.id.publicKeyEditText)).perform(ViewActions.closeSoftKeyboard())
         onView(withId(R.id.copyButton)).perform(ViewActions.click())
         val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        val copied = clipboardManager.primaryClip!!.getItemAt(0).text
-        onView(withId(R.id.publicKeyEditText)).perform(ViewActions.typeText(copied.toString()))
+        lateinit var copied: String
+        InstrumentationRegistry.getInstrumentation().runOnMainSync {
+            val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+            copied = clipboardManager.primaryClip!!.getItemAt(0).text.toString()
+        }
+        onView(withId(R.id.publicKeyEditText)).perform(ViewActions.typeText(copied))
         onView(withId(R.id.createPrivateChatButton)).perform(ViewActions.click())
     }
 

From 7bcfb561279c8bbeb53420b77997932138b39a93 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Wed, 1 Sep 2021 13:56:11 +1000
Subject: [PATCH 42/43] build: adding latest strings

---
 app/src/main/res/values-af/strings.xml     |  20 +-
 app/src/main/res/values-ar/strings.xml     |  30 +-
 app/src/main/res/values-az/strings.xml     |  20 +-
 app/src/main/res/values-bal/strings.xml    |  20 +-
 app/src/main/res/values-be/strings.xml     |  20 +-
 app/src/main/res/values-bg/strings.xml     |  48 +-
 app/src/main/res/values-ca/strings.xml     |  20 +-
 app/src/main/res/values-cs/strings.xml     | 152 +++--
 app/src/main/res/values-cy/strings.xml     |  20 +-
 app/src/main/res/values-da/strings.xml     |  30 +-
 app/src/main/res/values-de/strings.xml     |  68 +-
 app/src/main/res/values-el/strings.xml     |  20 +-
 app/src/main/res/values-eo/strings.xml     |  30 +-
 app/src/main/res/values-es/strings.xml     |  38 +-
 app/src/main/res/values-et/strings.xml     |  20 +-
 app/src/main/res/values-fa/strings.xml     |  52 +-
 app/src/main/res/values-fi/strings.xml     | 172 ++---
 app/src/main/res/values-fr/strings.xml     |  66 +-
 app/src/main/res/values-gl/strings.xml     | 230 ++++---
 app/src/main/res/values-ha/strings.xml     |  20 +-
 app/src/main/res/values-he/strings.xml     |  60 +-
 app/src/main/res/values-hi/strings.xml     |  62 +-
 app/src/main/res/values-hr/strings.xml     |  20 +-
 app/src/main/res/values-hu/strings.xml     | 152 +++--
 app/src/main/res/values-hy-rAM/strings.xml |  20 +-
 app/src/main/res/values-id/strings.xml     |  46 +-
 app/src/main/res/values-it/strings.xml     |  44 +-
 app/src/main/res/values-ja/strings.xml     |  20 +-
 app/src/main/res/values-ka/strings.xml     |  26 +-
 app/src/main/res/values-km/strings.xml     |  20 +-
 app/src/main/res/values-ko/strings.xml     |  20 +-
 app/src/main/res/values-lo/strings.xml     |  20 +-
 app/src/main/res/values-lt/strings.xml     |  38 +-
 app/src/main/res/values-lv/strings.xml     |  20 +-
 app/src/main/res/values-mk/strings.xml     |  20 +-
 app/src/main/res/values-mn/strings.xml     |  26 +-
 app/src/main/res/values-ms/strings.xml     |  26 +-
 app/src/main/res/values-nb/strings.xml     |  20 +-
 app/src/main/res/values-nl/strings.xml     |  20 +-
 app/src/main/res/values-nn-rNO/strings.xml |  20 +-
 app/src/main/res/values-no/strings.xml     |  26 +-
 app/src/main/res/values-ny/strings.xml     |  20 +-
 app/src/main/res/values-pa-rIN/strings.xml |  26 +-
 app/src/main/res/values-pl/strings.xml     |  22 +-
 app/src/main/res/values-ps/strings.xml     |  26 +-
 app/src/main/res/values-pt-rBR/strings.xml | 164 +++--
 app/src/main/res/values-pt-rPT/strings.xml |  20 +-
 app/src/main/res/values-ro/strings.xml     |  20 +-
 app/src/main/res/values-ru/strings.xml     | 232 ++++---
 app/src/main/res/values-si-rLK/strings.xml | 747 +++++++++++++++++++++
 app/src/main/res/values-sk/strings.xml     |  20 +-
 app/src/main/res/values-sl/strings.xml     |  20 +-
 app/src/main/res/values-sq/strings.xml     |  20 +-
 app/src/main/res/values-sr/strings.xml     |  20 +-
 app/src/main/res/values-sv-rSE/strings.xml |  20 +-
 app/src/main/res/values-sw/strings.xml     |  20 +-
 app/src/main/res/values-ta/strings.xml     |  26 +-
 app/src/main/res/values-te/strings.xml     |  36 +-
 app/src/main/res/values-th/strings.xml     |  20 +-
 app/src/main/res/values-tr/strings.xml     | 306 +++++----
 app/src/main/res/values-uk/strings.xml     | 420 ++++++------
 app/src/main/res/values-ur-rIN/strings.xml |  26 +-
 app/src/main/res/values-vi/strings.xml     |  20 +-
 app/src/main/res/values-xh/strings.xml     |  20 +-
 app/src/main/res/values-zh-rCN/strings.xml |  96 +--
 app/src/main/res/values-zh-rTW/strings.xml |  48 +-
 66 files changed, 3036 insertions(+), 1201 deletions(-)
 create mode 100644 app/src/main/res/values-si-rLK/strings.xml

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 9fb7a2db5..39b0b69bb 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,7 +639,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -728,4 +734,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ceda5050b..a62b1bea4 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -39,7 +39,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(صوت)</string>
     <string name="DraftDatabase_Draft_video_snippet">(فيديو)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(رَدّ)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">لم يتم العثور على تطبيق لاختيار ملف.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">يحتاج Session إلى إذن سعة التخزين من أجل إضافة الصور والمرفقات ولكن تم إيقاف الإذن على نحو دائم، رجاء زيارة إعدادات التطبيق ثم \"الأذونات\"، ثم تفعيل \"سعة التخزين\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">يحتاج Session إلى إذن جهات الاتصال من أجل إرفاق بيانات جهة اتصال ولكن تم إيقاف الإذن على نحو دائم، رجاء زيارة إعدادات التطبيق ثم \"الأذونات\"، ثم تفعيل \"جهات الاتصال\".</string>
@@ -62,7 +62,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">فشل الإرسال، انقر للرد الغير آمن</string>
     <string name="ConversationItem_unable_to_open_media">لم يتم العثور على تطبيق قادر على فتح الملف.</string>
     <string name="ConversationItem_copied_text">تم نسخ %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">اقرأ المزيد</string>
     <string name="ConversationItem_download_more">&#160; تنزيل المزيد</string>
     <string name="ConversationItem_pending">&#160; في الإنتظار</string>
     <!-- ConversationActivity -->
@@ -72,6 +72,7 @@
     <string name="ConversationActivity_message">رسالة</string>
     <string name="ConversationActivity_compose">إنشاء رسالة</string>
     <string name="ConversationActivity_muted_until_date">كتم حتى %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d عضو</string>
     <string name="ConversationActivity_open_group_guidelines">إرشادات المستخدمين</string>
     <string name="ConversationActivity_invalid_recipient">جهة اتصال غير صحيحة!</string>
@@ -91,6 +92,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">لإرسال رسالة صوتية, برجاء السماح لSession بالوصول إلي المايكروفون</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">يحتاج Session إلى إذن الميكروفون من أجل الرسائل الصوتية ولكن تم إيقاف الإذن على نحو دائم، رجاء زيارة إعدادات التطبيق ثم \"الأذونات\"، ثم تفعيل \"الميكروفون\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">لإلتقاط صور و فيديوهات, برجاء السماح لSession بالوصول إلي الكاميرا.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">يحتاج Session إلي إذن الكاميرا لالتقاط صور أو تسجيل فيديو</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">يحتاج Session إلى إذن الكاميرا من أجل التقاط صور وفيديو  ولكن تم إيقاف الإذن على نحو دائم، رجاء زيارة إعدادات التطبيق ثم \"الأذونات\"، ثم تفعيل \"الكاميرا\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">يحتاج Session إلي إذن الكاميرا لالتقاط صور أو تسجيل فيديو</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
@@ -258,6 +260,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">إلغاء حظر جهة الاتصال؟</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">سوف تتمكن مرة أخرى من استقبال الرسائل والمكالمات من هذا المستخدم.</string>
     <string name="RecipientPreferenceActivity_unblock">رفع الحظر</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">صورة</string>
     <string name="Slide_audio">صوت</string>
@@ -308,7 +311,7 @@
     <string name="MediaPreviewActivity_you">أنت</string>
     <string name="MediaPreviewActivity_unssuported_media_type">غير مدعوم.</string>
     <string name="MediaPreviewActivity_draft">مسودة:</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">يحتاج Session إلى إذن سعة التخزين من أجل استخدام الذاكرة الخارجية ولكن تم إيقاف الإذن على نحو دائم، رجاء زيارة إعدادات التطبيق ثم \"الأذونات\"، ثم تفعيل \"سعة التخزين\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">لا يمكن الحفظ إلى الذاكرة الخارجية بدون أذونات</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">أَتريد حذف الرسالة ؟</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">سوف يقوم هذا بحذف الرسالة كُليًا.</string>
@@ -408,8 +411,8 @@
     <string name="open_group_invitation_view__join_accessibility_description">إنضم</string>
     <string name="open_group_invitation_view__open_group_invitation">دعوة المجموعة المفتوحة</string>
     <string name="open_group_guidelines_pinned_message">الرسائل المثبّتة</string>
-    <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
-    <string name="open_group_guidelines_read">Read</string>
+    <string name="open_group_guidelines_community_guidelines">المبادئ التوجيهية للمجتمع</string>
+    <string name="open_group_guidelines_read">قراءة</string>
     <!-- QuoteView -->
     <string name="QuoteView_audio">صوت</string>
     <string name="QuoteView_video">فيديو</string>
@@ -452,6 +455,7 @@
     <string name="arrays__mute_for_one_day">كتم لمدة يوم</string>
     <string name="arrays__mute_for_seven_days">كتم لمدة سبعة أيام</string>
     <string name="arrays__mute_for_one_year">كتم لمدة عام واحد</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">الإعدادات الافتراضية</string>
     <string name="arrays__enabled">مفعل</string>
     <string name="arrays__disabled">معطل</string>
@@ -481,7 +485,7 @@
     <!-- preferences.xml -->
     <string name="preferences__pref_enter_sends_title">مفتاح الدخول يقوم بالإرسال</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">الضغط على مفتاح الدخول سيقوم بإرسال الرسالة</string>
-    <string name="preferences__send_link_previews">Send link previews</string>
+    <string name="preferences__send_link_previews">إرسال معاينة الرابط</string>
     <string name="preferences__previews_are_supported_for">Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links</string>
     <string name="preferences__screen_security">تأمين الشاشة</string>
     <string name="preferences__disable_screen_security_to_allow_screen_shots">منع لقطات الشاشة داخل التطبيق</string>
@@ -544,6 +548,7 @@
     <string name="conversation_context__menu_copy_text">نسخ النص</string>
     <string name="conversation_context__menu_delete_message">حذف الرسالة</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">إعادة الإرسال</string>
     <string name="conversation_context__menu_reply_to_message">الرَدّ على الرسالة</string>
     <!-- conversation_context_image -->
@@ -687,7 +692,8 @@
     <string name="activity_settings_notifications_button_title">الإشعارات</string>
     <string name="activity_settings_chats_button_title">المحادثات</string>
     <string name="activity_settings_devices_button_title">الأجهزة</string>
-    <string name="activity_settings_invite_button_title">إرسال دعوة</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">عبارة الإسترداد</string>
     <string name="activity_settings_clear_all_data_button_title">مسح البيانات</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -781,4 +787,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 9278e51a9..331018319 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(səs)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(cavab)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Seçilmiş media üçün aplikasiyanı tapa bilmirəm.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session-ın normal işləməsi üçün şəkil, video və ya səsləri saxlamağa yaddaş lazımdır ki, bu da hal hazırda qadağa edilib. Davam edə bilmək üçün zəhmət olmasa aplikasiya parametrləri menyusuna, orada isə \"İcazələr\" bölməsinə keçərək \"Yaddaş\" hissəsini aktivləşdir.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Əlaqə məlumatlarını yükləyə bilməsi üçün Session-ın Əlaqələr bölməsinə giriş icazəsi olmalıdır ki, o da hal hazırda qadağan edilmişdir. Davam edə bilmək üçün zəhmət olmasa aplikasiya parametrləri menyusuna, oradan isə \"İcazələr\" bölməsinə keçərək \"Əlaqələr\" hissəsini aktivləşdir.</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Mesaj</string>
     <string name="ConversationActivity_compose">Yarat</string>
     <string name="ConversationActivity_muted_until_date">%1$s qədər səssizdə</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d üzv</string>
     <string name="ConversationActivity_open_group_guidelines">Cəmiyyət Təlimatları</string>
     <string name="ConversationActivity_invalid_recipient">Etibarsız alıcı!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Səsli mesaj göndərə bilmək üçün Session-a icazə ver mikrofonunu istifadə edə bilsin.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Səsli mesaj göndərə bilməsi üçün Session-ın Mikrofon seçimlərinə giriş icazəsi olmalıdır ki, o da hal hazırda qadağa edilmişdir. Davam edə bilmək üçün zəhmət olmasa aplikasiya parametrləri menyusuna, oradan isə \"İcazələr bölməsinə keçərək \"Mikrofon\" hissəsini aktivləşdir.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Şəkil və video çəkə bilməsi üçün Session-a Kamera seçimlərinə giriş icazəsi ver.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Şəkil və ya Video çəkə bilməsi üçün Session-ın Kamera seçimlərinə giriş icazəsi olmalıdır ki, o da hal hazırda qadağa edilmişdir. Davam edə bilmək üçün zəhmət olmasa aplikasiya parametrləri menyusuna, oradan isə \"İcazələr bölməsinə keçərək \"Kamera\" hissəsini aktivləşdir.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Şəkil və ya video çəkə bilməsi üçün Session-ın Kamera seçimlərinə giriş icazəsi olmalıdır</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Bi əlaqənin kilidini açırsan?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Bu əlaqədən yenə mesaj və zəng qəbul edəcəksən.</string>
     <string name="RecipientPreferenceActivity_unblock">Kilidi aç</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Şəkil</string>
     <string name="Slide_audio">Səs</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">1 gün səssiz olsun</string>
     <string name="arrays__mute_for_seven_days">7 gün səssiz olsun</string>
     <string name="arrays__mute_for_one_year">1 il səssiz olsun</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Mövcud parametrlər</string>
     <string name="arrays__enabled">Aktiv et</string>
     <string name="arrays__disabled">Deaktiv et</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Mətni köçür</string>
     <string name="conversation_context__menu_delete_message">Mesajı sil</string>
     <string name="conversation_context__menu_ban_user">İstifadəçiyə qadağa qoy</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Mesajı yenidən göndər</string>
     <string name="conversation_context__menu_reply_to_message">Mesajı cavabla</string>
     <!-- conversation_context_image -->
@@ -634,7 +639,8 @@
     <string name="activity_settings_notifications_button_title">Bildirişlər</string>
     <string name="activity_settings_chats_button_title">Söhbətlər</string>
     <string name="activity_settings_devices_button_title">Cihazlar</string>
-    <string name="activity_settings_invite_button_title">Dəvət et</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Fazanı bərpa edin</string>
     <string name="activity_settings_clear_all_data_button_title">Verilənləri təmizləyin</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -728,4 +734,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-bal/strings.xml b/app/src/main/res/values-bal/strings.xml
index 992636441..6ccaffcf7 100644
--- a/app/src/main/res/values-bal/strings.xml
+++ b/app/src/main/res/values-bal/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(balas)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Tidak bisa menemukan aplikasi untuk memilih media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session memerlukan akses ke Penyimpanan untuk mengirimkan foto, video, atau suara, tetapi saat ini telah ditolak secara permanen. Harap lanjutkan ke menu pengaturan aplikasi, Pilih \"Izin\", dan aktifkan \"Penyimpanan\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session memerlukan akses ke Kontak untuk mengirimkan informasi kontak, tetapi saat ini ditolak secara permanen. Harap melanjutkan ke menu pengaturan aplikasi, Pilih \"Izin\", dan aktifkan \"Kontak\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Penerima tidak lengkap!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Untuk mengirim pesan suara, izinkan Session mengakses mikrofon Anda.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session memerlukan akses ke Mikrofon untuk mengirim pesan audio, namun ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Mikrofon\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Untuk merekam foto dan video, izinkan Session mengakses kamera.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session memerlukan izin Kamera untuk mengambil foto dan video, tetapi telah ditolak secara permanen. Silakan lanjut ke pengaturan aplikasi, pilih \"Perizinan\" dan aktifkan \"Kamera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session memerlukan izin Kamera untuk mengambil foto atau video.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Buka blokir kontak ini?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Anda kembali dapat menerima pesan dan panggilan dari kontak ini.</string>
     <string name="RecipientPreferenceActivity_unblock">Buka blokir</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Gambar</string>
     <string name="Slide_audio">Audio</string>
@@ -401,6 +404,7 @@ memproses pertukaran kunci korupsi.</string>
     <string name="arrays__mute_for_one_day">Bisukan selama 1 hari</string>
     <string name="arrays__mute_for_seven_days">Bisukan selama 7 hari</string>
     <string name="arrays__mute_for_one_year">Bisukan selama 1 tahun</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Pengaturan bawaan</string>
     <string name="arrays__enabled">Aktif</string>
     <string name="arrays__disabled">Nonaktif</string>
@@ -489,6 +493,7 @@ memproses pertukaran kunci korupsi.</string>
     <string name="conversation_context__menu_copy_text">Salin teks</string>
     <string name="conversation_context__menu_delete_message">Hapus pesan</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Kirim ulang </string>
     <string name="conversation_context__menu_reply_to_message">Balas pesan</string>
     <!-- conversation_context_image -->
@@ -632,7 +637,8 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_settings_notifications_button_title">Notifikasi</string>
     <string name="activity_settings_chats_button_title">Percakapan</string>
     <string name="activity_settings_devices_button_title">Perangkat</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Kata pemulihan</string>
     <string name="activity_settings_clear_all_data_button_title">Hapus data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 06b72a669..2e0877133 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -35,7 +35,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -68,6 +68,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -87,6 +88,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -234,6 +236,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -429,6 +432,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -519,6 +523,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -662,7 +667,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -756,4 +762,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 1a1683fab..efe571d4a 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -4,11 +4,11 @@
     <string name="yes">Да</string>
     <string name="no">Не</string>
     <string name="delete">Изтрий</string>
-    <string name="ban">Ban</string>
+    <string name="ban">Забрана</string>
     <string name="please_wait">Моля, изчакайте...</string>
     <string name="save">Запази</string>
     <string name="note_to_self">Бележка за Мен</string>
-    <string name="version_s">Version %s</string>
+    <string name="version_s">Версия %s</string>
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">Ново съобщение</string>
     <!-- AlbumThumbnailView -->
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(аудио)</string>
     <string name="DraftDatabase_Draft_video_snippet">(видео)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(отговори)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Неуспешно откриване на папка за избор на файл.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session се нуждае от достъп до вградения диск, за да може да прикачва снимки, видеота или аудио, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Дискове\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session се нуждае от достъп до контактите Ви, за да може да прикачва информация за тях, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Контакти\".</string>
@@ -54,16 +54,17 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Неуспешно изпращане, натиснете за изпращане по несигурен начин</string>
     <string name="ConversationItem_unable_to_open_media">Неуспешно откриване на приложение за отваряне на този файл.</string>
     <string name="ConversationItem_copied_text">%s e копирано</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">Прочетете повече</string>
     <string name="ConversationItem_download_more">Изтегли Повече</string>
     <string name="ConversationItem_pending"> в Очакване</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">Прикачване на файл</string>
     <string name="ConversationActivity_select_contact_info">Посочи информация за контакта</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">За съжаление, настъпи грешка при прикачването.</string>
-    <string name="ConversationActivity_message">Message</string>
+    <string name="ConversationActivity_message">Съобщение</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Невалиден получател!</string>
@@ -78,11 +79,12 @@
     <string name="ConversationActivity_unable_to_record_audio">Не може да бъде записано аудио!</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Нямате инсталирано приложение, което да може да използва тази препратка.</string>
     <string name="ConversationActivity_invite_to_open_group">Add members</string>
-    <string name="ConversationActivity_join_open_group">Join %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_join_open_group">Присъединяване %s</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">Сигурни ли сте, че искате да се присъедините към <b>%s</b> отворената група?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">За да изпратите аудио съобщение, разрешете достъпа на Session до микрофона.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session се нуждае от достъп до микрофона Ви, за да може да изпраща аудио съобщения, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Микрофон\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">За прави снимки и видеота, Session се нуждае от достъп до камерта Ви.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session се нуждае от достъп до камерта Ви, за да може да прави снимки или видеота, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Камера\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session се нуждае от достъп до камерата, за да прави снимки и видеота</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Отблокиране на този контакт?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Отново ще може да получавате съобщения и обаждания от този контакт.</string>
     <string name="RecipientPreferenceActivity_unblock">Отблокиране</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Изображение</string>
     <string name="Slide_audio">Аудио</string>
@@ -240,7 +243,7 @@
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">Числата Ви за сигурност с %s са променени.</string>
     <string name="ThreadRecord_you_marked_verified">Отбелязахте като потвърдено</string>
     <string name="ThreadRecord_you_marked_unverified">Отбелязахте като непотвърдено</string>
-    <string name="ThreadRecord_empty_message">This conversation is empty</string>
+    <string name="ThreadRecord_empty_message">Този разговор е празен</string>
     <string name="ThreadRecord_open_group_invitation">Open group invitation</string>
     <!-- UpdateApkReadyListener -->
     <string name="UpdateApkReadyListener_Signal_update">Обновление на Session</string>
@@ -300,7 +303,7 @@
     <!-- ShortcutLauncherActivity -->
     <string name="ShortcutLauncherActivity_invalid_shortcut">Невалидена препратка</string>
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Session</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Сесия</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Ново съобщение</string>
     <!-- TransferControlView -->
     <plurals name="TransferControlView_n_items">
@@ -401,6 +404,7 @@
     <string name="arrays__mute_for_one_day">Тих режим за 1 ден</string>
     <string name="arrays__mute_for_seven_days">Тих режим за 7 дена</string>
     <string name="arrays__mute_for_one_year">Тих режим за 1 година</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Настройки по подразбиране</string>
     <string name="arrays__enabled">Разрешено</string>
     <string name="arrays__disabled">Деактивирано</string>
@@ -488,7 +492,8 @@
     <string name="conversation_context__menu_message_details">Информация за съобщението</string>
     <string name="conversation_context__menu_copy_text">Копирай текста</string>
     <string name="conversation_context__menu_delete_message">Изтрий съобщението</string>
-    <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_user">Забрана на потребител</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Забрани и изтрий всичко</string>
     <string name="conversation_context__menu_resend_message">Повторно изпращане</string>
     <string name="conversation_context__menu_reply_to_message">Отговор на съобщение</string>
     <!-- conversation_context_image -->
@@ -548,9 +553,9 @@
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">Време за активирнае при неактивност</string>
     <string name="AppProtectionPreferenceFragment_none">Нищо</string>
     <!-- Conversation activity -->
-    <string name="activity_conversation_copy_public_key_button_title">Copy public key</string>
+    <string name="activity_conversation_copy_public_key_button_title">Копиране на обществен ключ</string>
     <!-- Session -->
-    <string name="continue_2">Continue</string>
+    <string name="continue_2">Продължи</string>
     <string name="copy">Copy</string>
     <string name="invalid_url">Invalid URL</string>
     <string name="copied_to_clipboard">Copied to clipboard</string>
@@ -561,7 +566,7 @@
     <string name="your_session_id">Your Session ID</string>
     <string name="activity_landing_title_2">Your Session begins here...</string>
     <string name="activity_landing_register_button_title">Create Session ID</string>
-    <string name="activity_landing_restore_button_title">Continue Your Session</string>
+    <string name="activity_landing_restore_button_title">Продължете Вашата Сесия</string>
     <string name="view_fake_chat_bubble_1">What\'s Session?</string>
     <string name="view_fake_chat_bubble_2">It\'s a decentralized, encrypted messaging app</string>
     <string name="view_fake_chat_bubble_3">So it doesn\'t collect my personal information or my conversation metadata? How does it work?</string>
@@ -569,7 +574,7 @@
     <string name="view_fake_chat_bubble_5">Friends don\'t let friends use compromised messengers. You\'re welcome.</string>
     <string name="activity_register_title">Say hello to your Session ID</string>
     <string name="activity_register_explanation">Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.</string>
-    <string name="activity_restore_title">Restore your account</string>
+    <string name="activity_restore_title">Възстановяване на профил</string>
     <string name="activity_restore_explanation">Enter the recovery phrase that was given to you when you signed up to restore your account.</string>
     <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
     <string name="activity_display_name_title_2">Pick your display name</string>
@@ -595,7 +600,7 @@
     <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
     <string name="activity_path_title">Path</string>
     <string name="activity_path_explanation">Session hides your IP by bouncing your messages through several Service Nodes in Session\'s decentralized network. These are the countries your connection is currently being bounced through:</string>
-    <string name="activity_path_device_row_title">You</string>
+    <string name="activity_path_device_row_title">Вие</string>
     <string name="activity_path_guard_node_row_title">Entry Node</string>
     <string name="activity_path_service_node_row_title">Service Node</string>
     <string name="activity_path_destination_row_title">Destination</string>
@@ -632,7 +637,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 1241b86ba..c5dda1b9f 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(àudio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vídeo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reposta)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">No s\'ha trobat cap aplicació compatible.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">El Session necessita el permís de l\'emmagatzematge per tal d\'adjuntar fotografies, vídeos o àudio, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i habiliteu-hi l\'emmagatzematge.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">El Session necessita el permís dels contactes per tal d\'adjuntar-ne informació, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i habiliteu-hi els contactes.</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Missatge</string>
     <string name="ConversationActivity_compose">Escriu</string>
     <string name="ConversationActivity_muted_until_date">Silenciat fins %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d membres</string>
     <string name="ConversationActivity_open_group_guidelines">Directrius de la comunitat</string>
     <string name="ConversationActivity_invalid_recipient">Destinatari no vàlid.</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Per enviar missatges d\'àudio, permeteu que el Session tingui accés al micròfon.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">El Session necessita el permís del micròfon per tal d\'enviar missatges d\'àudio, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i habiliteu-hi el micròfon.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Per captar fotografies i vídeos, permeteu que el Session tingui accés a la càmera.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">El Session necessita el permís de la càmera per tal de fer fotografies i vídeos, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i habiliteu-hi la càmera.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">El Session necessita el permís de la càmera per fer fotografies i vídeos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Voleu desblocar aquest contacte?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Podreu tornar a rebre missatges i trucades d\'aquest contacte.</string>
     <string name="RecipientPreferenceActivity_unblock">Desbloca</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Imatge</string>
     <string name="Slide_audio">Àudio</string>
@@ -401,6 +404,7 @@ d\'intercanvi de claus!</string>
     <string name="arrays__mute_for_one_day">Silencia-ho durant 1 dia</string>
     <string name="arrays__mute_for_seven_days">Silencia-ho durant 7 dies</string>
     <string name="arrays__mute_for_one_year">Silencia-ho durant 1 any</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Configuració predeterminada</string>
     <string name="arrays__enabled">Habilitat</string>
     <string name="arrays__disabled">Inhabilitat</string>
@@ -489,6 +493,7 @@ d\'intercanvi de claus!</string>
     <string name="conversation_context__menu_copy_text">Copia el text</string>
     <string name="conversation_context__menu_delete_message">Suprimeix el missatge</string>
     <string name="conversation_context__menu_ban_user">Bloca l\'usuari</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Torna a enviar el missatge</string>
     <string name="conversation_context__menu_reply_to_message">Respon el missatge</string>
     <!-- conversation_context_image -->
@@ -632,7 +637,8 @@ d\'intercanvi de claus!</string>
     <string name="activity_settings_notifications_button_title">Notificacions</string>
     <string name="activity_settings_chats_button_title">Xats</string>
     <string name="activity_settings_devices_button_title">Dispositius</string>
-    <string name="activity_settings_invite_button_title">Convida</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Frase de recuperació</string>
     <string name="activity_settings_clear_all_data_button_title">Neteja les dades</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@ d\'intercanvi de claus!</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 38f34c413..63d77bbf4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -35,7 +35,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(zvuk)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(odpověď)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nemohu nalézt aplikaci pro vybraný typ dat.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signál potřebuje oprávnění pro přístup k úložišti aby mohl připojovat fotky, videa nebo zvuky, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Úložiště\",</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signál potřebuje oprávnění pro přístup ke kontaktům aby mohl připojit informace o kontaktu, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Kontakty\",</string>
@@ -58,18 +58,19 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Odeslání se nezdařilo, klikněte pro odeslání nezabepečeným způsobem</string>
     <string name="ConversationItem_unable_to_open_media">Nemohu nalézt aplikaci pro otevření tohoto typu dat.</string>
     <string name="ConversationItem_copied_text">Zkopírováno %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">Více</string>
     <string name="ConversationItem_download_more">Stáhnout další</string>
     <string name="ConversationItem_pending">Probíhá</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">Přidat přílohu</string>
     <string name="ConversationActivity_select_contact_info">Vybrat informace o kontaktu</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Omlouváme se, ale došlo k chybě při zpracování přílohy</string>
-    <string name="ConversationActivity_message">Message</string>
-    <string name="ConversationActivity_compose">Compose</string>
-    <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
-    <string name="ConversationActivity_member_count">%1$d members</string>
-    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_message">Zpráva</string>
+    <string name="ConversationActivity_compose">Napsat</string>
+    <string name="ConversationActivity_muted_until_date">Ztlumeno do %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">%1$d členů</string>
+    <string name="ConversationActivity_open_group_guidelines">Pravidla komunity</string>
     <string name="ConversationActivity_invalid_recipient">Chybný příjemce!</string>
     <string name="ConversationActivity_added_to_home_screen">Přidáno na plochu</string>
     <string name="ConversationActivity_leave_group">Opustit skupinu?</string>
@@ -83,10 +84,11 @@
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Není zde žádná aplikace která by dokázala zpracovat tento odkaz.</string>
     <string name="ConversationActivity_invite_to_open_group">Přidat členy</string>
     <string name="ConversationActivity_join_open_group">Připojit se k %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">Opravdu se chcete připojit k otevřené skupině <b>%s</b>?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Pro posílání audio zpráv potřebuje Signál přístup k mikrofonu.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signál potřebuje oprávnění pro přístup k mikrofonu aby mohl poslat audio zprávu, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pro pořizování fotografií nebo videa potřebuje Signál přístup k fotoaparátu.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">K pořizování fotografií a videa potřebuje Session přístup k úložišti.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signál potřebuje oprávnění pro přístup k fotoaparátu aby mohl pořizovat fotografie nebo video, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Fotoaparát\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signál potřebuje přístup k fotoaparátu aby mohl pořizovat fotografie nebo videa.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -112,7 +114,7 @@
         <item quantity="many">Tímto trvale smažete všech %1$d označených zpráv.</item>
         <item quantity="other">Tímto trvale smažete všech %1$d označených zpráv.</item>
     </plurals>
-    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_ban_selected_user">Vykázat tohoto uživatele?</string>
     <string name="ConversationFragment_save_to_sd_card">Uložit do paměti?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="one">Uložíte-li přílohu do úložiště, budou k ní mít přístup všechny aplikace ve vašem zařízení.\n\nPokračovat?</item>
@@ -139,13 +141,13 @@
         <item quantity="other">Uloženo %1$d příloh do úložiště</item>
     </plurals>
     <string name="ConversationFragment_pending">Probíhající:</string>
-    <string name="ConversationFragment_push">Data (Session)</string>
+    <string name="ConversationFragment_push">Data(Session)</string>
     <string name="ConversationFragment_mms">MMS</string>
     <string name="ConversationFragment_sms">SMS</string>
     <string name="ConversationFragment_deleting">Mažu</string>
     <string name="ConversationFragment_deleting_messages">Mažu zprávy...</string>
-    <string name="ConversationFragment_banning">Banning</string>
-    <string name="ConversationFragment_banning_user">Banning user…</string>
+    <string name="ConversationFragment_banning">Vykazuji</string>
+    <string name="ConversationFragment_banning_user">Vykazuji uživatele…</string>
     <string name="ConversationFragment_quoted_message_not_found">Původní zpráva nebyla nalezena</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">Původní zpráva již není dostupná</string>
     <!-- ConversationListItem -->
@@ -234,6 +236,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Odblokovat tento kontakt?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Budete opět moci přijímat zprávy a hovory od tohoto kontaktu.</string>
     <string name="RecipientPreferenceActivity_unblock">Odblokovat</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Obrázek</string>
     <string name="Slide_audio">Zvuk</string>
@@ -282,10 +285,10 @@
     <string name="KeyCachingService_lock">Zamknout Session</string>
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Vy</string>
-    <string name="MediaPreviewActivity_unssuported_media_type">Nepodporovaný typ dat.</string>
+    <string name="MediaPreviewActivity_unssuported_media_type">Nepodporovaný typ dat</string>
     <string name="MediaPreviewActivity_draft">Koncept</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
-    <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nelze ukládat do externího úložiště bez oprávnění.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session potřebuje oprávnění pro přístup k úložišti aby mohl zapisovat do externího úložiště, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Úložiště\".</string>
+    <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nelze ukládat do externího úložiště bez oprávnění</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Smazat zprávu?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Tímto trvale smažete tuto zprávu.</string>
     <!-- MessageNotifier -->
@@ -323,7 +326,7 @@
     <!-- ShortcutLauncherActivity -->
     <string name="ShortcutLauncherActivity_invalid_shortcut">Chybná klávesová zkratka</string>
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Session</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Relace</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nová zpráva</string>
     <!-- TransferControlView -->
     <plurals name="TransferControlView_n_items">
@@ -335,8 +338,8 @@
     <!-- VideoPlayer -->
     <string name="VideoPlayer_error_playing_video">Chyba při přehrávání videa</string>
     <!-- attachment_type_selector -->
-    <string name="attachment_type_selector__audio">Audio</string>
-    <string name="attachment_type_selector__audio_description">Audio</string>
+    <string name="attachment_type_selector__audio">Zvuk</string>
+    <string name="attachment_type_selector__audio_description">Zvuk</string>
     <string name="attachment_type_selector__contact">Kontakt</string>
     <string name="attachment_type_selector__contact_description">Kontakt</string>
     <string name="attachment_type_selector__camera">Kamera</string>
@@ -379,13 +382,13 @@
     <string name="audio_view__pause_accessibility_description">Zastavit</string>
     <string name="audio_view__download_accessibility_description">Stáhnout</string>
     <!-- open_group_invitation_view -->
-    <string name="open_group_invitation_view__join_accessibility_description">Join</string>
+    <string name="open_group_invitation_view__join_accessibility_description">Přidat se</string>
     <string name="open_group_invitation_view__open_group_invitation">Open group invitation</string>
     <string name="open_group_guidelines_pinned_message">Připnutá zpráva</string>
-    <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
-    <string name="open_group_guidelines_read">Read</string>
+    <string name="open_group_guidelines_community_guidelines">Pravidla komunity</string>
+    <string name="open_group_guidelines_read">Číst</string>
     <!-- QuoteView -->
-    <string name="QuoteView_audio">Audio</string>
+    <string name="QuoteView_audio">Zvuk</string>
     <string name="QuoteView_video">Video</string>
     <string name="QuoteView_photo">Fotografie</string>
     <string name="QuoteView_you">Vy</string>
@@ -417,7 +420,7 @@
     <!-- AndroidManifest.xml -->
     <string name="AndroidManifest__create_passphrase">Vytvořit heslo</string>
     <string name="AndroidManifest__select_contacts">Výběr kontaktů</string>
-    <string name="AndroidManifest__media_preview">Náhled multimedií</string>
+    <string name="AndroidManifest__media_preview">Náhled multimédií</string>
     <!-- arrays.xml -->
     <string name="arrays__use_default">Použít výchozí</string>
     <string name="arrays__use_custom">Použít vlastní</string>
@@ -426,6 +429,7 @@
     <string name="arrays__mute_for_one_day">Ztišit na 1 den</string>
     <string name="arrays__mute_for_seven_days">Ztišit na 7 dnů</string>
     <string name="arrays__mute_for_one_year">Ztišit na 1 rok</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Výchozí nastavení</string>
     <string name="arrays__enabled">Povoleno</string>
     <string name="arrays__disabled">Zakázáno</string>
@@ -433,7 +437,7 @@
     <string name="arrays__name_only">Pouze jméno</string>
     <string name="arrays__no_name_or_message">Žádné jméno ani zprávy</string>
     <string name="arrays__images">Obrázky</string>
-    <string name="arrays__audio">Audio</string>
+    <string name="arrays__audio">Zvuk</string>
     <string name="arrays__video">Video</string>
     <string name="arrays__documents">Dokumenty</string>
     <string name="arrays__small">Malé</string>
@@ -442,7 +446,7 @@
     <string name="arrays__extra_large">Extra velké</string>
     <string name="arrays__default">Výchozí</string>
     <string name="arrays__high">Vysoká</string>
-    <string name="arrays__max">Max</string>
+    <string name="arrays__max">Maximum</string>
     <!-- plurals.xml -->
     <plurals name="hours_ago">
         <item quantity="one">%d hodina</item>
@@ -516,12 +520,13 @@
     <string name="conversation_context__menu_copy_text">Kopírovat text</string>
     <string name="conversation_context__menu_delete_message">Smazat zprávu</string>
     <string name="conversation_context__menu_ban_user">Zablokovat uživatele</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Znovu poslat zprávu</string>
     <string name="conversation_context__menu_reply_to_message">Odpovědět na zprávu</string>
     <!-- conversation_context_image -->
     <string name="conversation_context_image__save_attachment">Uložit přílohu</string>
     <!-- conversation_expiring_off -->
-    <string name="conversation_expiring_off__disappearing_messages">Zmizení zpráv</string>
+    <string name="conversation_expiring_off__disappearing_messages">Mizející zprávy</string>
     <!-- conversation_expiring_on -->
     <string name="menu_conversation_expiring_on__messages_expiring">Končí doba platnosti zprávy</string>
     <!-- conversation_muted -->
@@ -546,7 +551,7 @@
     <!-- media_overview -->
     <string name="media_overview_documents_fragment__no_documents_found">Žádné dokumenty</string>
     <!-- media_preview_activity -->
-    <string name="media_preview_activity__media_content_description">Náhled multimedií</string>
+    <string name="media_preview_activity__media_content_description">Náhled multimédií</string>
     <!-- Trimmer -->
     <string name="trimmer__deleting">Mažu</string>
     <string name="trimmer__deleting_old_messages">Mazání starých zpráv...</string>
@@ -575,44 +580,44 @@
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">Časový limit neaktivity zámku obrazovky</string>
     <string name="AppProtectionPreferenceFragment_none">Nic</string>
     <!-- Conversation activity -->
-    <string name="activity_conversation_copy_public_key_button_title">Copy public key</string>
+    <string name="activity_conversation_copy_public_key_button_title">Kopírovat veřejný klíč</string>
     <!-- Session -->
     <string name="continue_2">Pokračovat</string>
-    <string name="copy">Copy</string>
-    <string name="invalid_url">Invalid URL</string>
-    <string name="copied_to_clipboard">Copied to clipboard</string>
-    <string name="next">Next</string>
-    <string name="share">Share</string>
-    <string name="invalid_session_id">Invalid Session ID</string>
-    <string name="cancel">Cancel</string>
-    <string name="your_session_id">Your Session ID</string>
-    <string name="activity_landing_title_2">Your Session begins here...</string>
-    <string name="activity_landing_register_button_title">Create Session ID</string>
+    <string name="copy">Kopírovat</string>
+    <string name="invalid_url">Neplatná adresa URL</string>
+    <string name="copied_to_clipboard">Zkopírováno do schránky</string>
+    <string name="next">Další</string>
+    <string name="share">Sdílet</string>
+    <string name="invalid_session_id">Neplatné Session ID</string>
+    <string name="cancel">Zrušit</string>
+    <string name="your_session_id">ID vaší relace</string>
+    <string name="activity_landing_title_2">Vaše Session začíná zde...</string>
+    <string name="activity_landing_register_button_title">Vytvořit ID relace</string>
     <string name="activity_landing_restore_button_title">Continue Your Session</string>
-    <string name="view_fake_chat_bubble_1">What\'s Session?</string>
-    <string name="view_fake_chat_bubble_2">It\'s a decentralized, encrypted messaging app</string>
-    <string name="view_fake_chat_bubble_3">So it doesn\'t collect my personal information or my conversation metadata? How does it work?</string>
-    <string name="view_fake_chat_bubble_4">Using a combination of advanced anonymous routing and end-to-end encryption technologies.</string>
-    <string name="view_fake_chat_bubble_5">Friends don\'t let friends use compromised messengers. You\'re welcome.</string>
-    <string name="activity_register_title">Say hello to your Session ID</string>
-    <string name="activity_register_explanation">Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.</string>
-    <string name="activity_restore_title">Restore your account</string>
-    <string name="activity_restore_explanation">Enter the recovery phrase that was given to you when you signed up to restore your account.</string>
-    <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
-    <string name="activity_display_name_title_2">Pick your display name</string>
-    <string name="activity_display_name_explanation">This will be your name when you use Session. It can be your real name, an alias, or anything else you like.</string>
-    <string name="activity_display_name_edit_text_hint">Enter a display name</string>
-    <string name="activity_display_name_display_name_missing_error">Please pick a display name</string>
-    <string name="activity_display_name_display_name_too_long_error">Please pick a shorter display name</string>
-    <string name="activity_pn_mode_recommended_option_tag">Recommended</string>
-    <string name="activity_pn_mode_no_option_picked_dialog_title">Please Pick an Option</string>
-    <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
+    <string name="view_fake_chat_bubble_1">Co je Session?</string>
+    <string name="view_fake_chat_bubble_2">Je to decentralizovaná a šifrovaná aplikace pro zasílání zpráv</string>
+    <string name="view_fake_chat_bubble_3">Takže neshromažďuje mé osobní údaje ani metadata mých konverzací? Jak to funguje?</string>
+    <string name="view_fake_chat_bubble_4">Použitím kombinace pokročilých anonymních směrovacích a end-to-end šifrovacích technologií.</string>
+    <string name="view_fake_chat_bubble_5">Přátelé nenechávají přátelé používat kompromitované aplikace. Není zač.</string>
+    <string name="activity_register_title">Přivítejte své nové Session ID</string>
+    <string name="activity_register_explanation">Vaše Session ID je jedinečná adresa, kterou mohou lidé použít k vašemu kontaktování na Session. Bez jakékoli návaznosti na vaší skutečnou identitu je vaše Session ID stavbou zcela anonymní a soukromí chránící.</string>
+    <string name="activity_restore_title">Obnovit účet</string>
+    <string name="activity_restore_explanation">Zadejte frázi pro obnovení, která vám byla vygenerována během registrace účtu.</string>
+    <string name="activity_restore_seed_edit_text_hint">Zadejte frázi pro obnovení</string>
+    <string name="activity_display_name_title_2">Vaše jméno</string>
+    <string name="activity_display_name_explanation">Toto bude váš pseudonym během používání Session. Může to být vaše skutečné jméno, alias, nebo cokoliv jiného, co se vám líbí.</string>
+    <string name="activity_display_name_edit_text_hint">Zadejte pseudonym</string>
+    <string name="activity_display_name_display_name_missing_error">Vyberte prosím pseudonym</string>
+    <string name="activity_display_name_display_name_too_long_error">Vyberte prosím kratší pseudonym</string>
+    <string name="activity_pn_mode_recommended_option_tag">Doporučeno</string>
+    <string name="activity_pn_mode_no_option_picked_dialog_title">Prosím vyberte možnost</string>
+    <string name="activity_home_empty_state_message">Zatím nemáte žádné kontakty</string>
     <string name="activity_home_empty_state_button_title">Start a Session</string>
-    <string name="activity_home_leave_group_dialog_message">Are you sure you want to leave this group?</string>
-    <string name="activity_home_leaving_group_failed_message">"Couldn't leave group"</string>
-    <string name="activity_home_delete_conversation_dialog_message">Are you sure you want to delete this conversation?</string>
+    <string name="activity_home_leave_group_dialog_message">Opravdu chcete opustit tuto skupinu?</string>
+    <string name="activity_home_leaving_group_failed_message">"Skupinu se nepodařilo opustit"</string>
+    <string name="activity_home_delete_conversation_dialog_message">Opravdu chcete smazat tuto konverzaci?</string>
     <string name="activity_home_conversation_deleted_message">Konverzace byla smazána</string>
-    <string name="activity_seed_title">Your Recovery Phrase</string>
+    <string name="activity_seed_title">Vaše fráze pro obnovení</string>
     <string name="activity_seed_title_2">Meet your recovery phrase</string>
     <string name="activity_seed_explanation">Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don\'t give it to anyone.</string>
     <string name="activity_seed_reveal_button_title">Hold to reveal</string>
@@ -623,14 +628,14 @@
     <string name="activity_path_title">Path</string>
     <string name="activity_path_explanation">Session hides your IP by bouncing your messages through several Service Nodes in Session\'s decentralized network. These are the countries your connection is currently being bounced through:</string>
     <string name="activity_path_device_row_title">You</string>
-    <string name="activity_path_guard_node_row_title">Entry Node</string>
-    <string name="activity_path_service_node_row_title">Service Node</string>
-    <string name="activity_path_destination_row_title">Destination</string>
-    <string name="activity_path_learn_more_button_title">Learn More</string>
-    <string name="activity_path_resolving_progress">Resolving…</string>
+    <string name="activity_path_guard_node_row_title">Vstupní uzel</string>
+    <string name="activity_path_service_node_row_title">Provozní uzel</string>
+    <string name="activity_path_destination_row_title">Cíl</string>
+    <string name="activity_path_learn_more_button_title">Další informace</string>
+    <string name="activity_path_resolving_progress">Připojování…</string>
     <string name="activity_create_private_chat_title">New Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Enter Session ID</string>
-    <string name="activity_create_private_chat_scan_qr_code_tab_title">Scan QR Code</string>
+    <string name="activity_create_private_chat_enter_session_id_tab_title">Zadejte Session ID</string>
+    <string name="activity_create_private_chat_scan_qr_code_tab_title">Naskenovat QR kód</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scan a user\'s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
     <string name="fragment_enter_public_key_explanation">Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.</string>
@@ -659,7 +664,8 @@
     <string name="activity_settings_notifications_button_title">Oznámení</string>
     <string name="activity_settings_chats_button_title">Konverzace</string>
     <string name="activity_settings_devices_button_title">Zařízení</string>
-    <string name="activity_settings_invite_button_title">Pozvat</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Fráze pro obnovení</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -753,4 +759,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index cc3b8903e..d6e3cea9f 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -39,7 +39,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(sain)</string>
     <string name="DraftDatabase_Draft_video_snippet">(fideo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(ateb)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Methu canfod rhaglen i ddewis cyfryngau.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Mae ar Session angen caniatâd Storio er mwyn atodi lluniau, fideos neu sain, ond mae wedi\'i wrthod yn barhaol. Ewch i ddewislen gosodiadau\'r ap, dewis \"Caniatâd\", a galluogi \"Storio\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Mae ar Session angen caniatâd Cysylltiadau er mwyn atodi gwybodaeth gyswllt, ond fe\'i rwystrwyd yn barhaol. Ewch i ddewislen gosodiadau\'r ap, dewis \"Caniatâd\", a galluogi \"Cysylltiadau\".</string>
@@ -72,6 +72,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Derbynnydd annilys!</string>
@@ -91,6 +92,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">I anfon negeseuon sain, caniatewch i Session gael mynediad i\'ch meicroffon.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Mae ar Session angen caniatâd Meicroffon i anfon negeseuon sain, ond mae wed\'i atal yn barhaol. Ewch i osodiadau\'r ap, dewis \"Caniatâd\", a galluogi \"Microffon\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">I gipio lluniau a fideo, caniatewch i Session gael mynediad i\'r camera.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Mae ar Session angen caniatâd Camera er mwyn atodi tynnu lluniau neu fideos, ond fe\'i rwystrwyd yn barhaol. Ewch i ddewislen gosodiadau\'r ap, dewis \"Caniatâd\", a galluogi \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Angen Session angen caniatâd camera i dynnu lluniau neu fideo</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -258,6 +260,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Dadrwystro\'r cyswllt hwn?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Byddwch unwaith eto yn gallu derbyn negeseuon a galwadau o\'r cyswllt hwn.</string>
     <string name="RecipientPreferenceActivity_unblock">Dadrwystro</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Llun</string>
     <string name="Slide_audio">Sain</string>
@@ -453,6 +456,7 @@
     <string name="arrays__mute_for_one_day">Tewi am 1 diwrnod</string>
     <string name="arrays__mute_for_seven_days">Tewi am 7 diwrnod</string>
     <string name="arrays__mute_for_one_year">Tewi am 1 blwyddyn</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Rhagosodiadau\'r gosodiadau</string>
     <string name="arrays__enabled">Galluogwyd</string>
     <string name="arrays__disabled">Analluogwyd</string>
@@ -545,6 +549,7 @@
     <string name="conversation_context__menu_copy_text">Copïo testun</string>
     <string name="conversation_context__menu_delete_message">Dileu neges</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Ailanfon y neges</string>
     <string name="conversation_context__menu_reply_to_message">Ateb neges</string>
     <!-- conversation_context_image -->
@@ -688,7 +693,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -782,4 +788,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 2dbe1eaaf..6833419df 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(lyd)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(svar)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Ingen app tilgængelig til valg af data</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session kræver tilladelse til at tilgå din hukommelse, for at kunne vedhæfte billeder, videoer eller lydfiler, hvilket det er blevet nægtet. Gå venligst via appens menu til Indstillinger, vælg \"Tilladelser\" og tilvælg \"Hukommelse\"</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session kræver tilladelse til at tilgå dine kontakter, for at kunne vedhæfte kontakt informationer, hvilket det er blevet nægtet. Gå venligst via appens menu til Indstillinger, vælg \"Tilladelser\" og tilvælg \"Kontakter\"</string>
@@ -54,7 +54,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Fejl ved afsendelse, tap for at sende usikret</string>
     <string name="ConversationItem_unable_to_open_media">Kan ikke finde en app, der kan åbne mediet</string>
     <string name="ConversationItem_copied_text">Kopieret %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">Læs mere</string>
     <string name="ConversationItem_download_more">  Download mere</string>
     <string name="ConversationItem_pending">  Afventer </string>
     <!-- ConversationActivity -->
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Besked</string>
     <string name="ConversationActivity_compose">Ny meddelelse</string>
     <string name="ConversationActivity_muted_until_date">Lydløs indtil %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d medlemmer</string>
     <string name="ConversationActivity_open_group_guidelines">Retningslinjer For Fællesskabet</string>
     <string name="ConversationActivity_invalid_recipient">Ugyldig modtager!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">For at sende talebeskeder skal du give Session tilladelse til at tilgå mikrofonen</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session kræver tilladelse til at tilgå mikrofonen for at kunne sende lydfiler, hvilket det er blevet nægtet. Gå venligst via appens menu til Indstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\"</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session kræver tilladelse til at tilgå dit kamera, for at kunne tage billeder og optage video</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session har brug for lageradgang for at sende billeder og videoer.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session kræver tilladelse til at tilgå dit kamera, for at kunne tage billeder eller optage video, hvilket det er blevet nægtet. Gå venligst via appens menu til Indstillinger, vælg \"Tilladelser\" og tilvælg \"Kamera\"</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session kræver tilladelse til at tilgå kameraet, for at kunne tage billeder eller videoer.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Fjern blokering af kontakten?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Du vil igen modtage beskeder og opkald fra kontakten</string>
     <string name="RecipientPreferenceActivity_unblock">Fjern blokering</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Billede</string>
     <string name="Slide_audio">Lyd</string>
@@ -235,7 +238,7 @@ udveksel besked!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Beskeder med tidsudløb deaktiveret</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">Beskeder udløber efter %s</string>
     <string name="ThreadRecord_s_took_a_screenshot">%s tog et screenshot.</string>
-    <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
+    <string name="ThreadRecord_media_saved_by_s">Medier gemt af %s.</string>
     <string name="ThreadRecord_safety_number_changed">Sikkerhedsnummer ændret</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">Dit sikkerhedsnummer med %s er ændret</string>
     <string name="ThreadRecord_you_marked_verified">Markerét som verificeret</string>
@@ -358,7 +361,7 @@ udveksel besked!</string>
     <string name="open_group_invitation_view__open_group_invitation">Åben gruppe invitation</string>
     <string name="open_group_guidelines_pinned_message">Fastgjort besked</string>
     <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
-    <string name="open_group_guidelines_read">Read</string>
+    <string name="open_group_guidelines_read">Læst</string>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Lyd</string>
     <string name="QuoteView_video">Video</string>
@@ -401,6 +404,7 @@ udveksel besked!</string>
     <string name="arrays__mute_for_one_day">Udsæt 1 dag</string>
     <string name="arrays__mute_for_seven_days">Udsæt 7 dage</string>
     <string name="arrays__mute_for_one_year">Udsæt 1 år</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Standardindstillinger</string>
     <string name="arrays__enabled">Aktiveret</string>
     <string name="arrays__disabled">Deaktiverét</string>
@@ -489,6 +493,7 @@ udveksel besked!</string>
     <string name="conversation_context__menu_copy_text">Kopiér tekst</string>
     <string name="conversation_context__menu_delete_message">Slet besked</string>
     <string name="conversation_context__menu_ban_user">Udeluk bruger</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Send besked igen</string>
     <string name="conversation_context__menu_reply_to_message">Svar på besked</string>
     <!-- conversation_context_image -->
@@ -572,9 +577,9 @@ udveksel besked!</string>
     <string name="activity_restore_title">Gendan din konto</string>
     <string name="activity_restore_explanation">Enter the recovery phrase that was given to you when you signed up to restore your account.</string>
     <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
-    <string name="activity_display_name_title_2">Pick your display name</string>
+    <string name="activity_display_name_title_2">Vælg dit visningsnavn</string>
     <string name="activity_display_name_explanation">This will be your name when you use Session. It can be your real name, an alias, or anything else you like.</string>
-    <string name="activity_display_name_edit_text_hint">Enter a display name</string>
+    <string name="activity_display_name_edit_text_hint">Tast et visningsnavn</string>
     <string name="activity_display_name_display_name_missing_error">Please pick a display name</string>
     <string name="activity_display_name_display_name_too_long_error">Please pick a shorter display name</string>
     <string name="activity_pn_mode_recommended_option_tag">Recommended</string>
@@ -632,7 +637,8 @@ udveksel besked!</string>
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@ udveksel besked!</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2aaf3e26a..0fecbd783 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(Audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(Video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(Antwort)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Keine App zur Auswahl der Medieninhalte auffindbar.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session benötigt die Berechtigung »Speicher« für das Anhängen von Fotos, Videos oder Audiodateien, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Speicher«.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session benötigt die Berechtigung »Kontakte« für das Anhängen von Kontaktinformationen, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kontakte«.</string>
@@ -54,7 +54,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Senden gescheitert. Für Rückgriff auf unsicheren Versand antippen.</string>
     <string name="ConversationItem_unable_to_open_media">Keine App zum Öffnen dieser Medieninhalte gefunden.</string>
     <string name="ConversationItem_copied_text">%s kopiert</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">Mehr lesen</string>
     <string name="ConversationItem_download_more">  Mehr herunterladen</string>
     <string name="ConversationItem_pending">  Ausstehend</string>
     <!-- ConversationActivity -->
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Nachricht</string>
     <string name="ConversationActivity_compose">Verfasse</string>
     <string name="ConversationActivity_muted_until_date">Stummgeschaltet bis %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d Mitglieder</string>
     <string name="ConversationActivity_open_group_guidelines">Gruppenrichtlinien</string>
     <string name="ConversationActivity_invalid_recipient">Ungültiger Kontakt!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Erlaube Session zum Versenden von Sprachnachrichten Zugriff auf dein Mikrofon.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session benötigt die Berechtigung »Mikrofon« für das Senden von Sprachnachrichten, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon«.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Erlaube Session zum Aufnehmen von Fotos und Videos Zugriff auf deine Kamera.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session benötigt Speicherzugriff, um Fotos und Videos zu versenden.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session benötigt die Berechtigung »Kamera« für die Aufnahme von Fotos oder Videos, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session benötigt die Berechtigung »Kamera«, um Fotos oder Videos aufzunehmen.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Diesen Kontakt freigeben?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Du wirst wieder Nachrichten und Anrufe von diesem Kontakt erhalten können.</string>
     <string name="RecipientPreferenceActivity_unblock">Freigeben</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Bild</string>
     <string name="Slide_audio">Audio</string>
@@ -260,7 +263,7 @@
     <string name="MediaPreviewActivity_you">Du</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nicht unterstützter Medieninhaltetyp</string>
     <string name="MediaPreviewActivity_draft">Entwurf</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Die Sitzung benötigt Speicherzugriff, um auf einem externen Speicher zu speichern, aber dieser wurde dauerhaft verweigert. Gehe bitte zu den App-Einstellungen, wähle »Berechtigungen« und aktiviere »Speicher«.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Speichern in den Gerätespeicher ohne Berechtigungen nicht möglich.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Nachricht löschen?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Dies wird diese Nachricht unwiderruflich löschen.</string>
@@ -400,6 +403,7 @@
     <string name="arrays__mute_for_one_day">Für 1 Tag</string>
     <string name="arrays__mute_for_seven_days">Für 7 Tage</string>
     <string name="arrays__mute_for_one_year">Für 1 Jahr</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Standard</string>
     <string name="arrays__enabled">Aktiviert</string>
     <string name="arrays__disabled">Deaktiviert</string>
@@ -488,6 +492,7 @@
     <string name="conversation_context__menu_copy_text">Text kopieren</string>
     <string name="conversation_context__menu_delete_message">Nachrichten löschen</string>
     <string name="conversation_context__menu_ban_user">Nutzer speeren</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Sperren und alles löschen</string>
     <string name="conversation_context__menu_resend_message">Nachricht erneut senden</string>
     <string name="conversation_context__menu_reply_to_message">Auf Nachricht antworten</string>
     <!-- conversation_context_image -->
@@ -631,10 +636,11 @@
     <string name="activity_settings_notifications_button_title">Benachrichtigungen</string>
     <string name="activity_settings_chats_button_title">Konversationen</string>
     <string name="activity_settings_devices_button_title">Geräte</string>
-    <string name="activity_settings_invite_button_title">Einladen</string>
+    <string name="activity_settings_invite_button_title">Einen Freund einladen</string>
+    <string name="activity_settings_faq_button_title">Häufig gestellte Fragen</string>
     <string name="activity_settings_recovery_phrase_button_title">Wiederherstellungssatz</string>
     <string name="activity_settings_clear_all_data_button_title">Daten löschen</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Daten löschen, einschließlich Netzwerk</string>
     <string name="activity_settings_help_translate_session">Hilf uns, Session zu übersetzen</string>
     <string name="activity_notification_settings_title">Benachrichtigungen</string>
     <string name="activity_notification_settings_style_section_title">Stil der Benachrichtigungen</string>
@@ -650,9 +656,9 @@
     <string name="dialog_seed_explanation">Das ist Ihr Wiederherstellungssatz. Damit können Sie Ihre Session ID wiederherstellen oder auf ein neues Gerät migrieren.</string>
     <string name="dialog_clear_all_data_title">Alle Daten löschen</string>
     <string name="dialog_clear_all_data_explanation">Dadurch werden Ihre Nachrichten, Sessions und Kontakte dauerhaft gelöscht.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="dialog_clear_all_data_network_explanation">Möchtest du nur dieses Gerät leeren oder dein gesamtes Konto löschen?</string>
+    <string name="dialog_clear_all_data_local_only">Nur leeren</string>
+    <string name="dialog_clear_all_data_clear_network">Gesamtes Konto</string>
     <string name="activity_qr_code_title">QR-Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">Meinen QR-Code anzeigen</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">QR-Code scannen</string>
@@ -707,22 +713,32 @@
     <string name="activity_prompt_passphrase_tap_to_unlock">Tippe zum entsperren</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Spitznamen eingeben</string>
     <string name="invalid_public_key">Ungültiger öffentlicher Schlüssel</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="document">Dokument</string>
+    <string name="dialog_blocked_title">%s freigeben?</string>
+    <string name="dialog_blocked_explanation">Bist du sicher, dass du %s freigeben möchtest?</string>
+    <string name="dialog_join_open_group_title">%s beitreten?</string>
+    <string name="dialog_join_open_group_explanation">Bist du sicher, dass du der offenen Gruppe %s beitreten möchtest?</string>
+    <string name="dialog_open_url_title">URL öffnen?</string>
+    <string name="dialog_open_url_explanation">Bist du sicher, dass du %s öffnen möchtest?</string>
+    <string name="open">Öffnen</string>
+    <string name="dialog_link_preview_title">Linkvorschau aktivieren?</string>
+    <string name="dialog_link_preview_explanation">Wenn du die Linkvorschau aktivierst, werden Vorschauen für URLs angezeigt, die du sendest und empfängst. Dies kann nützlich sein, aber Session muss die verlinkten Webseiten kontaktieren, um Vorschauen zu generieren. Du kannst die Linkvorschau jederzeit in den Einstellungen von Session deaktivieren.</string>
+    <string name="dialog_link_preview_enable_button_title">Aktivieren</string>
+    <string name="dialog_download_title">%s vertrauen?</string>
+    <string name="dialog_download_explanation">Bist du sicher, dass du die von %s gesendeten Medien herunterladen möchtest?</string>
+    <string name="dialog_download_button_title">Herunterladen</string>
+    <string name="activity_conversation_blocked_banner_text">%s ist blockiert. Freigeben?</string>
+    <string name="activity_conversation_attachment_prep_failed">Der Anhang konnte nicht zum Senden vorbereitet werden.</string>
+    <string name="media">Medien</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tippen, um %s herunterzuladen</string>
+    <string name="message_details_header__error">Fehler</string>
+    <string name="dialog_send_seed_title">Warnung</string>
+    <string name="dialog_send_seed_explanation">Dies ist dein Wiederherstellungssatz. Wenn du ihn jemandem schickst, hat er oder sie vollen Zugriff auf dein Konto.</string>
+    <string name="dialog_send_seed_send_button_title">Senden</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index d86af3eae..357fe50ac 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(ήχος)</string>
     <string name="DraftDatabase_Draft_video_snippet">(βίντεο)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(απάντηση)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Δεν μπορεί να βρεθεί εφαρμογή για επιλογή πολυμέσων.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio"> Το Session χρειάζεται τα δικαιώματα Αποθηκευτικού Χώρου για να μπορούμε να επισυνάψουμε φωτογραφίες, βίντεο ή κομμάτια ήχου, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πηγαίνετε στις ρυθμίσεις εφαρμογών, επιλέξτε τα \"Δικαιώματα\", και ενεργοποιήστε το \"Αποθηκευτικός Χώρος\". </string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Το Session χρειάζεται τα δικαιώματα Επαφών για να μπορούμε να επισυνάπτουμε πληροφορίες επαφών, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πηγαίνετε στις ρυθμίσεις εφαρμογών, επιλέξτε τα \"Δικαιώματα\", και ενεργοποιήστε τις \"Επαφές\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Μήνυμα</string>
     <string name="ConversationActivity_compose">Δημιουργία</string>
     <string name="ConversationActivity_muted_until_date">Σε σίγαση μέχρι %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d μέλη</string>
     <string name="ConversationActivity_open_group_guidelines">Οδηγίες Κοινότητας</string>
     <string name="ConversationActivity_invalid_recipient">Μη έγκυρος/η παραλήπτης/τρια!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Για να στείλετε μηνύματα ήχου, δώστε στο Session πρόσβαση στο μικρόφωνό σας.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Το Session χρειάζεται τα δικαιώματα Μικροφώνου για να μπορούμε να στείλουμε μηνύματα ήχου, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πηγαίνετε στις ρυθμίσεις εφαρμογών, επιλέξτε τα \"Δικαιώματα\", και ενεργοποιήστε το \"Μικρόφωνο\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Για να τραβήξετε φωτογραφίες και βίντεο, δώστε στο Session πρόσβαση στην κάμερα.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Το Session χρειάζεται πρόσβαση στον αποθηκευτικό χώρο για την αποστολή φωτογραφιών και βίντεο.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Το Session χρειάζεται τα δικαιώματα Κάμερας για να μπορούμε να τραβήξουμε φωτογραφίες και βίντεο, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πηγαίνετε στις ρυθμίσεις εφαρμογών, επιλέξτε τα \"Δικαιώματα\", και ενεργοποιήστε την \"Κάμερα\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Το Session χρειάζεται τα δικαιώματα Κάμερας για να τραβήξει φωτογραφίες ή βίντεο</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s, %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Ξεμπλοκάρισμα αυτής της επαφής;</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Θα μπορείτε και πάλι να λάβετε μηνύματα και κλήσεις από αυτή την επαφή.</string>
     <string name="RecipientPreferenceActivity_unblock">Ξεμπλοκάρισμα</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Εικόνα</string>
     <string name="Slide_audio">Ήχος</string>
@@ -402,6 +405,7 @@
     <string name="arrays__mute_for_one_day">Σίγαση για 1 ημέρα</string>
     <string name="arrays__mute_for_seven_days">Σίγαση για 7 ημέρες</string>
     <string name="arrays__mute_for_one_year">Σίγαση για 1 χρόνο</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Προκαθορισμένες ρυθμίσεις</string>
     <string name="arrays__enabled">Ενεργοποιημένο</string>
     <string name="arrays__disabled">Απενεργοποιημένο</string>
@@ -490,6 +494,7 @@
     <string name="conversation_context__menu_copy_text">Αντιγραφή κειμένου</string>
     <string name="conversation_context__menu_delete_message">Διαγραφή μηνύματος</string>
     <string name="conversation_context__menu_ban_user">Αποκλεισμός χρήστη</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Αποκλεισμός και διαγραφή όλων</string>
     <string name="conversation_context__menu_resend_message">Αποστολή ξανά</string>
     <string name="conversation_context__menu_reply_to_message">Απαντήστε στο μήνυμα</string>
     <!-- conversation_context_image -->
@@ -633,7 +638,8 @@
     <string name="activity_settings_notifications_button_title">Ειδοποιήσεις</string>
     <string name="activity_settings_chats_button_title">Συνομιλίες</string>
     <string name="activity_settings_devices_button_title">Συσκευές</string>
-    <string name="activity_settings_invite_button_title">Πρόσκληση</string>
+    <string name="activity_settings_invite_button_title">Προσκαλέστε ένα φίλο</string>
+    <string name="activity_settings_faq_button_title">Συχνές ερωτήσεις</string>
     <string name="activity_settings_recovery_phrase_button_title">Φράση Ανάκτησης</string>
     <string name="activity_settings_clear_all_data_button_title">Εκκαθάριση Δεδομένων</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Εκκαθάριση Δεδομένων Με Το Δίκτυο</string>
@@ -727,4 +733,14 @@
     <string name="activity_conversation_attachment_prep_failed">Αποτυχία προετοιμασίας συνημμένου για αποστολή.</string>
     <string name="media">Πολυμέσα</string>
     <string name="UntrustedAttachmentView_download_attachment">Αγγίξτε για λήψη %s</string>
+    <string name="message_details_header__error">Σφάλμα</string>
+    <string name="dialog_send_seed_title">Προειδοποίηση</string>
+    <string name="dialog_send_seed_explanation">Αυτή είναι η φράση ανάκτησής σας. Αν την στείλετε σε κάποιον θα έχει πλήρη πρόσβαση στο λογαριασμό σας.</string>
+    <string name="dialog_send_seed_send_button_title">Αποστολή</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 7a5b47310..30df7d153 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(sonaĵo)</string>
     <string name="DraftDatabase_Draft_video_snippet">(videaĵo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(respondo)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Ne eblas trovi aplikaĵon por malfermi aŭdvidaĵon.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session bezonas la Konservejo-permeson por almeti bildojn, videojn aŭ aŭdaĵojn, sed ĝi estis porĉiame malakceptita. Bonvolu daŭrigi al la aplikaĵaj agordoj, elekti „Permesoj“, kaj ŝalti „Konservejo“.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session bezonas permeson legi kontaktojn por kunligi kontaktajn informojn, sed ĝi estis porĉiame malakceptita. Bonvolu daŭrigi al la aplikaĵaj agordoj, elekti „Permesoj“, kaj ŝalti „Kontaktoj“.</string>
@@ -64,8 +64,9 @@
     <string name="ConversationActivity_message">Mesaĝo</string>
     <string name="ConversationActivity_compose">Verku</string>
     <string name="ConversationActivity_muted_until_date">Silentigita ĝis %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d membroj</string>
-    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_open_group_guidelines">Komunumaj reguloj</string>
     <string name="ConversationActivity_invalid_recipient">Nevalida ricevonto!</string>
     <string name="ConversationActivity_added_to_home_screen">Aldonita al la ĉefekrano</string>
     <string name="ConversationActivity_leave_group">Ĉu forlasi grupon?</string>
@@ -78,11 +79,12 @@
     <string name="ConversationActivity_unable_to_record_audio">Ne eblas registri sonaĵon!</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Estas neniu aplikaĵo disponebla por trakti ĉi tiun ligilon ĉe via aparato.</string>
     <string name="ConversationActivity_invite_to_open_group">Aldoni membrojn</string>
-    <string name="ConversationActivity_join_open_group">Join %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_join_open_group">Aliĝi al %s</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">Ĉu vi certas, ke vi volas aliĝi al la <b>%s</b> publika grupo?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Por registri aŭdajn mesaĝojn, donu al Session permeson uzi vian mikrofonon.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session bezonas la Mikrofono-permeson por sendi aŭdajn mesaĝojn, sed ĝi estis porĉiame malakceptita. Bonvolu daŭrigi al la aplikaĵaj agordoj, elekti „Permesoj“, kaj ŝalti „Mikrofono“.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Por registri bildojn kaj videaĵojn, donu al Session aliron al la fotilo.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session bezonas aliron al la memoro por sendi bildojn kaj filmetojn.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session bezonas la Fotilo-permeson por preni fotojn aŭ videojn, sed ĝi estis porĉiame malakceptita. Bonvolu daŭrigi al la aplikaĵaj agordoj, elekti „Permesoj“, kaj ŝalti „Fotilo“.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session bezonas la Fotilo-permeson por preni fotojn aŭ videaĵojn</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Ĉu malbloki ĉi tiun kontakton?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Vi ree ricevos mesaĝojn kaj alvokojn de ĉi tiu kontakto.</string>
     <string name="RecipientPreferenceActivity_unblock">Malbloki</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Bildo</string>
     <string name="Slide_audio">Sonaĵo</string>
@@ -235,8 +238,8 @@
     <string name="ThreadRecord_s_is_on_signal">%s estas ĉe Session!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Memviŝontaj mesaĝoj malŝaltita</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">Daŭro de memviŝontaj mesaĝoj agordita je %s</string>
-    <string name="ThreadRecord_s_took_a_screenshot">%s took a screenshot.</string>
-    <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
+    <string name="ThreadRecord_s_took_a_screenshot">%s kreis ekrankopion.</string>
+    <string name="ThreadRecord_media_saved_by_s">%s elŝutis la dosieron.</string>
     <string name="ThreadRecord_safety_number_changed">Sekuriga numero ŝanĝiĝis</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">Via sekuriga numero kun %s ŝanĝiĝis.</string>
     <string name="ThreadRecord_you_marked_verified">Vi markis kiel konfirmita</string>
@@ -402,6 +405,7 @@
     <string name="arrays__mute_for_one_day">Silentigi dum 1 tago</string>
     <string name="arrays__mute_for_seven_days">Silentigi dum 7 tagoj</string>
     <string name="arrays__mute_for_one_year">Silentigi dum 1 jaro</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Laŭ la ĝenerala agordo</string>
     <string name="arrays__enabled">Ŝaltita</string>
     <string name="arrays__disabled">Malŝaltita</string>
@@ -490,6 +494,7 @@
     <string name="conversation_context__menu_copy_text">Kopii tekston</string>
     <string name="conversation_context__menu_delete_message">Forviŝi mesaĝon</string>
     <string name="conversation_context__menu_ban_user">Forbari uzanton</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resendi mesaĝon</string>
     <string name="conversation_context__menu_reply_to_message">Respondi mesaĝon</string>
     <!-- conversation_context_image -->
@@ -633,7 +638,8 @@
     <string name="activity_settings_notifications_button_title">Sciigoj</string>
     <string name="activity_settings_chats_button_title">Interparoloj</string>
     <string name="activity_settings_devices_button_title">Aparatoj</string>
-    <string name="activity_settings_invite_button_title">Inviti</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Ripara Frazo</string>
     <string name="activity_settings_clear_all_data_button_title">Viŝi Datumojn</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -727,4 +733,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6aa709bc8..77a8bae75 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -4,7 +4,7 @@
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="delete">Eliminar</string>
-    <string name="ban">Banear</string>
+    <string name="ban">Bloquear</string>
     <string name="please_wait">Por favor, espera ...</string>
     <string name="save">Guardar</string>
     <string name="note_to_self">Notas personales</string>
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vídeo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(responder)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">No se pudo encontrar una aplicación para el contenido seleccionado.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session necesita acceso al almacenamiento de tu teléfono para adjuntar fotos, vídeos o audio. Por favor, ve al menú de configuración de la aplicación, selecciona «Permisos» y activa «Almacenamiento».</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session necesita acceso a los contactos en tu teléfono para adjuntar información de contactos en tus chats. Por favor, ve al menú de configuración de la aplicación, selecciona «Permisos» y activa «Contactos».</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Mensaje</string>
     <string name="ConversationActivity_compose">Escribir</string>
     <string name="ConversationActivity_muted_until_date">Silenciado hasta %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d miembros</string>
     <string name="ConversationActivity_open_group_guidelines">Normas de la Comunidad</string>
     <string name="ConversationActivity_invalid_recipient">¡Destinatario inválido!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Para enviar notas de voz y hacer llamadas, permite a Session acceder al micrófono.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session necesita acceso al micrófono para enviar notas de voz. Por favor, ve al menú de configuración de la aplicación, selecciona «Permisos» y activa «Micrófono».</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para hacer fotos y vídeos, permite el acceso de Session a la cámara.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session necesita permiso de almacenamiento para enviar fotos y videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session necesita acceso a la cámara para tomar fotos o vídeos. Por favor, ve al menú de configuración de la aplicación, selecciona «Permisos» y habilita «Cámara».</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session necesita acceder a la cámara para tomar fotos o vídeo.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">¿Desbloquear este contacto?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Podrás volver a recibir mensajes y llamadas de este contacto.</string>
     <string name="RecipientPreferenceActivity_unblock">Desbloquear</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Imagen</string>
     <string name="Slide_audio">Audio</string>
@@ -401,6 +404,7 @@ de intercambio de claves!</string>
     <string name="arrays__mute_for_one_day">Silenciar durante 1 día</string>
     <string name="arrays__mute_for_seven_days">Silenciar durante 7 días</string>
     <string name="arrays__mute_for_one_year">Silenciar durante 1 año</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Configuración predeterminada</string>
     <string name="arrays__enabled">Activado</string>
     <string name="arrays__disabled">Desactivado</string>
@@ -489,6 +493,7 @@ de intercambio de claves!</string>
     <string name="conversation_context__menu_copy_text">Copiar texto</string>
     <string name="conversation_context__menu_delete_message">Eliminar mensaje</string>
     <string name="conversation_context__menu_ban_user">Banear usuario</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Banear y eliminar todo</string>
     <string name="conversation_context__menu_resend_message">Reenviar mensaje</string>
     <string name="conversation_context__menu_reply_to_message">Responder al mensaje</string>
     <!-- conversation_context_image -->
@@ -632,10 +637,11 @@ de intercambio de claves!</string>
     <string name="activity_settings_notifications_button_title">Notificaciones</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Dispositivos</string>
-    <string name="activity_settings_invite_button_title">Invitar</string>
+    <string name="activity_settings_invite_button_title">Invitar a un amigo</string>
+    <string name="activity_settings_faq_button_title">Preguntas frecuentes</string>
     <string name="activity_settings_recovery_phrase_button_title">Frase de recuperación</string>
     <string name="activity_settings_clear_all_data_button_title">Borrar datos</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Limpiar Datos Incluyendo La Red</string>
     <string name="activity_settings_help_translate_session">Ayúdanos a traducir Session</string>
     <string name="activity_notification_settings_title">Notificaciones</string>
     <string name="activity_notification_settings_style_section_title">Estilo de Notificación</string>
@@ -651,9 +657,9 @@ de intercambio de claves!</string>
     <string name="dialog_seed_explanation">Esta es tu frase de recuperación. Con ella, puedes restaurar o migrar tu ID de Session a un nuevo dispositivo.</string>
     <string name="dialog_clear_all_data_title">Borrar todos los datos</string>
     <string name="dialog_clear_all_data_explanation">Esto eliminará permanentemente tu ID de Session, incluyendo todos los mensajes, sesiones y contactos.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="dialog_clear_all_data_network_explanation">¿Quieres borrar sólo este dispositivo o eliminar toda tu cuenta?</string>
+    <string name="dialog_clear_all_data_local_only">Solo eliminar</string>
+    <string name="dialog_clear_all_data_clear_network">Toda La Cuenta</string>
     <string name="activity_qr_code_title">Código QR</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">Ver mi código QR</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Escanear código QR</string>
@@ -722,8 +728,18 @@ de intercambio de claves!</string>
     <string name="dialog_download_title">¿Confiar en %s?</string>
     <string name="dialog_download_explanation">¿Estás seguro que quieres descargar el medio enviado por %s?</string>
     <string name="dialog_download_button_title">Descargar</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="activity_conversation_blocked_banner_text">%s está bloqueado. ¿Desbloquearlo?</string>
+    <string name="activity_conversation_attachment_prep_failed">Falló la preparación del adjunto para el envío.</string>
+    <string name="media">Multimedia</string>
+    <string name="UntrustedAttachmentView_download_attachment">Toca para descargar %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Alerta</string>
+    <string name="dialog_send_seed_explanation">Esta es tu frase de recuperación. Si se la envias a alguien, tendrá acceso completo a tu cuenta.</string>
+    <string name="dialog_send_seed_send_button_title">Enviar</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index f243e52ea..ddcd7a6a3 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(heli)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(vastus)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Ei leia rakendust meediafaili valimiseks.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session vajab fotode, videote või audiofailide manustamiseks ligipääsu salvestusmeediale, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Salvestusmeedia\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session vajab kontaktide manustamiseks ligipääsu kontaktidele, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kontaktid\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Sobimatu saaja!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Audiosõnumite saatmiseks luba Sessionile juurdepääs seadme mikrofonile.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session vajab audiosõnumite saatmiseks ligipääsu seadme mikrofonile, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Mikrofon\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Luba Sessionile ligipääs kaamerale fotode ja videote salvestamiseks.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session vajab ligipääsu kaamerale, et salvestada fotosid ja videosid, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kaamera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session vajab fotode ja videote salvestamiseks ligipääsu kaamerale</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Eemaldada kontakti blokeering?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Sa saad uuesti sellelt kontaktilt sõnumeid ja kõnesid vastu võtta.</string>
     <string name="RecipientPreferenceActivity_unblock">Eemalda blokeering</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Pilt</string>
     <string name="Slide_audio">Heli</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Vaigista 1 päevaks</string>
     <string name="arrays__mute_for_seven_days">Vaigista 7 päevaks</string>
     <string name="arrays__mute_for_one_year">Vaigista 1 aastaks</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Seadete vaikeväärtus</string>
     <string name="arrays__enabled">Lubatud</string>
     <string name="arrays__disabled">Keelatud</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Kopeeri tekst</string>
     <string name="conversation_context__menu_delete_message">Kustuta sõnum</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Saada sõnum uuesti</string>
     <string name="conversation_context__menu_reply_to_message">Vasta sõnumile</string>
     <!-- conversation_context_image -->
@@ -634,7 +639,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -728,4 +734,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index e5caa384a..22b99e53c 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(صدا)</string>
     <string name="DraftDatabase_Draft_video_snippet">(ویدئو)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(پاسخ)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">امکان یافتن برنامه‌ای برای انتخاب رسانه وجود ندارد.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal برای ارسال فایل‌های تصویری و صوتی نیاز به دسترسی به حافظه دارد اما این دسترسی به طور همیشگی رد شده است. لطفا به بخش برنامه در تنظیمات تلفن همراه خود رفته و پس از یافتن Session وارد بخش دسترسی ها شده و گزینه حافظه را فعال کنید.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal برای جستجو مخاطبان نیاز به دسترسی به مجوز مخاطبان دارد اما این دسترسی به Signal داده نشده است. لطفا به بخش برنامه ها در تنظیمات تلفن همراه خود رفته در ادامه پس از یافتن Session وارد بخش دسترسی ها شده و گزینه مخاطبان را فعال کنید.</string>
@@ -54,7 +54,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">ارسال نشد, برای روش جایگزین ناامن لمس کنید</string>
     <string name="ConversationItem_unable_to_open_media">برنامه ای برای بازکردن این رسانه وجود ندارد.</string>
     <string name="ConversationItem_copied_text">%s کپی شد</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">بیشتر بخوانید</string>
     <string name="ConversationItem_download_more">&#160; بیشتر دانلود کنید</string>
     <string name="ConversationItem_pending">&#160; در انتظار</string>
     <!-- ConversationActivity -->
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">پیام</string>
     <string name="ConversationActivity_compose">نوشتن</string>
     <string name="ConversationActivity_muted_until_date">بی صدا تا %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d عضو</string>
     <string name="ConversationActivity_open_group_guidelines">راهنمای انجمن</string>
     <string name="ConversationActivity_invalid_recipient">گیرنده نامعتبر است!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">برای ارسال صدا، به Session اجازه دهید به میکروفن شما دسترسی پیدا کند.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session برای ارسال صدا، نیازمند دسترسی به میکروفن دارد ولی این دسترسی قطع شده است. لطفا برای ادامه دادن، به بخش منوی تنظیمات برنامه رفته، \"اجازه ها\" را انتخاب کرده و گزینه ی \"میکروفن\" را فعال نمایید.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">برای گرفتن تصاویر و ویدیو، به Session اجازه دسترسی دوربین را بدهید.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session برای گرفتن عکس و فیلم، نیازمند دسترسی به دوربین دارد ولی این دسترسی برای همیشه قطع شده است. لطفا برای ادامه دادن، به بخش منوی تنظیمات برنامه رفته، \"اجازه ها\" را انتخاب کرده و گزینه ی \"دوربین\" را فعال نمایید.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session برای عکس گرفتن یا ضبط ویدیو نیاز به دسترسی به دوربین دارد</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">رفع انسداد این تماس؟</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">شما مجددا قادر به دریافت پیام ها و تماس ها از این مخاطب هستید.</string>
     <string name="RecipientPreferenceActivity_unblock">رفع انسداد</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">تصویر</string>
     <string name="Slide_audio">صدا</string>
@@ -261,7 +264,7 @@
     <string name="MediaPreviewActivity_you">شما</string>
     <string name="MediaPreviewActivity_unssuported_media_type">نوع رسانه پشتیبانی نشده</string>
     <string name="MediaPreviewActivity_draft">پیش نویس</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session برای ذخیره در حافظه‌ی خارجی نیاز به دسترسی به حافظه دارد اما این دسترسی به طور همیشگی رد شده است. لطفا به بخش برنامه در تنظیمات تلفن همراه خود رفته و پس از یافتن Session وارد بخش دسترسی ها شده و گزینه حافظه را فعال کنید.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">نمی‌توان بدون دسترسی‌ها در حافظه‌ی خارجی ذخیره‌سازی نمود</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">حذف پیام؟</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">این باعث حذف این پیام به صورت دائم خواهد شد.</string>
@@ -401,6 +404,7 @@
     <string name="arrays__mute_for_one_day">بی صدا برای 1 روز</string>
     <string name="arrays__mute_for_seven_days">بی صدا به مدت 7 روز</string>
     <string name="arrays__mute_for_one_year">بی صدا برای 1 سال</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">تنظیمات پیش فرض</string>
     <string name="arrays__enabled">فعال</string>
     <string name="arrays__disabled">غیر فعال</string>
@@ -489,6 +493,7 @@
     <string name="conversation_context__menu_copy_text">کپی متن</string>
     <string name="conversation_context__menu_delete_message">حذف پیام</string>
     <string name="conversation_context__menu_ban_user">مسدود کردن کاربر</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">پیام فرستادن مجدد</string>
     <string name="conversation_context__menu_reply_to_message">پاسخ به پیام</string>
     <!-- conversation_context_image -->
@@ -605,7 +610,7 @@
     <string name="activity_create_private_chat_enter_session_id_tab_title">شناسه‌ی Session را وارد کنید</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">کد QR را اسکن کنید</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">برای شروع Session، کد QR کاربر را اسکن کنید. با ضربه زدن روی نماد کد QR در تنظیمات حساب کاربری، کدهای QR را می‌توان یافت.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
+    <string name="fragment_enter_public_key_edit_text_hint">شماره session نامعتبر</string>
     <string name="fragment_enter_public_key_explanation">کاربران می‌توانند شناسه‌ی Session خود را با رفتن به تنظیمات حساب خود و ضربه زدن به Share Session ID یا با به اشتراک گذاشتن کد QR خود‌، با دیگران به اشتراک بگذارند.</string>
     <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">اپ Session برای اسکن کدهای QR احتیاج دارد به دوربین دسترسی داشته باشد</string>
@@ -632,7 +637,8 @@
     <string name="activity_settings_notifications_button_title">اعلان‌ها</string>
     <string name="activity_settings_chats_button_title">گفت‌وگوها</string>
     <string name="activity_settings_devices_button_title">دستگاه‌ها</string>
-    <string name="activity_settings_invite_button_title">دعوت کردن</string>
+    <string name="activity_settings_invite_button_title">دعوت از یک دوست</string>
+    <string name="activity_settings_faq_button_title">سوالات متداول</string>
     <string name="activity_settings_recovery_phrase_button_title">عبارت بازیابی</string>
     <string name="activity_settings_clear_all_data_button_title">پاک کردن اطلاعات</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -652,7 +658,7 @@
     <string name="dialog_clear_all_data_title">پاک کردن همه داده‌ها</string>
     <string name="dialog_clear_all_data_explanation">این به طور دائم پیام‌ها، جلسات و مخاطبین شما را حذف می‌کند.</string>
     <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_local_only">فقط حذف شود</string>
     <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">کد QR</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">مشاهده کد QR من</string>
@@ -708,22 +714,32 @@
     <string name="activity_prompt_passphrase_tap_to_unlock"> ﺑﺮﺍﯼ ﮔﺸﻮﺩﻥ ﺿﺮﺑﻪ ﺑﺰﻧﻴﺪ</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">یک نام مستعار وارد کنید</string>
     <string name="invalid_public_key">کلید عمومی نامعتبر</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
+    <string name="document">سند</string>
+    <string name="dialog_blocked_title">%sاز حالت مسدود خارج شود؟</string>
+    <string name="dialog_blocked_explanation">آیا مطمئن هستید که میخواهید %s را باز کنید؟</string>
+    <string name="dialog_join_open_group_title">پیوستن به %s ؟</string>
+    <string name="dialog_join_open_group_explanation">آیا اطمینان دارید که می‌خواهید به گروه باز %s جوین شوید؟</string>
+    <string name="dialog_open_url_title">URL باز شود ؟</string>
+    <string name="dialog_open_url_explanation">آیا مطمئن هستید که میخواهید %s را باز کنید؟</string>
+    <string name="open">باز کردن</string>
+    <string name="dialog_link_preview_title">فعال‌سازی پیش‌نمایش لینک؟</string>
     <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
+    <string name="dialog_link_preview_enable_button_title">فعال کردن</string>
     <string name="dialog_download_title">Trust %s?</string>
     <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
+    <string name="dialog_download_button_title">دانلود</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
+    <string name="media">رسانه</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">خطا</string>
+    <string name="dialog_send_seed_title">هشدار</string>
+    <string name="dialog_send_seed_explanation">این عبارت بازیابی شماست. اگر آن را برای شخصی ارسال کنید ، دسترسی کامل به حساب شما خواهد داشت.</string>
+    <string name="dialog_send_seed_send_button_title">ارسال</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 8a20151c8..9e48982c9 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -4,7 +4,7 @@
     <string name="yes">Kyllä</string>
     <string name="no">Ei</string>
     <string name="delete">Poista</string>
-    <string name="ban">Ban</string>
+    <string name="ban">Porttikielto</string>
     <string name="please_wait">Odota hetki...</string>
     <string name="save">Tallenna</string>
     <string name="note_to_self">Viestit itselleni</string>
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(äänitallenne)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(vastaus)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Median valintaan ei löytynyt sovellusta.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal tarvitsee lupaa käyttää laitteesi tallennustilaa kuvien, videoiden tai äänitiedostojen liittämistä varten, mutta tämä käyttöoikeus on pysyvästi evätty Sessionilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Tallennustila\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal tarvitsee lupaa käyttää laitteesi yhteystietoja oman yhteystietolistansa käsittelyä varten, mutta tämä käyttöoikeus on pysyvästi evätty Sessionilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Yhteystiedot\".</string>
@@ -54,18 +54,19 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Lähetys epäonnistui, napauta lähettääksesi suojaamattomana</string>
     <string name="ConversationItem_unable_to_open_media">Median avaamiseen ei löytynyt sovellusta.</string>
     <string name="ConversationItem_copied_text">Kopioitu: %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">Lue lisää</string>
     <string name="ConversationItem_download_more">  Lataa lisää</string>
     <string name="ConversationItem_pending">  Käsiteltävänä</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">Lisää liite</string>
     <string name="ConversationActivity_select_contact_info">Valitse yhteystieto</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Virhe liitteen lisäämisessä</string>
-    <string name="ConversationActivity_message">Message</string>
-    <string name="ConversationActivity_compose">Compose</string>
-    <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
-    <string name="ConversationActivity_member_count">%1$d members</string>
-    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_message">Viesti</string>
+    <string name="ConversationActivity_compose">Aloita keskustelu</string>
+    <string name="ConversationActivity_muted_until_date">Mykistetty %1$s asti</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">%1$d jäsentä</string>
+    <string name="ConversationActivity_open_group_guidelines">Yhteisön Säännöt</string>
     <string name="ConversationActivity_invalid_recipient">Virheellinen vastaanottaja!</string>
     <string name="ConversationActivity_added_to_home_screen">Lisätty kotiruudulle</string>
     <string name="ConversationActivity_leave_group">Poistutaanko ryhmästä?</string>
@@ -77,12 +78,13 @@
     <string name="ConversationActivity_attachment_exceeds_size_limits">Liitetiedosto ylittää kyseisen viestityypin kokorajoituikset.</string>
     <string name="ConversationActivity_unable_to_record_audio">Äänen nauhoitus ei onnistunut!</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Laitteessasi ei ole sovellusta, joka osaa avata tämän linkin.</string>
-    <string name="ConversationActivity_invite_to_open_group">Add members</string>
-    <string name="ConversationActivity_join_open_group">Join %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_invite_to_open_group">Lisää jäseniä</string>
+    <string name="ConversationActivity_join_open_group">Liity%s</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">Oletko varma, että haluat liittyä <b>%s</b> avoimeen ryhmään?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Jotta voit lähettää ääniviestejä, Session tarvitsee lupaa käyttää mikrofonia.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal tarvitsee lupaa käyttää mikrofonia äänitiedostojen lähettämistä varten, mutta tämä käyttöoikeus on pysyvästi evätty Sessionilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Mikrofoni\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Jotta voit ottaa kuvia ja videoita, anna Sessionille lupaa käyttää kameraa.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Istunto tarvitsee tallennustilan käyttöoikeuden kuvien ja videoiden lähettämiseen.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal tarvitsee lupaa käyttää laitteesi kameraa kuvien ja videoiden ottamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Sessionilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Kamera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session tarvitsee kameran käyttöoikeutta kuvien ja videoiden ottamista varten.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -102,7 +104,7 @@
         <item quantity="one">Tämä poistaa pysyvästi valitun viestin.</item>
         <item quantity="other">Tämä poistaa pysyvästi kaikki %1$d valittua viestiä.</item>
     </plurals>
-    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_ban_selected_user">Estä tämä käyttäjä?</string>
     <string name="ConversationFragment_save_to_sd_card">Kopioi tallennustilaan?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="one">Jos kopioit tämän tiedoston laitteesi tallennustilaan, niin kaikki muutkin sovellukset saavat oikeuden käyttää sitä.\n\nHaluatko jatkaa?</item>
@@ -126,8 +128,8 @@
     <string name="ConversationFragment_sms">Tekstiviesti</string>
     <string name="ConversationFragment_deleting">Poistetaan</string>
     <string name="ConversationFragment_deleting_messages">Viestejä poistetaan...</string>
-    <string name="ConversationFragment_banning">Banning</string>
-    <string name="ConversationFragment_banning_user">Banning user…</string>
+    <string name="ConversationFragment_banning">Esto</string>
+    <string name="ConversationFragment_banning_user">Estetään käyttäjää…</string>
     <string name="ConversationFragment_quoted_message_not_found">Alkuperäistä viestiä ei löytynyt</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">Alkuperäinen viesti ei ole enää saatavilla</string>
     <!-- ConversationListItem -->
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Poista esto tältä yhteystiedolta?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Jatkossa voit taas saada viestejä ja puheluita tältä yhteystiedolta.</string>
     <string name="RecipientPreferenceActivity_unblock">Poista esto</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Kuva</string>
     <string name="Slide_audio">Äänitallenne</string>
@@ -234,14 +237,14 @@ on viallinen!</string>
     <string name="ThreadRecord_s_is_on_signal">%s käyttää Sessionia!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Katoavat viestit poistettu käytöstä</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">Katoavien viestien ajaksi asetettu %s</string>
-    <string name="ThreadRecord_s_took_a_screenshot">%s took a screenshot.</string>
-    <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
+    <string name="ThreadRecord_s_took_a_screenshot">%s otti kuvakaappauksen.</string>
+    <string name="ThreadRecord_media_saved_by_s">Media tallennettu toimesta.</string>
     <string name="ThreadRecord_safety_number_changed">Turvanumero vaihtunut</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">Sinun ja yhteystiedon %s turvanumero on vaihtunut.</string>
     <string name="ThreadRecord_you_marked_verified">Merkitsit varmennetuksi.</string>
     <string name="ThreadRecord_you_marked_unverified">Merkitsit varmentamattomaksi.</string>
-    <string name="ThreadRecord_empty_message">This conversation is empty</string>
-    <string name="ThreadRecord_open_group_invitation">Open group invitation</string>
+    <string name="ThreadRecord_empty_message">Tämä keskustelu on tyhjä</string>
+    <string name="ThreadRecord_open_group_invitation">Avaa ryhmä kutsu</string>
     <!-- UpdateApkReadyListener -->
     <string name="UpdateApkReadyListener_Signal_update">Session-päivitys</string>
     <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">Uusi versio Sessionista on saatavilla. Päivitä napauttamalla.</string>
@@ -261,7 +264,7 @@ on viallinen!</string>
     <string name="MediaPreviewActivity_you">Sinä</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Median tyyppiä ei tueta</string>
     <string name="MediaPreviewActivity_draft">Luonnos</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session tarvitsee luvan tallentaakseen ulkoiseen tallennustilaan, mutta se on pysyvästi kielletty. Jatka sovelluksen asetuksiin, valitse \"luvat\", ja käytä \"tallennustilaa\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Tallennus ulkoiseen tallennustilaan ei onnistu ilman käyttöoikeutta.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Poistetaanko viesti?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Tämä poistaa pysyvästi tämän viestin.</string>
@@ -354,11 +357,11 @@ on viallinen!</string>
     <string name="audio_view__pause_accessibility_description">Pysäytä</string>
     <string name="audio_view__download_accessibility_description">Lataa</string>
     <!-- open_group_invitation_view -->
-    <string name="open_group_invitation_view__join_accessibility_description">Join</string>
-    <string name="open_group_invitation_view__open_group_invitation">Open group invitation</string>
-    <string name="open_group_guidelines_pinned_message">Pinned message</string>
-    <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
-    <string name="open_group_guidelines_read">Read</string>
+    <string name="open_group_invitation_view__join_accessibility_description">Liity</string>
+    <string name="open_group_invitation_view__open_group_invitation">Avaa ryhmä kutsu</string>
+    <string name="open_group_guidelines_pinned_message">Kiinnitetty viesti</string>
+    <string name="open_group_guidelines_community_guidelines">Yhteisön normit</string>
+    <string name="open_group_guidelines_read">Lue</string>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Äänitallenne</string>
     <string name="QuoteView_video">Video</string>
@@ -401,6 +404,7 @@ on viallinen!</string>
     <string name="arrays__mute_for_one_day">1 vuorokaudeksi</string>
     <string name="arrays__mute_for_seven_days">7 vuorokaudeksi</string>
     <string name="arrays__mute_for_one_year">1 vuodeksi</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Oletus</string>
     <string name="arrays__enabled">Päällä</string>
     <string name="arrays__disabled">Poissa</string>
@@ -488,7 +492,8 @@ on viallinen!</string>
     <string name="conversation_context__menu_message_details">Viestin tiedot</string>
     <string name="conversation_context__menu_copy_text">Kopioi teksti</string>
     <string name="conversation_context__menu_delete_message">Poista viesti</string>
-    <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_user">Estä käyttäjä</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Estä ja poista kaikki</string>
     <string name="conversation_context__menu_resend_message">Lähetä viesti uudelleen</string>
     <string name="conversation_context__menu_reply_to_message">Vastaa viestiin</string>
     <!-- conversation_context_image -->
@@ -589,7 +594,7 @@ on viallinen!</string>
     <string name="activity_seed_title_2">Tutustu palautuslauseesi</string>
     <string name="activity_seed_explanation">Sinun palautuslause on pääavain Session tunnukseesi — voit käyttää sitä palauttamaan Session tunnuksesi jos menetät pääsyn laitteeseen. Säilytä palautuslauseesi turvallisessa paikassa, ja älä anna sitä kenellekään.</string>
     <string name="activity_seed_reveal_button_title">Pidä pohjassa paljastaaksesi</string>
-    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
+    <string name="view_seed_reminder_title">Olet melkein valmis! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Suojaa tilisi tallentamalla palautuslauseke</string>
     <string name="view_seed_reminder_subtitle_2">Napauta ja pidä piiloteettuja sanoja paljastaaksesi palautuslauseen, ja säästä se turvallisesti suojataksesi Session tilisi.</string>
     <string name="view_seed_reminder_subtitle_3">Varmista, että säilytät palautuslauseesi turvallisessa paikassa</string>
@@ -600,14 +605,14 @@ on viallinen!</string>
     <string name="activity_path_service_node_row_title">Palvelu Solmu</string>
     <string name="activity_path_destination_row_title">Päämäärä</string>
     <string name="activity_path_learn_more_button_title">Lisätietoja</string>
-    <string name="activity_path_resolving_progress">Resolving…</string>
+    <string name="activity_path_resolving_progress">Ratkaistaan…</string>
     <string name="activity_create_private_chat_title">Uusi Istunto</string>
     <string name="activity_create_private_chat_enter_session_id_tab_title">Anna Session ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Lue QR-koodi</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Skannaa käyttäjän QR-koodi aloittaaksesi istunnon. QR-koodit löytyvät napauttamalla QR-koodin kuvaketta tilin asetuksista.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Syötä Session ID tai ONS-nimi</string>
     <string name="fragment_enter_public_key_explanation">Käyttäjät voivat jakaa Session tunnuksensa menemällä tiliasetuksiinsa ja painamalla \"Jaa Session ID\" tai jakamalla QR-koodin.</string>
-    <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
+    <string name="fragment_enter_public_key_error_message">Tarkista istunnon tunnus tai ONS nimi ja yritä uudelleen.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session tarvitsee kameran käyttöoikeuden skannatakseensa QR-koodit</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Myönnä Kameran Käyttöoikeus</string>
     <string name="activity_create_closed_group_title">Uusi Suljettu Ryhmä</string>
@@ -617,7 +622,7 @@ on viallinen!</string>
     <string name="activity_create_closed_group_group_name_missing_error">Syötä ryhmän nimi</string>
     <string name="activity_create_closed_group_group_name_too_long_error">Anna lyhyempi ryhmän nimi</string>
     <string name="activity_create_closed_group_not_enough_group_members_error">Valitse vähintään 1 ryhmän jäsen</string>
-    <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 100 members</string>
+    <string name="activity_create_closed_group_too_many_group_members_error">Yksityisessä ryhmässä voi olla enintään 100 jäsentä</string>
     <string name="activity_join_public_chat_title">Liity Avoimeen Ryhmään</string>
     <string name="activity_join_public_chat_error">Ryhmään ei voitu liittyä</string>
     <string name="activity_join_public_chat_enter_group_url_tab_title">Avaa Ryhmän URL</string>
@@ -632,39 +637,40 @@ on viallinen!</string>
     <string name="activity_settings_notifications_button_title">Ilmoitukset</string>
     <string name="activity_settings_chats_button_title">Keskustelut</string>
     <string name="activity_settings_devices_button_title">Laitteet</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Kutsu ystäviä</string>
+    <string name="activity_settings_faq_button_title">UKK</string>
     <string name="activity_settings_recovery_phrase_button_title">Palautuslauseke</string>
     <string name="activity_settings_clear_all_data_button_title">Tyhjennä tiedot</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
-    <string name="activity_settings_help_translate_session">Help us Translate Session</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Tyhjennä Tiedot Mukaan Lukien Verkko</string>
+    <string name="activity_settings_help_translate_session">Auta meitä kääntämään Session</string>
     <string name="activity_notification_settings_title">Ilmoitukset</string>
     <string name="activity_notification_settings_style_section_title">Ilmoitusten tyyli</string>
     <string name="activity_notification_settings_content_section_title">Ilmoituksen Sisältö</string>
     <string name="activity_privacy_settings_title">Yksityisyys</string>
     <string name="activity_chat_settings_title">Keskustelut</string>
     <string name="preferences_notifications_strategy_category_title">Ilmoitusten Strategia</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_title">Käytä Nopeaa Tilaa</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">Sinulle ilmoitetaan uusista viesteistä luotettavasti ja viivyttelemättä Applen ilmoituspalvelua käyttäen.</string>
     <string name="fragment_device_list_bottom_sheet_change_name_button_title">Vaihda nimi</string>
     <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Poista laitteen linkitys</string>
     <string name="dialog_seed_title">Palautuslauseke</string>
     <string name="dialog_seed_explanation">Tämä on palautuslause. Sen avulla voit palauttaa tai siirtää Session tunnuksesi uudelle laitteelle.</string>
     <string name="dialog_clear_all_data_title">Tyhjennä tiedot</string>
     <string name="dialog_clear_all_data_explanation">Tämä poistaa pysyvästi viestit, istunnot ja yhteystiedot.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="dialog_clear_all_data_network_explanation">Haluatko tyhjentää datan vain tästä laitteesta vai poistaa koko tilin?</string>
+    <string name="dialog_clear_all_data_local_only">Poista Ainoastaan</string>
+    <string name="dialog_clear_all_data_clear_network">Koko käyttäjätili</string>
     <string name="activity_qr_code_title">QR-koodi</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">Näytä QR-koodini</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Skannaa QR-koodi</string>
     <string name="activity_qr_code_view_scan_qr_code_explanation">Skannaa jonkun QR-koodi aloittaaksesi keskustelun heidän kanssaan</string>
-    <string name="fragment_view_my_qr_code_title">Scan Me</string>
+    <string name="fragment_view_my_qr_code_title">Skannaa Minut</string>
     <string name="fragment_view_my_qr_code_explanation">Tämä on QR-koodisi. Muut käyttäjät voivat skannata sen aloittaaksesi istunnon kanssasi.</string>
     <string name="fragment_view_my_qr_code_share_title">Jaa QR-koodi</string>
     <string name="fragment_contact_selection_contacts_title">Yhteystiedot</string>
     <string name="fragment_contact_selection_closed_groups_title">Suljetut Ryhmät</string>
     <string name="fragment_contact_selection_open_groups_title">Avoimet Ryhmät</string>
-    <string name="fragment_contact_selection_empty_contacts">You don\'t have any contacts yet</string>
+    <string name="fragment_contact_selection_empty_contacts">Sinulla ei ole vielä yhtään kontaktia</string>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Käytä</string>
     <string name="menu_done_button">Valmis</string>
@@ -687,43 +693,53 @@ on viallinen!</string>
     <string name="attachment_type_voice_message">Ääniviesti</string>
     <string name="details">Lisätiedot</string>
     <string name="dialog_backup_activation_failed">Varmuuskopioiden aktivointi epäonnistui. Yritä uudelleen tai ota yhteyttä tukeen.</string>
-    <string name="activity_backup_restore_title">Restore backup</string>
-    <string name="activity_backup_restore_select_file">Select a file</string>
-    <string name="activity_backup_restore_explanation_1">Select a backup file and enter the passphrase it was created with.</string>
-    <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
-    <string name="activity_link_device_skip_prompt">This is taking a while, would you like to skip?</string>
-    <string name="activity_link_device_link_device">Link a Device</string>
-    <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
-    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
-    <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
-    <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
-    <string name="activity_pn_mode_message_notifications">Message Notifications</string>
-    <string name="activity_pn_mode_explanation">There are two ways Session can notify you of new messages.</string>
-    <string name="activity_pn_mode_fast_mode">Fast Mode</string>
-    <string name="activity_pn_mode_slow_mode">Slow Mode</string>
-    <string name="activity_pn_mode_fast_mode_explanation">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
-    <string name="activity_pn_mode_slow_mode_explanation">Session will occasionally check for new messages in the background.</string>
-    <string name="fragment_recovery_phrase_title">Recovery Phrase</string>
-    <string name="activity_prompt_passphrase_session_locked">Session is Locked</string>
-    <string name="activity_prompt_passphrase_tap_to_unlock">Tap to Unlock</string>
-    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Enter a nickname</string>
-    <string name="invalid_public_key">Invalid public key</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="activity_backup_restore_title">Palauta varmuuskopio</string>
+    <string name="activity_backup_restore_select_file">Valitse tiedosto</string>
+    <string name="activity_backup_restore_explanation_1">Valitse varmuuskopiotiedosto ja kirjoita salasana, jonka kanssa se on luotu.</string>
+    <string name="activity_backup_restore_passphrase">30-merkkinen pääsykoodi</string>
+    <string name="activity_link_device_skip_prompt">Tämä kestää jonkin aikaa, haluaisitko ohittaa?</string>
+    <string name="activity_link_device_link_device">Yhdistä laite</string>
+    <string name="activity_link_device_recovery_phrase">Palautusvirke</string>
+    <string name="activity_link_device_scan_qr_code">Skannaa QR-koodi</string>
+    <string name="activity_link_device_qr_message">Siirry asetuksiin → palautusvirke toisella laitteellasi näyttääksesi QR-koodisi.</string>
+    <string name="activity_join_public_chat_join_rooms">Tai liity johonkin näistä…</string>
+    <string name="activity_pn_mode_message_notifications">Viesti-ilmoitukset</string>
+    <string name="activity_pn_mode_explanation">On kaksi tapaa joilla Session voi ilmoittaa sinulle uusista viesteistä.</string>
+    <string name="activity_pn_mode_fast_mode">Nopea tila</string>
+    <string name="activity_pn_mode_slow_mode">Hidastila</string>
+    <string name="activity_pn_mode_fast_mode_explanation">Sinulle ilmoitetaan uusista viesteistä luotettavasti ja viivyttelemättä Applen ilmoituspalvelua käyttäen.</string>
+    <string name="activity_pn_mode_slow_mode_explanation">Session tarkistaa taustalla ajoittain uudet viestit.</string>
+    <string name="fragment_recovery_phrase_title">Palautusvirke</string>
+    <string name="activity_prompt_passphrase_session_locked">Session on lukittu</string>
+    <string name="activity_prompt_passphrase_tap_to_unlock">Avaa napauttamalla</string>
+    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Anna nimimerkki</string>
+    <string name="invalid_public_key">Virheellinen julkinen avain</string>
+    <string name="document">Asiakirja</string>
+    <string name="dialog_blocked_title">Poistetaanko esto henkilöltä %s?</string>
+    <string name="dialog_blocked_explanation">Oletko varma, että haluat poistaa eston henkilöltä %s?</string>
+    <string name="dialog_join_open_group_title">Liity%s?</string>
+    <string name="dialog_join_open_group_explanation">Oletko varma, että haluat liittyä %s avoimeen ryhmään?</string>
+    <string name="dialog_open_url_title">Avataanko URL?</string>
+    <string name="dialog_open_url_explanation">Oletko varma, että haluat avata linkin %s?</string>
+    <string name="open">Avaa</string>
+    <string name="dialog_link_preview_title">Salli linkkien esikatselu?</string>
+    <string name="dialog_link_preview_explanation">Linkkien esikatselu näyttää esikatselun saamiesi ja lähettämiesi linkkien sisällöstä. Tämä voi olla hyödyllistä, mutta Sessionin pitää vierailla linkatulla nettisivulla luodakseen esikatselun. Voit aina ottaa tämän toiminnon pois päältä Sessionin asetuksissa.</string>
+    <string name="dialog_link_preview_enable_button_title">Ota käyttöön</string>
+    <string name="dialog_download_title">Luotatko henkilöön %s?</string>
+    <string name="dialog_download_explanation">Oletko varma, että haluat ladata henkilön %s lähettämää mediaa?</string>
+    <string name="dialog_download_button_title">Lataa</string>
+    <string name="activity_conversation_blocked_banner_text">%s on estetty. Poistetaanko esto?</string>
+    <string name="activity_conversation_attachment_prep_failed">Liitetiedoston valmistelu lähettämistä varten epäonnistui.</string>
     <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="UntrustedAttachmentView_download_attachment">Lataa koskettamalla %s</string>
+    <string name="message_details_header__error">Virhe</string>
+    <string name="dialog_send_seed_title">Varoitus</string>
+    <string name="dialog_send_seed_explanation">Tämä on palautuslauseesi. Jos lähetät sen jollekulle, heillä on täysin vapaa pääsy tililesi.</string>
+    <string name="dialog_send_seed_send_button_title">Lähetä</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b4fc22f24..1bbf19f9d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vidéo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(réponse)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Impossible de trouver une appli pour sélectionner le média.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session exige l’autorisation « Stockage » afin de joindre des photos, des vidéos ou du contenu audio, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Stockage ».</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session exige l’autorisation Contacts afin de joindre des renseignements de contact, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Contacts ».</string>
@@ -54,7 +54,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Échec de l’envoi, touchez pour utiliser la solution de rechange non sécurisée</string>
     <string name="ConversationItem_unable_to_open_media">Impossible de trouver une appli pour ouvrir ce média.</string>
     <string name="ConversationItem_copied_text">Copié %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">En savoir plus</string>
     <string name="ConversationItem_download_more">&#160; Télécharger plus</string>
     <string name="ConversationItem_pending">&#160; En attente</string>
     <!-- ConversationActivity -->
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Rédiger</string>
     <string name="ConversationActivity_muted_until_date">Son désactivé jusqu\'à %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d membres</string>
     <string name="ConversationActivity_open_group_guidelines">Règles de la communauté</string>
     <string name="ConversationActivity_invalid_recipient">Le destinataire est invalide !</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Pour envoyer des messages audio, Session a besoin d’accéder à votre microphone.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session exige l’autorisation Microphone afin d’envoyer des messages audio, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Microphone ».</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pour capturer des photos et des vidéos, autorisez Session à accéder à l’appareil photo.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session a besoin d\'un accès au stockage pour envoyer des photos et des vidéos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session a besoin de l’autorisation Appareil photo afin de prendre des photos ou des vidéos, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner Autorisations et activer Appareil photo.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session a besoin de l’autorisation Appareil photo pour prendre des photos ou des vidéos</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Débloquer ce contact ?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Vous pourrez de nouveau recevoir les messages et appels de ce contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Débloquer</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Son</string>
@@ -260,7 +263,7 @@
     <string name="MediaPreviewActivity_you">Vous</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Type de médias non pris en charge</string>
     <string name="MediaPreviewActivity_draft">Brouillon</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">La session a besoin d\'un accès au stockage afin d\'enregistrer sur le stockage externe, mais cet accès a été refusé de manière permanente. Veuillez continuer dans les paramètres de l\'application, sélectionner « Permissions », et activer « Stockage ».</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Impossible d’enregistrer sur la mémoire externe sans autorisation</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Supprimer le message ?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Ce message sera supprimé définitivement.</string>
@@ -400,6 +403,7 @@
     <string name="arrays__mute_for_one_day">Sourdine pendant 1 jour</string>
     <string name="arrays__mute_for_seven_days">Sourdine pendant 7 jours</string>
     <string name="arrays__mute_for_one_year">Sourdine pendant 1 an</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Valeur par défaut</string>
     <string name="arrays__enabled">Activé</string>
     <string name="arrays__disabled">Désactivé</string>
@@ -488,6 +492,7 @@
     <string name="conversation_context__menu_copy_text">Copier le texte</string>
     <string name="conversation_context__menu_delete_message">Supprimer le message</string>
     <string name="conversation_context__menu_ban_user">Bannir l\'utilisateur</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Bannir et supprimer tout</string>
     <string name="conversation_context__menu_resend_message">Renvoyer le message</string>
     <string name="conversation_context__menu_reply_to_message">Répondre au message</string>
     <!-- conversation_context_image -->
@@ -631,10 +636,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Conversations</string>
     <string name="activity_settings_devices_button_title">Appareils reliés</string>
-    <string name="activity_settings_invite_button_title">Inviter</string>
+    <string name="activity_settings_invite_button_title">Inviter un ami</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Phrase de récupération</string>
     <string name="activity_settings_clear_all_data_button_title">Effacer les données</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Effacer les données et le réseau</string>
     <string name="activity_settings_help_translate_session">Aidez-nous à traduire Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Style de notification</string>
@@ -650,9 +656,9 @@
     <string name="dialog_seed_explanation">Ceci est votre phrase de récupération. Elle vous permet de restaurer ou migrer votre Session ID vers un nouvel appareil.</string>
     <string name="dialog_clear_all_data_title">Effacer toutes les données</string>
     <string name="dialog_clear_all_data_explanation">Cela supprimera définitivement vos messages, vos sessions et vos contacts.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="dialog_clear_all_data_network_explanation">Souhaitez-vous effacer seulement cet appareil ou supprimer l\'ensemble de votre compte ?</string>
+    <string name="dialog_clear_all_data_local_only">Effacer seulement</string>
+    <string name="dialog_clear_all_data_clear_network">Compte complet</string>
     <string name="activity_qr_code_title">Code QR</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">Afficher mon code QR</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scanner le code QR</string>
@@ -708,21 +714,31 @@
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Saisissez un nom</string>
     <string name="invalid_public_key">Clé publique non valide</string>
     <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="dialog_blocked_title">Débloquer %s ?</string>
+    <string name="dialog_blocked_explanation">Êtes-vous sûr de vouloir débloquer %s ?</string>
+    <string name="dialog_join_open_group_title">Rejoindre %s ?</string>
+    <string name="dialog_join_open_group_explanation">Êtes-vous sûr de vouloir rejoindre le groupe ouvert %s ?</string>
+    <string name="dialog_open_url_title">Ouvrir l\'URL ?</string>
+    <string name="dialog_open_url_explanation">Êtes-vous sûr de vouloir ouvrir %s?</string>
+    <string name="open">Ouvrir</string>
+    <string name="dialog_link_preview_title">Activer les aperçus de liens ?</string>
+    <string name="dialog_link_preview_explanation">L\'activation des aperçus de liens affichera des aperçus des URL que vous envoyez et recevez. Cela peut être utile, mais Session devra contacter les sites Web liés pour générer des aperçus. Vous pouvez toujours désactiver les aperçus de liens dans les paramètres de Session.</string>
+    <string name="dialog_link_preview_enable_button_title">Activer</string>
+    <string name="dialog_download_title">Faire confiance à %s ?</string>
+    <string name="dialog_download_explanation">Êtes-vous sûr de vouloir télécharger le média envoyé par %s ?</string>
+    <string name="dialog_download_button_title">Télécharger</string>
+    <string name="activity_conversation_blocked_banner_text">%s est bloqué. Débloquer ?</string>
+    <string name="activity_conversation_attachment_prep_failed">La préparation de la pièce jointe pour l\'envoi a échoué.</string>
+    <string name="media">Médias</string>
+    <string name="UntrustedAttachmentView_download_attachment">Touchez pour télécharger %s</string>
+    <string name="message_details_header__error">Erreur</string>
+    <string name="dialog_send_seed_title">Attention</string>
+    <string name="dialog_send_seed_explanation">C\'est votre phrase de récupération. Si vous l\'envoyez à quelqu\'un, il aura un accès complet à votre compte.</string>
+    <string name="dialog_send_seed_send_button_title">Envoyer</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index e0e3859d2..e0c7e6a31 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -4,11 +4,11 @@
     <string name="yes">Si</string>
     <string name="no">Non</string>
     <string name="delete">Borrar</string>
-    <string name="ban">Ban</string>
+    <string name="ban">Bloquear</string>
     <string name="please_wait">Por favor, agarda...</string>
     <string name="save">Gardar</string>
     <string name="note_to_self">Notificarmo</string>
-    <string name="version_s">Version %s</string>
+    <string name="version_s">Versión %s</string>
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">Nova mensaxe</string>
     <!-- AlbumThumbnailView -->
@@ -24,14 +24,14 @@
         <item quantity="other">Isto reducirá todas as conversas ás %d mensaxes máis recentes.</item>
     </plurals>
     <string name="ApplicationPreferencesActivity_delete">Borrar</string>
-    <string name="ApplicationPreferencesActivity_On">On</string>
-    <string name="ApplicationPreferencesActivity_Off">Off</string>
+    <string name="ApplicationPreferencesActivity_On">Activado</string>
+    <string name="ApplicationPreferencesActivity_Off">Desactivado</string>
     <!-- DraftDatabase -->
     <string name="DraftDatabase_Draft_image_snippet">(imaxe)</string>
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vídeo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(resposta)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Non se atopa unha app para seleccionar contido multimedia.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session require permiso de almacenamento para poder anexar fotografías, vídeos ou ficheiros de audio, pero este foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Almacenamento\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session require permiso para poder anexar información dos contactos, pero este foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Contactos\".</string>
@@ -54,18 +54,19 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Erro ao enviar, toca para volver a un modo non seguro</string>
     <string name="ConversationItem_unable_to_open_media">Non se atopa unha aplicación con que abrir este contido multimedia.</string>
     <string name="ConversationItem_copied_text">Copiouse %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
-    <string name="ConversationItem_download_more">Descargar máis</string>
-    <string name="ConversationItem_pending">Pendente</string>
+    <string name="ConversationItem_read_more">Ler máis</string>
+    <string name="ConversationItem_download_more">&#160; Descargar máis</string>
+    <string name="ConversationItem_pending">&#160; Pendente</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">Engadir anexo</string>
     <string name="ConversationActivity_select_contact_info">Seleccionar información de contacto</string>
-    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sentímolo, hai un erro na configuración do teu anexo.</string>
-    <string name="ConversationActivity_message">Message</string>
-    <string name="ConversationActivity_compose">Compose</string>
-    <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
-    <string name="ConversationActivity_member_count">%1$d members</string>
-    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sentímolo, produciuse un erro ao configurar o teu anexo.</string>
+    <string name="ConversationActivity_message">Escribe aquí a túa mensaxe</string>
+    <string name="ConversationActivity_compose">Redactar</string>
+    <string name="ConversationActivity_muted_until_date">Silenciado até %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">%1$d membros</string>
+    <string name="ConversationActivity_open_group_guidelines">Directrices da Comunidade</string>
     <string name="ConversationActivity_invalid_recipient">Destinatario non válido!</string>
     <string name="ConversationActivity_added_to_home_screen">Engadido á pantalla de inicio</string>
     <string name="ConversationActivity_leave_group">Abandonar o grupo?</string>
@@ -74,15 +75,16 @@
     <string name="ConversationActivity_unblock_this_contact_question">Desbloquear este contacto?</string>
     <string name="ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Volverá ser posible que recibas mensaxes e chamadas deste contacto.</string>
     <string name="ConversationActivity_unblock">Desbloquear</string>
-    <string name="ConversationActivity_attachment_exceeds_size_limits">O anexo excede o límite para o tipo de mensaxe que estás a enviar.</string>
+    <string name="ConversationActivity_attachment_exceeds_size_limits">O anexo excede o tamaño límite para o tipo de mensaxe que estás a enviar.</string>
     <string name="ConversationActivity_unable_to_record_audio">Non é posible gravar audio!</string>
-    <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Non hai ningunha app dispoñible para tratar esta ligazón no teu dispositivo.</string>
-    <string name="ConversationActivity_invite_to_open_group">Add members</string>
-    <string name="ConversationActivity_join_open_group">Join %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Non hai ningunha app que poida abrir esta ligazón no teu dispositivo.</string>
+    <string name="ConversationActivity_invite_to_open_group">Engadir membros</string>
+    <string name="ConversationActivity_join_open_group">Entrar no grupo %s</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">Tes a certeza de querer entrar no grupo aberto <b>%s</b>?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Para enviar mensaxes de audio, Session necesita acceder ao teu micrófono.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session require permiso para poder enviar mensaxes de audio, pero este foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Micrófono\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para tirar fotografías e facer vídeos, Session necesita acceder á cámara.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Para enviar fotografías e vídeos, Session necesita acceder ao almacenamento.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session necesita permiso para acceder á cámara e poder tirar fotografías, pero foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Cámara\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session necesita permiso para acceder á cámara e tirar fotografías ou facer vídeos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -102,7 +104,7 @@
         <item quantity="one">Isto borrará de xeito permanente a mensaxe seleccionada.</item>
         <item quantity="other">Isto borrará de xeito permanente as %1$d mensaxes seleccionadas.</item>
     </plurals>
-    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_ban_selected_user">Bloquear a este usuario?</string>
     <string name="ConversationFragment_save_to_sd_card">Gardar no almacenamento?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="one">Ao gardar este contido multimedia no almacenamento permitirás o acceso a el doutras aplicacións do teu dispositivo. \n\nDesexas continuar?</item>
@@ -126,14 +128,14 @@
     <string name="ConversationFragment_sms">SMS</string>
     <string name="ConversationFragment_deleting">Borrando</string>
     <string name="ConversationFragment_deleting_messages">Borrando mensaxes...</string>
-    <string name="ConversationFragment_banning">Banning</string>
-    <string name="ConversationFragment_banning_user">Banning user…</string>
+    <string name="ConversationFragment_banning">Bloqueando</string>
+    <string name="ConversationFragment_banning_user">Bloqueando usuario…</string>
     <string name="ConversationFragment_quoted_message_not_found">Non se atopou a mensaxe orixinal</string>
-    <string name="ConversationFragment_quoted_message_no_longer_available">A mensaxe orixinal xa non está máis dispoñible</string>
+    <string name="ConversationFragment_quoted_message_no_longer_available">A mensaxe orixinal xa non está dispoñible</string>
     <!-- ConversationListItem -->
     <string name="ConversationListItem_key_exchange_message">Mensaxe de intercambio de chaves</string>
     <!-- CreateProfileActivity -->
-    <string name="CreateProfileActivity_profile_photo">Fotografía do perfil</string>
+    <string name="CreateProfileActivity_profile_photo">Foto de perfil</string>
     <!-- CustomDefaultPreference -->
     <string name="CustomDefaultPreference_using_custom">Uso personalizado: %s</string>
     <string name="CustomDefaultPreference_using_default">Uso predefinido: %s</string>
@@ -150,7 +152,7 @@
     <!-- GiphyActivity -->
     <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Erro ao recuperar o GIF coa resolución completa</string>
     <!-- GiphyFragmentPageAdapter -->
-    <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
+    <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
     <string name="GiphyFragmentPagerAdapter_stickers">Adhesivos</string>
     <!-- CropImageActivity -->
     <string name="CropImageActivity_profile_avatar">Avatar</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Desbloquear este contacto?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Volverá ser posible que recibas mensaxes e chamadas deste contacto.</string>
     <string name="RecipientPreferenceActivity_unblock">Desbloquear</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Imaxe</string>
     <string name="Slide_audio">Audio</string>
@@ -236,13 +239,13 @@
     <string name="ThreadRecord_s_is_on_signal">%s está en Session!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Desaparición das mensaxes desactivada</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">Desaparición das mensaxes establecida en%s</string>
-    <string name="ThreadRecord_s_took_a_screenshot">%s took a screenshot.</string>
+    <string name="ThreadRecord_s_took_a_screenshot">%s fixo unha captura de pantalla.</string>
     <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
     <string name="ThreadRecord_safety_number_changed">O número de seguranza cambiou</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">O teu número de seguranza con %s cambiou.</string>
     <string name="ThreadRecord_you_marked_verified">Marcaches como verificado</string>
     <string name="ThreadRecord_you_marked_unverified">Marcaches como sen verificar</string>
-    <string name="ThreadRecord_empty_message">This conversation is empty</string>
+    <string name="ThreadRecord_empty_message">Esta conversa está baleira</string>
     <string name="ThreadRecord_open_group_invitation">Open group invitation</string>
     <!-- UpdateApkReadyListener -->
     <string name="UpdateApkReadyListener_Signal_update">Actualizar Session</string>
@@ -256,7 +259,7 @@
     <!-- MuteDialog -->
     <string name="MuteDialog_mute_notifications">Silenciar notificacións</string>
     <!-- KeyCachingService -->
-    <string name="KeyCachingService_signal_passphrase_cached">Toca para abrir</string>
+    <string name="KeyCachingService_signal_passphrase_cached">Toca para abrir.</string>
     <string name="KeyCachingService_passphrase_cached">Session está desbloqueado</string>
     <string name="KeyCachingService_lock">Bloquear Session</string>
     <!-- MediaPreviewActivity -->
@@ -307,7 +310,7 @@
     <!-- TransferControlView -->
     <plurals name="TransferControlView_n_items">
         <item quantity="one">%d elemento</item>
-        <item quantity="other">%d elementos.</item>
+        <item quantity="other">%d elementos</item>
     </plurals>
     <!-- VideoPlayer -->
     <string name="VideoPlayer_error_playing_video">Erro ao reproducir o vídeo</string>
@@ -328,7 +331,7 @@
     <string name="attachment_type_selector__file">Ficheiro</string>
     <string name="attachment_type_selector__drawer_description">Activar panel de ficheiros anexos</string>
     <!-- contact_selection_group_activity -->
-    <string name="contact_selection_group_activity__finding_contacts">Cargando contactos...</string>
+    <string name="contact_selection_group_activity__finding_contacts">Cargando contactos&#8230;</string>
     <!-- conversation_activity -->
     <string name="conversation_activity__send">Enviar</string>
     <string name="conversation_activity__compose_description">Redacción da mensaxe</string>
@@ -336,10 +339,10 @@
     <string name="conversation_activity__attachment_thumbnail">Miniatura do anexo</string>
     <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Activar panel rápido de ficheiros da cámara</string>
     <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Gravar e enviar un anexo de audio</string>
-    <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Lock recording of audio attachment</string>
+    <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Fixar a gravación do anexo de audio</string>
     <string name="conversation_activity__enable_signal_for_sms">Activar Session para SMS</string>
     <!-- conversation_input_panel -->
-    <string name="conversation_input_panel__slide_to_cancel">Slide to cancel</string>
+    <string name="conversation_input_panel__slide_to_cancel">Pasa o dedo para cancelar</string>
     <string name="conversation_input_panel__cancel">Cancelar</string>
     <!-- conversation_item -->
     <string name="conversation_item__mms_image_description">Mensaxe multimedia</string>
@@ -356,11 +359,11 @@
     <string name="audio_view__pause_accessibility_description">Pausar</string>
     <string name="audio_view__download_accessibility_description">Descargar</string>
     <!-- open_group_invitation_view -->
-    <string name="open_group_invitation_view__join_accessibility_description">Join</string>
+    <string name="open_group_invitation_view__join_accessibility_description">Entrar no grupo</string>
     <string name="open_group_invitation_view__open_group_invitation">Open group invitation</string>
-    <string name="open_group_guidelines_pinned_message">Pinned message</string>
-    <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
-    <string name="open_group_guidelines_read">Read</string>
+    <string name="open_group_guidelines_pinned_message">Mensaxe fixada</string>
+    <string name="open_group_guidelines_community_guidelines">Directrices da comunidade</string>
+    <string name="open_group_guidelines_read">Ler</string>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Vídeo</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Silenciar durante 1 día</string>
     <string name="arrays__mute_for_seven_days">Silenciar durante 7 días</string>
     <string name="arrays__mute_for_one_year">Silenciar durante 1 ano</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Configuración predefinida</string>
     <string name="arrays__enabled">Activado</string>
     <string name="arrays__disabled">Desactivado</string>
@@ -429,7 +433,7 @@
     <string name="preferences__pref_enter_sends_title">Tecla Intro para enviar</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Ao tocar na tecla Intro enviaranse as mensaxes</string>
     <string name="preferences__send_link_previews">Enviar previsualizacións das ligazóns.</string>
-    <string name="preferences__previews_are_supported_for">Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links</string>
+    <string name="preferences__previews_are_supported_for">As previsualizacións están dispoñibles para ligazóns a Imgur, Instagram, Pinterest, Reddit e YouTube</string>
     <string name="preferences__screen_security">Seguranza da pantalla</string>
     <string name="preferences__disable_screen_security_to_allow_screen_shots">Bloquea as capturas na listaxe de recentes e no interior da aplicación.</string>
     <string name="preferences__notifications">Notificacións</string>
@@ -461,7 +465,7 @@
     <string name="preferences__delete_old_messages">Borrar as mensaxes antigas</string>
     <string name="preferences__conversation_length_limit">Lonxitude máxima das conversas</string>
     <string name="preferences__trim_all_conversations_now">Recortar as mensaxes agora</string>
-    <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Escanea todas as conversas e axusta o seu tamaño</string>
+    <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Escanear todas as conversas e limitalas ao tamaño máximo</string>
     <string name="preferences__default">Por defecto</string>
     <string name="preferences__incognito_keyboard">Teclado de incógnito</string>
     <string name="preferences__read_receipts">Confirmacións de lectura</string>
@@ -490,9 +494,10 @@
     <string name="conversation_context__menu_message_details">Detalles da mensaxe</string>
     <string name="conversation_context__menu_copy_text">Copiar texto</string>
     <string name="conversation_context__menu_delete_message">Borrar mensaxe</string>
-    <string name="conversation_context__menu_ban_user">Ban user</string>
-    <string name="conversation_context__menu_resend_message">Reenviar mensaxe</string>
-    <string name="conversation_context__menu_reply_to_message">Responder a mensaxe</string>
+    <string name="conversation_context__menu_ban_user">Bloquear usuario</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Bloquear e eliminar todo</string>
+    <string name="conversation_context__menu_resend_message">Volver a enviar a mensaxe</string>
+    <string name="conversation_context__menu_reply_to_message">Responder á mensaxe</string>
     <!-- conversation_context_image -->
     <string name="conversation_context_image__save_attachment">Gardar anexo</string>
     <!-- conversation_expiring_off -->
@@ -527,17 +532,17 @@
     <string name="trimmer__deleting_old_messages">Borrando as mensaxes antigas...</string>
     <string name="trimmer__old_messages_successfully_deleted">Mensaxes antigas borradas satisfactoriamente</string>
     <!-- transport_selection_list_item -->
-    <string name="Permissions_permission_required">Permiso obrigatorio</string>
+    <string name="Permissions_permission_required">Permiso necesario</string>
     <string name="Permissions_continue">Continuar</string>
     <string name="Permissions_not_now">Agora non</string>
-    <string name="backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup">As copias de seguranza gardaranse no almacenamento externo e cifraranse cunha frase de acceso. A devandita frase é necesaria para restaurar unha copia de seguranza.</string>
-    <string name="backup_enable_dialog__i_have_written_down_this_passphrase">Escribín esta frase de acceso. Sen ela non poderei restaurar unha copia de seguranza.</string>
+    <string name="backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup">As copias de seguranza gardaranse no almacenamento externo e cifraranse cunha frase de paso. A devandita frase é necesaria para restaurar unha copia de seguranza.</string>
+    <string name="backup_enable_dialog__i_have_written_down_this_passphrase">Escribín esta frase de paso. Sen ela non poderei restaurar unha copia de seguranza.</string>
     <string name="registration_activity__skip">Omitir</string>
     <string name="RegistrationActivity_backup_failure_downgrade">Non se pode importar copias de seguranza a partir de versións de Session máis recentes</string>
-    <string name="RegistrationActivity_incorrect_backup_passphrase">Frase de acceso de copia de seguranza incorrecta</string>
+    <string name="RegistrationActivity_incorrect_backup_passphrase">Frase de paso incorrecta</string>
     <string name="BackupDialog_enable_local_backups">Activar copias de seguranza locais?</string>
     <string name="BackupDialog_enable_backups">Activar copias de seguranza</string>
-    <string name="BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Por favor, recoñece que o entendes marcando a caixa de verificación.</string>
+    <string name="BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Por favor, recoñece que o entendes marcando a caixa de comprobación.</string>
     <string name="BackupDialog_delete_backups">Borrar copias de seguranza?</string>
     <string name="BackupDialog_disable_and_delete_all_local_backups">Desactivar e borrar todas as copias de seguranza locais?</string>
     <string name="BackupDialog_delete_backups_statement">Borrar copias de seguranza</string>
@@ -550,26 +555,26 @@
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">Tempo de inactividade para o bloqueo de pantalla</string>
     <string name="AppProtectionPreferenceFragment_none">Ningunha</string>
     <!-- Conversation activity -->
-    <string name="activity_conversation_copy_public_key_button_title">Copy public key</string>
+    <string name="activity_conversation_copy_public_key_button_title">Copiar a clave pública</string>
     <!-- Session -->
-    <string name="continue_2">Continue</string>
-    <string name="copy">Copy</string>
-    <string name="invalid_url">Invalid URL</string>
-    <string name="copied_to_clipboard">Copied to clipboard</string>
-    <string name="next">Next</string>
-    <string name="share">Share</string>
-    <string name="invalid_session_id">Invalid Session ID</string>
-    <string name="cancel">Cancel</string>
-    <string name="your_session_id">Your Session ID</string>
-    <string name="activity_landing_title_2">Your Session begins here...</string>
-    <string name="activity_landing_register_button_title">Create Session ID</string>
-    <string name="activity_landing_restore_button_title">Continue Your Session</string>
-    <string name="view_fake_chat_bubble_1">What\'s Session?</string>
-    <string name="view_fake_chat_bubble_2">It\'s a decentralized, encrypted messaging app</string>
-    <string name="view_fake_chat_bubble_3">So it doesn\'t collect my personal information or my conversation metadata? How does it work?</string>
-    <string name="view_fake_chat_bubble_4">Using a combination of advanced anonymous routing and end-to-end encryption technologies.</string>
+    <string name="continue_2">Continuar</string>
+    <string name="copy">Copiar</string>
+    <string name="invalid_url">URL inválido</string>
+    <string name="copied_to_clipboard">Copiado ao portapapeis</string>
+    <string name="next">Seguinte</string>
+    <string name="share">Partillar</string>
+    <string name="invalid_session_id">ID de Session inválido</string>
+    <string name="cancel">Cancelar</string>
+    <string name="your_session_id">O teu ID de Session</string>
+    <string name="activity_landing_title_2">A túa sesión comeza aquí...</string>
+    <string name="activity_landing_register_button_title">Crear ID de Session</string>
+    <string name="activity_landing_restore_button_title">Continuar coa túa sesión</string>
+    <string name="view_fake_chat_bubble_1">Que é Session?</string>
+    <string name="view_fake_chat_bubble_2">É unha app de mensaxería cifrada e descentralizada</string>
+    <string name="view_fake_chat_bubble_3">Entón non recompila a miña información persoal ou os metadatos das miñas conversas? Como funciona?</string>
+    <string name="view_fake_chat_bubble_4">Empregando unha combinación de tecnoloxías avanzadas de encamiñamento anónimo e cifrado punto-a-punto.</string>
     <string name="view_fake_chat_bubble_5">Friends don\'t let friends use compromised messengers. You\'re welcome.</string>
-    <string name="activity_register_title">Say hello to your Session ID</string>
+    <string name="activity_register_title">Di ola ao teu ID de Session</string>
     <string name="activity_register_explanation">Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.</string>
     <string name="activity_restore_title">Restore your account</string>
     <string name="activity_restore_explanation">Enter the recovery phrase that was given to you when you signed up to restore your account.</string>
@@ -582,11 +587,11 @@
     <string name="activity_pn_mode_recommended_option_tag">Recommended</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Please Pick an Option</string>
     <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
-    <string name="activity_home_empty_state_button_title">Start a Session</string>
-    <string name="activity_home_leave_group_dialog_message">Are you sure you want to leave this group?</string>
-    <string name="activity_home_leaving_group_failed_message">"Couldn't leave group"</string>
-    <string name="activity_home_delete_conversation_dialog_message">Are you sure you want to delete this conversation?</string>
-    <string name="activity_home_conversation_deleted_message">Conversation deleted</string>
+    <string name="activity_home_empty_state_button_title">Iniciar unha sesión</string>
+    <string name="activity_home_leave_group_dialog_message">Tes a certeza de querer abandonar este grupo?</string>
+    <string name="activity_home_leaving_group_failed_message">"Non foi posible abandonar o grupo"</string>
+    <string name="activity_home_delete_conversation_dialog_message">Tes a certeza de querer borrar esta conversa?</string>
+    <string name="activity_home_conversation_deleted_message">Conversa borrada</string>
     <string name="activity_seed_title">Your Recovery Phrase</string>
     <string name="activity_seed_title_2">Meet your recovery phrase</string>
     <string name="activity_seed_explanation">Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don\'t give it to anyone.</string>
@@ -597,35 +602,35 @@
     <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
     <string name="activity_path_title">Path</string>
     <string name="activity_path_explanation">Session hides your IP by bouncing your messages through several Service Nodes in Session\'s decentralized network. These are the countries your connection is currently being bounced through:</string>
-    <string name="activity_path_device_row_title">You</string>
+    <string name="activity_path_device_row_title">Ti</string>
     <string name="activity_path_guard_node_row_title">Entry Node</string>
     <string name="activity_path_service_node_row_title">Service Node</string>
     <string name="activity_path_destination_row_title">Destination</string>
     <string name="activity_path_learn_more_button_title">Learn More</string>
-    <string name="activity_path_resolving_progress">Resolving…</string>
-    <string name="activity_create_private_chat_title">New Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Enter Session ID</string>
-    <string name="activity_create_private_chat_scan_qr_code_tab_title">Scan QR Code</string>
+    <string name="activity_path_resolving_progress">Procesando…</string>
+    <string name="activity_create_private_chat_title">Nova sesión</string>
+    <string name="activity_create_private_chat_enter_session_id_tab_title">Introducir ID de Session</string>
+    <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scan a user\'s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
     <string name="fragment_enter_public_key_explanation">Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.</string>
     <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session needs camera access to scan QR codes</string>
-    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Grant Camera Access</string>
-    <string name="activity_create_closed_group_title">New Closed Group</string>
-    <string name="activity_create_closed_group_edit_text_hint">Enter a group name</string>
-    <string name="activity_create_closed_group_empty_state_message">You don\'t have any contacts yet</string>
-    <string name="activity_create_closed_group_empty_state_button_title">Start a Session</string>
-    <string name="activity_create_closed_group_group_name_missing_error">Please enter a group name</string>
-    <string name="activity_create_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
-    <string name="activity_create_closed_group_not_enough_group_members_error">Please pick at least 1 group member</string>
-    <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 100 members</string>
-    <string name="activity_join_public_chat_title">Join Open Group</string>
-    <string name="activity_join_public_chat_error">Couldn\'t join group</string>
-    <string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
-    <string name="activity_join_public_chat_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_join_public_chat_scan_qr_code_explanation">Scan the QR code of the open group you\'d like to join</string>
-    <string name="fragment_enter_chat_url_edit_text_hint">Enter an open group URL</string>
+    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Conceder acceso á cámara</string>
+    <string name="activity_create_closed_group_title">Crear grupo pechado</string>
+    <string name="activity_create_closed_group_edit_text_hint">Introduce o nome do grupo</string>
+    <string name="activity_create_closed_group_empty_state_message">Aínda non tes ningún contacto</string>
+    <string name="activity_create_closed_group_empty_state_button_title">Iniciar unha sesión</string>
+    <string name="activity_create_closed_group_group_name_missing_error">Por favor, introduce o nome do grupo</string>
+    <string name="activity_create_closed_group_group_name_too_long_error">Introduce un nome de grupo máis curto, por favor</string>
+    <string name="activity_create_closed_group_not_enough_group_members_error">Por favor, selecciona polo menos un membro para o grupo</string>
+    <string name="activity_create_closed_group_too_many_group_members_error">Un grupo pechado non pode ter máis de 100 membros</string>
+    <string name="activity_join_public_chat_title">Entrar no grupo aberto</string>
+    <string name="activity_join_public_chat_error">Non foi posible entrar no grupo</string>
+    <string name="activity_join_public_chat_enter_group_url_tab_title">URL do grupo aberto</string>
+    <string name="activity_join_public_chat_scan_qr_code_tab_title">Escanear código QR</string>
+    <string name="activity_join_public_chat_scan_qr_code_explanation">Escanea o código QR do grupo aberto no que queiras entrar</string>
+    <string name="fragment_enter_chat_url_edit_text_hint">Introduce o URL dun grupo aberto</string>
     <string name="activity_settings_title">Settings</string>
     <string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
     <string name="activity_settings_display_name_missing_error">Please pick a display name</string>
@@ -634,7 +639,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -656,35 +662,35 @@
     <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
     <string name="dialog_clear_all_data_local_only">Delete Only</string>
     <string name="dialog_clear_all_data_clear_network">Entire Account</string>
-    <string name="activity_qr_code_title">QR Code</string>
+    <string name="activity_qr_code_title">Código QR</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_qr_code_view_scan_qr_code_explanation">Scan someone\'s QR code to start a conversation with them</string>
+    <string name="activity_qr_code_view_scan_qr_code_explanation">Escanea o código QR dalgunha persoa para comezar unha conversa con ela</string>
     <string name="fragment_view_my_qr_code_title">Scan Me</string>
     <string name="fragment_view_my_qr_code_explanation">This is your QR code. Other users can scan it to start a session with you.</string>
     <string name="fragment_view_my_qr_code_share_title">Share QR Code</string>
     <string name="fragment_contact_selection_contacts_title">Contacts</string>
-    <string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
-    <string name="fragment_contact_selection_open_groups_title">Open Groups</string>
+    <string name="fragment_contact_selection_closed_groups_title">Grupos pechados</string>
+    <string name="fragment_contact_selection_open_groups_title">Grupos abertos</string>
     <string name="fragment_contact_selection_empty_contacts">You don\'t have any contacts yet</string>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
-    <string name="activity_edit_closed_group_title">Edit Group</string>
-    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
-    <string name="activity_edit_closed_group_edit_members">Members</string>
-    <string name="activity_edit_closed_group_add_members">Add members</string>
-    <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
-    <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
-    <string name="activity_edit_closed_group_not_enough_group_members_error">Groups must have at least 1 group member</string>
-    <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
+    <string name="activity_edit_closed_group_title">Editar grupo</string>
+    <string name="activity_edit_closed_group_edit_text_hint">Introduce un novo nome para o grupo</string>
+    <string name="activity_edit_closed_group_edit_members">Membros</string>
+    <string name="activity_edit_closed_group_add_members">Engadir membros</string>
+    <string name="activity_edit_closed_group_group_name_missing_error">O nome do grupo non pode quedar baleiro</string>
+    <string name="activity_edit_closed_group_group_name_too_long_error">Introduce un nome de grupo máis curto, por favor</string>
+    <string name="activity_edit_closed_group_not_enough_group_members_error">Os grupos deben ter polo menos 1 membro</string>
+    <string name="fragment_edit_group_bottom_sheet_remove">Eliminar usuario do grupo</string>
     <string name="activity_select_contacts_title">Select Contacts</string>
     <string name="view_reset_secure_session_done_message">Secure session reset done</string>
     <string name="dialog_ui_mode_title">Theme</string>
     <string name="dialog_ui_mode_option_day">Day</string>
     <string name="dialog_ui_mode_option_night">Night</string>
     <string name="dialog_ui_mode_option_system_default">System default</string>
-    <string name="activity_conversation_menu_copy_session_id">Copy Session ID</string>
+    <string name="activity_conversation_menu_copy_session_id">Copiar ID de Session</string>
     <string name="attachment">Attachment</string>
     <string name="attachment_type_voice_message">Voice Message</string>
     <string name="details">Details</string>
@@ -713,8 +719,8 @@
     <string name="document">Document</string>
     <string name="dialog_blocked_title">Unblock %s?</string>
     <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
+    <string name="dialog_join_open_group_title">Entrar no grupo %s?</string>
+    <string name="dialog_join_open_group_explanation">Tes a certeza de querer entrar no grupo aberto %s?</string>
     <string name="dialog_open_url_title">Open URL?</string>
     <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
     <string name="open">Open</string>
@@ -724,8 +730,18 @@
     <string name="dialog_download_title">Trust %s?</string>
     <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
     <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="activity_conversation_blocked_banner_text">%s está bloqueado. Desbloquealo?</string>
+    <string name="activity_conversation_attachment_prep_failed">No foi posible preparar o anexo para ser enviado.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ha/strings.xml b/app/src/main/res/values-ha/strings.xml
index 5709e2430..87840474a 100644
--- a/app/src/main/res/values-ha/strings.xml
+++ b/app/src/main/res/values-ha/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(deng)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vîdyo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(bersiv)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Sepana ji bo bijartina medyayê nehate dîtin.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Ji bo zêdekirina wêne, vidyo yan deng, Session destûra Bîrbarê pêwîst dike, lê ew bi awayekî mayinde hate redkirin. Ji kerema xwe biçe menuya sazkariyên sepanê \"Destûr\"ê bibijêre û  \"Bîrbar\"ê çalak bike.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Ji bo tevllîkirina agahiyên berdenga Session destûra Navnivîskê pêwîst dike, lê ew bi awayekî mayînde hate redkirin. Ji kerema xwe biçe menuya sazkariyên sepanê \"Destûr\"ê bibijêre û \"Navnivîsk\"ê çalak bike.</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Stînerê nederbasdar!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Ji bo şandina peyamên dengî, destûra gihana Sessionê bide mîkrofona xwe.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session ji bo şandina peyamên dengî destûra Mîkrofonê pêwîst dike, lê ew bi awayekî mayinde hate redkirin. Ji kerema xwe biçe sazkariyên sepanê \"Destûr\"ê bibijêre û \"Mîkrofon\"ê çalak bike.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Ji bo kişandina vîdyo û wêneyan destura gihana Sessionê bide kamera.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Ji bo kişandina vîdyo an jî wêneyan Session destûra kamera pêwîst dike, lê ew bi awayekî mayinde hate redkirin. Ji kerema xwe biçe sazkariyên sepanê \"Destûr\"ê bibijêre û \"Kamera\"yê çalak bike.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Ji bo kişandina vîdyo an jî wêneyan pêdiviya Sessionê bi destûra kamera heye</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Astenga vî berdengî rake?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Tu yê dîsa bikaribî ji vî berdengî peyam û bangan wer bigrî.</string>
     <string name="RecipientPreferenceActivity_unblock">Astengê rakirin</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Wêne</string>
     <string name="Slide_audio">Deng</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Heta 1 rojê bêdeng bike</string>
     <string name="arrays__mute_for_seven_days">Heta 7 rojan bêdeng bike</string>
     <string name="arrays__mute_for_one_year">Heta 1 salê bêdeng bike</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Sazkariyên jixweber</string>
     <string name="arrays__enabled">Rêdayî</string>
     <string name="arrays__disabled">Neçalakkirî</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Nivîsê ji ber bigire</string>
     <string name="conversation_context__menu_delete_message">Peyamê rake</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Peyam dîsa bişîne</string>
     <string name="conversation_context__menu_reply_to_message">Bersiv bide peyamê</string>
     <!-- conversation_context_image -->
@@ -634,7 +639,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -728,4 +734,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index ad804edb9..fb47d5def 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -35,7 +35,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(שמע)</string>
     <string name="DraftDatabase_Draft_video_snippet">(וידיאו)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(תגובה)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">לא ניתן למצוא יישום לבחירת מדיה.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session דורש את הרשאת האחסון על מנת לצרף תצלומים, וידיאוים, או שמע, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\", אפשר את \"אחסון\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session דורש הרשאת אנשי קשר על מנת לצרף מידע איש קשר, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אנשי קשר\".</string>
@@ -58,7 +58,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">שליחה נכשלה, הקש לנסיגה בלתי מאובטחת</string>
     <string name="ConversationItem_unable_to_open_media">לא ניתן למצוא יישום המסוגל לפתוח מדיה זו.</string>
     <string name="ConversationItem_copied_text">הועתק %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">מידע נוסף</string>
     <string name="ConversationItem_download_more">  הורד עוד</string>
     <string name="ConversationItem_pending">  ממתין</string>
     <!-- ConversationActivity -->
@@ -66,10 +66,11 @@
     <string name="ConversationActivity_select_contact_info">בחר מידע של איש קשר</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">סליחה, אירעה שגיאה בהוספת הצרופה שלך.</string>
     <string name="ConversationActivity_message">הודעה</string>
-    <string name="ConversationActivity_compose">Compose</string>
+    <string name="ConversationActivity_compose">הודעה חדשה</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
-    <string name="ConversationActivity_member_count">%1$d members</string>
-    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">%1$d משתמשים</string>
+    <string name="ConversationActivity_open_group_guidelines">כללי הקהילה</string>
     <string name="ConversationActivity_invalid_recipient">מקבל לא תקף!</string>
     <string name="ConversationActivity_added_to_home_screen">התווסף אל מסך הבית</string>
     <string name="ConversationActivity_leave_group">לעזוב קבוצה?</string>
@@ -81,12 +82,13 @@
     <string name="ConversationActivity_attachment_exceeds_size_limits">הצרופה חורגת ממגבלות הגודל עבור הסוג של ההודעה שאתה שולח.</string>
     <string name="ConversationActivity_unable_to_record_audio">לא היה ניתן להקליט שמע!</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">אין יישום זמין לטיפול בקישור זה במכשיר שלך.</string>
-    <string name="ConversationActivity_invite_to_open_group">Add members</string>
+    <string name="ConversationActivity_invite_to_open_group">הוסף משתמשים</string>
     <string name="ConversationActivity_join_open_group">Join %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">האם ברצונך להצטרף לקבוצה <b>%s</b>?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">כדי לשלוח הודעות שמע, אפשר ל-Session לקבל גישה אל המיקרופון שלך.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session דורש את הרשאת המיקרופון על מנת לשלוח הודעות שמע, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">כדי ללכוד תצלומים ווידיאו, אפשר ל-Session גישה אל המצלמה.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session צריך הרשאות גישה לאחסון על מנת לשלוח תמונות ווידיאו.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session צריך את הרשאת המצלמה כדי לצלם תצלומים או וידיאו, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מצלמה\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session צריך הרשאות מצלמה כדי לצלם תצלומים או להקליט וידיאו</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
@@ -112,7 +114,7 @@
         <item quantity="many">זה ימחק לצמיתות את כל %1$d ההודעות שנבחרו.</item>
         <item quantity="other">זה ימחק לצמיתות את כל %1$d ההודעות שנבחרו.</item>
     </plurals>
-    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_ban_selected_user">חסום משתמש זה?</string>
     <string name="ConversationFragment_save_to_sd_card">לשמור באחסון?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="one">שמירת המדיה הזאת לאחסון תאפשר לכל אפליקציה אחרת לגשת אליהם.\n\nלהמשיך?</item>
@@ -234,6 +236,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">לבטל חסימה של איש קשר זה?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">תוכל שוב לקבל הודעות ושיחות מאיש קשר זה.</string>
     <string name="RecipientPreferenceActivity_unblock">בטל חסימה</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">תמונה</string>
     <string name="Slide_audio">שמע</string>
@@ -258,13 +261,13 @@
     <string name="ThreadRecord_s_is_on_signal">%s משתמש ב-Session!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">הודעות נעלמות הושבתו</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">זמן הודעות נעלמות הוגדר אל %s</string>
-    <string name="ThreadRecord_s_took_a_screenshot">%s took a screenshot.</string>
-    <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
+    <string name="ThreadRecord_s_took_a_screenshot">המסך צולם ע״י %s.</string>
+    <string name="ThreadRecord_media_saved_by_s">המדיה נשמרה ע״י %s.</string>
     <string name="ThreadRecord_safety_number_changed">מספר ביטחון השתנה</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">מספר הביטחון שלך עם %s השתנה.</string>
     <string name="ThreadRecord_you_marked_verified">סימנת כמוודא</string>
     <string name="ThreadRecord_you_marked_unverified">סימנת כבלתי מוודא</string>
-    <string name="ThreadRecord_empty_message">This conversation is empty</string>
+    <string name="ThreadRecord_empty_message">השיחה הזו ריקה</string>
     <string name="ThreadRecord_open_group_invitation">Open group invitation</string>
     <!-- UpdateApkReadyListener -->
     <string name="UpdateApkReadyListener_Signal_update">עדכון Session</string>
@@ -345,7 +348,7 @@
     <string name="attachment_type_selector__location">מיקום</string>
     <string name="attachment_type_selector__location_description">מיקום</string>
     <string name="attachment_type_selector__gif">GIF</string>
-    <string name="attachment_type_selector__gif_description">Gif</string>
+    <string name="attachment_type_selector__gif_description">GIF</string>
     <string name="attachment_type_selector__gallery_description">תמונה או וידיאו</string>
     <string name="attachment_type_selector__file_description">קובץ</string>
     <string name="attachment_type_selector__gallery">גלריה</string>
@@ -380,9 +383,9 @@
     <string name="audio_view__pause_accessibility_description">השהה</string>
     <string name="audio_view__download_accessibility_description">הורד</string>
     <!-- open_group_invitation_view -->
-    <string name="open_group_invitation_view__join_accessibility_description">Join</string>
+    <string name="open_group_invitation_view__join_accessibility_description">להצטרפות</string>
     <string name="open_group_invitation_view__open_group_invitation">Open group invitation</string>
-    <string name="open_group_guidelines_pinned_message">Pinned message</string>
+    <string name="open_group_guidelines_pinned_message">הודעה נעוצה</string>
     <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
     <string name="open_group_guidelines_read">Read</string>
     <!-- QuoteView -->
@@ -427,6 +430,7 @@
     <string name="arrays__mute_for_one_day">השתק למשך יום 1</string>
     <string name="arrays__mute_for_seven_days">השתק למשך 7 ימים</string>
     <string name="arrays__mute_for_one_year">השתק למשך שנה</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">הגדרות ברירת מחדל</string>
     <string name="arrays__enabled">מאופשר</string>
     <string name="arrays__disabled">מושבת</string>
@@ -517,6 +521,7 @@
     <string name="conversation_context__menu_copy_text">העתק טקסט</string>
     <string name="conversation_context__menu_delete_message">מחק הודעה</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">שלח מחדש הודעה</string>
     <string name="conversation_context__menu_reply_to_message">הגב אל הודעה</string>
     <!-- conversation_context_image -->
@@ -576,16 +581,16 @@
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">אי־פעילות נעילת מסך</string>
     <string name="AppProtectionPreferenceFragment_none">ללא</string>
     <!-- Conversation activity -->
-    <string name="activity_conversation_copy_public_key_button_title">Copy public key</string>
+    <string name="activity_conversation_copy_public_key_button_title">העתק מפתח ציבורי</string>
     <!-- Session -->
-    <string name="continue_2">Continue</string>
-    <string name="copy">Copy</string>
-    <string name="invalid_url">Invalid URL</string>
+    <string name="continue_2">המשך</string>
+    <string name="copy">העתקה</string>
+    <string name="invalid_url">קישור לא תקין</string>
     <string name="copied_to_clipboard">Copied to clipboard</string>
-    <string name="next">Next</string>
-    <string name="share">Share</string>
+    <string name="next">הבא</string>
+    <string name="share">שיתוף</string>
     <string name="invalid_session_id">Invalid Session ID</string>
-    <string name="cancel">Cancel</string>
+    <string name="cancel">ביטול</string>
     <string name="your_session_id">Your Session ID</string>
     <string name="activity_landing_title_2">Your Session begins here...</string>
     <string name="activity_landing_register_button_title">Create Session ID</string>
@@ -660,7 +665,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -754,4 +760,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 92ebc93dc..3af4ac4a4 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(ऑडियो)</string>
     <string name="DraftDatabase_Draft_video_snippet">(वीडियो)</string>
     <string name="DraftDatabase_Draft_quote_snippet">( उत्तर ) </string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">मीडिया का चयन करने के लिए कोई ऐप नहीं मिल सकता है</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">फ़ोटो, वीडियो या ऑडियो संलग्न करने के लिए Session को संग्रहण अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"संग्रहण\" सक्षम करें।</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">संपर्क जानकारी संलग्न करने के लिए Session को संपर्क अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"संपर्क\" सक्षम करें।</string>
@@ -54,7 +54,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">भेजने में असफल रहा, असुरक्षित फ़ॉलबैक के लिए टैप करें</string>
     <string name="ConversationItem_unable_to_open_media">इस मीडिया को खोलने में सक्षम कोई ऐप नहीं मिल सकता है।</string>
     <string name="ConversationItem_copied_text">%s अनुकरण </string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">और पढ़ें</string>
     <string name="ConversationItem_download_more">और डाउनलोड करें</string>
     <string name="ConversationItem_pending">बचा हुआ</string>
     <!-- ConversationActivity -->
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">मैसेज</string>
     <string name="ConversationActivity_compose">लिखें</string>
     <string name="ConversationActivity_muted_until_date">%s तक मौन किया</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$dसदस्य</string>
     <string name="ConversationActivity_open_group_guidelines">सामुदायिक दिशानिर्देश</string>
     <string name="ConversationActivity_invalid_recipient">अवैध प्राप्तकर्ता</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ऑडियो संदेश भेजने के लिए माइक्रोफोन की अनुमति Session को दें।</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ऑडियो संदेशों को भेजने के लिए Session को माइक्रोफ़ोन अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफ़ोन\" सक्षम करें।</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">फोटो और वीडियो कैप्चर करने के लिए Session को कैमरे की अनुमति दें।</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session को फ़ोटो या वीडियो लेने के लिए Storage अनुमति चाहिए</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session को फ़ोटो या वीडियो लेने के लिए कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"कैमरा\" सक्षम करें।</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session को फ़ोटो या वीडियो लेने के लिए कैमरा अनुमति चाहिए</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">इस संपर्क को अनवरोधित करें?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">आप एक बार फिर से इस संपर्क से संदेश और कॉल प्राप्त करने में सक्षम होंगे।</string>
     <string name="RecipientPreferenceActivity_unblock">अनब्लॉक करें</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">तस्वीर </string>
     <string name="Slide_audio">ऑडियो </string>
@@ -261,7 +264,7 @@
     <string name="MediaPreviewActivity_you">आप</string>
     <string name="MediaPreviewActivity_unssuported_media_type">असमर्थित मीडिया प्रकार</string>
     <string name="MediaPreviewActivity_draft">प्रारूप</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">बाहरी भंडारण को सहेजने के लिए Session को स्टोरेज अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"संग्रहण\" सक्षम करें।</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">अनुमति के बिना बाहरी भंडारण में सहेजने में असमर्थ</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">चयनित संदेश हटाएं?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">यह इस संदेश को स्थायी रूप से हटा देगा।</string>
@@ -401,6 +404,7 @@
     <string name="arrays__mute_for_one_day">1 दिन के लिए म्यूट करें</string>
     <string name="arrays__mute_for_seven_days">7 दिन के लिए म्यूट करें</string>
     <string name="arrays__mute_for_one_year">1 साल के लिए म्यूट करें</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">सेटिंग्स डिफ़ॉल्ट</string>
     <string name="arrays__enabled">सक्षम</string>
     <string name="arrays__disabled">अक्षम</string>
@@ -489,6 +493,7 @@
     <string name="conversation_context__menu_copy_text">कॉपी टेक्स्ट</string>
     <string name="conversation_context__menu_delete_message"> डिलीट मेसिज</string>
     <string name="conversation_context__menu_ban_user">प्रतिबंध उपयोगकर्ता</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">संदेश दोबारा भेजें</string>
     <string name="conversation_context__menu_reply_to_message">संदेश का जवाब</string>
     <!-- conversation_context_image -->
@@ -605,7 +610,7 @@
     <string name="activity_create_private_chat_enter_session_id_tab_title">सेशन आईडी डालें</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR कोड को स्कैन करें</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">सेशन शुरू करने के लिए यूजर के क्यूआर कोड को स्कैन करें। क्यूआर कोड को अकाउंट सेटिंग में क्यूआर कोड आइकन पर टैप करके पाया जा सकता है।</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Session आईडी या ओएनएस नाम दर्ज करें</string>
     <string name="fragment_enter_public_key_explanation">यूजर अपनी अकाउंट सेटिंग में जाकर और \"शेयर Session आईडी\" टैप करके, या अपना क्यूआर कोड शेयर कर सकते है।</string>
     <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">क्यूआर कोड स्कैन करने के लिए Session को कैमरा एक्सेस की आवश्यकता है</string>
@@ -632,7 +637,8 @@
     <string name="activity_settings_notifications_button_title">सूचनाएं</string>
     <string name="activity_settings_chats_button_title">चैट</string>
     <string name="activity_settings_devices_button_title">डिवाइसेज़</string>
-    <string name="activity_settings_invite_button_title">आमंत्रण</string>
+    <string name="activity_settings_invite_button_title">किसी मित्र को आमंत्रित करें</string>
+    <string name="activity_settings_faq_button_title">अकसर किये गए सवाल</string>
     <string name="activity_settings_recovery_phrase_button_title">पुनर्प्राप्ति वाक्यांश</string>
     <string name="activity_settings_clear_all_data_button_title">डेटा हटाएं</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -644,7 +650,7 @@
     <string name="activity_chat_settings_title">चैट</string>
     <string name="preferences_notifications_strategy_category_title">सूचना रणनीति</string>
     <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">आपको नई सूचनाओं के बारे में google के नोटीफिकेशन servers से तत्काल सूचित किया जाएगा।</string>
     <string name="fragment_device_list_bottom_sheet_change_name_button_title">नाम बदलें</string>
     <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">डिवाइस को अनलिंक करें</string>
     <string name="dialog_seed_title">आपका पुनर्प्राप्ति वाक्यांश</string>
@@ -693,8 +699,8 @@
     <string name="activity_backup_restore_passphrase">30 अंक का पासफ्रेस</string>
     <string name="activity_link_device_skip_prompt">यह समय ले रहा है, इसे छोड़ दें?</string>
     <string name="activity_link_device_link_device">डिवाइस को लिंक करें</string>
-    <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
-    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
+    <string name="activity_link_device_recovery_phrase">पुनर्प्राप्ति वाक्यांश</string>
+    <string name="activity_link_device_scan_qr_code">QR कोड को स्कैन करें</string>
     <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
     <string name="activity_join_public_chat_join_rooms">या इनमें से एक को जोड़ें...</string>
     <string name="activity_pn_mode_message_notifications">संदेश सूचनाएं</string>
@@ -708,22 +714,32 @@
     <string name="activity_prompt_passphrase_tap_to_unlock">अनलॉक करने के लिए टैप करें</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">उपनाम चुनें</string>
     <string name="invalid_public_key">अमान्य सार्वजनिक कुंजी</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
+    <string name="document">दस्तावेज़</string>
+    <string name="dialog_blocked_title">%s अनब्लॉक करें?</string>
+    <string name="dialog_blocked_explanation">क्या आप वाकई %s को अनब्लॉक करना चाहते हैं?</string>
+    <string name="dialog_join_open_group_title">%s से जुड़ें</string>
+    <string name="dialog_join_open_group_explanation">क्या आप %s open ग्रुप से जुड़ना चाहते हैं?</string>
+    <string name="dialog_open_url_title">यूआरएल खोलें</string>
+    <string name="dialog_open_url_explanation">क्या आप वाकई %s खोलना चाहते हैं?</string>
+    <string name="open">खोलें</string>
+    <string name="dialog_link_preview_title">लिंक पूर्वावलोकन सक्षम करें?</string>
+    <string name="dialog_link_preview_explanation">लिंक पूर्वावलोकन सक्षम करने से आपके द्वारा भेजे और प्राप्त किए जाने वाले URL के पूर्वावलोकन दिखाई देंगे. यह उपयोगी हो सकता है, लेकिन Session को पूर्वावलोकन उत्पन्न करने के लिए लिंक की गई वेबसाइटों से संपर्क करने की आवश्यकता होगी। आप कभी भी Session की सेटिंग में लिंक पूर्वावलोकन अक्षम कर सकते हैं।</string>
+    <string name="dialog_link_preview_enable_button_title">सक्षम करें</string>
     <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
+    <string name="dialog_download_explanation">क्या आप वाकई %s द्वारा भेजे गए मीडिया को डाउनलोड करना चाहते हैं?</string>
+    <string name="dialog_download_button_title">डाउनलोड</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="media">मीडिया</string>
+    <string name="UntrustedAttachmentView_download_attachment">%s डाउनलोड करने के लिए टैप करें</string>
+    <string name="message_details_header__error">त्रुटि!</string>
+    <string name="dialog_send_seed_title">चेतावनी!</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">भेजें</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 566e1ecf3..c5e9876e9 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -33,7 +33,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -66,6 +66,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -85,6 +86,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -222,6 +224,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -416,6 +419,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -505,6 +509,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -648,7 +653,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -742,4 +748,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 7def405e9..b1186990f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Ülés</string>
+    <string name="app_name">Session</string>
     <string name="yes">Igen</string>
     <string name="no">Nem</string>
     <string name="delete">Törlés</string>
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(hang)</string>
     <string name="DraftDatabase_Draft_video_snippet">(videó)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(válasz)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nem található alkalmazás médiafájl kiválasztásához.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">A Session-nak szüksége van a Tárhely engedélyre, hogy fotókat, videókat vagy hangokat csatolhasson, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Tárhely\"-t.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">A Session-nak szüksége van a Névjegyek engedélyre, hogy névjegy információt csatolhasson, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Névjegyek\"-et.</string>
@@ -54,7 +54,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Sikertelen küldés, koppints a titkosítatlan üzenetküldéshez</string>
     <string name="ConversationItem_unable_to_open_media">Nem található olyan alkalmazás, ami képes lenne megnyitni ezt a médiafájlt.</string>
     <string name="ConversationItem_copied_text">%s másolva</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">Részletek</string>
     <string name="ConversationItem_download_more"> További letöltése</string>
     <string name="ConversationItem_pending"> Függőben</string>
     <!-- ConversationActivity -->
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Üzenet</string>
     <string name="ConversationActivity_compose">Összeállít</string>
     <string name="ConversationActivity_muted_until_date">Eddig van némítva %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d tagok</string>
     <string name="ConversationActivity_open_group_guidelines">Közösségi irányelvek</string>
     <string name="ConversationActivity_invalid_recipient">Érvénytelen címzett!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Hangüzenetek küldéséhez engedélyezd, hogy a Session hozzáférhessen a mikrofonhoz!</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">A Session-nak szüksége van a Mikrofon engedélyre, hogy hangüzeneteket küldhessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd az \"Mikrofon\"-t.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Fotók és videók készítéséhez engedélyezd a Session-nak a kamerához való hozzáférést!</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">A Üléshez tárhely hozzáférésre van szükség a fotók, és videók küldéséhez.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">A Session-nak szüksége van a Kamera engedélyre, hogy fotót vagy videót készíthessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Kamera\"-t.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">A Session-nak szüksége van Kamera engedélyekre fotók és videók készítéséhez</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Feloldod a kontakt blokkolását?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Újra kaphatsz üzeneteket és hívásokat ettől a kontakttól.</string>
     <string name="RecipientPreferenceActivity_unblock">Feloldás</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Kép</string>
     <string name="Slide_audio">Hang</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Némítás 1 napra</string>
     <string name="arrays__mute_for_seven_days">Némítás 7 napra</string>
     <string name="arrays__mute_for_one_year">Némítás 1 évre</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Alapértelmezett beállítások</string>
     <string name="arrays__enabled">Engedélyezve</string>
     <string name="arrays__disabled">Letiltva</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Szöveg másolása</string>
     <string name="conversation_context__menu_delete_message">Üzenet törlése</string>
     <string name="conversation_context__menu_ban_user">Felhasználó kitiltása</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Tiltás és minden törlése</string>
     <string name="conversation_context__menu_resend_message">Üzenet újraküldése</string>
     <string name="conversation_context__menu_reply_to_message">Válasz az üzenetre</string>
     <!-- conversation_context_image -->
@@ -563,68 +568,68 @@
     <string name="your_session_id">Az ön Session azonosítója</string>
     <string name="activity_landing_title_2">Az ön Session-ja itt kezdődik...</string>
     <string name="activity_landing_register_button_title">Session azonosító létrehozása</string>
-    <string name="activity_landing_restore_button_title">Continue Your Session</string>
+    <string name="activity_landing_restore_button_title">Folytassa az ülését</string>
     <string name="view_fake_chat_bubble_1">Mi az a Session?</string>
     <string name="view_fake_chat_bubble_2">Ez egy decentralizált, titkosított üzenetküldő alkalmazás</string>
     <string name="view_fake_chat_bubble_3">Tehát nem gyűjti a személyes adataimat vagy a beszélgetés metaadatait? Hogyan működik?</string>
     <string name="view_fake_chat_bubble_4">Fejlett névtelen útválasztási és end-to-end titkosítási technológiák kombinációjának használata.</string>
     <string name="view_fake_chat_bubble_5">A barátok nem engedik, hogy a barátok kompromittált hírnököket használjanak. Szívesen.</string>
     <string name="activity_register_title">Ismerd meg a Session ID-d</string>
-    <string name="activity_register_explanation">Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.</string>
+    <string name="activity_register_explanation">Az üles azonosító az az egyedi cím, amelyet az emberek használhatnak, hogy kapcsolatba lépjenek Önnel az Ülés során. Mivel nincs kapcsolat a valódi személyazonosságával, az Ülés azonosító teljesen névtelen, és privát.</string>
     <string name="activity_restore_title">Fiók visszaállítása</string>
     <string name="activity_restore_explanation">Írja be azt a helyreállítási kifejezést, amelyet a fiók visszaállításához regisztrálásakor kapott.</string>
-    <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
+    <string name="activity_restore_seed_edit_text_hint">Írja be a helyreállítási kifejezést</string>
     <string name="activity_display_name_title_2">Válassza ki a megjelenítendő nevet</string>
     <string name="activity_display_name_explanation">Ez lesz az ön neve, amikor használja a Session alkalmazást. Ez lehet a valódi neve, álneve, vagy bármi más, ami tetszik.</string>
     <string name="activity_display_name_edit_text_hint">Írja be a megjelenítendő nevet</string>
     <string name="activity_display_name_display_name_missing_error">Kérjük, válassza ki a megjelenítendő nevet</string>
     <string name="activity_display_name_display_name_too_long_error">Válasszon rövidebb megjelenítési nevet</string>
-    <string name="activity_pn_mode_recommended_option_tag">Recommended</string>
-    <string name="activity_pn_mode_no_option_picked_dialog_title">Please Pick an Option</string>
-    <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
-    <string name="activity_home_empty_state_button_title">Start a Session</string>
-    <string name="activity_home_leave_group_dialog_message">Are you sure you want to leave this group?</string>
+    <string name="activity_pn_mode_recommended_option_tag">Ajánlott</string>
+    <string name="activity_pn_mode_no_option_picked_dialog_title">Kérjük, válasszon egy lehetőséget</string>
+    <string name="activity_home_empty_state_message">Még nincsenek névjegyei</string>
+    <string name="activity_home_empty_state_button_title">Indítson el egy ülést</string>
+    <string name="activity_home_leave_group_dialog_message">Biztosan elhagyja ezt a csoportot?</string>
     <string name="activity_home_leaving_group_failed_message">"Nem sikerült kilépni a csoportból"</string>
-    <string name="activity_home_delete_conversation_dialog_message">Are you sure you want to delete this conversation?</string>
-    <string name="activity_home_conversation_deleted_message">Conversation deleted</string>
-    <string name="activity_seed_title">Your Recovery Phrase</string>
-    <string name="activity_seed_title_2">Meet your recovery phrase</string>
+    <string name="activity_home_delete_conversation_dialog_message">Biztosan törli ezt a beszélgetést?</string>
+    <string name="activity_home_conversation_deleted_message">A beszélgetés törölve</string>
+    <string name="activity_seed_title">A helyreállítási kifejezés</string>
+    <string name="activity_seed_title_2">Írja be a helyreállítási kifejezést</string>
     <string name="activity_seed_explanation">A helyreállítási kifejezés a Session azonosító főkulcsa - használhatja a Session azonosító visszaállítására, ha elveszíti a hozzáférését eszközéhez. Tárolja helyreállítási mondatát biztonságos helyen, és ne adja át senkinek.</string>
-    <string name="activity_seed_reveal_button_title">Hold to reveal</string>
+    <string name="activity_seed_reveal_button_title">Tartsa lenyomva, hogy felfedje</string>
     <string name="view_seed_reminder_title">Már majdnem kész! 80%</string>
-    <string name="view_seed_reminder_subtitle_1">Secure your account by saving your recovery phrase</string>
+    <string name="view_seed_reminder_subtitle_1">Biztosítsa fiókját a helyreállítási szöveg elmentésével</string>
     <string name="view_seed_reminder_subtitle_2">Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID.</string>
-    <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
-    <string name="activity_path_title">Path</string>
-    <string name="activity_path_explanation">Session hides your IP by bouncing your messages through several Service Nodes in Session\'s decentralized network. These are the countries your connection is currently being bounced through:</string>
+    <string name="view_seed_reminder_subtitle_3">Ügyeljen arra, hogy a helyreállítási szöveget biztonságos helyen tárolja</string>
+    <string name="activity_path_title">Útvonal</string>
+    <string name="activity_path_explanation">A Session elrejti IP címét azzal, hogy az üzeneteket a Session decentralizált hálózatának több szolgáltatási csomópontján vezeti keresztül. Ezek azok az országok, ahol a kapcsolat jelenleg átmegy:</string>
     <string name="activity_path_device_row_title">Te</string>
-    <string name="activity_path_guard_node_row_title">Entry Node</string>
-    <string name="activity_path_service_node_row_title">Service Node</string>
-    <string name="activity_path_destination_row_title">Destination</string>
-    <string name="activity_path_learn_more_button_title">Learn More</string>
-    <string name="activity_path_resolving_progress">Resolving…</string>
-    <string name="activity_create_private_chat_title">New Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Enter Session ID</string>
-    <string name="activity_create_private_chat_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_create_private_chat_scan_qr_code_explanation">Scan a user\'s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings.</string>
+    <string name="activity_path_guard_node_row_title">Belépési csomópont</string>
+    <string name="activity_path_service_node_row_title">Szolgáltatási csomópont</string>
+    <string name="activity_path_destination_row_title">Célállomás</string>
+    <string name="activity_path_learn_more_button_title">Tudj meg többet</string>
+    <string name="activity_path_resolving_progress">Feloldás...</string>
+    <string name="activity_create_private_chat_title">Új Ülés</string>
+    <string name="activity_create_private_chat_enter_session_id_tab_title">Adja meg az Ülés azonosítóját</string>
+    <string name="activity_create_private_chat_scan_qr_code_tab_title">QR kód beolvasása</string>
+    <string name="activity_create_private_chat_scan_qr_code_explanation">A beszélgetés elindításához olvassa be a felhasználó QR kódját. A QR kód a fiókbeállításokban található a QR kód ikonra koppintva.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
-    <string name="fragment_enter_public_key_explanation">Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.</string>
+    <string name="fragment_enter_public_key_explanation">A felhasználók megoszthatják Session azonosítójukat, ha belépnek a fiókbeállításokba, és megérintik a „Session azonosító megosztása” lehetőséget, vagy más egyéb módon átküldik QR kódjukat.</string>
     <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
-    <string name="fragment_scan_qr_code_camera_access_explanation">Session needs camera access to scan QR codes</string>
-    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Grant Camera Access</string>
-    <string name="activity_create_closed_group_title">New Closed Group</string>
+    <string name="fragment_scan_qr_code_camera_access_explanation">Kamera hozzáférésre van szükség a QR kód beolvasásához</string>
+    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Adjon hozzáférést a kamerához</string>
+    <string name="activity_create_closed_group_title">Új Zárt Csoport</string>
     <string name="activity_create_closed_group_edit_text_hint">Írja be a csoport nevét</string>
-    <string name="activity_create_closed_group_empty_state_message">You don\'t have any contacts yet</string>
+    <string name="activity_create_closed_group_empty_state_message">Még nincsenek névjegyei</string>
     <string name="activity_create_closed_group_empty_state_button_title">Start a Session</string>
     <string name="activity_create_closed_group_group_name_missing_error">Kérjük, adja meg a csoport nevét</string>
     <string name="activity_create_closed_group_group_name_too_long_error">Írjon be rövidebb csoportnevet</string>
-    <string name="activity_create_closed_group_not_enough_group_members_error">Please pick at least 1 group member</string>
-    <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 100 members</string>
-    <string name="activity_join_public_chat_title">Join Open Group</string>
-    <string name="activity_join_public_chat_error">Couldn\'t join group</string>
+    <string name="activity_create_closed_group_not_enough_group_members_error">Kérjük, válasszon legalább 1 csoporttagot</string>
+    <string name="activity_create_closed_group_too_many_group_members_error">Egy zárt csoport nem lehet több 100 tagnál</string>
+    <string name="activity_join_public_chat_title">Csatlakozzon Nyitott Csoporthoz</string>
+    <string name="activity_join_public_chat_error">Nem sikerült csatlakozni a csoporthoz</string>
     <string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
-    <string name="activity_join_public_chat_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_join_public_chat_scan_qr_code_explanation">Scan the QR code of the open group you\'d like to join</string>
+    <string name="activity_join_public_chat_scan_qr_code_tab_title">QR kód beolvasása</string>
+    <string name="activity_join_public_chat_scan_qr_code_explanation">Olvassa be annak a nyitott csoportnak a QR kódját, amelyhez csatlakozni szeretne</string>
     <string name="fragment_enter_chat_url_edit_text_hint">Enter an open group URL</string>
     <string name="activity_settings_title">Beállítások</string>
     <string name="activity_settings_display_name_edit_text_hint">Írja be a megjelenítendő nevet</string>
@@ -634,32 +639,33 @@
     <string name="activity_settings_notifications_button_title">Értesítések</string>
     <string name="activity_settings_chats_button_title">Beszélgetések</string>
     <string name="activity_settings_devices_button_title">Eszközök</string>
-    <string name="activity_settings_invite_button_title">Meghívás</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">Gyakori kérdések</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Adataid törlése</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Segítsen nekünk a Session lefordításában</string>
-    <string name="activity_notification_settings_title">Notifications</string>
+    <string name="activity_notification_settings_title">Értesítések</string>
     <string name="activity_notification_settings_style_section_title">Értesítések stílusa</string>
-    <string name="activity_notification_settings_content_section_title">Notification Content</string>
+    <string name="activity_notification_settings_content_section_title">Értesítés tartalma</string>
     <string name="activity_privacy_settings_title">Adatvédelem</string>
     <string name="activity_chat_settings_title">Beszélgetések</string>
-    <string name="preferences_notifications_strategy_category_title">Notification Strategy</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="preferences_notifications_strategy_category_title">Értesítések módja</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_title">Használja a Gyors módot</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">A Google értesítési szerverein keresztül megbízhatóan és azonnal értesítést kap az új üzenetekről.</string>
     <string name="fragment_device_list_bottom_sheet_change_name_button_title">Név módosítása</string>
-    <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Unlink device</string>
+    <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Eszköz társításának megszüntetése</string>
     <string name="dialog_seed_title">Your Recovery Phrase</string>
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
-    <string name="dialog_clear_all_data_title">Clear All Data</string>
-    <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_title">Az összes adat törlése</string>
+    <string name="dialog_clear_all_data_explanation">Ez végleg törölni fogja üzeneteit, beszélgetéseit és ismerőseit.</string>
+    <string name="dialog_clear_all_data_network_explanation">Csak ezt az eszközt szeretné törölni, vagy törölni szeretné az egész fiókját?</string>
     <string name="dialog_clear_all_data_local_only">Delete Only</string>
     <string name="dialog_clear_all_data_clear_network">Entire Account</string>
-    <string name="activity_qr_code_title">QR Code</string>
-    <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
-    <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_qr_code_view_scan_qr_code_explanation">Scan someone\'s QR code to start a conversation with them</string>
+    <string name="activity_qr_code_title">QR kód</string>
+    <string name="activity_qr_code_view_my_qr_code_tab_title">Saját QR kódom</string>
+    <string name="activity_qr_code_view_scan_qr_code_tab_title">QR kód beolvasása</string>
+    <string name="activity_qr_code_view_scan_qr_code_explanation">Olvassa be valaki QR kódját, hogy beszélgetést kezdhessen vele</string>
     <string name="fragment_view_my_qr_code_title">Scan Me</string>
     <string name="fragment_view_my_qr_code_explanation">This is your QR code. Other users can scan it to start a session with you.</string>
     <string name="fragment_view_my_qr_code_share_title">Share QR Code</string>
@@ -686,9 +692,9 @@
     <string name="dialog_ui_mode_option_system_default">System default</string>
     <string name="activity_conversation_menu_copy_session_id">Az ön Session azonosító kimásolása</string>
     <string name="attachment">Attachment</string>
-    <string name="attachment_type_voice_message">Voice Message</string>
-    <string name="details">Details</string>
-    <string name="dialog_backup_activation_failed">Failed to activate backups. Please try again or contact support.</string>
+    <string name="attachment_type_voice_message">Hangüzenet</string>
+    <string name="details">Részletek</string>
+    <string name="dialog_backup_activation_failed">Nem sikerült aktiválni a biztonsági mentéseket. Kérjük, próbálja újra, vagy lépjen kapcsolatba az ügyfélszolgálattal.</string>
     <string name="activity_backup_restore_title">Restore backup</string>
     <string name="activity_backup_restore_select_file">Fájl kiválasztása</string>
     <string name="activity_backup_restore_explanation_1">Select a backup file and enter the passphrase it was created with.</string>
@@ -696,7 +702,7 @@
     <string name="activity_link_device_skip_prompt">This is taking a while, would you like to skip?</string>
     <string name="activity_link_device_link_device">Link a Device</string>
     <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
-    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
+    <string name="activity_link_device_scan_qr_code">QR kód beolvasása</string>
     <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
     <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
     <string name="activity_pn_mode_message_notifications">Message Notifications</string>
@@ -717,15 +723,25 @@
     <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
     <string name="dialog_open_url_title">Open URL?</string>
     <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="open">Megnyit</string>
+    <string name="dialog_link_preview_title">Engedélyezi a linkelőnézeteket?</string>
+    <string name="dialog_link_preview_explanation">A linkelőnézetek engedélyezése megjeleníti az Ön által küldött és kapott linkek előnézetét. Ez hasznos lehet, de a Session így kapcsolatba fog lépni a linkelt webhelyekkel az előnézetek létrehozásához. A link előnézetét bármikor letilthatja a Session beállításaiban.</string>
+    <string name="dialog_link_preview_enable_button_title">Engedélyezés</string>
+    <string name="dialog_download_title">%s megbízható?</string>
+    <string name="dialog_download_explanation">Biztosan le szeretné tölteni %s által küldött tartalmat?</string>
+    <string name="dialog_download_button_title">Letöltés</string>
+    <string name="activity_conversation_blocked_banner_text">%s blokkolva van. Feloldja a blokkolást?</string>
+    <string name="activity_conversation_attachment_prep_failed">Nem sikerült előkészíteni a mellékletet a küldéshez.</string>
     <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="UntrustedAttachmentView_download_attachment">Kattintson %s letöltéséhez</string>
+    <string name="message_details_header__error">Hiba</string>
+    <string name="dialog_send_seed_title">Figyelmeztetés</string>
+    <string name="dialog_send_seed_explanation">Ez az Ön helyreállítási kulcsa. Ha elküldi valakinek, akkor a címzettnek teljes hozzáférése lesz az Ön fiókjához.</string>
+    <string name="dialog_send_seed_send_button_title">Küldés</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index cde9f1c69..57b157b28 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Պատճենել տեքստը</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,7 +639,8 @@
     <string name="activity_settings_notifications_button_title">Ծանուցումներ</string>
     <string name="activity_settings_chats_button_title">Զրույցներ</string>
     <string name="activity_settings_devices_button_title">Սարքեր</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Վերականգնման Արտահայտություն</string>
     <string name="activity_settings_clear_all_data_button_title">Զրոյացնել</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -728,4 +734,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index c43dc298a..598cb90d0 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -5,31 +5,31 @@
     <string name="no">Tidak</string>
     <string name="delete">Hapus</string>
     <string name="ban">Larang</string>
-    <string name="please_wait">Mohon Tunggu...</string>
+    <string name="please_wait">Harap tunggu...</string>
     <string name="save">Simpan</string>
     <string name="note_to_self">Catatan Pribadi</string>
     <string name="version_s">Versi %s</string>
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">Pesan baru</string>
     <!-- AlbumThumbnailView -->
-    <string name="AlbumThumbnailView_plus">\+ %d</string>
+    <string name="AlbumThumbnailView_plus">\+%d</string>
     <!-- ApplicationPreferencesActivity -->
     <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
-        <item quantity="other">%d pesan tiap percakapan</item>
+        <item quantity="other">%d pesan setiap percakapan</item>
     </plurals>
-    <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Hapus semua pesan lama?</string>
+    <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Hapus semua pesan lama sekarang?</string>
     <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
         <item quantity="other">Ini akan memangkas semua percakapan menjadi %d percakapan terbaru.</item>
     </plurals>
     <string name="ApplicationPreferencesActivity_delete">Hapus</string>
-    <string name="ApplicationPreferencesActivity_On">Nyala</string>
+    <string name="ApplicationPreferencesActivity_On">Hidup</string>
     <string name="ApplicationPreferencesActivity_Off">Mati</string>
     <!-- DraftDatabase -->
     <string name="DraftDatabase_Draft_image_snippet">(gambar)</string>
     <string name="DraftDatabase_Draft_audio_snippet">(suara)</string>
-    <string name="DraftDatabase_Draft_video_snippet">(videi)</string>
+    <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(balas)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Tidak menemukan aplikasi untuk memilih media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session membutuhkan izin penyimpanan untuk melampirkan foto, video, atau audio, namun izin tersebut telah ditolak secara permanen. Harap melanjutkan ke menu pengaturan aplikasi, pilih \"Perizinan\", dan izinkan \"Penyimpanan\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -37,16 +37,16 @@
     <!-- AudioSlidePlayer -->
     <string name="AudioSlidePlayer_error_playing_audio">Error playing audio!</string>
     <!-- BucketedThreadMedia -->
-    <string name="BucketedThreadMedia_Today">Today</string>
-    <string name="BucketedThreadMedia_Yesterday">Yesterday</string>
-    <string name="BucketedThreadMedia_This_week">This week</string>
-    <string name="BucketedThreadMedia_This_month">This month</string>
+    <string name="BucketedThreadMedia_Today">Hari ini</string>
+    <string name="BucketedThreadMedia_Yesterday">Kemarin</string>
+    <string name="BucketedThreadMedia_This_week">Minggu ini</string>
+    <string name="BucketedThreadMedia_This_month">Bulan Ini</string>
     <!-- CommunicationActions -->
-    <string name="CommunicationActions_no_browser_found">No web browser found.</string>
+    <string name="CommunicationActions_no_browser_found">Peramban tidak ditemukan.</string>
     <!-- ContactsCursorLoader -->
-    <string name="ContactsCursorLoader_groups">Groups</string>
+    <string name="ContactsCursorLoader_groups">Grup</string>
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Send failed, tap for details</string>
+    <string name="ConversationItem_error_not_delivered">Pengiriman gagal, ketuk untuk rincian</string>
     <string name="ConversationItem_received_key_exchange_message_tap_to_process">Received key exchange message, tap to process.</string>
     <string name="ConversationItem_group_action_left">%1$s has left the group.</string>
     <string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
@@ -62,6 +62,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -390,6 +393,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -477,6 +481,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -620,7 +625,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -714,4 +720,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2a57bdae1..41ca415f8 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -4,13 +4,13 @@
     <string name="yes">Sì</string>
     <string name="no">No</string>
     <string name="delete">Cancella</string>
-    <string name="ban">Ban</string>
+    <string name="ban">Espelli</string>
     <string name="please_wait">Attendere...</string>
     <string name="save">Salva</string>
     <string name="note_to_self">Note personali</string>
     <string name="version_s">Versione %s</string>
     <!-- AbstractNotificationBuilder -->
-    <string name="AbstractNotificationBuilder_new_message">Nuovo messaggio</string>
+    <string name="AbstractNotificationBuilder_new_message">Scrivi un messaggio</string>
     <!-- AlbumThumbnailView -->
     <string name="AlbumThumbnailView_plus">\+%d</string>
     <!-- ApplicationPreferencesActivity -->
@@ -18,9 +18,9 @@
         <item quantity="one">%d messaggio per conversazione</item>
         <item quantity="other">%d messaggi per conversazione</item>
     </plurals>
-    <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Eliminare tutti i messaggi vecchi ora?</string>
+    <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Vuoi eliminare ora tutti i vecchi messaggi?</string>
     <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
-        <item quantity="one">Questo ridurrà immediatamente tutte le conversazioni al messaggio più recente.</item>
+        <item quantity="one">Questo porterà immediatamente tutte le conversazioni al messaggio più recente.</item>
         <item quantity="other">Saranno ridotte immediatamente tutte le conversazioni ai %d messaggi più recenti.</item>
     </plurals>
     <string name="ApplicationPreferencesActivity_delete">Elimina</string>
@@ -31,11 +31,11 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(risposta)</string>
-    <!-- AttchmentManager -->
-    <string name="AttachmentManager_cant_open_media_selection">Impossibile trovare un\'app per selezionare il file.</string>
+    <!-- AttachmentManager -->
+    <string name="AttachmentManager_cant_open_media_selection">Impossibile trovare un app per selezionare un file.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session richiede l\'autorizzazione all\'accesso della memoria per allegare foto, video o audio, ma è stata negata in modo permanente. Si prega di continuare con il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Archiviazione\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session richiede l\'autorizzazione alla lettura dei contatti per allegare le informazioni di contatto, ma è stata negata in modo permanente. Si prega di continuare con il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Contatti\".</string>
-    <string name="AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied">Session richiede l\'autorizzazione all\'uso della fotocamera per scattare foto, ma è stata negata in modo permanente. Si prega di continuare al menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session ha bisogno dell\'autorizzazione per leggere i contatti per allegare le informazioni di contatto, ma il permesso è stato negato permanentemente. Prosegui nel menù delle impostazioni di Session, abilitando la voce \"Contatti\" nella sezione \"Autorizzazioni\".</string>
+    <string name="AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied">Session ha bisogno dell\'autorizzazione alla fotocamera per poter scattare foto, ma il permesso è stato negato permanentemente. Prosegui nel menù android delle impostazioni di Session, abilitando la voce \"Fotocamera\" nella sezione \"Autorizzazioni\".</string>
     <!-- AudioSlidePlayer -->
     <string name="AudioSlidePlayer_error_playing_audio">Errore nel riprodurre l\'audio!</string>
     <!-- BucketedThreadMedia -->
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Messaggio</string>
     <string name="ConversationActivity_compose">Componi</string>
     <string name="ConversationActivity_muted_until_date">Mutato fino a %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d membri</string>
     <string name="ConversationActivity_open_group_guidelines">Linee guida della comunità</string>
     <string name="ConversationActivity_invalid_recipient">Destinatario non valido!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Per poter mandare un messaggio audio, permetti a Session di accedere al tuo microfono.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session richiede l\'autorizzazione all\'uso del microfono per inviare messaggi audio, ma è stata negata in modo permanente. Si prega di continuare con le impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Per poter catturare foto e video, permetti a Session di accedere alla fotocamera del tuo dispositivo</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Autorizza Session ad accedere alla memoria del tuo dispositivo per inviare foto e video.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session richiede l\'autorizzazione all\'uso della fotocamera per scattare foto o registrare video, ma è stata negata in modo permanente. Si prega di continuare al menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session richiede l\'autorizzazione all\'uso della fotocamera per scattare foto o registrare video</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Sbloccare questo contatto?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Sarai di nuovo in grado di ricevere messaggi e chiamate da questo contatto.</string>
     <string name="RecipientPreferenceActivity_unblock">Sblocca</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Immagini</string>
     <string name="Slide_audio">Audio</string>
@@ -401,6 +404,7 @@ scambia un altro messaggio!</string>
     <string name="arrays__mute_for_one_day">Silenzia per 1 giorno</string>
     <string name="arrays__mute_for_seven_days">Silenzia per 7 giorni</string>
     <string name="arrays__mute_for_one_year">Silenzia per 1 anno</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Impostazioni di default</string>
     <string name="arrays__enabled">Attivato</string>
     <string name="arrays__disabled">Disattivato</string>
@@ -489,6 +493,7 @@ scambia un altro messaggio!</string>
     <string name="conversation_context__menu_copy_text">Copia testo</string>
     <string name="conversation_context__menu_delete_message">Cancella messaggio</string>
     <string name="conversation_context__menu_ban_user">Banna utente</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Revoca ed elimina tutto</string>
     <string name="conversation_context__menu_resend_message">Rinvia il messaggio</string>
     <string name="conversation_context__menu_reply_to_message">Rispondi al messaggio</string>
     <!-- conversation_context_image -->
@@ -632,10 +637,11 @@ scambia un altro messaggio!</string>
     <string name="activity_settings_notifications_button_title">Notifiche</string>
     <string name="activity_settings_chats_button_title">Chat</string>
     <string name="activity_settings_devices_button_title">Dispositivi</string>
-    <string name="activity_settings_invite_button_title">Invita</string>
+    <string name="activity_settings_invite_button_title">Invita un amico</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Frase di recupero</string>
     <string name="activity_settings_clear_all_data_button_title">Elimina dati</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Cancella i dati e la rete</string>
     <string name="activity_settings_help_translate_session">Aiutaci a tradurre Session</string>
     <string name="activity_notification_settings_title">Notifiche</string>
     <string name="activity_notification_settings_style_section_title">Stile della notifica</string>
@@ -651,9 +657,9 @@ scambia un altro messaggio!</string>
     <string name="dialog_seed_explanation">Questa è la tua frase di recupero. Usala per ripristinare o migrare la Sessione ID a un nuovo dispositivo.</string>
     <string name="dialog_clear_all_data_title">Elimina tutti i dati</string>
     <string name="dialog_clear_all_data_explanation">Ciò eliminerà permanentemente i tuoi messaggi, sessioni e contatti.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="dialog_clear_all_data_network_explanation">Vuoi formattare solo questo dispositivo o cancellare del tutto l\'account?</string>
+    <string name="dialog_clear_all_data_local_only">Cancella solo</string>
+    <string name="dialog_clear_all_data_clear_network">Account completo</string>
     <string name="activity_qr_code_title">Codice QR</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">Visualizza il mio codice QR</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scansiona il codice QR</string>
@@ -725,5 +731,15 @@ scambia un altro messaggio!</string>
     <string name="activity_conversation_blocked_banner_text">%s sono bloccati. Sbloccarli?</string>
     <string name="activity_conversation_attachment_prep_failed">Impossibile preparare l\'allegato per l\'invio.</string>
     <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tocca per scaricare %s</string>
+    <string name="message_details_header__error">Errore</string>
+    <string name="dialog_send_seed_title">Attenzione</string>
+    <string name="dialog_send_seed_explanation">Questa è la tua frase di recupero. Qualora dovessi inviarla a qualcuno questi avranno accesso totale al tuo account.</string>
+    <string name="dialog_send_seed_send_button_title">Invia</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0ee55ac17..43819c2e8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(音声)</string>
     <string name="DraftDatabase_Draft_video_snippet">(動画)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(返信)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">ファイルを開くアプリが見つかりません。</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Sessionに写真や動画、音声データを添付するには、ストレージへのアクセスを許可する必要がありますが、無効になっています。アプリ設定から、アプリの権限を選び、ストレージへのアクセス許可を有効にしてください。</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Sessionで連絡先を添付するには、連絡先へのアクセスを許可する必要がありますが、無効になっています。アプリ設定メニューから、アプリの権限を選び、連絡先へのアクセス許可を有効にしてください。</string>
@@ -62,6 +62,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">受信先が無効です。</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">音声メッセージを送るには、Sessionのマイクへのアクセスを許可してください。</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Sessionで音声メッセージを添付するには、『マイク』へのアクセスを許可する必要がありますが、無効になっています。アプリ設定メニューから、『アプリの権限』を選び、『マイク』へのアクセス許可を有効にしてください。</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">写真や動画を撮るには、Sessionのカメラへのアクセスを許可してください。</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Sessionで写真や動画を撮るには、カメラへのアクセスを許可する必要がありますが、無効になっています。アプリ設定メニューから、『アプリの権限』を選び、『カメラ』へのアクセス許可を有効にしてください。</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Sessionで写真や動画を撮るには、カメラへのアクセス許可が必要です。</string>
     <string name="ConversationActivity_quoted_contact_message">%2$s%1$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">この連絡先のブロックを解除しますか？</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">この連絡先からのメッセージや通話を受信できるようになります。</string>
     <string name="RecipientPreferenceActivity_unblock">ブロック解除</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">画像</string>
     <string name="Slide_audio">音声</string>
@@ -387,6 +390,7 @@
     <string name="arrays__mute_for_one_day">1日間ミュート</string>
     <string name="arrays__mute_for_seven_days">7日間ミュート</string>
     <string name="arrays__mute_for_one_year">1年間ミュート</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">既定の設定</string>
     <string name="arrays__enabled">有効</string>
     <string name="arrays__disabled">無効</string>
@@ -474,6 +478,7 @@
     <string name="conversation_context__menu_copy_text">テキストをコピー</string>
     <string name="conversation_context__menu_delete_message">メッセージの削除</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">メッセージを再送信</string>
     <string name="conversation_context__menu_reply_to_message">メッセージに返信</string>
     <!-- conversation_context_image -->
@@ -617,7 +622,8 @@
     <string name="activity_settings_notifications_button_title">お知らせ</string>
     <string name="activity_settings_chats_button_title">チャット</string>
     <string name="activity_settings_devices_button_title">デバイス</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">リカバリーフレーズ</string>
     <string name="activity_settings_clear_all_data_button_title">データを消去する</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -711,4 +717,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 62328c1fc..39b0b69bb 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,9 +639,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -652,6 +659,9 @@
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
     <string name="dialog_clear_all_data_title">Clear All Data</string>
     <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">QR Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
@@ -722,4 +732,16 @@
     <string name="dialog_download_button_title">Download</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">Media</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index ecf85e8f7..a0adf1a18 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(សំឡេង)</string>
     <string name="DraftDatabase_Draft_video_snippet">(វីដេអូ)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(ឆ្លើយតប)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">មិនអាចស្វែងរកកម្មវិធីដើម្បីជ្រើសរើសព័ត៌មាន</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session ទាមទារសិទ្ធិប្រើប្រាស់អង្គរក្សាទុកដើម្បីភ្ជាប់រូបថត វីដេអូ ឬសំឡេង ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់របស់ប្រព័ន្ធ ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"អង្គរក្សាទុក\" ។</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session ទាមទារសិទ្ធិប្រើប្រាស់បញ្ជីទំនាក់ទំនងដើម្បីភ្ជាប់ព័ត៌មានបញ្ជីទំនាក់ទំនង ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់របស់ប្រព័ន្ធ ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"បញ្ជីទំនាក់ទំនង\" ។</string>
@@ -62,6 +62,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">អ្នកទទួលមិនត្រឹមត្រូវ!</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ដើម្បីផ្ញើសារជាសំឡេង អនុញ្ញាតឱ្យ Session ចូលទៅប្រើប្រាស់មីក្រូហ្វូនរបស់អ្នក។</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session សុំសិទ្ធិប្រើប្រាស់ម៉ៃក្រូហ្វូន ដើម្បីផ្ញើសារជាសំឡេង, ប៉ុន្តែ វាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់កម្មវិធី, ជ្រើសរើស  \"ការអនុញ្ញាត\", និងបើក \"ប្រដាប់ស្រូបសំឡេង\"។</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ដើម្បីថតរូបភាព និងវីដេអូ, សូមអនុញ្ញាត Session ចូលប្រើប្រាស់កាមេរ៉ា។</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Sessionត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ាដើម្បីថតរូប ឬវីដេអូ ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់ជ្រើសរើស \"អនុញ្ញាត\" ហើយបើក \"កាមេរ៉ា\"។</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session​ សុំសិទ្ធិប្រើប្រាស់កាមេរ៉ា ដើម្បីថតរូបភាព ឬវីដេអូ</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">មិនបិទលេខទំនាក់ទំនងនេះទេ?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">អ្នកនឹងទទួលបានសារ និងការហៅចូលពីលេខទំនាក់ទំនងនេះម្តងទៀត។</string>
     <string name="RecipientPreferenceActivity_unblock">បើកវិញ</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">រូបភាព</string>
     <string name="Slide_audio">សំឡេង</string>
@@ -388,6 +391,7 @@
     <string name="arrays__mute_for_one_day">បិទសំឡេង 1 ថ្ងៃ</string>
     <string name="arrays__mute_for_seven_days">បិទសំឡេង 7 ថ្ងៃ</string>
     <string name="arrays__mute_for_one_year">បិទសំឡេង 1 ឆ្នាំ</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">ការកំណត់លំនាំដើម</string>
     <string name="arrays__enabled">បានបើក</string>
     <string name="arrays__disabled">បានបិទ</string>
@@ -475,6 +479,7 @@
     <string name="conversation_context__menu_copy_text">ថតចម្លងអក្សរ</string>
     <string name="conversation_context__menu_delete_message">លុបសារ</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">ផ្ញើសារឡើងវិញ</string>
     <string name="conversation_context__menu_reply_to_message">ឆ្លើយតបសារ</string>
     <!-- conversation_context_image -->
@@ -618,7 +623,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -712,4 +718,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index cd91f5b8c..b663b348f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(오디오)</string>
     <string name="DraftDatabase_Draft_video_snippet">(동영상)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">미디어를 선택할 수 있는 앱이 없음</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -62,6 +62,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">수신자가 잘못됨</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">음성 메시지를 보내기 위해서, Session 이 마이크에 접근하 수 있게 허용하십시오.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">사용자를 차단 해제하시겠습니까?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">이 연락처로부터 메시지와 전화를 다시 받을 수 있게 될 것입니다.</string>
     <string name="RecipientPreferenceActivity_unblock">차단 해제</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">이미지</string>
     <string name="Slide_audio">오디오</string>
@@ -387,6 +390,7 @@
     <string name="arrays__mute_for_one_day">하루 동안 알림 일시 끄기</string>
     <string name="arrays__mute_for_seven_days">7일 동안 알림 일시 끄기</string>
     <string name="arrays__mute_for_one_year">1년 동안 알림 일시 끄기</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">기본설정</string>
     <string name="arrays__enabled">사용</string>
     <string name="arrays__disabled">사용 안함</string>
@@ -474,6 +478,7 @@
     <string name="conversation_context__menu_copy_text">텍스트 복사</string>
     <string name="conversation_context__menu_delete_message">메시지 삭제</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">메시지 다시 보내기</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -617,7 +622,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -711,4 +717,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml
index f4faddc16..fa4027710 100644
--- a/app/src/main/res/values-lo/strings.xml
+++ b/app/src/main/res/values-lo/strings.xml
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -62,6 +62,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -390,6 +393,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -477,6 +481,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -620,7 +625,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -714,4 +720,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 2f41b8f77..ac09af6cf 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -22,10 +22,10 @@
     </plurals>
     <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Ištrinti visas senas žinutes dabar?</string>
     <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
-        <item quantity="one">Tai nedelsiant apkirps visus pokalbius iki %d naujausios žinutės.</item>
-        <item quantity="few">Tai nedelsiant apkirps visus pokalbius iki %d naujausių žinučių.</item>
-        <item quantity="many">Tai nedelsiant apkirps visus pokalbius iki %d naujausių žinučių.</item>
-        <item quantity="other">Tai nedelsiant apkirps visus pokalbius iki %d naujausių žinučių.</item>
+        <item quantity="one">Tai nedelsiant išvalys visus pokalbius iki %d naujausios žinutės.</item>
+        <item quantity="few">Tai nedelsiant išvalys visus pokalbius iki %d naujausių žinučių.</item>
+        <item quantity="many">Tai nedelsiant išvalys visus pokalbius iki %d naujausių žinučių.</item>
+        <item quantity="other">Tai nedelsiant išvalys visus pokalbius iki %d naujausių žinučių.</item>
     </plurals>
     <string name="ApplicationPreferencesActivity_delete">Ištrinti</string>
     <string name="ApplicationPreferencesActivity_On">Įjungta</string>
@@ -35,7 +35,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(garsas)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vaizdas)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(atsakymas)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nerasta programėlė medijos pasirinkimui.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Norint pridėti nuotraukas, vaizdo įrašus ar garsą, Session reikia saugyklos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Saugyklą“.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Norint pridėti kontaktinę informaciją, Session reikia adresatų leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Adresatus“.</string>
@@ -68,6 +68,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">Narių: %1$d</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Neteisingas gavėjas!</string>
@@ -87,6 +88,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Norėdami siųsti garso žinutes, leiskite Session prieigą prie mikrofono.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Norint siųsti garso žinutes, Session reikia mikrofono leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Norėdami fotografuoti ir filmuoti vaizdo įrašus, leiskite Session prieigą prie kameros.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Norint fotografuoti, Session reikia kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Norint fotografuoti ar filmuoti, Session reikalinga prieiga prie kameros</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -234,6 +236,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Atblokuoti šį adresatą?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Jūs ir vėl galėsite gauti žinutes ir priimti skambučius nuo šio adresato.</string>
     <string name="RecipientPreferenceActivity_unblock">Atblokuoti</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Paveikslas</string>
     <string name="Slide_audio">Garsas</string>
@@ -429,6 +432,7 @@
     <string name="arrays__mute_for_one_day">Nutildyti 1 dienai</string>
     <string name="arrays__mute_for_seven_days">Nutildyti 7 dienoms</string>
     <string name="arrays__mute_for_one_year">Nutildyti 1 metams</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Pagal nustatymų numatymą</string>
     <string name="arrays__enabled">Įjungta</string>
     <string name="arrays__disabled">Išjungta</string>
@@ -454,8 +458,8 @@
         <item quantity="other">%d valandų</item>
     </plurals>
     <!-- preferences.xml -->
-    <string name="preferences__pref_enter_sends_title">Enter (Įvedimo) klavišas išsiunčia</string>
-    <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter (Įvedimo) klavišo paspaudimas išsiųs tekstines žinutes</string>
+    <string name="preferences__pref_enter_sends_title">„Enter“ (Įvedimo) klavišas išsiunčia</string>
+    <string name="preferences__pressing_the_enter_key_will_send_text_messages">„Enter“ (Įvedimo) klavišo paspaudimas išsiųs tekstines žinutes</string>
     <string name="preferences__send_link_previews">Siųsti nuorodų peržiūras</string>
     <string name="preferences__previews_are_supported_for">Peržiūros yra palaikomos Imgur, Instagram, Pinterest, Reddit, ir YouTube nuorodoms</string>
     <string name="preferences__screen_security">Ekrano saugumas</string>
@@ -488,7 +492,7 @@
     <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Automatiškai ištrinti senesnes žinutes, kai pokalbis viršija nurodytą ilgį</string>
     <string name="preferences__delete_old_messages">Ištrinti senas žinutes</string>
     <string name="preferences__conversation_length_limit">Pokalbio ilgio riba</string>
-    <string name="preferences__trim_all_conversations_now">Apkirpti visus pokalbius dabar</string>
+    <string name="preferences__trim_all_conversations_now">Išvalyti visus pokalbius dabar</string>
     <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Peržiūrėti visus pokalbius ir priverstinai taikyti pokalbio ilgio ribas</string>
     <string name="preferences__default">Numatytoji</string>
     <string name="preferences__incognito_keyboard">Inkognito klaviatūra</string>
@@ -499,7 +503,7 @@
     <string name="preferences__request_keyboard_to_disable_personalized_learning">Prašyti klaviatūros išjungti suasmenintą mokymąsi</string>
     <string name="preferences__light_theme">Šviesus</string>
     <string name="preferences__dark_theme">Tamsus</string>
-    <string name="preferences_chats__message_trimming">Žinučių apkirpimas</string>
+    <string name="preferences_chats__message_trimming">Žinučių išvalymas</string>
     <string name="preferences_advanced__use_system_emoji">Naudoti sistemos jaustukus</string>
     <string name="preferences_advanced__disable_signal_built_in_emoji_support">Išjungti Session įtaisytą jaustukų palaikymą</string>
     <string name="preferences_app_protection__app_access">Programėlės prieiga</string>
@@ -519,6 +523,7 @@
     <string name="conversation_context__menu_copy_text">Kopijuoti tekstą</string>
     <string name="conversation_context__menu_delete_message">Ištrinti žinutę</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Iš naujo siųsti žinutę</string>
     <string name="conversation_context__menu_reply_to_message">Atsakyti į žinutę</string>
     <!-- conversation_context_image -->
@@ -574,7 +579,7 @@
     <string name="ProgressPreference_d_messages_so_far">Jau %d žinučių</string>
     <string name="BackupUtil_never">Niekada</string>
     <string name="preferences_app_protection__screen_lock">Ekrano užraktas</string>
-    <string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">Užrakinti prieigą prie Session, naudojant Android ekrano užraktą ar piršto atspaudą</string>
+    <string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">Užrakinti prieigą prie Session, naudojant „Android“ ekrano užraktą ar piršto atspaudą</string>
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">Ekrano užrakto neveiklumui skirtas laikas</string>
     <string name="AppProtectionPreferenceFragment_none">Nėra</string>
     <!-- Conversation activity -->
@@ -662,7 +667,8 @@
     <string name="activity_settings_notifications_button_title">Pranešimai</string>
     <string name="activity_settings_chats_button_title">Pokalbiai</string>
     <string name="activity_settings_devices_button_title">Įrenginiai</string>
-    <string name="activity_settings_invite_button_title">Pakviesti</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Atkūrimo frazė</string>
     <string name="activity_settings_clear_all_data_button_title">Išvalyti duomenis</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -756,4 +762,14 @@
     <string name="activity_conversation_attachment_prep_failed">Nepavyko paruošti priedo išsiuntimui.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 963da0d6c..87342e207 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -33,7 +33,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(skaņa)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(atbilde)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nevar atrast programmu multivides atlasīšanai.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Sesijai ir nepieciešama krātuves atļauja, lai pievienotu fotoattēlus, videoklipus vai audio, bet tā ir pastāvīgi aizliegta. Lūdzu, pārejiet uz programmu iestatījumu izvēlni, atlasiet “Atļaujas” un iespējojiet “Krātuve”.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Sesijai ir nepieciešama atļauja piekļūt Kontaktpersonām, lai pievienotu kotaktpersonu datus, bet tā ir pastāvīgi aizliegta. Lūdzu, pārejiet uz programmu iestatījumu izvēlni, atlasiet “Atļaujas” un iespējojiet “Kontaktpersonas”.</string>
@@ -66,6 +66,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Nederīgs adresāts!</string>
@@ -85,6 +86,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Sesijai ir nepieciešama piekļuve mikrofonam, lai nosūtītu balss ziņas.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Sesijai ir nepieciešama atļauja piekļūt mikrofonam, lai sūtītu balss ziņas, bet tā ir pastāvīgi aizliegta. Lūdzu, ejiet uz programmu iestatījumiem, izvēlieties “Atļaujas” un iespējojiet “Mikrofons”.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Sesijai nepieciešama piekļuve kamerai, lai uzņemtu attēlus un video.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Sesijai ir nepieciešama atļauja piekļūt kamerai, lai uzņemtu attēlus un video, bet tā ir pastāvīgi aizliegta. Lūdzu, ejiet uz programmu iestatījumiem, izvēlieties “Atļaujas” un iespējojiet “Kamera”.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Sesijai nepieciešama piekļuve kamerai, lai uzņemtu attēlus un video.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -222,6 +224,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -416,6 +419,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -505,6 +509,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -648,7 +653,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -742,4 +748,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index f23b2c748..dc14823ae 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(အသံ)</string>
     <string name="DraftDatabase_Draft_video_snippet">(ဗွီဒီယို) </string>
     <string name="DraftDatabase_Draft_quote_snippet">(ပြန်လည်ပေးပို့လာသောစာတို)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">ရုပ်သံကိုဖွင့်ရန်သင့်တော်သည့် app မတွေ့ပါ </string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">အဆက်အသွယ်များ၏ အချက်အလက်များကို ပို့နိုင်ရန် Sessionမှ အဆက်အသွယ်များအား အသုံးပြုခွင့်ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းတွက် ခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ဖိုင်ကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">အဆက်အသွယ်များ၏ အချက်အလက်များကို ပို့နိုင်ရန် Sessionမှ အဆက်အသွယ်များအား အသုံးပြုခွင့်ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းတွက် ခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ အဆက်အသွယ်များကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">လက်ခံမည့်သူမရှိပါ</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">အသံဖိုင်ပို့နိုင်ရန် မိမိမိုက်ခရိုဖုန်းကို Session အား အသုံးပြုခွင့်ပေးပါ။</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">အသံဖိုင်များပို့နိုင်ရန် Sessionမှ မိုက်ခရိုဖုန်းအား အသုံးပြုခွင့်ရရန် လိုအပ်သည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ မိုက်ခရိုဖုန်းကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Session မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးပါ။</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Session မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးထားရန်လိုသည်။  သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Session မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးထားရန်လိုသည်</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">ဤသူကို ဘလော့ဖြည်မလား? </string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">ယင်းသူထံမှ စာတိုများ ၊ ဖုန်းခေါ်ဆိုမှုများ ပြန်လည်လက်ခံနိုင်လိမ့်မည်။ </string>
     <string name="RecipientPreferenceActivity_unblock">ဘလော့ဖြည်ပါ </string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">ပုံ</string>
     <string name="Slide_audio">အသံ</string>
@@ -400,6 +403,7 @@
     <string name="arrays__mute_for_one_day">အသံကို ၁ ရက် ပိတ်ထားပါ</string>
     <string name="arrays__mute_for_seven_days">အသံကို ၇ ရက် ပိတ်ထားပါ။</string>
     <string name="arrays__mute_for_one_year">အသံကို ၁ နှစ် ပိတ်ထားပါ။</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">အပြင်အဆင်များကို မူလသို့</string>
     <string name="arrays__enabled">လုပ်ဆောင်နိုင်သည်</string>
     <string name="arrays__disabled">မလုပ်ဆောင်နိုင်ပါ</string>
@@ -488,6 +492,7 @@
     <string name="conversation_context__menu_copy_text">စာသား ကူးပါ။</string>
     <string name="conversation_context__menu_delete_message">စာတို ဖျက်ရန်</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">စာကို ပြန်ပို့ပါ</string>
     <string name="conversation_context__menu_reply_to_message">စာပြန်ပို့မည်</string>
     <!-- conversation_context_image -->
@@ -631,7 +636,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -725,4 +731,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml
index 62328c1fc..39b0b69bb 100644
--- a/app/src/main/res/values-mn/strings.xml
+++ b/app/src/main/res/values-mn/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,9 +639,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -652,6 +659,9 @@
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
     <string name="dialog_clear_all_data_title">Clear All Data</string>
     <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">QR Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
@@ -722,4 +732,16 @@
     <string name="dialog_download_button_title">Download</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">Media</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index ef4c12b12..fa4027710 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -62,6 +62,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -390,6 +393,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -477,6 +481,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -620,9 +625,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -638,6 +645,9 @@
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
     <string name="dialog_clear_all_data_title">Clear All Data</string>
     <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">QR Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
@@ -708,4 +718,16 @@
     <string name="dialog_download_button_title">Download</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">Media</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 2f4b22ccb..9a44355d9 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(lyd)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(svar)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Fant ingen programmer for valg av medier.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session krever tillatelse fra systemet for å kunne legge til bilder, videoer eller lyd, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Lagring».</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session krever tillatelse fra systemet for å kunne legge til kontaktinformasjon, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kontakter».</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Melding</string>
     <string name="ConversationActivity_compose">Skriv ny</string>
     <string name="ConversationActivity_muted_until_date">Dempet til %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d medlemmer</string>
     <string name="ConversationActivity_open_group_guidelines">Fellesskapets rettningslinjer</string>
     <string name="ConversationActivity_invalid_recipient">Ugyldig mottaker.</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Du må gi Session tilgang til mikrofonen for å kunne sende lydmeldinger.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session krever tillatelse fra systemet for å kunne bruke mikrofonen, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Mikrofon».</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Du må gi Session «Kamera»-tillatelse på systemet for å kunne filme og ta bilder.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session krever tillatelse fra systemet for å kunne ta bilder eller filme, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kamera».</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Du må gi Session «Kamera»-tillatelse på systemet for å kunne filme og ta bilder.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Vil du fjerne blokkering av denne kontakten?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Du åpner i så fall for mottak av meldinger og anrop fra denne kontakten.</string>
     <string name="RecipientPreferenceActivity_unblock">Fjern blokkering</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Bilde</string>
     <string name="Slide_audio">Lyd</string>
@@ -401,6 +404,7 @@ nøkkelutvekslingsmelding.</string>
     <string name="arrays__mute_for_one_day">Demp i 1 dag</string>
     <string name="arrays__mute_for_seven_days">Demp i 7 dager</string>
     <string name="arrays__mute_for_one_year">Demp i 1 år</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Standardoppsett</string>
     <string name="arrays__enabled">Slått på</string>
     <string name="arrays__disabled">Slått av</string>
@@ -489,6 +493,7 @@ nøkkelutvekslingsmelding.</string>
     <string name="conversation_context__menu_copy_text">Kopier tekst</string>
     <string name="conversation_context__menu_delete_message">Slett melding</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Send melding på nytt</string>
     <string name="conversation_context__menu_reply_to_message">Svar på melding</string>
     <!-- conversation_context_image -->
@@ -632,7 +637,8 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_settings_notifications_button_title">Varsler</string>
     <string name="activity_settings_chats_button_title">Samtaler</string>
     <string name="activity_settings_devices_button_title">Enheter</string>
-    <string name="activity_settings_invite_button_title">Inviter</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Gjenopprettingsfrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e725b578a..c9150a798 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(geluid)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reactie)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Geen app gevonden om media te selecteren.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session heeft toegang nodig tot de externe opslagruimte om foto\'s, video\'s of audio te kunnen verzenden, maar deze toestemming is permanent geweigerd. Ga naar de instellingen, selecteer \"Toestemmingen\" en schakel \"Opslagruimte\" in.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal heeft toegang nodig tot de contacten om contactinformatie in Session weer te geven, maar deze toestemming is pertinent geweigerd. Ga naar de instellingen, selecteer ‘Toestemmingen’ en schakel ‘Contacten’ in.</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Bericht</string>
     <string name="ConversationActivity_compose">Opstellen</string>
     <string name="ConversationActivity_muted_until_date">Gedempt tot %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d leden</string>
     <string name="ConversationActivity_open_group_guidelines">Community Richtlijnen</string>
     <string name="ConversationActivity_invalid_recipient">Ongeldige ontvanger!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Om audioberichten op te nemen, moet je Session toegang geven tot je microfoon.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session heeft toegang nodig tot de microfoon om audioberichten te kunnen opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, selecteer ‘Machtigingen’ en schakel ‘Microfoon’ in.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Geef Session toegang tot de camera om foto\'s en video\'s te maken.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session heeft toegang nodig tot de camera om foto’s en video’s te kunnen opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, selecteer ‘Machtigingen’ en schakel ‘Camera’ in.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session heeft toegang tot de camera nodig om foto’s en video’s te kunnen opnemen</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Gesprekspartner deblokkeren?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Je zult weer berichten en oproepen van deze gesprekspartner kunnen ontvangen.</string>
     <string name="RecipientPreferenceActivity_unblock">Deblokkeren</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Afbeelding</string>
     <string name="Slide_audio">Geluid</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Demp voor 1 dag</string>
     <string name="arrays__mute_for_seven_days">Demp voor 7 dagen</string>
     <string name="arrays__mute_for_one_year">Demp voor 1 jaar</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Gebruik systeem-standaard</string>
     <string name="arrays__enabled">Ingeschakeld</string>
     <string name="arrays__disabled">Uitgeschakeld</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Tekst kopiëren</string>
     <string name="conversation_context__menu_delete_message">Bericht wissen</string>
     <string name="conversation_context__menu_ban_user">Verban gebruiker</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Bericht opnieuw verzenden</string>
     <string name="conversation_context__menu_reply_to_message">Reageren</string>
     <!-- conversation_context_image -->
@@ -634,7 +639,8 @@
     <string name="activity_settings_notifications_button_title">Meldingen</string>
     <string name="activity_settings_chats_button_title">Gesprekken</string>
     <string name="activity_settings_devices_button_title">Apparaten</string>
-    <string name="activity_settings_invite_button_title">Uitnodigen</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Herstel zin</string>
     <string name="activity_settings_clear_all_data_button_title">Gegevens wissen</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -728,4 +734,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 1936170fd..741710e0b 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(lyd)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(svar)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Fann ingen program for valt medium.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session treng tilgang til lagring for å legga ved bilete, film eller lydklipp, men tilgangen er permanent avslått. Opna app-innstillingsmenyen og vel «Tilgang» – eventuelt «Tillatelser» – og skru på «Lagring».</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session treng tilgang til kontaktar for å legga til kontaktinformasjon som vedlegg, men tilgangen er permanent avslått. Opna app-innstillingsmenyen og vel «Tilgang» – eventuelt «Tillatelser» – og skru på «Kontaktar».</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Ugyldig mottakar.</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">La Session få tilgang til mikrofonen for å senda lydmeldingar.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session treng tilgang til mikrofonen for å senda lydklipp, men tilgangen er permanent avslått. Opna app-innstillingsmenyen og vel «Tilgang» – eventuelt «Tillatelser» – og skru på «Mikrofon».</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Gi Session tilgang til kameraet for å ta bilete eller videoopptak.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session treng tilgang til kameraet for å ta bilete eller videoar, men tilgangen er permanent avslått. Opna app-innstillingsmenyen og vel «Tilgang» – eventuelt «Tillatelser» – og skru på «Kamera».</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session treng tilgang til kameraet for å ta bilete eller videoopptak</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Vil du fjerna blokkering av denne kontakten?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Du opnar i så fall for mottak av meldingar og anrop frå denne kontakten.</string>
     <string name="RecipientPreferenceActivity_unblock">Fjern blokkering</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Bilete</string>
     <string name="Slide_audio">Lyd</string>
@@ -401,6 +404,7 @@ nøkkelutvekslingsmelding.</string>
     <string name="arrays__mute_for_one_day">Demp i 1 dag</string>
     <string name="arrays__mute_for_seven_days">Demp i 7 dagar</string>
     <string name="arrays__mute_for_one_year">Demp i 1 år</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Standardoppsett</string>
     <string name="arrays__enabled">Slått på</string>
     <string name="arrays__disabled">Slått av</string>
@@ -489,6 +493,7 @@ nøkkelutvekslingsmelding.</string>
     <string name="conversation_context__menu_copy_text">Kopier tekst</string>
     <string name="conversation_context__menu_delete_message">Slett melding</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Send melding på nytt</string>
     <string name="conversation_context__menu_reply_to_message">Svar på meldinga</string>
     <!-- conversation_context_image -->
@@ -632,7 +637,8 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 62328c1fc..39b0b69bb 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,9 +639,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -652,6 +659,9 @@
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
     <string name="dialog_clear_all_data_title">Clear All Data</string>
     <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">QR Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
@@ -722,4 +732,16 @@
     <string name="dialog_download_button_title">Download</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">Media</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ny/strings.xml b/app/src/main/res/values-ny/strings.xml
index f13e1f164..82a99c325 100644
--- a/app/src/main/res/values-ny/strings.xml
+++ b/app/src/main/res/values-ny/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(uyariy)</string>
     <string name="DraftDatabase_Draft_video_snippet">(shuyukuyurik)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(kutichina)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Kayta rikuchinkapakka mana aplicacionta taririnchu.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session ari nichun munanmi shuyuman, uyayman, shuyukuyurikmanpash yaykunkapak, shinapash mana arinirishkachu.  \"Menú de configuración\" ukuman yaykushpa \"Permisos\" nikukta llapipay, \"Almacenamiento\" paskarichun.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session ari nichun munanmi kikinpa yupaymashikunapaman yaykunkapak, shinapash mana arinirishkachu. \"Menú de configuración\" ukuman yaykushpa \"Permisos\" nikukta llapipay, \"Contactos\" paskarichun.</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">¡Yupaymashi wakllimi kan!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Chaski uyayta kachankapak Session ukuta rimachikman yaykuchun saki.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session ari nichun munanmi kikinpa Rimachikman yaykunkapak, shinapash mana arinirishkachu. \"Menú de configuración\" ukuman yaykushpa \"Permisos\" nikukta llapipay, \"Micrófono\" paskarichun.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Shuyuta, shinallata shuyukuyurikta hapinkapakka, shuyullukchikman Sessionta yaykuchun sakipay.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session ari nichun munanmi kikinpa shuyullukchikman yaykunkapak, shuyukunata, shuyukuyurikkunatapash llukchinkapak, shinapash mana arinirishkachu. \"Menú de configuración\" ukuman yaykushpa \"Permisos\" nikukta llapipay, \"Cámara\" paskarichun.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session ari nichun munanmi shuyullukchikman yaykunkapak, shuyuta shinallata shuyukurikta llukchinkapak.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Kay yupaymashita pakashkamanta llukchinayanchu.</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Kutinllami kay yupaymashipa killkashkata, kayachikunatapash chaskita ushakrinki.</string>
     <string name="RecipientPreferenceActivity_unblock">Pakashkamanta llukchi</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Shuyu</string>
     <string name="Slide_audio">Uyariy</string>
@@ -401,6 +404,7 @@ ranti pakalla yupaykunamanta</string>
     <string name="arrays__mute_for_one_day">1 punchata upallayachina</string>
     <string name="arrays__mute_for_seven_days">7 punchata upallayachina</string>
     <string name="arrays__mute_for_one_year">1 watata upallayachina</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Ña charishka configuración</string>
     <string name="arrays__enabled">Paskashka</string>
     <string name="arrays__disabled">Mana paskashka</string>
@@ -489,6 +493,7 @@ ranti pakalla yupaykunamanta</string>
     <string name="conversation_context__menu_copy_text">Shinashina kilkashkata yallichina</string>
     <string name="conversation_context__menu_delete_message">Chaskita pichana</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Chaskita kutin kachana</string>
     <string name="conversation_context__menu_reply_to_message">Chaskita kutichina</string>
     <!-- conversation_context_image -->
@@ -632,7 +637,8 @@ ranti pakalla yupaykunamanta</string>
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@ ranti pakalla yupaykunamanta</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index 62328c1fc..39b0b69bb 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,9 +639,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -652,6 +659,9 @@
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
     <string name="dialog_clear_all_data_title">Clear All Data</string>
     <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">QR Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
@@ -722,4 +732,16 @@
     <string name="dialog_download_button_title">Download</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">Media</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 2bb026d27..f394320a8 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -35,7 +35,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(dźwięk)</string>
     <string name="DraftDatabase_Draft_video_snippet">(wideo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(odpowiedź)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nie można znaleźć aplikacji, aby otworzyć tę zawartość.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session wymaga pozwolenia na przechowywanie w celu dołączania zdjęć, filmów lub dźwięków, ale zostało one na stałe odrzucone. Przejdź do menu ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Przechowywanie\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session wymaga pozwolenia na dostęp do kontaktów w celu dołączenia informacji o kontaktach, ale zostało one na stałe odrzucone. Przejdź do menu ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Kontakty\".</string>
@@ -68,6 +68,7 @@
     <string name="ConversationActivity_message">Wiadomość</string>
     <string name="ConversationActivity_compose">Napisz</string>
     <string name="ConversationActivity_muted_until_date">Wyciszono do %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d członków</string>
     <string name="ConversationActivity_open_group_guidelines">Wskazówki społeczności</string>
     <string name="ConversationActivity_invalid_recipient">Nieprawidłowy adresat!</string>
@@ -87,6 +88,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Aby wysyłać wiadomości głosowe, zezwól Session na dostęp do mikrofonu.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session wymaga pozwolenia na dostęp do mikrofonu w celu umożliwienia wysyłania wiadomości głosowych, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Mikrofon\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Aby móc robić zdjęcia i nagrywać wideo, zezwól Session na dostęp do aparatu.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session potrzebuje dostępu do pamięci aby wysyłać zdjęcia i filmy.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session wymaga pozwolenia na dostęp do aparatu w celu umożliwienia robienia zdjęć i nagrywania filmów, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session wymaga pozwolenia na dostęp do aparatu w celu umożliwienia robienia zdjęć i nagrywania filmów</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -234,6 +236,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Odblokować ten kontakt?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Będziesz mógł(a) znowu odbierać wiadomości i połączenia od tego kontaktu.</string>
     <string name="RecipientPreferenceActivity_unblock">Odblokuj</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Obraz</string>
     <string name="Slide_audio">Dźwięk</string>
@@ -426,6 +429,7 @@
     <string name="arrays__mute_for_one_day">Wycisz na 1 dzień</string>
     <string name="arrays__mute_for_seven_days">Wycisz na 7 dni</string>
     <string name="arrays__mute_for_one_year">Wycisz na 1 rok</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Ustawienia domyślne</string>
     <string name="arrays__enabled">Włączone</string>
     <string name="arrays__disabled">Wyłączone</string>
@@ -516,6 +520,7 @@
     <string name="conversation_context__menu_copy_text">Kopiuj tekst</string>
     <string name="conversation_context__menu_delete_message">Usuń wiadomość</string>
     <string name="conversation_context__menu_ban_user">Zablokuj użytkownika</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Zbanuj i usuń wszystko</string>
     <string name="conversation_context__menu_resend_message">Wyślij ponownie wiadomość</string>
     <string name="conversation_context__menu_reply_to_message">Odpowiedz na wiadomość</string>
     <!-- conversation_context_image -->
@@ -627,7 +632,7 @@
     <string name="activity_path_service_node_row_title">Węzeł serwisowy</string>
     <string name="activity_path_destination_row_title">Miejsce docelowe</string>
     <string name="activity_path_learn_more_button_title">Dowiedz się więcej</string>
-    <string name="activity_path_resolving_progress">Resolving…</string>
+    <string name="activity_path_resolving_progress">Ładowanie…</string>
     <string name="activity_create_private_chat_title">Nowa sesja</string>
     <string name="activity_create_private_chat_enter_session_id_tab_title">Wpisz identyfikator Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skanowania QR code</string>
@@ -659,7 +664,8 @@
     <string name="activity_settings_notifications_button_title">Powiadomienia</string>
     <string name="activity_settings_chats_button_title">Czaty</string>
     <string name="activity_settings_devices_button_title">Urządzenia</string>
-    <string name="activity_settings_invite_button_title">Zaproś</string>
+    <string name="activity_settings_invite_button_title">Zaproś znajomego</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Fraza odzyskiwania</string>
     <string name="activity_settings_clear_all_data_button_title">Wyczyść dane</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Wyczyść dane łącznie z siecią</string>
@@ -753,4 +759,14 @@
     <string name="activity_conversation_attachment_prep_failed">Nie udało się przygotować załącznika do wysłania.</string>
     <string name="media">Multimedia</string>
     <string name="UntrustedAttachmentView_download_attachment">Kliknij by pobrać %s</string>
+    <string name="message_details_header__error">Błąd</string>
+    <string name="dialog_send_seed_title">Uwaga</string>
+    <string name="dialog_send_seed_explanation">To jest Twoja fraza odzyskiwania. Jeśli wyślesz ją do kogoś, będzie miał pełny dostęp do Twojego konta.</string>
+    <string name="dialog_send_seed_send_button_title">Wyślij</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 62328c1fc..39b0b69bb 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,9 +639,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -652,6 +659,9 @@
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
     <string name="dialog_clear_all_data_title">Clear All Data</string>
     <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">QR Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
@@ -722,4 +732,16 @@
     <string name="dialog_download_button_title">Download</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">Media</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index aee30ab20..20cb2cc3c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -3,9 +3,9 @@
     <string name="app_name">Session</string>
     <string name="yes">Sim</string>
     <string name="no">Não</string>
-    <string name="delete">Deletar</string>
-    <string name="ban">Ban</string>
-    <string name="please_wait">Por favor espere...</string>
+    <string name="delete">Excluir</string>
+    <string name="ban">Banir</string>
+    <string name="please_wait">Por favor, aguarde...</string>
     <string name="save">Salvar</string>
     <string name="note_to_self">Nota para Si</string>
     <string name="version_s">Versão %s</string>
@@ -20,8 +20,8 @@
     </plurals>
     <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Deletar todas as mensagens antigas agora?</string>
     <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
-        <item quantity="one">Isto vai imediatamente aparar todas as conversas para a mensagem mais recente.</item>
-        <item quantity="other">Isto vai imediatamente aparar todas as conversas para as %d mensagens mais recentes.</item>
+        <item quantity="one">Isto irá imediatamente reduzir todas as conversas para a mensagem mais recente.</item>
+        <item quantity="other">Isto irá imediatamente reduzir todas as conversas para as %d mensagens mais recentes.</item>
     </plurals>
     <string name="ApplicationPreferencesActivity_delete">Deletar</string>
     <string name="ApplicationPreferencesActivity_On">Ligado</string>
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(áudio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vídeo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(resposta)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Não foi possível encontrar um app para selecionar mídia.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requer a permissão Memória a fim de anexar fotos, vídeos, ou áudios, mas ela foi permanentemente negada. Por favor continue para o menu de configurações do app, selecione \"Permissões\", e habilite \"Memória\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requer permissão Contatos a fim de anexar informação de contato, mas ela foi permanentemente negada. Por favor continue para o menu de configurações do app, selecione \"Permissões\", e habilite \"Contatos\".</string>
@@ -54,18 +54,19 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Falha no envio, toque para fallback inseguro</string>
     <string name="ConversationItem_unable_to_open_media">Não é possível encontrar um app para abrir esta mídia.</string>
     <string name="ConversationItem_copied_text">Copiou %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">Leia mais</string>
     <string name="ConversationItem_download_more">&#160; Fazer Download de Mais</string>
     <string name="ConversationItem_pending">&#160; Pendendo</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">Adicionar anexo</string>
     <string name="ConversationActivity_select_contact_info">Selecionar info de contato</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Desculpe, houve um erro definindo seu anexo.</string>
-    <string name="ConversationActivity_message">Message</string>
-    <string name="ConversationActivity_compose">Compose</string>
-    <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
-    <string name="ConversationActivity_member_count">%1$d members</string>
-    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_message">Mensagem</string>
+    <string name="ConversationActivity_compose">Compor</string>
+    <string name="ConversationActivity_muted_until_date">Silenciado até %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">%1$d membros</string>
+    <string name="ConversationActivity_open_group_guidelines">Diretrizes da Comunidade</string>
     <string name="ConversationActivity_invalid_recipient">Recipiente inválida(o)!</string>
     <string name="ConversationActivity_added_to_home_screen">Adicionada à tela inicial</string>
     <string name="ConversationActivity_leave_group">Sair do grupo?</string>
@@ -77,12 +78,13 @@
     <string name="ConversationActivity_attachment_exceeds_size_limits">Anexo excede limites de tamanho para o tipo de mensagem que você está enviando.</string>
     <string name="ConversationActivity_unable_to_record_audio">Incapaz de gravar áudio!</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Não tem nenhum app disponível para lidar com este link em seu dispositivo.</string>
-    <string name="ConversationActivity_invite_to_open_group">Add members</string>
-    <string name="ConversationActivity_join_open_group">Join %s</string>
+    <string name="ConversationActivity_invite_to_open_group">Adicionar membros</string>
+    <string name="ConversationActivity_join_open_group">Junte-se a %s</string>
     <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session precisa de acesso ao microfone para enviar mensagens de áudio.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session precisa de acesso ao microfone para enviar mensagens de áudio, mas ele foi permanentemente negado. Por favor continue para configurações de app, selecione \"Permissões\", e habilite \"Microfone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session precisa de acesso à câmera para tirar fotos e vídeos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session precisa de acesso à câmera para tirar fotos e vídeos, mas ela foi permanentemente negada. Por favor continue para configurações de app, selecione \"Permissões\", e habilite \"Câmera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session precisa de acesso à câmera para tirar fotos ou vídeos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -102,7 +104,7 @@
         <item quantity="one">Isto vai permanentemente deletar a mensagem selecionada.</item>
         <item quantity="other">Isto vai permanentemente deletar todas as %1$d mensagens selecionadas.</item>
     </plurals>
-    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_ban_selected_user">Banir este usuário?</string>
     <string name="ConversationFragment_save_to_sd_card">Salvar em armazenamento?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="one">Salvar esta mídia em armazenamento vai permitir que quaisquer outros apps em seu dispositivo a acessem.\n\nContinuar?</item>
@@ -126,8 +128,8 @@
     <string name="ConversationFragment_sms">SMS</string>
     <string name="ConversationFragment_deleting">Deletando</string>
     <string name="ConversationFragment_deleting_messages">Deletando mensagens...</string>
-    <string name="ConversationFragment_banning">Banning</string>
-    <string name="ConversationFragment_banning_user">Banning user…</string>
+    <string name="ConversationFragment_banning">Banindo</string>
+    <string name="ConversationFragment_banning_user">Banindo usuário…</string>
     <string name="ConversationFragment_quoted_message_not_found">Mensagem original não encontrada</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">Mensagem original não mais disponível</string>
     <!-- ConversationListItem -->
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Desbloquear este contato?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Você poderá novamente receber mensagens e chamadas deste contato.</string>
     <string name="RecipientPreferenceActivity_unblock">Desbloquear</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Imagem</string>
     <string name="Slide_audio">Áudio</string>
@@ -236,13 +239,13 @@
     <string name="ThreadRecord_s_is_on_signal">%s está em Session!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Mensagens desaparecendo desabilitadas</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">Tempo de mensagem desaparecendo definido para %s</string>
-    <string name="ThreadRecord_s_took_a_screenshot">%s took a screenshot.</string>
-    <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
+    <string name="ThreadRecord_s_took_a_screenshot">%s fez uma captura de tela.</string>
+    <string name="ThreadRecord_media_saved_by_s">Mídia salva por %s.</string>
     <string name="ThreadRecord_safety_number_changed">Número de segurança mudado</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">Seu número de segurança com %s mudou.</string>
     <string name="ThreadRecord_you_marked_verified">Você marcou verificado</string>
     <string name="ThreadRecord_you_marked_unverified">Você marcou não-verificado</string>
-    <string name="ThreadRecord_empty_message">This conversation is empty</string>
+    <string name="ThreadRecord_empty_message">Esta conversa está vazia</string>
     <string name="ThreadRecord_open_group_invitation">Open group invitation</string>
     <!-- UpdateApkReadyListener -->
     <string name="UpdateApkReadyListener_Signal_update">Atualização de Session</string>
@@ -356,11 +359,11 @@
     <string name="audio_view__pause_accessibility_description">Pausar</string>
     <string name="audio_view__download_accessibility_description">Baixar</string>
     <!-- open_group_invitation_view -->
-    <string name="open_group_invitation_view__join_accessibility_description">Join</string>
+    <string name="open_group_invitation_view__join_accessibility_description">Juntar-se</string>
     <string name="open_group_invitation_view__open_group_invitation">Open group invitation</string>
-    <string name="open_group_guidelines_pinned_message">Pinned message</string>
-    <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
-    <string name="open_group_guidelines_read">Read</string>
+    <string name="open_group_guidelines_pinned_message">Mensagem fixada</string>
+    <string name="open_group_guidelines_community_guidelines">Diretrizes da comunidade</string>
+    <string name="open_group_guidelines_read">Ler</string>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Áudio</string>
     <string name="QuoteView_video">Vídeo</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mutar por 1 dia</string>
     <string name="arrays__mute_for_seven_days">Mutar por 7 dias</string>
     <string name="arrays__mute_for_one_year">Mutar por 1 ano</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Default de configurações</string>
     <string name="arrays__enabled">Habilitado</string>
     <string name="arrays__disabled">Desabilitado</string>
@@ -490,7 +494,8 @@
     <string name="conversation_context__menu_message_details">Detalhes de mensagem</string>
     <string name="conversation_context__menu_copy_text">Copiar texto</string>
     <string name="conversation_context__menu_delete_message">Deletar mensagem</string>
-    <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_user">Banir usuário</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Banir e excluír tudo</string>
     <string name="conversation_context__menu_resend_message">Reenviar mensagem</string>
     <string name="conversation_context__menu_reply_to_message">Responder a mensagem</string>
     <!-- conversation_context_image -->
@@ -550,7 +555,7 @@
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">Tempo de espera para bloquear tela</string>
     <string name="AppProtectionPreferenceFragment_none">Nenhuma</string>
     <!-- Conversation activity -->
-    <string name="activity_conversation_copy_public_key_button_title">Copy public key</string>
+    <string name="activity_conversation_copy_public_key_button_title">Copiar chave pública</string>
     <!-- Session -->
     <string name="continue_2">Continuar</string>
     <string name="copy">Copiar</string>
@@ -591,7 +596,7 @@
     <string name="activity_seed_title_2">Revele sua frase de recuperação</string>
     <string name="activity_seed_explanation">Sua frase de recuperação é a chave mestra do seu ID Session - você pode usá-la para restaurar seu ID Session se perder o acesso ao seu dispositivo. Armazene sua frase de recuperação em um local seguro e não a entregue a ninguém.</string>
     <string name="activity_seed_reveal_button_title">Segure para revelar</string>
-    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
+    <string name="view_seed_reminder_title">Você está quase terminando! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Proteja sua conta salvando sua frase de recuperação</string>
     <string name="view_seed_reminder_subtitle_2">Toque e segure as palavras editadas para revelar sua frase de recuperação e armazene-a com segurança para proteger seu ID Session.</string>
     <string name="view_seed_reminder_subtitle_3">Guarde sua frase de recuperação em um local seguro</string>
@@ -607,9 +612,9 @@
     <string name="activity_create_private_chat_enter_session_id_tab_title">Digite o ID Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Escaneie o código QR de um usuário para iniciar uma sessão. Os códigos QR podem ser encontrados tocando no ícone de código QR nas configurações da conta.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Insira um ID Session ou nome ONS</string>
     <string name="fragment_enter_public_key_explanation">Os usuários podem compartilhar seus IDs Session acessando as configurações da conta e tocando em Compartilhar ID Session, ou compartilhando o código QR.</string>
-    <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
+    <string name="fragment_enter_public_key_error_message">Por favor, verifique o ID Session ou o nome ONS e tente novamente.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">O Session precisa de acesso à câmera para escanear códigos QR</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Conceder acesso à câmera</string>
     <string name="activity_create_closed_group_title">Novo grupo fechado</string>
@@ -619,7 +624,7 @@
     <string name="activity_create_closed_group_group_name_missing_error">Digite um nome de grupo</string>
     <string name="activity_create_closed_group_group_name_too_long_error">Digite um nome de grupo mais curto</string>
     <string name="activity_create_closed_group_not_enough_group_members_error">Por favor, escolha pelo menos 1 membro para o grupo</string>
-    <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 100 members</string>
+    <string name="activity_create_closed_group_too_many_group_members_error">Um grupo fechado não pode ter mais de 100 membros</string>
     <string name="activity_join_public_chat_title">Juntar-se a Grupo Aberto</string>
     <string name="activity_join_public_chat_error">Não foi possível juntar-se a grupo</string>
     <string name="activity_join_public_chat_enter_group_url_tab_title">URL de Grupo Aberto</string>
@@ -634,41 +639,42 @@
     <string name="activity_settings_notifications_button_title">Notificações</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Dispositivos</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Convide um amigo</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Frase de Recuperação</string>
     <string name="activity_settings_clear_all_data_button_title">Limpar Dados</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
-    <string name="activity_settings_help_translate_session">Help us Translate Session</string>
+    <string name="activity_settings_help_translate_session">Ajude-nos a traduzir o Session</string>
     <string name="activity_notification_settings_title">Notificações</string>
     <string name="activity_notification_settings_style_section_title">Estilo de Notificação</string>
     <string name="activity_notification_settings_content_section_title">Conteúdo de Notificação</string>
     <string name="activity_privacy_settings_title">Privacidade</string>
     <string name="activity_chat_settings_title">Chats</string>
     <string name="preferences_notifications_strategy_category_title">Estratégia de Notificação</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_title">Usar Modo Rápido</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">Você será notificado de forma confiável e imediata sobre novas mensagens usando os servidores de notificação da Google.</string>
     <string name="fragment_device_list_bottom_sheet_change_name_button_title">Mudar nome</string>
     <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Deslinkar dispositivo</string>
     <string name="dialog_seed_title">Sua Frase de Recuperação</string>
     <string name="dialog_seed_explanation">Esta é sua frase de recuperação. Com ela, você pode restaurar ou migrar sua Session ID para um novo dispositivo.</string>
     <string name="dialog_clear_all_data_title">Limpar Todos os Dados</string>
     <string name="dialog_clear_all_data_explanation">Isso excluirá permanentemente suas mensagens, sessões e contatos.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="dialog_clear_all_data_network_explanation">Você gostaria de limpar apenas este dispositivo, ou excluir toda sua conta?</string>
+    <string name="dialog_clear_all_data_local_only">Excluir apenas</string>
+    <string name="dialog_clear_all_data_clear_network">Toda a conta</string>
     <string name="activity_qr_code_title">Código QR</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">Ver meu código QR</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="activity_qr_code_view_scan_qr_code_explanation">Escaneie o código QR de alguém para iniciar uma conversa com essa pessoa</string>
-    <string name="fragment_view_my_qr_code_title">Scan Me</string>
+    <string name="fragment_view_my_qr_code_title">Me escaneie</string>
     <string name="fragment_view_my_qr_code_explanation">Este é o seu código QR. Outros usuários podem escaneá-lo para iniciar uma sessão com você.</string>
     <string name="fragment_view_my_qr_code_share_title">Compartilhar QR Code</string>
     <string name="fragment_contact_selection_contacts_title">Contatos</string>
     <string name="fragment_contact_selection_closed_groups_title">Grupos Fechados</string>
     <string name="fragment_contact_selection_open_groups_title">Grupos Abertos</string>
-    <string name="fragment_contact_selection_empty_contacts">You don\'t have any contacts yet</string>
+    <string name="fragment_contact_selection_empty_contacts">Você ainda não possui contatos</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Apply</string>
+    <string name="menu_apply_button">Aplicar</string>
     <string name="menu_done_button">Concluído</string>
     <string name="activity_edit_closed_group_title">Editar Grupo</string>
     <string name="activity_edit_closed_group_edit_text_hint">Insira um novo nome para o grupo</string>
@@ -689,43 +695,53 @@
     <string name="attachment_type_voice_message">Mensagem de Voz</string>
     <string name="details">Detalhes</string>
     <string name="dialog_backup_activation_failed">Falha em ativar backups. Por favor tente de novo ou contate suporte.</string>
-    <string name="activity_backup_restore_title">Restore backup</string>
+    <string name="activity_backup_restore_title">Restaurar backup</string>
     <string name="activity_backup_restore_select_file">Select a file</string>
     <string name="activity_backup_restore_explanation_1">Select a backup file and enter the passphrase it was created with.</string>
-    <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
+    <string name="activity_backup_restore_passphrase">Senha de 30 dígitos</string>
     <string name="activity_link_device_skip_prompt">This is taking a while, would you like to skip?</string>
-    <string name="activity_link_device_link_device">Link a Device</string>
-    <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
-    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
+    <string name="activity_link_device_link_device">Vincular um Dispositivo</string>
+    <string name="activity_link_device_recovery_phrase">Frase de Recuperação</string>
+    <string name="activity_link_device_scan_qr_code">Ler Código QR</string>
     <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
-    <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
-    <string name="activity_pn_mode_message_notifications">Message Notifications</string>
-    <string name="activity_pn_mode_explanation">There are two ways Session can notify you of new messages.</string>
-    <string name="activity_pn_mode_fast_mode">Fast Mode</string>
-    <string name="activity_pn_mode_slow_mode">Slow Mode</string>
-    <string name="activity_pn_mode_fast_mode_explanation">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
-    <string name="activity_pn_mode_slow_mode_explanation">Session will occasionally check for new messages in the background.</string>
-    <string name="fragment_recovery_phrase_title">Recovery Phrase</string>
-    <string name="activity_prompt_passphrase_session_locked">Session is Locked</string>
-    <string name="activity_prompt_passphrase_tap_to_unlock">Tap to Unlock</string>
-    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Enter a nickname</string>
-    <string name="invalid_public_key">Invalid public key</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
+    <string name="activity_join_public_chat_join_rooms">Ou junte-se a um desses…</string>
+    <string name="activity_pn_mode_message_notifications">Notificações Push</string>
+    <string name="activity_pn_mode_explanation">Existem duas maneiras que o Session poder notificar você sobre novas mensagens.</string>
+    <string name="activity_pn_mode_fast_mode">Modo Rápido</string>
+    <string name="activity_pn_mode_slow_mode">Modo Lento</string>
+    <string name="activity_pn_mode_fast_mode_explanation">Você será notificado de forma confiável e imediata sobre novas mensagens usando os servidores de notificação da Google.</string>
+    <string name="activity_pn_mode_slow_mode_explanation">O session verificará ocasionalmente por novas mensagens em segundo plano.</string>
+    <string name="fragment_recovery_phrase_title">Frase de Recuperação</string>
+    <string name="activity_prompt_passphrase_session_locked">Session está Trancado</string>
+    <string name="activity_prompt_passphrase_tap_to_unlock">Toque para destrancar</string>
+    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Digite um apelido</string>
+    <string name="invalid_public_key">Chave pública inválida</string>
+    <string name="document">Documento</string>
+    <string name="dialog_blocked_title">Desbloquear %s?</string>
+    <string name="dialog_blocked_explanation">Você tem certeza que deseja desbloquear %s?</string>
+    <string name="dialog_join_open_group_title">Juntar-se a %s?</string>
+    <string name="dialog_join_open_group_explanation">Tem certeza que deseja se juntar ao grupo aberto %s?</string>
+    <string name="dialog_open_url_title">Abrir URL?</string>
+    <string name="dialog_open_url_explanation">Você tem certeza que deseja abrir %s?</string>
+    <string name="open">Abrir</string>
+    <string name="dialog_link_preview_title">Ativar pré-visualizações de link?</string>
     <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="dialog_link_preview_enable_button_title">Ativar</string>
+    <string name="dialog_download_title">Confiar em %s?</string>
+    <string name="dialog_download_explanation">Você tem certeza que deseja baixar a mídia enviada por %s?</string>
+    <string name="dialog_download_button_title">Baixar</string>
+    <string name="activity_conversation_blocked_banner_text">%s está bloqueado. Desbloqueiá-los?</string>
+    <string name="activity_conversation_attachment_prep_failed">Falha ao preparar o anexo para envio.</string>
+    <string name="media">Mídia</string>
+    <string name="UntrustedAttachmentView_download_attachment">Toque para baixar %s</string>
+    <string name="message_details_header__error">Erro</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8ec12028a..60805bdf1 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(áudio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vídeo)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(responder)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Não foi possível encontrar uma aplicação para selecionar a multimédia.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">O Session requer permissão de acesso ao armazenamento de forma a poder anexar fotos, vídeo e áudio, mas esta foi negada permanentemente. Por favor, aceda ao menu de definições da aplicação, seleccione \"Permissões\" e ative \"Armazenamento\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">O Session requer permissão de acesso aos contactos para anexar os dados do contacto, mas esta foi negada permanentemente. Por favor, aceda às definições da aplicação, seleccione \"Permissões\" e ative \"Contactos\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Destinatário inválido!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Para enviar mensagens áudio, dê permissões ao Session para acesso ao microfone.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">O Session requer permissão de acesso ao microfone para enviar mensagens áudio, mas esta foi negada permanentemente. Por favor, aceda às definições da aplicação, selecione \"Permissões\" e ative \"Microfone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para tirar fotos e filmar vídeos, dê permissões ao Session para acesso à câmara.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">O Session requer permissão de acesso à câmara para tirar fotos ou vídeo, mas esta foi negada permanentemente. Por favor, aceda às definições da aplicação, seleccione \"Permissões\" e ative \"Câmara\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">O Session requer permissão de acesso à Câmara para tirar fotos ou vídeo</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Desbloquear este contacto?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Voltará a ser possível receber mensagens e chamadas a partir deste contacto.</string>
     <string name="RecipientPreferenceActivity_unblock">Desbloquear</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Imagem</string>
     <string name="Slide_audio">Áudio</string>
@@ -401,6 +404,7 @@ foi recebida está corrompida!</string>
     <string name="arrays__mute_for_one_day">Silenciar por 1 dia</string>
     <string name="arrays__mute_for_seven_days">Silenciar por 7 dias</string>
     <string name="arrays__mute_for_one_year">Silenciar por 1 ano</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Definições padrão</string>
     <string name="arrays__enabled">Ativada</string>
     <string name="arrays__disabled">Desativada</string>
@@ -489,6 +493,7 @@ foi recebida está corrompida!</string>
     <string name="conversation_context__menu_copy_text">Copiar texto</string>
     <string name="conversation_context__menu_delete_message">Eliminar mensagem</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Reenviar mensagem</string>
     <string name="conversation_context__menu_reply_to_message">Responder à mensagem</string>
     <!-- conversation_context_image -->
@@ -632,7 +637,8 @@ foi recebida está corrompida!</string>
     <string name="activity_settings_notifications_button_title">Notificações</string>
     <string name="activity_settings_chats_button_title">Bate-papos</string>
     <string name="activity_settings_devices_button_title">Dispositivos</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Frase de recuperação</string>
     <string name="activity_settings_clear_all_data_button_title">Apagar os dados</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@ foi recebida está corrompida!</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index c0c1db2a4..68bfacd6d 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -33,7 +33,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(răspuns)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nu pot găsi o aplicație pentru selecție media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session are nevoie de permisiunea pentru spațiul de stocare pentru a putea atașa poze, filme sau audio, dar i-a fost refuzat accesul permanent. Vă rog navigați în meniul de setări al aplicației, selectați \"Permisiuni\" și activați \"Spațiu de stocare\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session are nevoie de permisiunea pentru Contacte pentru a putea atașa informații despre contacte dar i-a fost refuzat accesul permanent. Vă rog navigați în meniul de setări al aplicației, selectați \"Permisiuni\" și activați \"Contacte\".</string>
@@ -66,6 +66,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d membri</string>
     <string name="ConversationActivity_open_group_guidelines">Regulamentul Comunității</string>
     <string name="ConversationActivity_invalid_recipient">Destinatar invalid!</string>
@@ -85,6 +86,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Pentru a trimite mesaje audio, permite-i aplicației Session accesul la microfonul tău.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session are nevoie de permisiunea pentru Microfon pentru a putea trimite mesaje audio dar i-a fost refuzat accesul permanent. Vă rugăm să navigați în meniul de setări al aplicației, selectați \"Permisiuni\" și activați \"Microfon\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pentru a captura poze sau filme, permite-i Session accesul la cameră.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session are nevoie de permisiunea pentru Cameră pentru a captura poze sau filme dar i-a fost refuzat accesul permanent. Vă rog navigați în meniul de setări al aplicației, selectați \"Permisiuni\" și activați \"Cameră\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session are nevoie de permisiunea pentru Cameră pentru a captura poze sau filme</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -222,6 +224,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Deblochez acest contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">O să poți primi din nou mesaje și apeluri de la acest contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Deblochează</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Imagine</string>
     <string name="Slide_audio">Audio</string>
@@ -414,6 +417,7 @@ schimbul de chei este corupt </string>
     <string name="arrays__mute_for_one_day">Fără sunet pentru o zi</string>
     <string name="arrays__mute_for_seven_days">Fără sunet pentru 7 zile</string>
     <string name="arrays__mute_for_one_year">Fără sunet pentru un an</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Setări implicite</string>
     <string name="arrays__enabled">Activat</string>
     <string name="arrays__disabled">Dezactivat</string>
@@ -503,6 +507,7 @@ schimbul de chei este corupt </string>
     <string name="conversation_context__menu_copy_text">Copiază textul</string>
     <string name="conversation_context__menu_delete_message">Şterge mesajul</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Retrimite mesajul</string>
     <string name="conversation_context__menu_reply_to_message">Răspunde la mesaj</string>
     <!-- conversation_context_image -->
@@ -646,7 +651,8 @@ schimbul de chei este corupt </string>
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -740,4 +746,14 @@ schimbul de chei este corupt </string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d2c5b8617..0dc119f3b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -35,9 +35,9 @@
     <string name="DraftDatabase_Draft_audio_snippet">(аудио)</string>
     <string name="DraftDatabase_Draft_video_snippet">(видео)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(ответ)</string>
-    <!-- AttchmentManager -->
-    <string name="AttachmentManager_cant_open_media_selection">Не найдено приложение для выбора медиа-файлов.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session требуется разрешение на доступ к хранилищу для возможности прирепления фото, видео и аудио, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите Настройки, выберите Приложения, найдите Session, затем выберите Разрешения и включите Хранилище.</string>
+    <!-- AttachmentManager -->
+    <string name="AttachmentManager_cant_open_media_selection">Ошибка выбора вложения: соответствующее приложение не найдено.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Требуется разрешение на доступ к хранилищу для возможности прикрепления фото, видео и аудио, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите Настройки, выберите Приложения, найдите Session, затем выберите Разрешения и включите Хранилище.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Для прикрепления контактной информации Signal требуется разрешение на доступ к контактам, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите Настройки, выберите Приложения, найдите Session, затем выберите Разрешения и включите Контакты.</string>
     <string name="AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied">Чтобы сделать фото требуется разрешение на доступ к камере, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите Настройки, выберите Приложения, найдите Session, затем выберите Разрешения и включите Камеру.</string>
     <!-- AudioSlidePlayer -->
@@ -48,27 +48,28 @@
     <string name="BucketedThreadMedia_This_week">На этой неделе</string>
     <string name="BucketedThreadMedia_This_month">В этом месяце</string>
     <!-- CommunicationActions -->
-    <string name="CommunicationActions_no_browser_found">Браузер не найден</string>
+    <string name="CommunicationActions_no_browser_found">Браузер не найден.</string>
     <!-- ContactsCursorLoader -->
     <string name="ContactsCursorLoader_groups">Группы</string>
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Отправка не удалась, нажмите для деталей</string>
+    <string name="ConversationItem_error_not_delivered">Ошибка отправки. Нажмите для подробностей</string>
     <string name="ConversationItem_received_key_exchange_message_tap_to_process">Получено сообщение обмена ключами. Нажмите, чтобы его обработать.</string>
     <string name="ConversationItem_group_action_left">%1$s покинул(a) группу.</string>
     <string name="ConversationItem_click_to_approve_unencrypted">Отправка не удалась, нажмите для негарантированного отката</string>
     <string name="ConversationItem_unable_to_open_media">Не найдено приложение, которое может открыть этот медиа-файл.</string>
     <string name="ConversationItem_copied_text">Скопировано: %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
-    <string name="ConversationItem_download_more">  Скачать больше</string>
-    <string name="ConversationItem_pending">  Ожидание</string>
+    <string name="ConversationItem_read_more">Подробнее</string>
+    <string name="ConversationItem_download_more">&#160; Скачать больше</string>
+    <string name="ConversationItem_pending">&#160; Ожидание</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">Добавить вложение</string>
     <string name="ConversationActivity_select_contact_info">Выбрать контакт</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Извините, произошла ошибка при обработке вложения.</string>
     <string name="ConversationActivity_message">Сообщение</string>
     <string name="ConversationActivity_compose">Создать</string>
-    <string name="ConversationActivity_muted_until_date">Отключено до %1$s</string>
-    <string name="ConversationActivity_member_count">%1$d участников</string>
+    <string name="ConversationActivity_muted_until_date">Уведомления отключены до %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">Участников: %1$d</string>
     <string name="ConversationActivity_open_group_guidelines">Правила сообщества</string>
     <string name="ConversationActivity_invalid_recipient">Неверный получатель!</string>
     <string name="ConversationActivity_added_to_home_screen">Добавлено на главный экран</string>
@@ -82,22 +83,23 @@
     <string name="ConversationActivity_unable_to_record_audio">Невозможно записать аудио!</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">На вашем устройстве не найдено приложение для открытия этой ссылки.</string>
     <string name="ConversationActivity_invite_to_open_group">Добавить участников</string>
-    <string name="ConversationActivity_join_open_group">Присоединиться к %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Вы уверены, что хотите присоединиться к <b>%s</b> открытой группе?</string>
+    <string name="ConversationActivity_join_open_group">Присоединиться к «%s»</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">Вы уверены, что хотите присоединиться к открытой группе <b>%s</b>?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Для отправки аудиосообщений разрешите Session доступ к микрофону.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Для отправки аудиосообщений требуется разрешение на доступ к микрофону, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите Настройки, выберите Приложения, найдите Session, затем выберите Разрешения и включите Микрофон.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Для создания фото и видео разрешите Session доступ к камере.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Чтобы сделать фото или видео требуется разрешение на доступ к камере, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите Настройки, выберите Приложения, найдите Session, затем выберите Разрешения и включите Камеру.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Для съемки фото или видео предоставьте Session доступ к камере</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Для отправки аудиосообщений требуется разрешение на доступ к микрофону, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите в «Настройки», выберите «Приложения», найдите Session, затем выберите «Разрешения» и включите Микрофон.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Для съемки фото и видео Session требуется доступ к камере.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Для отправки фотографий и видео Session требуется доступ к хранилищу.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Чтобы сделать фото или видео требуется разрешение на доступ к камере, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите в «Настройки», выберите «Приложения», найдите Session, затем выберите «Разрешения» и включите Камеру.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Для съемки фото или видео Session требуется доступ к камере.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_search_position">%1$d из %2$d</string>
     <string name="ConversationActivity_no_results">Нет результатов</string>
     <!-- ConversationAdapter -->
     <plurals name="ConversationAdapter_n_unread_messages">
         <item quantity="one">%d непрочитанное сообщение</item>
-        <item quantity="few">Непрочитанных сообщений: %d</item>
-        <item quantity="many">Непрочитанных сообщений: %d</item>
-        <item quantity="other">Непрочитанных сообщений: %d</item>
+        <item quantity="few">%d непрочитанных сообщения</item>
+        <item quantity="many">%d непрочитанных сообщений</item>
+        <item quantity="other">%d непрочитанных сообщений</item>
     </plurals>
     <!-- ConversationFragment -->
     <plurals name="ConversationFragment_delete_selected_messages">
@@ -107,46 +109,46 @@
         <item quantity="other">Удалить сообщения?</item>
     </plurals>
     <plurals name="ConversationFragment_this_will_permanently_delete_all_n_selected_messages">
-        <item quantity="one">Выбранное сообщение будет навсегда удалено.</item>
-        <item quantity="few">%1$d выбранных сообщения будут навсегда удалены.</item>
-        <item quantity="many">%1$d выбранных сообщений будут навсегда удалены.</item>
+        <item quantity="one">Выбранное сообщение будет удалено. Это действие нельзя отменить.</item>
+        <item quantity="few">%1$d выбранных сообщения будут удалены. Это действие нельзя отменить.</item>
+        <item quantity="many">%1$d выбранных сообщений будут удалены. Это действие нельзя отменить.</item>
         <item quantity="other">%1$d выбранных сообщений будут навсегда удалены.</item>
     </plurals>
     <string name="ConversationFragment_ban_selected_user">Заблокировать этого пользователя?</string>
-    <string name="ConversationFragment_save_to_sd_card">Сохранить в память?</string>
+    <string name="ConversationFragment_save_to_sd_card">Сохранить в хранилище?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
-        <item quantity="one">Сохранение этого медиа-файла в память устройства позволит любому приложению иметь к нему доступ.\n\nПродолжить?</item>
-        <item quantity="few">Сохранение этих %1$d медиа-файлов в память устройства позволит любому приложению иметь к ним доступ.\n\nПродолжить?</item>
-        <item quantity="many">Сохранение этих %1$d медиа-файлов в память устройства позволит любому приложению иметь к ним доступ.\n\nПродолжить?</item>
-        <item quantity="other">Сохранение этих %1$d медиа-файлов в память устройства позволит любому приложению иметь к ним доступ.\n\nПродолжить?</item>
+        <item quantity="one">Сохранение этого медиафайла в хранилище устройства позволит любому приложению его просматривать.\n\nПродолжить?</item>
+        <item quantity="few">Сохранение этих %1$d медиафайлов в хранилище устройства позволит любому приложению их просматривать.\n\nПродолжить?</item>
+        <item quantity="many">Сохранение этих %1$d медиафайлов в хранилище устройства позволит любому приложению их просматривать.\n\nПродолжить?</item>
+        <item quantity="other">Сохранение этих %1$d медиафайлов в хранилище устройства позволит любому приложению их просматривать.\n\nПродолжить?</item>
     </plurals>
     <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
-        <item quantity="one">Ошибка при сохранении вложения в память!</item>
+        <item quantity="one">Ошибка сохранения вложения!</item>
         <item quantity="few">Ошибка при сохранении вложений в память!</item>
         <item quantity="many">Ошибка при сохранении вложений в память!</item>
         <item quantity="other">Ошибка при сохранении вложений в память!</item>
     </plurals>
     <plurals name="ConversationFragment_saving_n_attachments">
-        <item quantity="one">Сохранение вложения</item>
+        <item quantity="one">Сохранение %1$d вложения</item>
         <item quantity="few">Сохранение %1$d вложений</item>
         <item quantity="many">Сохранение %1$d вложений</item>
         <item quantity="other">Сохранение %1$d вложений</item>
     </plurals>
     <plurals name="ConversationFragment_saving_n_attachments_to_sd_card">
-        <item quantity="one">Сохраняем вложение в память устройства...</item>
-        <item quantity="few">Сохраняем %1$d вложения в память устройства...</item>
-        <item quantity="many">Сохраняем %1$d вложений в память устройства...</item>
-        <item quantity="other">Сохраняем %1$d вложений в память устройства...</item>
+        <item quantity="one">Сохранение вложения в память устройства...</item>
+        <item quantity="few">Сохранение %1$d вложений в память устройства...</item>
+        <item quantity="many">Сохранение %1$d вложений в память устройства...</item>
+        <item quantity="other">Сохранение %1$d вложений в память устройства...</item>
     </plurals>
     <string name="ConversationFragment_pending">Ожидание...</string>
     <string name="ConversationFragment_push">Интернет (Session)</string>
     <string name="ConversationFragment_mms">MMS</string>
     <string name="ConversationFragment_sms">SMS</string>
     <string name="ConversationFragment_deleting">Удаление</string>
-    <string name="ConversationFragment_deleting_messages">Удаляем сообщения...</string>
+    <string name="ConversationFragment_deleting_messages">Удаление сообщения...</string>
     <string name="ConversationFragment_banning">Блокировка</string>
     <string name="ConversationFragment_banning_user">Блокировка пользователя…</string>
-    <string name="ConversationFragment_quoted_message_not_found">Исходное сообщение не найдено</string>
+    <string name="ConversationFragment_quoted_message_not_found">Сообщение не найдено</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">Исходное сообщение больше не доступно</string>
     <!-- ConversationListItem -->
     <string name="ConversationListItem_key_exchange_message">Сообщение обмена ключами</string>
@@ -173,7 +175,7 @@
     <!-- CropImageActivity -->
     <string name="CropImageActivity_profile_avatar">Аватар</string>
     <!-- InputPanel -->
-    <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Нажмите и держите, чтобы записать голосовое сообщение; отпустите, чтобы отправить</string>
+    <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Нажмите и удерживайте для записи голосового сообщение; отпустите для отправки</string>
     <!-- LongMessageActivity -->
     <string name="LongMessageActivity_unable_to_find_message">Невозможно найти сообщение</string>
     <string name="LongMessageActivity_message_from_s">Сообщение от %1$s</string>
@@ -187,27 +189,27 @@
         <item quantity="other">Удалить выбранные сообщения?</item>
     </plurals>
     <plurals name="MediaOverviewActivity_Media_delete_confirm_message">
-        <item quantity="one">Это навсегда удалит выбранное сообщение.</item>
-        <item quantity="few">Это навсегда удалит все %1$d выбранных сообщения.</item>
-        <item quantity="many">Это навсегда удалит все %1$d выбранных сообщений.</item>
-        <item quantity="other">Это навсегда удалит все %1$d выбранных сообщений.</item>
+        <item quantity="one">Выбранное сообщение будет удалено. Это действие нельзя отменить.</item>
+        <item quantity="few">%1$d выбранных сообщения будут удалены. Это действие нельзя отменить.</item>
+        <item quantity="many">%1$d выбранных сообщений будут удалены. Это действие нельзя отменить.</item>
+        <item quantity="other">%1$d выбранных сообщений будут удалены. Это действие нельзя отменить.</item>
     </plurals>
     <string name="MediaOverviewActivity_Media_delete_progress_title">Удаление</string>
-    <string name="MediaOverviewActivity_Media_delete_progress_message">Удаляем сообщения...</string>
+    <string name="MediaOverviewActivity_Media_delete_progress_message">Удаление сообщений...</string>
     <string name="MediaOverviewActivity_Documents">Документы</string>
     <string name="MediaOverviewActivity_Select_all">Выбрать все</string>
-    <string name="MediaOverviewActivity_collecting_attachments">Собираем вложения...</string>
+    <string name="MediaOverviewActivity_collecting_attachments">Сбор вложений...</string>
     <!-- NotificationMmsMessageRecord -->
     <string name="NotificationMmsMessageRecord_multimedia_message">MMS-сообщение</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Скачиваем MMS-сообщение</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Ошибка при скачивании MMS-сообщения; нажмите, чтобы повторить</string>
+    <string name="NotificationMmsMessageRecord_downloading_mms_message">Загрузка MMS-сообщения</string>
+    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Ошибка при скачивании MMS-сообщения; нажмите для повтора</string>
     <!-- MediaPickerActivity -->
-    <string name="MediaPickerActivity_send_to">Отправить %s</string>
+    <string name="MediaPickerActivity_send_to">Отправить пользователю %s</string>
     <!-- MediaSendActivity -->
-    <string name="MediaSendActivity_add_a_caption">Добавить субтитры...</string>
+    <string name="MediaSendActivity_add_a_caption">Добавить подпись...</string>
     <string name="MediaSendActivity_an_item_was_removed_because_it_exceeded_the_size_limit">Элемент был удален из-за превышения размера</string>
     <string name="MediaSendActivity_camera_unavailable">Камера недоступна.</string>
-    <string name="MediaSendActivity_message_to_s">Сообщение для %s</string>
+    <string name="MediaSendActivity_message_to_s">Сообщение пользователю %s</string>
     <plurals name="MediaSendActivity_cant_share_more_than_n_items">
         <item quantity="one">Вы не можете поделиться больше, чем %d элементом.</item>
         <item quantity="few">Вы не можете поделиться больше, чем %d элементами.</item>
@@ -215,18 +217,18 @@
         <item quantity="other">Вы не можете поделиться больше, чем %d элементами.</item>
     </plurals>
     <!-- MediaRepository -->
-    <string name="MediaRepository_all_media">Все медиа-файлы</string>
+    <string name="MediaRepository_all_media">Все медиафайлы</string>
     <!-- MessageRecord -->
-    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Полученное сообщение зашифровано в старой версии Session, которая больше не поддерживается. Пожалуйста, попросите отправителя обновиться до последней версии и заново отправить сообщение.</string>
+    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Полученное сообщение зашифровано в старой версии Session, которая больше не поддерживается. Пожалуйста, попросите отправителя обновиться до последней версии и отправить сообщение заново.</string>
     <string name="MessageRecord_left_group">Вы покинули группу.</string>
     <string name="MessageRecord_you_updated_group">Вы обновили группу.</string>
-    <string name="MessageRecord_s_updated_group">%s обновил группу.</string>
+    <string name="MessageRecord_s_updated_group">%s обновил(а) группу.</string>
     <!-- ExpirationDialog -->
     <string name="ExpirationDialog_disappearing_messages">Исчезающие сообщения</string>
     <string name="ExpirationDialog_your_messages_will_not_expire">Срок показа сообщений не ограничен.</string>
     <string name="ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen">Сообщения, отправленные и полученные в этом разговоре, исчезнут, когда пройдёт %s после их прочтения.</string>
     <!-- PassphrasePromptActivity -->
-    <string name="PassphrasePromptActivity_enter_passphrase">Введите парольную фразу</string>
+    <string name="PassphrasePromptActivity_enter_passphrase">Введите кодовую фразу</string>
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block_this_contact_question">Заблокировать этот контакт?</string>
     <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">Вы больше не будете получать сообщения или звонки от этого контакта.</string>
@@ -234,6 +236,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Разблокировать этот контакт?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Вы снова сможете получать сообщения и звонки от этого контакта.</string>
     <string name="RecipientPreferenceActivity_unblock">Разблокировать</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Изображение</string>
     <string name="Slide_audio">Аудио</string>
@@ -253,54 +256,54 @@
     <string name="ThreadRecord_draft">Черновик:</string>
     <string name="ThreadRecord_called">Вы звонили</string>
     <string name="ThreadRecord_called_you">Звонили вам</string>
-    <string name="ThreadRecord_missed_call">Пропущен звонок</string>
+    <string name="ThreadRecord_missed_call">Пропущенный звонок</string>
     <string name="ThreadRecord_media_message">Медиа-сообщение</string>
     <string name="ThreadRecord_s_is_on_signal">%s теперь в Session!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Исчезающие сообщения отключены</string>
-    <string name="ThreadRecord_disappearing_message_time_updated_to_s">Время исчезновения сообщений – %s</string>
-    <string name="ThreadRecord_s_took_a_screenshot">%s сделал снимок экрана.</string>
-    <string name="ThreadRecord_media_saved_by_s">%s сохранил медиафайл.</string>
+    <string name="ThreadRecord_disappearing_message_time_updated_to_s">Время исчезновения сообщений установлено на %s</string>
+    <string name="ThreadRecord_s_took_a_screenshot">%s сделал(а) снимок экрана.</string>
+    <string name="ThreadRecord_media_saved_by_s">%s сохранил(а) медиафайл.</string>
     <string name="ThreadRecord_safety_number_changed">Код безопасности изменился</string>
-    <string name="ThreadRecord_your_safety_number_with_s_has_changed">Ваш код безопасности с %s изменился.</string>
-    <string name="ThreadRecord_you_marked_verified">Вы отметили как подтверждённый</string>
-    <string name="ThreadRecord_you_marked_unverified">Вы отметили как неподтверждённый</string>
+    <string name="ThreadRecord_your_safety_number_with_s_has_changed">Ваш код безопасности с %s был изменен.</string>
+    <string name="ThreadRecord_you_marked_verified">Подтверждено вами</string>
+    <string name="ThreadRecord_you_marked_unverified">Подтверждение вами отменено</string>
     <string name="ThreadRecord_empty_message">Этот диалог пуст</string>
     <string name="ThreadRecord_open_group_invitation">Открыть приглашение в группу</string>
     <!-- UpdateApkReadyListener -->
     <string name="UpdateApkReadyListener_Signal_update">Обновление Session</string>
-    <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">Доступна новая версия Session. Нажмите, чтобы обновиться</string>
+    <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">Доступна новая версия Session. Нажмите для обновления</string>
     <!-- MessageDisplayHelper -->
-    <string name="MessageDisplayHelper_bad_encrypted_message">Сообщение испорчено</string>
+    <string name="MessageDisplayHelper_bad_encrypted_message">Неправильно зашифрованное сообщение</string>
     <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Сообщение зашифровано для несуществующей сессии</string>
     <!-- MmsMessageRecord -->
-    <string name="MmsMessageRecord_bad_encrypted_mms_message">MMS-сообщение испорчено</string>
+    <string name="MmsMessageRecord_bad_encrypted_mms_message">Неправильно зашифрованное MMS-сообщение</string>
     <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS-сообщение зашифровано для несуществующей сессии</string>
     <!-- MuteDialog -->
     <string name="MuteDialog_mute_notifications">Отключить звук уведомлений</string>
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Нажмите, чтобы открыть.</string>
     <string name="KeyCachingService_passphrase_cached">Session разблокирован</string>
-    <string name="KeyCachingService_lock">Блокировать Session</string>
+    <string name="KeyCachingService_lock">Заблокировать Session</string>
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Вы</string>
-    <string name="MediaPreviewActivity_unssuported_media_type">Тип медиа-файла не поддерживается</string>
+    <string name="MediaPreviewActivity_unssuported_media_type">Неподдерживаемый тип медиафайла</string>
     <string name="MediaPreviewActivity_draft">Черновик</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
-    <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Не удается сохранить во внешнем хранилище без разрешений</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Для сохранения во внешнее хранилище приложению Session требуется доступ к хранилищу, однако это разрешение было вами безвозвратно отклонено. Чтобы предоставить это разрешение вручную заново, перейдите в настройки вашего устройства в раздел «Приложения», найдите Session, выберите «Разрешения», и разрешите «Файлы и медиаконтент».</string>
+    <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Не удается сохранить во внешнем хранилище. Доступ запрещен</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Удалить сообщение?</string>
-    <string name="MediaPreviewActivity_media_delete_confirmation_message">Это сообщение будет навсегда удалено.</string>
+    <string name="MediaPreviewActivity_media_delete_confirmation_message">Это сообщение будет безвозвратно удалено.</string>
     <!-- MessageNotifier -->
-    <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d новых сообщений в %2$d разговорах</string>
+    <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d новых сообщений в %2$d диалогах</string>
     <string name="MessageNotifier_most_recent_from_s">Последнее от %1$s</string>
     <string name="MessageNotifier_locked_message">Сообщение скрыто</string>
     <string name="MessageNotifier_message_delivery_failed">Сбой доставки сообщения.</string>
     <string name="MessageNotifier_failed_to_deliver_message">Не удалось доставить сообщение.</string>
     <string name="MessageNotifier_error_delivering_message">Ошибка при доставке сообщения.</string>
-    <string name="MessageNotifier_mark_all_as_read">Всё прочитано</string>
-    <string name="MessageNotifier_mark_read">Прочитано</string>
+    <string name="MessageNotifier_mark_all_as_read">Пометить все как прочитано</string>
+    <string name="MessageNotifier_mark_read">Пометить как прочитано</string>
     <string name="MessageNotifier_reply">Ответить</string>
     <string name="MessageNotifier_pending_signal_messages">Неполученные сообщения</string>
-    <string name="MessageNotifier_you_have_pending_signal_messages">У вас есть неполученные сообщения в Session. Нажмите, чтобы открыть приложение и получить их.</string>
+    <string name="MessageNotifier_you_have_pending_signal_messages">У вас есть неполученные сообщения в Session. Нажмите, чтобы открыть приложение и получить их</string>
     <string name="MessageNotifier_contact_message">%1$s %2$s</string>
     <string name="MessageNotifier_unknown_contact_message">Контакт</string>
     <!-- Notification Channels -->
@@ -310,9 +313,9 @@
     <string name="NotificationChannel_backups">Резервные копии</string>
     <string name="NotificationChannel_locked_status">Статус блокировки</string>
     <string name="NotificationChannel_app_updates">Обновления приложений</string>
-    <string name="NotificationChannel_other">Другой</string>
+    <string name="NotificationChannel_other">Другое</string>
     <string name="NotificationChannel_group_messages">Сообщения</string>
-    <string name="NotificationChannel_missing_display_name">Неизвестен</string>
+    <string name="NotificationChannel_missing_display_name">Неизвестный</string>
     <!-- QuickResponseService -->
     <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Быстрые ответы недоступны, когда Session заблокирован!</string>
     <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
@@ -352,13 +355,13 @@
     <string name="attachment_type_selector__file">Файл</string>
     <string name="attachment_type_selector__drawer_description">Показать панель вложений</string>
     <!-- contact_selection_group_activity -->
-    <string name="contact_selection_group_activity__finding_contacts">Загружаем контакты...</string>
+    <string name="contact_selection_group_activity__finding_contacts">Загружаем контакты&#8230;</string>
     <!-- conversation_activity -->
     <string name="conversation_activity__send">Отправить</string>
     <string name="conversation_activity__compose_description">Написание сообщения</string>
     <string name="conversation_activity__emoji_toggle_description">Клавиатура смайликов</string>
     <string name="conversation_activity__attachment_thumbnail">Миниатюра вложения</string>
-    <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Показать панель быстрой камеры</string>
+    <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Включить быстрое показывание камеры в панели вложений</string>
     <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Записать и отправить аудио-вложение</string>
     <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Зафиксировать запись аудиосообщения</string>
     <string name="conversation_activity__enable_signal_for_sms">Использовать Session для SMS</string>
@@ -384,7 +387,7 @@
     <string name="open_group_invitation_view__open_group_invitation">Открыть приглашение группы</string>
     <string name="open_group_guidelines_pinned_message">Закреплённое сообщение</string>
     <string name="open_group_guidelines_community_guidelines">Правила сообщества</string>
-    <string name="open_group_guidelines_read">Прочитано</string>
+    <string name="open_group_guidelines_read">Читать</string>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Аудио</string>
     <string name="QuoteView_video">Видео</string>
@@ -427,6 +430,7 @@
     <string name="arrays__mute_for_one_day">Отключить звук на 1 день</string>
     <string name="arrays__mute_for_seven_days">Отключить звук на 7 дней</string>
     <string name="arrays__mute_for_one_year">Отключить звук на 1 год</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Настройки по умолчанию</string>
     <string name="arrays__enabled">Включено</string>
     <string name="arrays__disabled">Отключено</string>
@@ -517,6 +521,7 @@
     <string name="conversation_context__menu_copy_text">Копировать текст</string>
     <string name="conversation_context__menu_delete_message">Удалить сообщение</string>
     <string name="conversation_context__menu_ban_user">Заблокировать пользователя</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Отправить в бан и всё удалить</string>
     <string name="conversation_context__menu_resend_message">Отправить заново</string>
     <string name="conversation_context__menu_reply_to_message">Ответ на сообщение</string>
     <!-- conversation_context_image -->
@@ -620,7 +625,7 @@
     <string name="view_seed_reminder_title">Вы почти закончили! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Защитите свой аккаунт, сохранив секретную фразу</string>
     <string name="view_seed_reminder_subtitle_2">Нажмите и удерживайте сокращенные слова, чтобы открыть секретную фразу, а затем сохраните ее в надежном месте, чтобы защитить свой Session ID.</string>
-    <string name="view_seed_reminder_subtitle_3">Обязательно сохраните секретную фразу в надежном месте.</string>
+    <string name="view_seed_reminder_subtitle_3">Обязательно сохраните секретную фразу в надежном месте</string>
     <string name="activity_path_title">Маршрут</string>
     <string name="activity_path_explanation">Session скрывает ваш IP, перенаправляя ваши сообщения через несколько сервисных узлов своей децентрализованной сети. Вот страны, через которые в данный момент проходит ваш сеанс связи:</string>
     <string name="activity_path_device_row_title">Вы</string>
@@ -628,14 +633,14 @@
     <string name="activity_path_service_node_row_title">Служебный узел</string>
     <string name="activity_path_destination_row_title">Место назначения</string>
     <string name="activity_path_learn_more_button_title">Узнать больше</string>
-    <string name="activity_path_resolving_progress">Resolving…</string>
+    <string name="activity_path_resolving_progress">Идёт определение…</string>
     <string name="activity_create_private_chat_title">Новый Диалог</string>
     <string name="activity_create_private_chat_enter_session_id_tab_title">Введите Session ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Сканировать QR-код</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Сканируйте QR-код пользователя, чтобы начать сессию. QR-коды можно найти, нажав значок QR-кода в настройках учетной записи.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Введите Session ID или ONS имя</string>
     <string name="fragment_enter_public_key_explanation">Пользователи могут поделиться своим Session ID, зайдя в настройки своей учетной записи и нажав «Отправить Session ID», или поделившись своим QR-кодом.</string>
-    <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
+    <string name="fragment_enter_public_key_error_message">Пожалуйста, проверьте Session ID или ONS имя и попробуйте снова.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session нужен доступ к камере для сканирования QR-кодов</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Предоставить доступ к камере</string>
     <string name="activity_create_closed_group_title">Новая закрытая группа</string>
@@ -660,10 +665,11 @@
     <string name="activity_settings_notifications_button_title">Уведомления</string>
     <string name="activity_settings_chats_button_title">Чаты</string>
     <string name="activity_settings_devices_button_title">Устройства</string>
-    <string name="activity_settings_invite_button_title">Пригласить</string>
+    <string name="activity_settings_invite_button_title">Пригласить друга</string>
+    <string name="activity_settings_faq_button_title">Часто задаваемые вопросы</string>
     <string name="activity_settings_recovery_phrase_button_title">Секретная фраза</string>
     <string name="activity_settings_clear_all_data_button_title">Очистить данные</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Очистить данные включая учетную запись</string>
     <string name="activity_settings_help_translate_session">Помогите нам перевести Session</string>
     <string name="activity_notification_settings_title">Уведомления</string>
     <string name="activity_notification_settings_style_section_title">Стиль уведомлений</string>
@@ -671,17 +677,17 @@
     <string name="activity_privacy_settings_title">Конфиденциальность</string>
     <string name="activity_chat_settings_title">Чаты</string>
     <string name="preferences_notifications_strategy_category_title">Метод уведомлений</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_title">Использовать быстрый режим</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">Вы будете получать уведомления о новых сообщениях надежно и сразу же с помощью серверов уведомлений Google.</string>
     <string name="fragment_device_list_bottom_sheet_change_name_button_title">Сменить имя</string>
     <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Отключить устройство</string>
     <string name="dialog_seed_title">Ваша секретная фраза</string>
     <string name="dialog_seed_explanation">Это ваша секретная фраза. С ее помощью вы можете восстановить или перенести свой Session ID на новое устройство.</string>
     <string name="dialog_clear_all_data_title">Очистить все данные</string>
     <string name="dialog_clear_all_data_explanation">Это навсегда удалит ваши сообщения, сессии и контакты.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="dialog_clear_all_data_network_explanation">Вы хотите очистить только это устройство или полностью удалить ваш аккаунт?</string>
+    <string name="dialog_clear_all_data_local_only">Только удалить</string>
+    <string name="dialog_clear_all_data_clear_network">Полностью аккаунт</string>
     <string name="activity_qr_code_title">QR-код</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">Посмотреть мой QR-код</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Сканировать QR-код</string>
@@ -721,10 +727,10 @@
     <string name="activity_backup_restore_passphrase">Фраза из 30 цифр</string>
     <string name="activity_link_device_skip_prompt">Это занимает некоторое время, хотите пропустить?</string>
     <string name="activity_link_device_link_device">Привязать устройство</string>
-    <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
-    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
-    <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
-    <string name="activity_join_public_chat_join_rooms">Или присоединитесь к одной из этих...</string>
+    <string name="activity_link_device_recovery_phrase">Фраза для восстановления доступа</string>
+    <string name="activity_link_device_scan_qr_code">Сканировать QR-код</string>
+    <string name="activity_link_device_qr_message">Перейдите в Настройки → Фраза для восстановления доступа на другом устройстве, чтобы показать ваш QR код.</string>
+    <string name="activity_join_public_chat_join_rooms">Или присоединитесь к одной из этих…</string>
     <string name="activity_pn_mode_message_notifications">Уведомления о Сообщениях</string>
     <string name="activity_pn_mode_explanation">Существует два способа оповещения о новых сообщениях.</string>
     <string name="activity_pn_mode_fast_mode">Ускоренный режим</string>
@@ -736,22 +742,32 @@
     <string name="activity_prompt_passphrase_tap_to_unlock">Разблокировать</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Введите ник</string>
     <string name="invalid_public_key">Неверный публичный ключ</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="document">Документ</string>
+    <string name="dialog_blocked_title">Разблокировать %s?</string>
+    <string name="dialog_blocked_explanation">Вы уверены, что хотите разблокировать %s?</string>
+    <string name="dialog_join_open_group_title">Присоединиться к группе %s?</string>
+    <string name="dialog_join_open_group_explanation">Вы уверены, что хотите присоединиться к открытой группе %s?</string>
+    <string name="dialog_open_url_title">Открыть ссылку?</string>
+    <string name="dialog_open_url_explanation">Вы уверены, что хотите открыть %s?</string>
+    <string name="open">Открыть</string>
+    <string name="dialog_link_preview_title">Включить предварительный просмотр ссылок?</string>
+    <string name="dialog_link_preview_explanation">Включение предпросмотра ссылок добавит эскиз содержимого для отправляемых и получаемых ссылок. При этом Session будет необходимо соединиться с сайтами, связанными с ссылками, чтобы сгенерировать предпросмотр. Вы всегда можете отключить предпросмотр ссылок в настройках Session.</string>
+    <string name="dialog_link_preview_enable_button_title">Включить</string>
+    <string name="dialog_download_title">Доверять %s?</string>
+    <string name="dialog_download_explanation">Вы уверены, что хотите загрузить медиафайл, отправленный %s?</string>
+    <string name="dialog_download_button_title">Скачать</string>
+    <string name="activity_conversation_blocked_banner_text">Аккаунт %s заблокирован. Разблокировать его?</string>
+    <string name="activity_conversation_attachment_prep_failed">Не удалось подготовить вложение для отправки.</string>
+    <string name="media">Медиа</string>
+    <string name="UntrustedAttachmentView_download_attachment">Нажмите, чтобы скачать %s</string>
+    <string name="message_details_header__error">Ошибка</string>
+    <string name="dialog_send_seed_title">Предупреждение</string>
+    <string name="dialog_send_seed_explanation">Это ваша фраза для восстановления. Если вы отправите ее кому-то, он получит полный доступ к вашей учетной записи.</string>
+    <string name="dialog_send_seed_send_button_title">Отправить</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml
new file mode 100644
index 000000000..e093e710b
--- /dev/null
+++ b/app/src/main/res/values-si-rLK/strings.xml
@@ -0,0 +1,747 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Session</string>
+    <string name="yes">ඔව්</string>
+    <string name="no">නැහැ</string>
+    <string name="delete">Delete</string>
+    <string name="ban">Ban</string>
+    <string name="please_wait">කරුණාකර රැඳෙන්න...</string>
+    <string name="save">සුරකින්න</string>
+    <string name="note_to_self">Note to Self</string>
+    <string name="version_s">අනුවාදය %s</string>
+    <!-- AbstractNotificationBuilder -->
+    <string name="AbstractNotificationBuilder_new_message">නව පණිවිඩය</string>
+    <!-- AlbumThumbnailView -->
+    <string name="AlbumThumbnailView_plus">\+%d</string>
+    <!-- ApplicationPreferencesActivity -->
+    <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
+        <item quantity="one">%d message per conversation</item>
+        <item quantity="other">%d messages per conversation</item>
+    </plurals>
+    <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Delete all old messages now?</string>
+    <plurals name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages">
+        <item quantity="one">This will immediately trim all conversations to the most recent message.</item>
+        <item quantity="other">This will immediately trim all conversations to the %d most recent messages.</item>
+    </plurals>
+    <string name="ApplicationPreferencesActivity_delete">Delete</string>
+    <string name="ApplicationPreferencesActivity_On">සක්‍රීයයි</string>
+    <string name="ApplicationPreferencesActivity_Off">අක්‍රීයයි</string>
+    <!-- DraftDatabase -->
+    <string name="DraftDatabase_Draft_image_snippet">(image)</string>
+    <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
+    <string name="DraftDatabase_Draft_video_snippet">(video)</string>
+    <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
+    <!-- AttachmentManager -->
+    <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
+    <string name="AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied">Session requires the Camera permission in order to take photos, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Camera\".</string>
+    <!-- AudioSlidePlayer -->
+    <string name="AudioSlidePlayer_error_playing_audio">Error playing audio!</string>
+    <!-- BucketedThreadMedia -->
+    <string name="BucketedThreadMedia_Today">අද</string>
+    <string name="BucketedThreadMedia_Yesterday">ඊයේ</string>
+    <string name="BucketedThreadMedia_This_week">මෙම සතිය</string>
+    <string name="BucketedThreadMedia_This_month">මෙම මාසය</string>
+    <!-- CommunicationActions -->
+    <string name="CommunicationActions_no_browser_found">No web browser found.</string>
+    <!-- ContactsCursorLoader -->
+    <string name="ContactsCursorLoader_groups">සමූහ</string>
+    <!-- ConversationItem -->
+    <string name="ConversationItem_error_not_delivered">Send failed, tap for details</string>
+    <string name="ConversationItem_received_key_exchange_message_tap_to_process">Received key exchange message, tap to process.</string>
+    <string name="ConversationItem_group_action_left">%1$s has left the group.</string>
+    <string name="ConversationItem_click_to_approve_unencrypted">Send failed, tap for unsecured fallback</string>
+    <string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
+    <string name="ConversationItem_copied_text">%s පිටපත් විය</string>
+    <string name="ConversationItem_read_more">තව කියවන්න</string>
+    <string name="ConversationItem_download_more">&#160; Download More</string>
+    <string name="ConversationItem_pending">&#160; Pending</string>
+    <!-- ConversationActivity -->
+    <string name="ConversationActivity_add_attachment">Add attachment</string>
+    <string name="ConversationActivity_select_contact_info">Select contact info</string>
+    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sorry, there was an error setting your attachment.</string>
+    <string name="ConversationActivity_message">පණිවිඩය</string>
+    <string name="ConversationActivity_compose">Compose</string>
+    <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">සාමාජිකයින් %1$d</string>
+    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
+    <string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
+    <string name="ConversationActivity_leave_group">සමූහය හැරයනවාද?</string>
+    <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Are you sure you want to leave this group?</string>
+    <string name="ConversationActivity_error_leaving_group">සමූහය හැරයාමේ දෝෂයකි</string>
+    <string name="ConversationActivity_unblock_this_contact_question">සබඳතාවය අනවහිර කරනවාද?</string>
+    <string name="ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
+    <string name="ConversationActivity_unblock">අනවහිර</string>
+    <string name="ConversationActivity_attachment_exceeds_size_limits">Attachment exceeds size limits for the type of message you\'re sending.</string>
+    <string name="ConversationActivity_unable_to_record_audio">Unable to record audio!</string>
+    <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">There is no app available to handle this link on your device.</string>
+    <string name="ConversationActivity_invite_to_open_group">සාමාජිකයින් එකතු කරන්න</string>
+    <string name="ConversationActivity_join_open_group">%s ට එක්වන්න</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
+    <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+    <string name="ConversationActivity_search_position">%1$d of %2$d</string>
+    <string name="ConversationActivity_no_results">ප්‍රතිඵල නැත</string>
+    <!-- ConversationAdapter -->
+    <plurals name="ConversationAdapter_n_unread_messages">
+        <item quantity="one">නොකියවූ පණිවිඩ %d යි</item>
+        <item quantity="other">නොකියවූ පණිවිඩ %d යි</item>
+    </plurals>
+    <!-- ConversationFragment -->
+    <plurals name="ConversationFragment_delete_selected_messages">
+        <item quantity="one">Delete selected message?</item>
+        <item quantity="other">Delete selected messages?</item>
+    </plurals>
+    <plurals name="ConversationFragment_this_will_permanently_delete_all_n_selected_messages">
+        <item quantity="one">This will permanently delete the selected message.</item>
+        <item quantity="other">This will permanently delete all %1$d selected messages.</item>
+    </plurals>
+    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_save_to_sd_card">Save to storage?</string>
+    <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
+        <item quantity="one">Saving this media to storage will allow any other apps on your device to access it.\n\nContinue?</item>
+        <item quantity="other">Saving all %1$d media to storage will allow any other apps on your device to access them.\n\nContinue?</item>
+    </plurals>
+    <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
+        <item quantity="one">Error while saving attachment to storage!</item>
+        <item quantity="other">Error while saving attachments to storage!</item>
+    </plurals>
+    <plurals name="ConversationFragment_saving_n_attachments">
+        <item quantity="one">ඇමුණුම සුරැකෙමින්</item>
+        <item quantity="other">ඇමුණුම් %1$d සුරැකෙමින්</item>
+    </plurals>
+    <plurals name="ConversationFragment_saving_n_attachments_to_sd_card">
+        <item quantity="one">ඇමුණුම ආචයනයට සුරැකෙමින්...</item>
+        <item quantity="other">ඇමුණුම් %1$d ක් ආචයනයට සුරැකෙමින්...</item>
+    </plurals>
+    <string name="ConversationFragment_pending">Pending...</string>
+    <string name="ConversationFragment_push">Data (Session)</string>
+    <string name="ConversationFragment_mms">මාධ්‍ය පණිවිඩ</string>
+    <string name="ConversationFragment_sms">කෙටි පණිවිඩය</string>
+    <string name="ConversationFragment_deleting">Deleting</string>
+    <string name="ConversationFragment_deleting_messages">Deleting messages...</string>
+    <string name="ConversationFragment_banning">Banning</string>
+    <string name="ConversationFragment_banning_user">Banning user…</string>
+    <string name="ConversationFragment_quoted_message_not_found">Original message not found</string>
+    <string name="ConversationFragment_quoted_message_no_longer_available">Original message no longer available</string>
+    <!-- ConversationListItem -->
+    <string name="ConversationListItem_key_exchange_message">යතුර හුවමාරු පණිවිඩය</string>
+    <!-- CreateProfileActivity -->
+    <string name="CreateProfileActivity_profile_photo">Profile photo</string>
+    <!-- CustomDefaultPreference -->
+    <string name="CustomDefaultPreference_using_custom">Using custom: %s</string>
+    <string name="CustomDefaultPreference_using_default">Using default: %s</string>
+    <string name="CustomDefaultPreference_none">None</string>
+    <!-- DateUtils -->
+    <string name="DateUtils_just_now">දැන්</string>
+    <string name="DateUtils_minutes_ago">විනාඩි %d</string>
+    <string name="DateUtils_today">අද</string>
+    <string name="DateUtils_yesterday">ඊයේ</string>
+    <!-- DeviceListItem -->
+    <string name="DeviceListItem_today">අද</string>
+    <!-- DocumentView -->
+    <string name="DocumentView_unknown_file">නොදන්නා ගොනුවකි</string>
+    <!-- GiphyActivity -->
+    <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Error while retrieving full resolution GIF</string>
+    <!-- GiphyFragmentPageAdapter -->
+    <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
+    <string name="GiphyFragmentPagerAdapter_stickers">Stickers</string>
+    <!-- CropImageActivity -->
+    <string name="CropImageActivity_profile_avatar">Photo</string>
+    <!-- InputPanel -->
+    <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tap and hold to record a voice message, release to send</string>
+    <!-- LongMessageActivity -->
+    <string name="LongMessageActivity_unable_to_find_message">Unable to find message</string>
+    <string name="LongMessageActivity_message_from_s">%1$s වෙතින් පණිවිඩය</string>
+    <string name="LongMessageActivity_your_message">ඔබගේ පණීවිඩය</string>
+    <!-- MediaOverviewActivity -->
+    <string name="MediaOverviewActivity_Media">මාධ්‍යය</string>
+    <plurals name="MediaOverviewActivity_Media_delete_confirm_title">
+        <item quantity="one">Delete selected message?</item>
+        <item quantity="other">Delete selected messages?</item>
+    </plurals>
+    <plurals name="MediaOverviewActivity_Media_delete_confirm_message">
+        <item quantity="one">This will permanently delete the selected message.</item>
+        <item quantity="other">This will permanently delete all %1$d selected messages.</item>
+    </plurals>
+    <string name="MediaOverviewActivity_Media_delete_progress_title">Deleting</string>
+    <string name="MediaOverviewActivity_Media_delete_progress_message">Deleting messages...</string>
+    <string name="MediaOverviewActivity_Documents">ලේඛන</string>
+    <string name="MediaOverviewActivity_Select_all">Select all</string>
+    <string name="MediaOverviewActivity_collecting_attachments">Collecting attachments...</string>
+    <!-- NotificationMmsMessageRecord -->
+    <string name="NotificationMmsMessageRecord_multimedia_message">බහුමාධ්‍ය පණිවිඩය</string>
+    <string name="NotificationMmsMessageRecord_downloading_mms_message">මාධ්‍ය පණිවිඩය බාගතවෙමින්</string>
+    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Error downloading MMS message, tap to retry</string>
+    <!-- MediaPickerActivity -->
+    <string name="MediaPickerActivity_send_to">%s ට යවන්න</string>
+    <!-- MediaSendActivity -->
+    <string name="MediaSendActivity_add_a_caption">Add a caption...</string>
+    <string name="MediaSendActivity_an_item_was_removed_because_it_exceeded_the_size_limit">An item was removed because it exceeded the size limit</string>
+    <string name="MediaSendActivity_camera_unavailable">Camera unavailable.</string>
+    <string name="MediaSendActivity_message_to_s">%s වෙත පණිවිඩය</string>
+    <plurals name="MediaSendActivity_cant_share_more_than_n_items">
+        <item quantity="one">You can\'t share more than %d item.</item>
+        <item quantity="other">You can\'t share more than %d items.</item>
+    </plurals>
+    <!-- MediaRepository -->
+    <string name="MediaRepository_all_media">සියලුම මාධ්‍යය</string>
+    <!-- MessageRecord -->
+    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Received a message encrypted using an old version of Session that is no longer supported. Please ask the sender to update to the most recent version and resend the message.</string>
+    <string name="MessageRecord_left_group">You have left the group.</string>
+    <string name="MessageRecord_you_updated_group">You updated the group.</string>
+    <string name="MessageRecord_s_updated_group">%s updated the group.</string>
+    <!-- ExpirationDialog -->
+    <string name="ExpirationDialog_disappearing_messages">නොපෙනී යන පණිවිඩ</string>
+    <string name="ExpirationDialog_your_messages_will_not_expire">ඔබගේ පණිවිඩ කල් ඉකුත් නොවනු ඇත.</string>
+    <string name="ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen">Messages sent and received in this conversation will disappear %s after they have been seen.</string>
+    <!-- PassphrasePromptActivity -->
+    <string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
+    <!-- RecipientPreferencesActivity -->
+    <string name="RecipientPreferenceActivity_block_this_contact_question">මෙම සබඳතාවය අවහිර කරනවාද?</string>
+    <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">You will no longer receive messages and calls from this contact.</string>
+    <string name="RecipientPreferenceActivity_block">අවහිර</string>
+    <string name="RecipientPreferenceActivity_unblock_this_contact_question">මෙම සබඳතාවය අනවහිර කරනවාද?</string>
+    <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
+    <string name="RecipientPreferenceActivity_unblock">අනවහිර</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
+    <!-- Slide -->
+    <string name="Slide_image">Image</string>
+    <string name="Slide_audio">ශ්‍රව්‍ය</string>
+    <string name="Slide_video">දෘශ්‍ය</string>
+    <!-- SmsMessageRecord -->
+    <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Received corrupted key
+        exchange message!
+    </string>
+    <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">        Received key exchange message for invalid protocol version.
+    </string>
+    <string name="SmsMessageRecord_received_message_with_new_safety_number_tap_to_process">Received message with new safety number. Tap to process and display.</string>
+    <string name="SmsMessageRecord_secure_session_reset">You reset the secure session.</string>
+    <string name="SmsMessageRecord_secure_session_reset_s">%s reset the secure session.</string>
+    <string name="SmsMessageRecord_duplicate_message">Duplicate message.</string>
+    <!-- ThreadRecord -->
+    <string name="ThreadRecord_group_updated">Group updated</string>
+    <string name="ThreadRecord_left_the_group">Left the group</string>
+    <string name="ThreadRecord_secure_session_reset">Secure session reset.</string>
+    <string name="ThreadRecord_draft">Draft:</string>
+    <string name="ThreadRecord_called">You called</string>
+    <string name="ThreadRecord_called_you">Called you</string>
+    <string name="ThreadRecord_missed_call">Missed call</string>
+    <string name="ThreadRecord_media_message">මාධ්‍යය පණිවිඩය</string>
+    <string name="ThreadRecord_s_is_on_signal">%s is on Session!</string>
+    <string name="ThreadRecord_disappearing_messages_disabled">Disappearing messages disabled</string>
+    <string name="ThreadRecord_disappearing_message_time_updated_to_s">Disappearing message time set to %s</string>
+    <string name="ThreadRecord_s_took_a_screenshot">%s took a screenshot.</string>
+    <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
+    <string name="ThreadRecord_safety_number_changed">Safety number changed</string>
+    <string name="ThreadRecord_your_safety_number_with_s_has_changed">Your safety number with %s has changed.</string>
+    <string name="ThreadRecord_you_marked_verified">You marked verified</string>
+    <string name="ThreadRecord_you_marked_unverified">You marked unverified</string>
+    <string name="ThreadRecord_empty_message">This conversation is empty</string>
+    <string name="ThreadRecord_open_group_invitation">Open group invitation</string>
+    <!-- UpdateApkReadyListener -->
+    <string name="UpdateApkReadyListener_Signal_update">Session update</string>
+    <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">A new version of Session is available, tap to update</string>
+    <!-- MessageDisplayHelper -->
+    <string name="MessageDisplayHelper_bad_encrypted_message">Bad encrypted message</string>
+    <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Message encrypted for non-existing session</string>
+    <!-- MmsMessageRecord -->
+    <string name="MmsMessageRecord_bad_encrypted_mms_message">Bad encrypted MMS message</string>
+    <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS message encrypted for non-existing session</string>
+    <!-- MuteDialog -->
+    <string name="MuteDialog_mute_notifications">Mute notifications</string>
+    <!-- KeyCachingService -->
+    <string name="KeyCachingService_signal_passphrase_cached">විවෘතකිරීමට තට්ටුකරන්න.</string>
+    <string name="KeyCachingService_passphrase_cached">Session is unlocked</string>
+    <string name="KeyCachingService_lock">Lock Session</string>
+    <!-- MediaPreviewActivity -->
+    <string name="MediaPreviewActivity_you">ඔබ</string>
+    <string name="MediaPreviewActivity_unssuported_media_type">Unsupported media type</string>
+    <string name="MediaPreviewActivity_draft">Draft</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Unable to save to external storage without permissions</string>
+    <string name="MediaPreviewActivity_media_delete_confirmation_title">Delete message?</string>
+    <string name="MediaPreviewActivity_media_delete_confirmation_message">This will permanently delete this message.</string>
+    <!-- MessageNotifier -->
+    <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d new messages in %2$d conversations</string>
+    <string name="MessageNotifier_most_recent_from_s">Most recent from: %1$s</string>
+    <string name="MessageNotifier_locked_message">Locked message</string>
+    <string name="MessageNotifier_message_delivery_failed">පණිවිඩය බාරදීමට අසමත්විය.</string>
+    <string name="MessageNotifier_failed_to_deliver_message">පණිවිඩය බාරදීමට අසමත්විය.</string>
+    <string name="MessageNotifier_error_delivering_message">Error delivering message.</string>
+    <string name="MessageNotifier_mark_all_as_read">Mark all as read</string>
+    <string name="MessageNotifier_mark_read">Mark read</string>
+    <string name="MessageNotifier_reply">පිළිතුරු</string>
+    <string name="MessageNotifier_pending_signal_messages">Pending Session messages</string>
+    <string name="MessageNotifier_you_have_pending_signal_messages">You have pending Session messages, tap to open and retrieve</string>
+    <string name="MessageNotifier_contact_message">%1$s %2$s</string>
+    <string name="MessageNotifier_unknown_contact_message">සබඳතාව</string>
+    <!-- Notification Channels -->
+    <string name="NotificationChannel_messages">Default</string>
+    <string name="NotificationChannel_calls">ඇමතුම්</string>
+    <string name="NotificationChannel_failures">Failures</string>
+    <string name="NotificationChannel_backups">උපස්ථ</string>
+    <string name="NotificationChannel_locked_status">Lock status</string>
+    <string name="NotificationChannel_app_updates">යෙදුම් යාවත්කාල</string>
+    <string name="NotificationChannel_other">වෙනත්</string>
+    <string name="NotificationChannel_group_messages">පණිවිඩ</string>
+    <string name="NotificationChannel_missing_display_name">Unknown</string>
+    <!-- QuickResponseService -->
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Quick response unavailable when Session is locked!</string>
+    <string name="QuickResponseService_problem_sending_message">Problem sending message!</string>
+    <!-- SaveAttachmentTask -->
+    <string name="SaveAttachmentTask_saved_to">Saved to %s</string>
+    <string name="SaveAttachmentTask_saved">Saved</string>
+    <!-- SearchToolbar -->
+    <string name="SearchToolbar_search">සොයන්න</string>
+    <!-- ShortcutLauncherActivity -->
+    <string name="ShortcutLauncherActivity_invalid_shortcut">වලංගු නොවන කෙටිමඟකි</string>
+    <!-- SingleRecipientNotificationBuilder -->
+    <string name="SingleRecipientNotificationBuilder_signal">Session</string>
+    <string name="SingleRecipientNotificationBuilder_new_message">නව පණිවිඩය</string>
+    <!-- TransferControlView -->
+    <plurals name="TransferControlView_n_items">
+        <item quantity="one">%d Item</item>
+        <item quantity="other">%d Items</item>
+    </plurals>
+    <!-- VideoPlayer -->
+    <string name="VideoPlayer_error_playing_video">දෘශ්‍යකය වාදන දෝෂයකි</string>
+    <!-- attachment_type_selector -->
+    <string name="attachment_type_selector__audio">ශ්‍රව්‍ය</string>
+    <string name="attachment_type_selector__audio_description">ශ්‍රව්‍ය</string>
+    <string name="attachment_type_selector__contact">සබඳතාව</string>
+    <string name="attachment_type_selector__contact_description">සබඳතාව</string>
+    <string name="attachment_type_selector__camera">Camera</string>
+    <string name="attachment_type_selector__camera_description">Camera</string>
+    <string name="attachment_type_selector__location">Location</string>
+    <string name="attachment_type_selector__location_description">Location</string>
+    <string name="attachment_type_selector__gif">GIF</string>
+    <string name="attachment_type_selector__gif_description">Gif</string>
+    <string name="attachment_type_selector__gallery_description">Image or video</string>
+    <string name="attachment_type_selector__file_description">File</string>
+    <string name="attachment_type_selector__gallery">Gallery</string>
+    <string name="attachment_type_selector__file">File</string>
+    <string name="attachment_type_selector__drawer_description">Toggle attachment drawer</string>
+    <!-- contact_selection_group_activity -->
+    <string name="contact_selection_group_activity__finding_contacts">Loading contacts&#8230;</string>
+    <!-- conversation_activity -->
+    <string name="conversation_activity__send">Send</string>
+    <string name="conversation_activity__compose_description">Message composition</string>
+    <string name="conversation_activity__emoji_toggle_description">Toggle emoji keyboard</string>
+    <string name="conversation_activity__attachment_thumbnail">Attachment Thumbnail</string>
+    <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Toggle quick camera attachment drawer</string>
+    <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Record and send audio attachment</string>
+    <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Lock recording of audio attachment</string>
+    <string name="conversation_activity__enable_signal_for_sms">Enable Session for SMS</string>
+    <!-- conversation_input_panel -->
+    <string name="conversation_input_panel__slide_to_cancel">Slide to cancel</string>
+    <string name="conversation_input_panel__cancel">අවලංගු</string>
+    <!-- conversation_item -->
+    <string name="conversation_item__mms_image_description">මාධ්‍යය පණිවිඩය</string>
+    <string name="conversation_item__secure_message_description">ආරක්ෂිත පණීවිඩය</string>
+    <!-- conversation_item_sent -->
+    <string name="conversation_item_sent__send_failed_indicator_description">යැවීමට අසමත්විය</string>
+    <string name="conversation_item_sent__pending_approval_description">Pending Approval</string>
+    <string name="conversation_item_sent__delivered_description">බාරදුනි</string>
+    <string name="conversation_item_sent__message_read">Message read</string>
+    <!-- conversation_item_received -->
+    <string name="conversation_item_received__contact_photo_description">Contact photo</string>
+    <!-- audio_view -->
+    <string name="audio_view__play_accessibility_description">වාදනය</string>
+    <string name="audio_view__pause_accessibility_description">Pause</string>
+    <string name="audio_view__download_accessibility_description">බාගන්න</string>
+    <!-- open_group_invitation_view -->
+    <string name="open_group_invitation_view__join_accessibility_description">එක්වන්න</string>
+    <string name="open_group_invitation_view__open_group_invitation">Open group invitation</string>
+    <string name="open_group_guidelines_pinned_message">Pinned message</string>
+    <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
+    <string name="open_group_guidelines_read">Read</string>
+    <!-- QuoteView -->
+    <string name="QuoteView_audio">Audio</string>
+    <string name="QuoteView_video">Video</string>
+    <string name="QuoteView_photo">Photo</string>
+    <string name="QuoteView_you">ඔබ</string>
+    <string name="QuoteView_original_missing">Original message not found</string>
+    <!-- conversation_fragment -->
+    <string name="conversation_fragment__scroll_to_the_bottom_content_description">Scroll to the bottom</string>
+    <!-- giphy_activity -->
+    <string name="giphy_activity_toolbar__search_gifs_and_stickers">Search GIFs and stickers</string>
+    <!-- giphy_fragment -->
+    <string name="giphy_fragment__nothing_found">Nothing found</string>
+    <!-- load_more_header -->
+    <string name="load_more_header__see_full_conversation">See full conversation</string>
+    <string name="load_more_header__loading">පූරණය වෙමින්</string>
+    <!-- media_overview_activity -->
+    <string name="media_overview_activity__no_media">මාධ්‍යය නැත</string>
+    <!-- message_recipients_list_item -->
+    <string name="message_recipients_list_item__resend">නැවත යවන්න</string>
+    <!-- recipient_preferences -->
+    <string name="recipient_preferences__block">අවහිර</string>
+    <!-- message_details_header -->
+    <string name="message_details_header__issues_need_your_attention">Some issues need your attention.</string>
+    <string name="message_details_header__sent">Sent</string>
+    <string name="message_details_header__received">Received</string>
+    <string name="message_details_header__disappears">Disappears</string>
+    <string name="message_details_header__via">Via</string>
+    <string name="message_details_header__to">To:</string>
+    <string name="message_details_header__from">From:</string>
+    <string name="message_details_header__with">With:</string>
+    <!-- AndroidManifest.xml -->
+    <string name="AndroidManifest__create_passphrase">Create passphrase</string>
+    <string name="AndroidManifest__select_contacts">Select contacts</string>
+    <string name="AndroidManifest__media_preview">Media preview</string>
+    <!-- arrays.xml -->
+    <string name="arrays__use_default">Use default</string>
+    <string name="arrays__use_custom">Use custom</string>
+    <string name="arrays__mute_for_one_hour">Mute for 1 hour</string>
+    <string name="arrays__mute_for_two_hours">Mute for 2 hours</string>
+    <string name="arrays__mute_for_one_day">Mute for 1 day</string>
+    <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
+    <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
+    <string name="arrays__settings_default">Settings default</string>
+    <string name="arrays__enabled">Enabled</string>
+    <string name="arrays__disabled">Disabled</string>
+    <string name="arrays__name_and_message">Name and message</string>
+    <string name="arrays__name_only">Name only</string>
+    <string name="arrays__no_name_or_message">No name or message</string>
+    <string name="arrays__images">Images</string>
+    <string name="arrays__audio">Audio</string>
+    <string name="arrays__video">Video</string>
+    <string name="arrays__documents">Documents</string>
+    <string name="arrays__small">Small</string>
+    <string name="arrays__normal">Normal</string>
+    <string name="arrays__large">Large</string>
+    <string name="arrays__extra_large">Extra large</string>
+    <string name="arrays__default">Default</string>
+    <string name="arrays__high">High</string>
+    <string name="arrays__max">Max</string>
+    <!-- plurals.xml -->
+    <plurals name="hours_ago">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <!-- preferences.xml -->
+    <string name="preferences__pref_enter_sends_title">Enter key sends</string>
+    <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressing the Enter key will send text messages</string>
+    <string name="preferences__send_link_previews">Send link previews</string>
+    <string name="preferences__previews_are_supported_for">Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links</string>
+    <string name="preferences__screen_security">Screen security</string>
+    <string name="preferences__disable_screen_security_to_allow_screen_shots">Block screenshots in the recents list and inside the app</string>
+    <string name="preferences__notifications">Notifications</string>
+    <string name="preferences__led_color">LED color</string>
+    <string name="preferences__led_color_unknown">Unknown</string>
+    <string name="preferences__pref_led_blink_title">LED blink pattern</string>
+    <string name="preferences__sound">Sound</string>
+    <string name="preferences__silent">Silent</string>
+    <string name="preferences__repeat_alerts">Repeat alerts</string>
+    <string name="preferences__never">Never</string>
+    <string name="preferences__one_time">One time</string>
+    <string name="preferences__two_times">Two times</string>
+    <string name="preferences__three_times">Three times</string>
+    <string name="preferences__five_times">Five times</string>
+    <string name="preferences__ten_times">Ten times</string>
+    <string name="preferences__vibrate">Vibrate</string>
+    <string name="preferences__green">කොළ</string>
+    <string name="preferences__red">රතු</string>
+    <string name="preferences__blue">නිල්</string>
+    <string name="preferences__orange">තැඹිලි</string>
+    <string name="preferences__cyan">Cyan</string>
+    <string name="preferences__magenta">Magenta</string>
+    <string name="preferences__white">සුදු</string>
+    <string name="preferences__none">None</string>
+    <string name="preferences__fast">Fast</string>
+    <string name="preferences__normal">Normal</string>
+    <string name="preferences__slow">Slow</string>
+    <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Automatically delete older messages once a conversation exceeds a specified length</string>
+    <string name="preferences__delete_old_messages">Delete old messages</string>
+    <string name="preferences__conversation_length_limit">Conversation length limit</string>
+    <string name="preferences__trim_all_conversations_now">Trim all conversations now</string>
+    <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Scan through all conversations and enforce conversation length limits</string>
+    <string name="preferences__default">Default</string>
+    <string name="preferences__incognito_keyboard">Incognito keyboard</string>
+    <string name="preferences__read_receipts">Read receipts</string>
+    <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">If read receipts are disabled, you won\'t be able to see read receipts from others.</string>
+    <string name="preferences__typing_indicators">Typing indicators</string>
+    <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">If typing indicators are disabled, you won\'t be able to see typing indicators from others.</string>
+    <string name="preferences__request_keyboard_to_disable_personalized_learning">Request keyboard to disable personalized learning</string>
+    <string name="preferences__light_theme">Light</string>
+    <string name="preferences__dark_theme">Dark</string>
+    <string name="preferences_chats__message_trimming">Message Trimming</string>
+    <string name="preferences_advanced__use_system_emoji">Use system emoji</string>
+    <string name="preferences_advanced__disable_signal_built_in_emoji_support">Disable Session\'s built-in emoji support</string>
+    <string name="preferences_app_protection__app_access">App Access</string>
+    <string name="preferences_app_protection__communication">Communication</string>
+    <string name="preferences_chats__chats">සංවාද</string>
+    <string name="preferences_notifications__messages">Messages</string>
+    <string name="preferences_notifications__in_chat_sounds">In-chat sounds</string>
+    <string name="preferences_notifications__show">Show</string>
+    <string name="preferences_notifications__priority">Priority</string>
+    <!-- **************************************** -->
+    <!-- menus -->
+    <!-- **************************************** -->
+    <!-- contact_selection_list -->
+    <string name="contact_selection_list__unknown_contact">New message to...</string>
+    <!-- conversation_context -->
+    <string name="conversation_context__menu_message_details">Message details</string>
+    <string name="conversation_context__menu_copy_text">Copy text</string>
+    <string name="conversation_context__menu_delete_message">Delete message</string>
+    <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
+    <string name="conversation_context__menu_resend_message">Resend message</string>
+    <string name="conversation_context__menu_reply_to_message">Reply to message</string>
+    <!-- conversation_context_image -->
+    <string name="conversation_context_image__save_attachment">Save attachment</string>
+    <!-- conversation_expiring_off -->
+    <string name="conversation_expiring_off__disappearing_messages">Disappearing messages</string>
+    <!-- conversation_expiring_on -->
+    <string name="menu_conversation_expiring_on__messages_expiring">Messages expiring</string>
+    <!-- conversation_muted -->
+    <string name="conversation_muted__unmute">Unmute</string>
+    <!-- conversation_unmuted -->
+    <string name="conversation_unmuted__mute_notifications">Mute notifications</string>
+    <!-- conversation -->
+    <string name="conversation__menu_edit_group">සමූහය සංස්කරණය</string>
+    <string name="conversation__menu_leave_group">සමූහය හැරයන්න</string>
+    <string name="conversation__menu_view_all_media">සියලුම මාධ්‍යය</string>
+    <string name="conversation__menu_add_shortcut">මුල් තිරයට එකතු කරන්න</string>
+    <!-- conversation_popup -->
+    <string name="conversation_popup__menu_expand_popup">Expand popup</string>
+    <!-- conversation_group_options -->
+    <string name="conversation_group_options__delivery">බාරදීම</string>
+    <string name="conversation_group_options__conversation">සම්භාෂණය</string>
+    <string name="conversation_group_options__broadcast">Broadcast</string>
+    <!-- media_preview -->
+    <string name="media_preview__save_title">සුරකින්න</string>
+    <string name="media_preview__forward_title">Forward</string>
+    <string name="media_preview__all_media_title">සියලුම මාධ්‍යය</string>
+    <!-- media_overview -->
+    <string name="media_overview_documents_fragment__no_documents_found">ලේඛන නැත</string>
+    <!-- media_preview_activity -->
+    <string name="media_preview_activity__media_content_description">මාධ්‍යය පෙරදසුන</string>
+    <!-- Trimmer -->
+    <string name="trimmer__deleting">Deleting</string>
+    <string name="trimmer__deleting_old_messages">Deleting old messages...</string>
+    <string name="trimmer__old_messages_successfully_deleted">Old messages successfully deleted</string>
+    <!-- transport_selection_list_item -->
+    <string name="Permissions_permission_required">අවසරය අවශ්‍යයි</string>
+    <string name="Permissions_continue">ඉදිරියට</string>
+    <string name="Permissions_not_now">දැන් නොවේ</string>
+    <string name="backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup">Backups will be saved to external storage and encrypted with the passphrase below. You must have this passphrase in order to restore a backup.</string>
+    <string name="backup_enable_dialog__i_have_written_down_this_passphrase">I have written down this passphrase. Without it, I will be unable to restore a backup.</string>
+    <string name="registration_activity__skip">මඟහරින්න</string>
+    <string name="RegistrationActivity_backup_failure_downgrade">Cannot import backups from newer versions of Session</string>
+    <string name="RegistrationActivity_incorrect_backup_passphrase">Incorrect backup passphrase</string>
+    <string name="BackupDialog_enable_local_backups">ස්ථානීය උපස්ථ සබලකරන්නද?</string>
+    <string name="BackupDialog_enable_backups">උපස්ථ සබල කරන්න</string>
+    <string name="BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Please acknowledge your understanding by marking the confirmation check box.</string>
+    <string name="BackupDialog_delete_backups">Delete backups?</string>
+    <string name="BackupDialog_disable_and_delete_all_local_backups">Disable and delete all local backups?</string>
+    <string name="BackupDialog_delete_backups_statement">Delete backups</string>
+    <string name="BackupDialog_copied_to_clipboard">පසුරුපුවරුවට පිටපත් විය</string>
+    <string name="LocalBackupJob_creating_backup">උපස්ථය සෑදෙමින්...</string>
+    <string name="ProgressPreference_d_messages_so_far">%d messages so far</string>
+    <string name="BackupUtil_never">Never</string>
+    <string name="preferences_app_protection__screen_lock">තිර අගුල</string>
+    <string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">Lock Session access with Android screen lock or fingerprint</string>
+    <string name="preferences_app_protection__screen_lock_inactivity_timeout">Screen lock inactivity timeout</string>
+    <string name="AppProtectionPreferenceFragment_none">None</string>
+    <!-- Conversation activity -->
+    <string name="activity_conversation_copy_public_key_button_title">Copy public key</string>
+    <!-- Session -->
+    <string name="continue_2">ඉදිරියට</string>
+    <string name="copy">පිටපත්</string>
+    <string name="invalid_url">වලංගු නොවන ඒ.ස.නි. කි</string>
+    <string name="copied_to_clipboard">පසුරුපුවරුවට පිටපත් විය</string>
+    <string name="next">Next</string>
+    <string name="share">බෙදාගන්න</string>
+    <string name="invalid_session_id">Invalid Session ID</string>
+    <string name="cancel">අවලංගු</string>
+    <string name="your_session_id">Your Session ID</string>
+    <string name="activity_landing_title_2">Your Session begins here...</string>
+    <string name="activity_landing_register_button_title">Create Session ID</string>
+    <string name="activity_landing_restore_button_title">Continue Your Session</string>
+    <string name="view_fake_chat_bubble_1">සෙෂන් යනු කුමක්ද?</string>
+    <string name="view_fake_chat_bubble_2">It\'s a decentralized, encrypted messaging app</string>
+    <string name="view_fake_chat_bubble_3">So it doesn\'t collect my personal information or my conversation metadata? How does it work?</string>
+    <string name="view_fake_chat_bubble_4">Using a combination of advanced anonymous routing and end-to-end encryption technologies.</string>
+    <string name="view_fake_chat_bubble_5">Friends don\'t let friends use compromised messengers. You\'re welcome.</string>
+    <string name="activity_register_title">Say hello to your Session ID</string>
+    <string name="activity_register_explanation">Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.</string>
+    <string name="activity_restore_title">ගිණුම ප්‍රත්‍යර්පණය කරන්න</string>
+    <string name="activity_restore_explanation">Enter the recovery phrase that was given to you when you signed up to restore your account.</string>
+    <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
+    <string name="activity_display_name_title_2">Pick your display name</string>
+    <string name="activity_display_name_explanation">This will be your name when you use Session. It can be your real name, an alias, or anything else you like.</string>
+    <string name="activity_display_name_edit_text_hint">Enter a display name</string>
+    <string name="activity_display_name_display_name_missing_error">Please pick a display name</string>
+    <string name="activity_display_name_display_name_too_long_error">Please pick a shorter display name</string>
+    <string name="activity_pn_mode_recommended_option_tag">නිර්දේශිත</string>
+    <string name="activity_pn_mode_no_option_picked_dialog_title">Please Pick an Option</string>
+    <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
+    <string name="activity_home_empty_state_button_title">Start a Session</string>
+    <string name="activity_home_leave_group_dialog_message">Are you sure you want to leave this group?</string>
+    <string name="activity_home_leaving_group_failed_message">"Couldn't leave group"</string>
+    <string name="activity_home_delete_conversation_dialog_message">Are you sure you want to delete this conversation?</string>
+    <string name="activity_home_conversation_deleted_message">Conversation deleted</string>
+    <string name="activity_seed_title">Your Recovery Phrase</string>
+    <string name="activity_seed_title_2">Meet your recovery phrase</string>
+    <string name="activity_seed_explanation">Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don\'t give it to anyone.</string>
+    <string name="activity_seed_reveal_button_title">Hold to reveal</string>
+    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
+    <string name="view_seed_reminder_subtitle_1">Secure your account by saving your recovery phrase</string>
+    <string name="view_seed_reminder_subtitle_2">Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID.</string>
+    <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
+    <string name="activity_path_title">Path</string>
+    <string name="activity_path_explanation">Session hides your IP by bouncing your messages through several Service Nodes in Session\'s decentralized network. These are the countries your connection is currently being bounced through:</string>
+    <string name="activity_path_device_row_title">ඔබ</string>
+    <string name="activity_path_guard_node_row_title">Entry Node</string>
+    <string name="activity_path_service_node_row_title">Service Node</string>
+    <string name="activity_path_destination_row_title">Destination</string>
+    <string name="activity_path_learn_more_button_title">Learn More</string>
+    <string name="activity_path_resolving_progress">Resolving…</string>
+    <string name="activity_create_private_chat_title">New Session</string>
+    <string name="activity_create_private_chat_enter_session_id_tab_title">Enter Session ID</string>
+    <string name="activity_create_private_chat_scan_qr_code_tab_title">Scan QR Code</string>
+    <string name="activity_create_private_chat_scan_qr_code_explanation">Scan a user\'s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings.</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
+    <string name="fragment_enter_public_key_explanation">Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.</string>
+    <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
+    <string name="fragment_scan_qr_code_camera_access_explanation">Session needs camera access to scan QR codes</string>
+    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Grant Camera Access</string>
+    <string name="activity_create_closed_group_title">New Closed Group</string>
+    <string name="activity_create_closed_group_edit_text_hint">සමූහ නාමයක් ඇතුල් කරන්න</string>
+    <string name="activity_create_closed_group_empty_state_message">You don\'t have any contacts yet</string>
+    <string name="activity_create_closed_group_empty_state_button_title">Start a Session</string>
+    <string name="activity_create_closed_group_group_name_missing_error">සමූහ නාමයක් ඇතුල් කරන්න</string>
+    <string name="activity_create_closed_group_group_name_too_long_error">කෙටි සමූහ නාමයක් ඇතුල් කරන්න</string>
+    <string name="activity_create_closed_group_not_enough_group_members_error">Please pick at least 1 group member</string>
+    <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 100 members</string>
+    <string name="activity_join_public_chat_title">විවෘත සමූහයට එක්වන්න</string>
+    <string name="activity_join_public_chat_error">සමූහයට එක්වීමට නොහැකි විය</string>
+    <string name="activity_join_public_chat_enter_group_url_tab_title">සමූහයේ ඒ.ස.නි. විවෘත කරන්න</string>
+    <string name="activity_join_public_chat_scan_qr_code_tab_title">Scan QR Code</string>
+    <string name="activity_join_public_chat_scan_qr_code_explanation">Scan the QR code of the open group you\'d like to join</string>
+    <string name="fragment_enter_chat_url_edit_text_hint">විවෘත සමූහ ඒ.ස.නි. ක් ඇතුල්කරන්න</string>
+    <string name="activity_settings_title">සැකසුම්</string>
+    <string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
+    <string name="activity_settings_display_name_missing_error">Please pick a display name</string>
+    <string name="activity_settings_display_name_too_long_error">Please pick a shorter display name</string>
+    <string name="activity_settings_privacy_button_title">පෞද්ගලිකත්වය</string>
+    <string name="activity_settings_notifications_button_title">දැනුම්දීම්</string>
+    <string name="activity_settings_chats_button_title">සංවාද</string>
+    <string name="activity_settings_devices_button_title">උපාංග</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">නිති පැණ</string>
+    <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
+    <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
+    <string name="activity_settings_help_translate_session">සෙෂන් පරිවර්තනයට උදව් කරන්න</string>
+    <string name="activity_notification_settings_title">දැනුම්දීම්</string>
+    <string name="activity_notification_settings_style_section_title">Notification Style</string>
+    <string name="activity_notification_settings_content_section_title">දැනුම්දීමේ අන්තර්ගතය</string>
+    <string name="activity_privacy_settings_title">පෞද්ගලිකත්වය</string>
+    <string name="activity_chat_settings_title">සංවාද</string>
+    <string name="preferences_notifications_strategy_category_title">Notification Strategy</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="fragment_device_list_bottom_sheet_change_name_button_title">නම වෙනස් කරන්න</string>
+    <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Unlink device</string>
+    <string name="dialog_seed_title">Your Recovery Phrase</string>
+    <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
+    <string name="dialog_clear_all_data_title">Clear All Data</string>
+    <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="activity_qr_code_title">QR Code</string>
+    <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
+    <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
+    <string name="activity_qr_code_view_scan_qr_code_explanation">Scan someone\'s QR code to start a conversation with them</string>
+    <string name="fragment_view_my_qr_code_title">මෙය පරිලෝකනය</string>
+    <string name="fragment_view_my_qr_code_explanation">This is your QR code. Other users can scan it to start a session with you.</string>
+    <string name="fragment_view_my_qr_code_share_title">Share QR Code</string>
+    <string name="fragment_contact_selection_contacts_title">සබඳතා</string>
+    <string name="fragment_contact_selection_closed_groups_title">සංවෘත සමූහ</string>
+    <string name="fragment_contact_selection_open_groups_title">විවෘත සමූහ</string>
+    <string name="fragment_contact_selection_empty_contacts">ඔබට තවම කිසිම සබඳතාවක් නැත</string>
+    <!-- Next round of translation -->
+    <string name="menu_apply_button">යොදන්න</string>
+    <string name="menu_done_button">Done</string>
+    <string name="activity_edit_closed_group_title">සමූහය සංස්කරණය</string>
+    <string name="activity_edit_closed_group_edit_text_hint">නව සමූහ නාමයක් ඇතුල් කරන්න</string>
+    <string name="activity_edit_closed_group_edit_members">සාමාජිකයින්</string>
+    <string name="activity_edit_closed_group_add_members">සාමාජිකයින් එකතු කරන්න</string>
+    <string name="activity_edit_closed_group_group_name_missing_error">සමූහයේ නම හිස්විය නොහැකිය</string>
+    <string name="activity_edit_closed_group_group_name_too_long_error">කෙටි සමූහ නාමයක් ඇතුල් කරන්න</string>
+    <string name="activity_edit_closed_group_not_enough_group_members_error">Groups must have at least 1 group member</string>
+    <string name="fragment_edit_group_bottom_sheet_remove">පරිශීලක සමූහයෙන් ඉවත් කරන්න</string>
+    <string name="activity_select_contacts_title">Select Contacts</string>
+    <string name="view_reset_secure_session_done_message">Secure session reset done</string>
+    <string name="dialog_ui_mode_title">තේමාව</string>
+    <string name="dialog_ui_mode_option_day">දවස</string>
+    <string name="dialog_ui_mode_option_night">රාත්‍රී</string>
+    <string name="dialog_ui_mode_option_system_default">System default</string>
+    <string name="activity_conversation_menu_copy_session_id">Copy Session ID</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachment_type_voice_message">හඬ පණිවිඩය</string>
+    <string name="details">විස්තර</string>
+    <string name="dialog_backup_activation_failed">Failed to activate backups. Please try again or contact support.</string>
+    <string name="activity_backup_restore_title">උපස්ථය ප්‍රත්‍යර්පණය</string>
+    <string name="activity_backup_restore_select_file">Select a file</string>
+    <string name="activity_backup_restore_explanation_1">Select a backup file and enter the passphrase it was created with.</string>
+    <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
+    <string name="activity_link_device_skip_prompt">This is taking a while, would you like to skip?</string>
+    <string name="activity_link_device_link_device">Link a Device</string>
+    <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
+    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
+    <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
+    <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
+    <string name="activity_pn_mode_message_notifications">පණිවිඩ දැනුම්දීම්</string>
+    <string name="activity_pn_mode_explanation">There are two ways Session can notify you of new messages.</string>
+    <string name="activity_pn_mode_fast_mode">Fast Mode</string>
+    <string name="activity_pn_mode_slow_mode">Slow Mode</string>
+    <string name="activity_pn_mode_fast_mode_explanation">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="activity_pn_mode_slow_mode_explanation">Session will occasionally check for new messages in the background.</string>
+    <string name="fragment_recovery_phrase_title">Recovery Phrase</string>
+    <string name="activity_prompt_passphrase_session_locked">Session is Locked</string>
+    <string name="activity_prompt_passphrase_tap_to_unlock">අනවහිරයට තට්ටු කරන්න</string>
+    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Enter a nickname</string>
+    <string name="invalid_public_key">Invalid public key</string>
+    <string name="document">Document</string>
+    <string name="dialog_blocked_title">Unblock %s?</string>
+    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
+    <string name="dialog_join_open_group_title">Join %s?</string>
+    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
+    <string name="dialog_open_url_title">Open URL?</string>
+    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
+    <string name="open">Open</string>
+    <string name="dialog_link_preview_title">Enable Link Previews?</string>
+    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
+    <string name="dialog_link_preview_enable_button_title">සබල කරන්න</string>
+    <string name="dialog_download_title">%s විශ්වාස ද?</string>
+    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
+    <string name="dialog_download_button_title">බාගන්න</string>
+    <string name="activity_conversation_blocked_banner_text">%s අවහිර කර ඇත. අනවහිර කරනවාද?</string>
+    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">මාධ්‍යය</string>
+    <string name="UntrustedAttachmentView_download_attachment">%s බාගැනීමට තට්ටු කරන්න</string>
+    <string name="message_details_header__error">දෝෂය</string>
+    <string name="dialog_send_seed_title">අවවාදයයි</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">යවන්න</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index fc6ef0985..26c430456 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -35,7 +35,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(zvuk)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(odpoveď)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nenašla sa aplikácia pre výber médií.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session potrebuje prístup k úložisku aby k správam mohol pridať obrázkové, video a zvukové prílohy, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Úložisko\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session potrebuje prístup ku kontaktom aby k správam mohol pripojiť informácie o kontakte, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Kontakty\".</string>
@@ -68,6 +68,7 @@
     <string name="ConversationActivity_message">Správa</string>
     <string name="ConversationActivity_compose">Napísať správu</string>
     <string name="ConversationActivity_muted_until_date">Stlmené upozornenia do %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d členov</string>
     <string name="ConversationActivity_open_group_guidelines">Usmernenia Spoločenstva</string>
     <string name="ConversationActivity_invalid_recipient">Neplatný príjemca</string>
@@ -87,6 +88,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Pre posielanie zvukových správ potrebuje Session prístup k mikrofónu.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session potrebuje prístup k mikrofónu aby mohol posielať zvukové správy, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Mikrofón\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pre fotenie a nahrávanie videa potrebuje Session prístup k fotoaparátu.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session potrebuje prístup k fotoaparátu aby mohol vytvárať fotografie a video, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session potrebuje prístup k Fotoaparátu, aby mohol vytvárať fotografie a videá</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -234,6 +236,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Odblokovať tento kontakt?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Znovu budete dostávať správy a hovory od tohoto kontaktu.</string>
     <string name="RecipientPreferenceActivity_unblock">Odblokovať</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Obrázok</string>
     <string name="Slide_audio">Zvuk</string>
@@ -427,6 +430,7 @@ výmeny kľúčov.</string>
     <string name="arrays__mute_for_one_day">Stlmiť na 1 deň</string>
     <string name="arrays__mute_for_seven_days">Stlmiť na 7 dní</string>
     <string name="arrays__mute_for_one_year">Stlmiť na 1 rok</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Predvolené nastavenie</string>
     <string name="arrays__enabled">Povolené</string>
     <string name="arrays__disabled">Zakázané</string>
@@ -517,6 +521,7 @@ výmeny kľúčov.</string>
     <string name="conversation_context__menu_copy_text">Kopírovať text</string>
     <string name="conversation_context__menu_delete_message">Zmazať správu</string>
     <string name="conversation_context__menu_ban_user">Zablokovať užívateľa</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Odoslať správu znovu</string>
     <string name="conversation_context__menu_reply_to_message">Odpovedať na správu</string>
     <!-- conversation_context_image -->
@@ -660,7 +665,8 @@ výmeny kľúčov.</string>
     <string name="activity_settings_notifications_button_title">Upozornenia</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Zariadenia</string>
-    <string name="activity_settings_invite_button_title">Pozvať</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Fráza pre obnovenie</string>
     <string name="activity_settings_clear_all_data_button_title">Odstrániť dáta</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -754,4 +760,14 @@ výmeny kľúčov.</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 557d9c0b6..a3fe6f5e7 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -35,7 +35,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -68,6 +68,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -87,6 +88,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -234,6 +236,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -429,6 +432,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -519,6 +523,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -662,7 +667,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -756,4 +762,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index a441207eb..4bd1dcf01 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(përgjigju)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">S\’gjendet dot aplikacion për përzgjedhje mediash.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Që të mund të bashkëngjisë foto, video, ose audio, Session-i lyp leje Depozitimi, por kjo i është mohuar. Ju lutemi, vazhdoni për te menuja e rregullimeve të aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Depozitim\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Që të mund të bashkëngjisë të dhëna kontakti, Session-i lyp leje përdorimi Kontaktesh, por kjo i është mohuar. Ju lutemi, vazhdoni për te menuja e rregullimeve të aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Kontakte\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Marrës i pavlefshëm!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Për të dërguar mesazhe zanorë, lejojeni Session-in të përdorë mikrofonin tuaj.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Që të mund të dërgojë mesazhe audio, Session-i lyp leje përdorimi të Mikrofonit, por kjo i është mohuar. Ju lutemi, kaloni te rregullimet e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Mikrofonin\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Për të bërë foto dhe dhe video, lejojini Session-it të përdorë kamerën.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Që të bëjë foto ose video, Session-i lyp leje përdorimi të Kamerës, por kjo i është mohuar. Ju lutemi, kaloni te rregullimet e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Kamerën\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Që të bëjë foto ose video, Session-i lyp leje përdorimi të Kamerës</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Të zhbllokohet ky kontakt?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Do të jeni sërish në gjendje të merrni mesazhe dhe thirrje prej këtij kontakti.</string>
     <string name="RecipientPreferenceActivity_unblock">Zhbllokoje</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Figurë</string>
     <string name="Slide_audio">Audio</string>
@@ -401,6 +404,7 @@
     <string name="arrays__mute_for_one_day">Heshtoje për 1 ditë</string>
     <string name="arrays__mute_for_seven_days">Heshtoje për 7 ditë</string>
     <string name="arrays__mute_for_one_year">Heshtoje për 1 vit</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Rregullime parazgjedhje</string>
     <string name="arrays__enabled">E aktivizuar</string>
     <string name="arrays__disabled">E çaktivizuar</string>
@@ -489,6 +493,7 @@
     <string name="conversation_context__menu_copy_text">Kopjo tekstin</string>
     <string name="conversation_context__menu_delete_message">Fshije mesazhin</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Ridërgoje mesazhin</string>
     <string name="conversation_context__menu_reply_to_message">Përgjigjuni mesazhin</string>
     <!-- conversation_context_image -->
@@ -632,7 +637,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index d401c5ed6..4a2e05c9a 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -33,7 +33,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(звук)</string>
     <string name="DraftDatabase_Draft_video_snippet">(видео)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(одговор)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Нема апликације за избор медијума.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -66,6 +66,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Неисправан прималац!</string>
@@ -85,6 +86,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -222,6 +224,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Одлокирати овај контакт?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Поново можете да примате поруке и позиве од овог контакта.</string>
     <string name="RecipientPreferenceActivity_unblock">Одблокирај</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Слика</string>
     <string name="Slide_audio">Звук</string>
@@ -414,6 +417,7 @@
     <string name="arrays__mute_for_one_day">Утишај 1 дан</string>
     <string name="arrays__mute_for_seven_days">Утишај 7 сати</string>
     <string name="arrays__mute_for_one_year">Утишај 1 годину</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Подразумевана поставка</string>
     <string name="arrays__enabled">Укључи</string>
     <string name="arrays__disabled">Искључи</string>
@@ -503,6 +507,7 @@
     <string name="conversation_context__menu_copy_text">Копирај текст</string>
     <string name="conversation_context__menu_delete_message">Обриши поруку</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Понови слање</string>
     <string name="conversation_context__menu_reply_to_message">Одговори на поруку</string>
     <!-- conversation_context_image -->
@@ -646,7 +651,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -740,4 +746,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 02f4512dc..3617fb55c 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(ljud)</string>
     <string name="DraftDatabase_Draft_video_snippet">(film)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(svar)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Kan inte hitta app för att välja media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session behöver behörigheten Lagring för att bifoga bilder, video och ljud men har nekats den permanent. Fortsätt till inställningsmenyn för Appar och aviseringar, välj \"Behörigheter\" och aktivera \"Lagring\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session behöver behörigheten Kontakter för att bifoga kontaktinformation men har nekats den permanent. Fortsätt till inställningsmenyn för Appar och aviseringar, välj \"Behörigheter\" och aktivera \"Kontakter\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Meddelande</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Ogiltig mottagare!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">För att skicka ljudmeddelanden, vänligen ge Session tillgång till din mikrofon.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session behöver behörigheten Mikrofon för att skicka ljudmeddelanden men har nekats den permanent. Fortsätt till inställningsmenyn för Appar och aviseringar, välj \"Behörigheter\" och aktivera \"Mikrofon\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">För att fånga fotografier och video, tillåt Session att tillgå kameran.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session behöver behörigheten Kamera för att ta bilder och filma men har nekats den permanent. Fortsätt till inställningsmenyn för Appar och aviseringar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session behöver behörigheten Kamera för att ta bilder och filma</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Avblockera denna kontakt?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Du kommer nu åter få meddelanden och samtal från denna kontakt.</string>
     <string name="RecipientPreferenceActivity_unblock">Avblockera</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Bilder</string>
     <string name="Slide_audio">Ljud</string>
@@ -401,6 +404,7 @@ för nyckelutbyte!</string>
     <string name="arrays__mute_for_one_day">Tysta i 1 dag</string>
     <string name="arrays__mute_for_seven_days">Tysta i 7 dagar</string>
     <string name="arrays__mute_for_one_year">Tysta i 1 år</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Inställningars standardvärden</string>
     <string name="arrays__enabled">Aktiverad</string>
     <string name="arrays__disabled">Inaktiverad</string>
@@ -489,6 +493,7 @@ för nyckelutbyte!</string>
     <string name="conversation_context__menu_copy_text">Kopiera text</string>
     <string name="conversation_context__menu_delete_message">Radera meddelande</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Skicka meddelande igen</string>
     <string name="conversation_context__menu_reply_to_message">Svara på meddelande</string>
     <!-- conversation_context_image -->
@@ -632,7 +637,8 @@ för nyckelutbyte!</string>
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -726,4 +732,14 @@ för nyckelutbyte!</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index afa9c6f09..45015dec8 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(sauti)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(jibu)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nashindwa kupata app ya kuchagua habari</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session inahitaji idhini ya Hifadhi ili kuunganisha picha, video, au sauti, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwawezesha \"Hifadhi\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session inahitaji idhini ya Mawasiliano ili kuunganisha maelezo ya mawasiliano, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwawezesha \"Mawasiliano\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Mpokeaji sio sahihi</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Kutuma ujumbe wa sauti, kuruhusu ufikiaji wa Session  kwenye kipaza sauti yako.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session inahitaji idhini ya Kipaza sauti ili kutuma ujumbe wa sauti, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwawezesha \"Kipaza sauti\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Ili kukamata picha na video, kuruhusu upatikanaji wa Session kwa kamera.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session inahitaji kibali cha Kamera kuchukua picha au video, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwawezesha \"Kamera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session inahitaji uruhusu kamera kuchukua picha na video</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Fungua mawasiliano hii?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Utapata tena ujumbe na wito kutoka kwa anwani hii.</string>
     <string name="RecipientPreferenceActivity_unblock">Fungua</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">picha</string>
     <string name="Slide_audio">Sauti</string>
@@ -400,6 +403,7 @@
     <string name="arrays__mute_for_one_day">toa sauti kwa siku moja</string>
     <string name="arrays__mute_for_seven_days">toa sauti kwa siku 7</string>
     <string name="arrays__mute_for_one_year">Simamisha kwa mwaka 1</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Vipimo vya chaguo msingi</string>
     <string name="arrays__enabled">wezesha</string>
     <string name="arrays__disabled">kuzuia</string>
@@ -488,6 +492,7 @@
     <string name="conversation_context__menu_copy_text">Nakala ya nakala</string>
     <string name="conversation_context__menu_delete_message">Futa ujumbe</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Tuma tena ujumbe</string>
     <string name="conversation_context__menu_reply_to_message">Jibu ujumbe</string>
     <!-- conversation_context_image -->
@@ -631,7 +636,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -725,4 +731,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 62328c1fc..39b0b69bb 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,9 +639,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -652,6 +659,9 @@
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
     <string name="dialog_clear_all_data_title">Clear All Data</string>
     <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">QR Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
@@ -722,4 +732,16 @@
     <string name="dialog_download_button_title">Download</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">Media</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index c08a7125d..5d08be269 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -4,11 +4,11 @@
     <string name="yes">అవును</string>
     <string name="no">కాదు</string>
     <string name="delete">తొలగించండి</string>
-    <string name="ban">Ban</string>
+    <string name="ban">Nishedham</string>
     <string name="please_wait">దయచేసి వేచి ఉండండి...</string>
     <string name="save">భద్రపరుచు</string>
-    <string name="note_to_self">Note to Self</string>
-    <string name="version_s">Version %s</string>
+    <string name="note_to_self">Sviya gamanika</string>
+    <string name="version_s">Sanskarana %s</string>
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">కొత్త సందేశం</string>
     <!-- AlbumThumbnailView -->
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(ఆడియో)</string>
     <string name="DraftDatabase_Draft_video_snippet">(వీడియో)</string>
     <string name="DraftDatabase_Draft_quote_snippet">స్పంధించు</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">మీడియా ఎంచుకోవడానికి అనువర్తనం దొరకదు.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ఫోటోలు, వీడియోలు లేదా ఆడియోను అటాచ్ చేయడానికి Sessionకు నిల్వ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్ల మెనుకు కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"నిల్వ\" ను ప్రారంభించండి.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">సంప్రదింపు సమాచారాన్ని అటాచ్ చేయడానికి Session కాంటాక్ట్స్ అనుమతి అవసరం, కానీ అది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తన సెట్టింగ్ల మెనుకి కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"పరిచయాలు\" ప్రారంభించండి.</string>
@@ -54,16 +54,17 @@
     <string name="ConversationItem_click_to_approve_unencrypted">పంపడం విఫలమైంది, అసురక్షిత తిరిగి పొందడం కోసం నొక్కండి</string>
     <string name="ConversationItem_unable_to_open_media">మీడియా ఎంచుకోవడానికి అనువర్తనం దొరకదు.</string>
     <string name="ConversationItem_copied_text">ప్రతి  తీసుకోబడింది %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
-    <string name="ConversationItem_download_more">&#160; Download More</string>
-    <string name="ConversationItem_pending">&#160; Pending</string>
+    <string name="ConversationItem_read_more">Ekkuva chadavatam</string>
+    <string name="ConversationItem_download_more">&#160; మరింత డౌన్‌లోడ్ చేయండి</string>
+    <string name="ConversationItem_pending">&#160; పెండింగ్‌</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">అటాచ్మెంట్ జోడించండి</string>
     <string name="ConversationActivity_select_contact_info">సంప్రదింపు సమాచారం ఎంచుకొండి</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">క్షమించండి, మీ అటాచ్మెంట్ అమర్చడంలో లోపం ఉంది.</string>
-    <string name="ConversationActivity_message">Message</string>
-    <string name="ConversationActivity_compose">Compose</string>
+    <string name="ConversationActivity_message">సందేశం</string>
+    <string name="ConversationActivity_compose">కంపోజ్</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">చెల్లని గ్రహీత!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ఆడియో సందేశాలను పంపడానికి, మీ మైక్రోఫోన్కు Session ప్రాప్తిని అనుమతించండి.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ఆడియో సందేశాలను పంపడానికి Sessionకు మైక్రోఫోన్ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" ని ప్రారంభించండి.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ఫోటోలు మరియు వీడియోలను సంగ్రహించడానికి, కెమెరాకి Session ప్రాప్తిని అనుమతించండి.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ఫోటోలను లేదా వీడియోను తీసుకోవడానికి Sessionకు కెమెరా అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ఛాయాచిత్రాలను లేదా వీడియోను తీసుకోవడానికి కెమెరా అనుమతులను Sessionకి అవసరం</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -214,6 +216,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">ఈ పరిచయం అన్బ్లాక్ చేయాలా?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">మీరు మరోసారి ఈ పరిచయం నుండి సందేశాలను మరియు కాల్స్ అందుకోగలరు.</string>
     <string name="RecipientPreferenceActivity_unblock">అనుమతించు</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">చిత్రం</string>
     <string name="Slide_audio">ఆడియో</string>
@@ -404,6 +407,7 @@
     <string name="arrays__mute_for_one_day">1 రోజు నిశబ్దంగా ఉంచు</string>
     <string name="arrays__mute_for_seven_days">7 రోజులు నిశబ్దంగా ఉంచు</string>
     <string name="arrays__mute_for_one_year">1 సంవత్సరం నిశబ్దంగా ఉంచు</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">అప్రమేయ అమరికలు</string>
     <string name="arrays__enabled">చేతనం అయింది</string>
     <string name="arrays__disabled">అచేతనం అయింది</string>
@@ -492,6 +496,7 @@
     <string name="conversation_context__menu_copy_text">మూల గ్రంథము అనుకరణ</string>
     <string name="conversation_context__menu_delete_message">సందేశాన్ని తొలగించు</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">సందేశాన్ని తిరిగి పంపు</string>
     <string name="conversation_context__menu_reply_to_message">సందేశానికి ప్రత్యుత్తరం ఇవ్వండి</string>
     <!-- conversation_context_image -->
@@ -635,7 +640,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -729,4 +735,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 1827619e4..c7e4600c3 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(เสียง)</string>
     <string name="DraftDatabase_Draft_video_snippet">(วิดีโอ)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(ตอบกลับ)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">ไม่พบแอปสำหรับสื่อที่เลือก</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">เพื่อที่จะแนบรูปภาพ วิดีโอ หรือเสียงได้ Session ต้องได้รับอนุญาตให้เข้าถึงที่เก็บข้อมูล แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ที่เก็บข้อมูล\"</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">เพื่อที่จะแนบข้อมูลผู้ติดต่อได้ Session ต้องได้รับอนุญาตให้เข้าถึงผู้ติดต่อ แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ผู้ติดต่อ\"</string>
@@ -62,6 +62,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">ผู้รับไม่ถูกต้อง</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">เพื่อจะส่งข้อความเสียง ต้องอนุญาตให้ Session เข้าถึงไมโครโฟนของคุณ</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">เพื่อจะส่งข้อความเสียงได้ Session ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟน แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\"</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">อนุญาต Session ให้ใช้กล้องเพื่อถ่ายรูปและวิดีโอ</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">เพื่อที่จะถ่ายรูปหรือวิดีโอได้ Session ต้องได้รับอนุญาตให้เข้าถึงกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session ต้องได้รับอนุญาตให้เข้าถึงกล้องเพื่อถ่ายรูปและวิดีโอ</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">เลิกปิดกั้นผู้ติดต่อนี้หรือไม่</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">คุณจะกลับมารับข้อความและสายโทรเข้าจากผู้ติดต่อนี้ได้อีก</string>
     <string name="RecipientPreferenceActivity_unblock">เลิกปิดกั้น</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">ภาพ</string>
     <string name="Slide_audio">เสียง</string>
@@ -390,6 +393,7 @@
     <string name="arrays__mute_for_one_day">ปิดเสียง 1 วัน</string>
     <string name="arrays__mute_for_seven_days">ปิดเสียง 7 วัน</string>
     <string name="arrays__mute_for_one_year">ปิดเสียง 1 ปี</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">การตั้งค่าเริ่มต้น</string>
     <string name="arrays__enabled">เปิดใช้งานแล้ว</string>
     <string name="arrays__disabled">ปิดใช้งานแล้ว</string>
@@ -477,6 +481,7 @@
     <string name="conversation_context__menu_copy_text">คัดลอกข้อความ</string>
     <string name="conversation_context__menu_delete_message">ลบข้อความ</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">ส่งข้อความอีกครั้ง</string>
     <string name="conversation_context__menu_reply_to_message">ตอบกลับข้อความ</string>
     <!-- conversation_context_image -->
@@ -620,7 +625,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -714,4 +720,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d5d7309ac..25b03026a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(ses)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(yanıtla)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Medya seçebilecek uygulama bulunamıyor.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session, fotoğraflar, videolar, veya ses ekleyebilmek için Depolama iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Depolama\"yı etkinleştirin.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session, iletişim bilgilerini eklemek için Kişiler iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kişiler\"i etkinleştirin.</string>
@@ -42,7 +42,7 @@
     <string name="BucketedThreadMedia_Today">Bugün</string>
     <string name="BucketedThreadMedia_Yesterday">Dün</string>
     <string name="BucketedThreadMedia_This_week">Bu hafta</string>
-    <string name="BucketedThreadMedia_This_month">Bu ay</string>
+    <string name="BucketedThreadMedia_This_month">Bu Ay</string>
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Hiçbir web tarayıcısı bulunamadı.</string>
     <!-- ContactsCursorLoader -->
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">İleti</string>
     <string name="ConversationActivity_compose">Oluştur</string>
     <string name="ConversationActivity_muted_until_date">%1$s\'e kadar sessiz</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d üye</string>
     <string name="ConversationActivity_open_group_guidelines">Topluluk İlkeleri</string>
     <string name="ConversationActivity_invalid_recipient">Geçersiz alıcı!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Sesli ileti göndermek için Session\'in mikrofonunuza erişmesine izin verin.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session, sesli iletiler göndermek için Mikrofon iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Mikrofon\"u etkinleştirin.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Fotoğraf veya video çekmek için, Session\'in kameraya erişmesine izin verin.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session, fotoğraf ve video göndermek için depolama erişimine ihtiyaç duyar.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session, fotoğraf veya video çekmek için Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kamera\"yı etkinleştirin.</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session fotoğraf veya video çekebilmek için kamera erişimine ihtiyaç duyar</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -126,8 +128,8 @@
     <string name="ConversationFragment_sms">SMS</string>
     <string name="ConversationFragment_deleting">Siliniyor</string>
     <string name="ConversationFragment_deleting_messages">İletiler siliniyor...</string>
-    <string name="ConversationFragment_banning">Banning</string>
-    <string name="ConversationFragment_banning_user">Banning user…</string>
+    <string name="ConversationFragment_banning">Yasaklama</string>
+    <string name="ConversationFragment_banning_user">Kullanıcı Yasaklanıyor...</string>
     <string name="ConversationFragment_quoted_message_not_found">İletinin aslı bulunamadı</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">İletinin aslı artık mevcut değil</string>
     <!-- ConversationListItem -->
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Bu kişinin engellemesini kaldır?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Bu kişiden gelen iletileri ve aramaları almak bir kez daha mümkün olacak.</string>
     <string name="RecipientPreferenceActivity_unblock">Engeli kaldır</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Görüntü</string>
     <string name="Slide_audio">Ses</string>
@@ -235,7 +238,7 @@ iletisi alındı!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Kaybolan iletiler devre dışı</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">Kaybolan ileti süresi %s olarak ayarlandı</string>
     <string name="ThreadRecord_s_took_a_screenshot">%s ekran görüntüsü aldı.</string>
-    <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
+    <string name="ThreadRecord_media_saved_by_s">Medya %s tarafından kaydedildi.</string>
     <string name="ThreadRecord_safety_number_changed">Güvenlik numarası değişti</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">%s ile güvenlik numaranız değişti.</string>
     <string name="ThreadRecord_you_marked_verified">Doğrulanmış olarak işaretlediniz.</string>
@@ -261,7 +264,7 @@ iletisi alındı!</string>
     <string name="MediaPreviewActivity_you">Siz</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Desteklenmeyen medya türü</string>
     <string name="MediaPreviewActivity_draft">Taslak</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session, harici depolamaya kaydetmek için depolama erişimine ihtiyaç duyuyor, ancak kalıcı olarak reddedildi. Lütfen uygulama ayarlarına girin, \"İzinler\"i seçin ve \"Depolama\" özelliğini etkinleştirin.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">İzinler olmadan harici depolamaya kaydedilemiyor</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">İletiyi sil?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Bu eylem bu iletiyi kalıcı olarak silecektir.</string>
@@ -401,6 +404,7 @@ iletisi alındı!</string>
     <string name="arrays__mute_for_one_day">1 günlüğüne sustur</string>
     <string name="arrays__mute_for_seven_days">7 günlüğüne sustur</string>
     <string name="arrays__mute_for_one_year">1 yıllığına sustur</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Varsayılan ayarlar</string>
     <string name="arrays__enabled">Etkin</string>
     <string name="arrays__disabled">Devre dışı</string>
@@ -489,6 +493,7 @@ iletisi alındı!</string>
     <string name="conversation_context__menu_copy_text">Metni kopyala</string>
     <string name="conversation_context__menu_delete_message">İletiyi sil</string>
     <string name="conversation_context__menu_ban_user">Kullanıcıyı engelle</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Tümünü yasakla ve sil</string>
     <string name="conversation_context__menu_resend_message">İletiyi tekrar gönder</string>
     <string name="conversation_context__menu_reply_to_message">İletiyi yanıtla</string>
     <!-- conversation_context_image -->
@@ -560,170 +565,181 @@ iletisi alındı!</string>
     <string name="cancel">İptal</string>
     <string name="your_session_id">Session ID\'niz</string>
     <string name="activity_landing_title_2">Your Session begins here...</string>
-    <string name="activity_landing_register_button_title">Create Session ID</string>
-    <string name="activity_landing_restore_button_title">Continue Your Session</string>
-    <string name="view_fake_chat_bubble_1">What\'s Session?</string>
-    <string name="view_fake_chat_bubble_2">It\'s a decentralized, encrypted messaging app</string>
-    <string name="view_fake_chat_bubble_3">So it doesn\'t collect my personal information or my conversation metadata? How does it work?</string>
-    <string name="view_fake_chat_bubble_4">Using a combination of advanced anonymous routing and end-to-end encryption technologies.</string>
-    <string name="view_fake_chat_bubble_5">Friends don\'t let friends use compromised messengers. You\'re welcome.</string>
-    <string name="activity_register_title">Say hello to your Session ID</string>
-    <string name="activity_register_explanation">Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.</string>
+    <string name="activity_landing_register_button_title">Session Kimliği Oluştur</string>
+    <string name="activity_landing_restore_button_title">Oturumunuza Devam Edin</string>
+    <string name="view_fake_chat_bubble_1">Session Nedir?</string>
+    <string name="view_fake_chat_bubble_2">Merkezi olmayan, şifreli bir mesajlaşma uygulamasıdır</string>
+    <string name="view_fake_chat_bubble_3">Yani kişisel bilgilerimi veya konuşma meta verilerimi toplamaz mı? Nasıl çalışır?</string>
+    <string name="view_fake_chat_bubble_4">Gelişmiş anonim yönlendirme ve uçtan uca şifreleme teknolojilerinin bir kombinasyonunu kullan.</string>
+    <string name="view_fake_chat_bubble_5">Arkadaşlar, arkadaşlarının güvenliği ihlal edilmiş mesajlaşma programlarını kullanmasına izin vermez. Rica ederim.</string>
+    <string name="activity_register_title">Yeni Session kimliğinize merhaba deyin.</string>
+    <string name="activity_register_explanation">Oturum Kimliğiniz, kişilerin Session\'da sizinle iletişim kurmak için kullanabileceği benzersiz adrestir. Gerçek kimliğinizle hiçbir bağlantısı olmadan, Oturum Kimliğiniz tasarım gereği tamamen anonim ve özeldir.</string>
     <string name="activity_restore_title">Hesabınızı geri yükleyin</string>
-    <string name="activity_restore_explanation">Enter the recovery phrase that was given to you when you signed up to restore your account.</string>
-    <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
-    <string name="activity_display_name_title_2">Pick your display name</string>
-    <string name="activity_display_name_explanation">This will be your name when you use Session. It can be your real name, an alias, or anything else you like.</string>
-    <string name="activity_display_name_edit_text_hint">Enter a display name</string>
-    <string name="activity_display_name_display_name_missing_error">Please pick a display name</string>
-    <string name="activity_display_name_display_name_too_long_error">Please pick a shorter display name</string>
+    <string name="activity_restore_explanation">Hesabınızı geri yüklemek için kaydolduğunuzda size verilen kurtarma ifadesini girin.</string>
+    <string name="activity_restore_seed_edit_text_hint">Kurtarma ifadenizi girin</string>
+    <string name="activity_display_name_title_2">Görünen adınızı seçin</string>
+    <string name="activity_display_name_explanation">Bu, Session kullandığınızda adınız olacaktır. Gerçek adınız, takma adınız veya istediğiniz herhangi bir şey olabilir.</string>
+    <string name="activity_display_name_edit_text_hint">Bir görünen ad girin</string>
+    <string name="activity_display_name_display_name_missing_error">Lütfen bir görünen ad seçin</string>
+    <string name="activity_display_name_display_name_too_long_error">Lütfen daha kısa bir görünen ad seçin</string>
     <string name="activity_pn_mode_recommended_option_tag">Önerilenler</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Lütfen Bir Seçenek Seçin</string>
-    <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
-    <string name="activity_home_empty_state_button_title">Start a Session</string>
-    <string name="activity_home_leave_group_dialog_message">Are you sure you want to leave this group?</string>
-    <string name="activity_home_leaving_group_failed_message">"Couldn't leave group"</string>
-    <string name="activity_home_delete_conversation_dialog_message">Are you sure you want to delete this conversation?</string>
-    <string name="activity_home_conversation_deleted_message">Conversation deleted</string>
-    <string name="activity_seed_title">Your Recovery Phrase</string>
-    <string name="activity_seed_title_2">Meet your recovery phrase</string>
-    <string name="activity_seed_explanation">Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don\'t give it to anyone.</string>
-    <string name="activity_seed_reveal_button_title">Hold to reveal</string>
-    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
-    <string name="view_seed_reminder_subtitle_1">Secure your account by saving your recovery phrase</string>
-    <string name="view_seed_reminder_subtitle_2">Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID.</string>
-    <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
+    <string name="activity_home_empty_state_message">Henüz kayıtlı kişi yok</string>
+    <string name="activity_home_empty_state_button_title">Oturumu başlat</string>
+    <string name="activity_home_leave_group_dialog_message">Bu gruptan ayrılmak istediğinize emin misiniz?</string>
+    <string name="activity_home_leaving_group_failed_message">"Gruptan ayrılamadı"</string>
+    <string name="activity_home_delete_conversation_dialog_message">Bu konuşmayı silmek istediğinden emin misin?</string>
+    <string name="activity_home_conversation_deleted_message">Konuşma silindi</string>
+    <string name="activity_seed_title">Kurtarma İfadeniz</string>
+    <string name="activity_seed_title_2">Kurtarma ifadenizle tanışın</string>
+    <string name="activity_seed_explanation">Kurtarma ifadeniz Session kimliğinizin ana anahtarıdır; cihazınıza erişiminizi kaybederseniz Session kimliğinizi geri yüklemek için bunu kullanabilirsiniz. Kurtarma ifadenizi güvenli bir yerde saklayın ve kimseye vermeyin.</string>
+    <string name="activity_seed_reveal_button_title">Ortaya çıkarmak için basılı tutun</string>
+    <string name="view_seed_reminder_title">Neredeyse bitirdiniz! %80</string>
+    <string name="view_seed_reminder_subtitle_1">Kurtarma ifadenizi kaydederek hesabınızı güvenceye alın</string>
+    <string name="view_seed_reminder_subtitle_2">Kurtarma ifadenizi ortaya çıkarmak için düzeltilen kelimelere dokunun ve basılı tutun, ardından Session kimliğinizi korumak için güvenli bir şekilde saklayın.</string>
+    <string name="view_seed_reminder_subtitle_3">Kurtarma ifadenizi güvenli bir yerde sakladığınızdan emin olun</string>
     <string name="activity_path_title">Yol</string>
-    <string name="activity_path_explanation">Session hides your IP by bouncing your messages through several Service Nodes in Session\'s decentralized network. These are the countries your connection is currently being bounced through:</string>
+    <string name="activity_path_explanation">Session, mesajlarınızı Session\'ın merkezi olmayan ağındaki birkaç Hizmet Düğümü üzerinden geri göndererek IP\'nizi gizler. Şu anda bağlantınızın geri döndüğü ülkeler şunlardır:</string>
     <string name="activity_path_device_row_title">Siz</string>
     <string name="activity_path_guard_node_row_title">Giriş Düğüm</string>
     <string name="activity_path_service_node_row_title">Hizmet Düğüm</string>
     <string name="activity_path_destination_row_title">Hedef Konum</string>
     <string name="activity_path_learn_more_button_title">Fazlasını Öğrenin</string>
     <string name="activity_path_resolving_progress">Çözümleniyor…</string>
-    <string name="activity_create_private_chat_title">New Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Enter Session ID</string>
-    <string name="activity_create_private_chat_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_create_private_chat_scan_qr_code_explanation">Scan a user\'s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
-    <string name="fragment_enter_public_key_explanation">Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.</string>
-    <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
-    <string name="fragment_scan_qr_code_camera_access_explanation">Session needs camera access to scan QR codes</string>
-    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Grant Camera Access</string>
-    <string name="activity_create_closed_group_title">New Closed Group</string>
-    <string name="activity_create_closed_group_edit_text_hint">Enter a group name</string>
-    <string name="activity_create_closed_group_empty_state_message">You don\'t have any contacts yet</string>
-    <string name="activity_create_closed_group_empty_state_button_title">Start a Session</string>
-    <string name="activity_create_closed_group_group_name_missing_error">Please enter a group name</string>
-    <string name="activity_create_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
-    <string name="activity_create_closed_group_not_enough_group_members_error">Please pick at least 1 group member</string>
-    <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 100 members</string>
-    <string name="activity_join_public_chat_title">Join Open Group</string>
-    <string name="activity_join_public_chat_error">Couldn\'t join group</string>
-    <string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
-    <string name="activity_join_public_chat_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_join_public_chat_scan_qr_code_explanation">Scan the QR code of the open group you\'d like to join</string>
-    <string name="fragment_enter_chat_url_edit_text_hint">Enter an open group URL</string>
+    <string name="activity_create_private_chat_title">Yeni Oturum</string>
+    <string name="activity_create_private_chat_enter_session_id_tab_title">Oturum Kimliğini Girin</string>
+    <string name="activity_create_private_chat_scan_qr_code_tab_title">QR Kodunu Tara</string>
+    <string name="activity_create_private_chat_scan_qr_code_explanation">Bir oturumu başlatmak için bir kullanıcının QR kodunu tarayın. QR kodları, hesap ayarlarındaki QR kodu simgesine dokunarak bulunabilir.</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Oturum kimliğini veya ONS adını girin</string>
+    <string name="fragment_enter_public_key_explanation">Kullanıcılar, hesap ayarlarına gidip \"Oturum Kimliğini Paylaş\"a dokunarak veya QR kodlarını paylaşarak Oturum Kimliklerini paylaşabilirler.</string>
+    <string name="fragment_enter_public_key_error_message">Lütfen oturum kimliğini veya ONS adını kontrol edin ve tekrar deneyin.</string>
+    <string name="fragment_scan_qr_code_camera_access_explanation">Oturumun QR kodlarını taramak için kamera erişimine ihtiyacı var</string>
+    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Kameraya erişim izni ver</string>
+    <string name="activity_create_closed_group_title">Yeni Kapalı Grup</string>
+    <string name="activity_create_closed_group_edit_text_hint">Yeni grup adı girin</string>
+    <string name="activity_create_closed_group_empty_state_message">Henüz kayıtlı kişi yok</string>
+    <string name="activity_create_closed_group_empty_state_button_title">Oturumu başlat</string>
+    <string name="activity_create_closed_group_group_name_missing_error">Lütfen bir grup adı girin</string>
+    <string name="activity_create_closed_group_group_name_too_long_error">Lütfen daha kısa bir grup adı girin</string>
+    <string name="activity_create_closed_group_not_enough_group_members_error">Lütfen en az 1 grup üyesi seçin</string>
+    <string name="activity_create_closed_group_too_many_group_members_error">Kapalı bir grubun 100\'den fazla üyesi olamaz</string>
+    <string name="activity_join_public_chat_title">Açık Gruba Katıl</string>
+    <string name="activity_join_public_chat_error">Gruba katılamadı</string>
+    <string name="activity_join_public_chat_enter_group_url_tab_title">Grup URL\'sini Aç</string>
+    <string name="activity_join_public_chat_scan_qr_code_tab_title">QR Kodunu Tara</string>
+    <string name="activity_join_public_chat_scan_qr_code_explanation">Katılmak istediğiniz açık grubun QR kodunu tarayın</string>
+    <string name="fragment_enter_chat_url_edit_text_hint">Açık bir grup URL\'si girin</string>
     <string name="activity_settings_title">Ayarlar</string>
-    <string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
-    <string name="activity_settings_display_name_missing_error">Please pick a display name</string>
-    <string name="activity_settings_display_name_too_long_error">Please pick a shorter display name</string>
+    <string name="activity_settings_display_name_edit_text_hint">Bir görünen ad girin</string>
+    <string name="activity_settings_display_name_missing_error">Lütfen bir görünen ad seçin</string>
+    <string name="activity_settings_display_name_too_long_error">Lütfen daha kısa bir görünen ad seçin</string>
     <string name="activity_settings_privacy_button_title">Gizlilik</string>
     <string name="activity_settings_notifications_button_title">Bildirimler</string>
-    <string name="activity_settings_chats_button_title">Chats</string>
-    <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
-    <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
-    <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
-    <string name="activity_settings_help_translate_session">Help us Translate Session</string>
+    <string name="activity_settings_chats_button_title">Sohbetler</string>
+    <string name="activity_settings_devices_button_title">Cihazlar</string>
+    <string name="activity_settings_invite_button_title">Bir arkadaş davet et</string>
+    <string name="activity_settings_faq_button_title">SSS</string>
+    <string name="activity_settings_recovery_phrase_button_title">Kurtarma Sözcük Grubu</string>
+    <string name="activity_settings_clear_all_data_button_title">Verileri Temizle</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Ağ Dahil Verileri Temizle</string>
+    <string name="activity_settings_help_translate_session">Session programını çevirmemize yardımcı olun</string>
     <string name="activity_notification_settings_title">Bildirimler</string>
-    <string name="activity_notification_settings_style_section_title">Notification Style</string>
-    <string name="activity_notification_settings_content_section_title">Notification Content</string>
+    <string name="activity_notification_settings_style_section_title">Bildirim Stili</string>
+    <string name="activity_notification_settings_content_section_title">Bildirim içeriği</string>
     <string name="activity_privacy_settings_title">Gizlilik</string>
-    <string name="activity_chat_settings_title">Chats</string>
-    <string name="preferences_notifications_strategy_category_title">Notification Strategy</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
-    <string name="fragment_device_list_bottom_sheet_change_name_button_title">Change name</string>
-    <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Unlink device</string>
-    <string name="dialog_seed_title">Your Recovery Phrase</string>
-    <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
-    <string name="dialog_clear_all_data_title">Clear All Data</string>
-    <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
-    <string name="activity_qr_code_title">QR Code</string>
-    <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
-    <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_qr_code_view_scan_qr_code_explanation">Scan someone\'s QR code to start a conversation with them</string>
-    <string name="fragment_view_my_qr_code_title">Scan Me</string>
-    <string name="fragment_view_my_qr_code_explanation">This is your QR code. Other users can scan it to start a session with you.</string>
+    <string name="activity_chat_settings_title">Sohbetler</string>
+    <string name="preferences_notifications_strategy_category_title">Bildirim Stili</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_title">Hızlı Modu Kullan</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">Google\'ın bildirim sunucularını kullanarak yeni iletilerden güvenilir ve anında haberdar olacaksınız.</string>
+    <string name="fragment_device_list_bottom_sheet_change_name_button_title">Adı değiştir</string>
+    <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Cihazın bağlantısını kaldır</string>
+    <string name="dialog_seed_title">Kurtarma İfadeniz</string>
+    <string name="dialog_seed_explanation">Bu sizin kurtarma ifadenizdir. Bununla, Session Kimliğinizi yeni bir cihaza geri yükleyebilir veya taşıyabilirsiniz.</string>
+    <string name="dialog_clear_all_data_title">Tüm Verileri Temizle</string>
+    <string name="dialog_clear_all_data_explanation">Bu, mesajlarınızı, oturumlarınızı ve kişilerinizi kalıcı olarak siler.</string>
+    <string name="dialog_clear_all_data_network_explanation">Yalnızca bu cihazı mı silmek istiyorsunuz yoksa hesabınızın tamamını mı silmek istiyorsunuz?</string>
+    <string name="dialog_clear_all_data_local_only">Sadece Sil</string>
+    <string name="dialog_clear_all_data_clear_network">Tüm Hesap</string>
+    <string name="activity_qr_code_title">QR kod</string>
+    <string name="activity_qr_code_view_my_qr_code_tab_title">QR Kodumu Görüntüle</string>
+    <string name="activity_qr_code_view_scan_qr_code_tab_title">QR Kodunu Tara</string>
+    <string name="activity_qr_code_view_scan_qr_code_explanation">Onlarla sohbet başlatmak için birinin QR kodunu tarayın</string>
+    <string name="fragment_view_my_qr_code_title">Beni Tara</string>
+    <string name="fragment_view_my_qr_code_explanation">Bu sizin QR kodunuz. Diğer kullanıcılar, sizinle bir oturum başlatmak için tarayabilir.</string>
     <string name="fragment_view_my_qr_code_share_title">QR kodu paylaş</string>
     <string name="fragment_contact_selection_contacts_title">Kişiler</string>
     <string name="fragment_contact_selection_closed_groups_title">Özel Gruplar</string>
     <string name="fragment_contact_selection_open_groups_title">Genel Gruplar</string>
-    <string name="fragment_contact_selection_empty_contacts">You don\'t have any contacts yet</string>
+    <string name="fragment_contact_selection_empty_contacts">Henüz kayıtlı kişi yok</string>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Uygula</string>
-    <string name="menu_done_button">Done</string>
-    <string name="activity_edit_closed_group_title">Edit Group</string>
-    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
-    <string name="activity_edit_closed_group_edit_members">Members</string>
-    <string name="activity_edit_closed_group_add_members">Add members</string>
-    <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
-    <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
-    <string name="activity_edit_closed_group_not_enough_group_members_error">Groups must have at least 1 group member</string>
-    <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
-    <string name="activity_select_contacts_title">Select Contacts</string>
-    <string name="view_reset_secure_session_done_message">Secure session reset done</string>
+    <string name="menu_done_button">Tamamlandı</string>
+    <string name="activity_edit_closed_group_title">Grubu Düzenle</string>
+    <string name="activity_edit_closed_group_edit_text_hint">Yeni bir grup adı girin</string>
+    <string name="activity_edit_closed_group_edit_members">Üyeler</string>
+    <string name="activity_edit_closed_group_add_members">Üye ekle</string>
+    <string name="activity_edit_closed_group_group_name_missing_error">Grup adı boş olamaz</string>
+    <string name="activity_edit_closed_group_group_name_too_long_error">Lütfen daha kısa bir grup adı girin</string>
+    <string name="activity_edit_closed_group_not_enough_group_members_error">Gruplarda en az 1 grup üyesi olmalıdır</string>
+    <string name="fragment_edit_group_bottom_sheet_remove">Kullanıcıyı gruptan kaldır</string>
+    <string name="activity_select_contacts_title">Kişileri Seçin</string>
+    <string name="view_reset_secure_session_done_message">Güvenli oturum sıfırlaması tamamlandı</string>
     <string name="dialog_ui_mode_title">Tema</string>
     <string name="dialog_ui_mode_option_day">Gün</string>
     <string name="dialog_ui_mode_option_night">Gece</string>
     <string name="dialog_ui_mode_option_system_default">Sistem varsayılanı</string>
-    <string name="activity_conversation_menu_copy_session_id">Copy Session ID</string>
-    <string name="attachment">Attachment</string>
-    <string name="attachment_type_voice_message">Voice Message</string>
+    <string name="activity_conversation_menu_copy_session_id">Session Kimliğini Kopyala</string>
+    <string name="attachment">Ek</string>
+    <string name="attachment_type_voice_message">Sesli mesaj</string>
     <string name="details">Ayrıntılar</string>
-    <string name="dialog_backup_activation_failed">Failed to activate backups. Please try again or contact support.</string>
-    <string name="activity_backup_restore_title">Restore backup</string>
-    <string name="activity_backup_restore_select_file">Select a file</string>
-    <string name="activity_backup_restore_explanation_1">Select a backup file and enter the passphrase it was created with.</string>
-    <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
-    <string name="activity_link_device_skip_prompt">This is taking a while, would you like to skip?</string>
-    <string name="activity_link_device_link_device">Link a Device</string>
-    <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
-    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
-    <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
-    <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
-    <string name="activity_pn_mode_message_notifications">Message Notifications</string>
-    <string name="activity_pn_mode_explanation">There are two ways Session can notify you of new messages.</string>
-    <string name="activity_pn_mode_fast_mode">Fast Mode</string>
-    <string name="activity_pn_mode_slow_mode">Slow Mode</string>
-    <string name="activity_pn_mode_fast_mode_explanation">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
-    <string name="activity_pn_mode_slow_mode_explanation">Session will occasionally check for new messages in the background.</string>
-    <string name="fragment_recovery_phrase_title">Recovery Phrase</string>
-    <string name="activity_prompt_passphrase_session_locked">Session is Locked</string>
-    <string name="activity_prompt_passphrase_tap_to_unlock">Tap to Unlock</string>
-    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Enter a nickname</string>
-    <string name="invalid_public_key">Invalid public key</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
+    <string name="dialog_backup_activation_failed">Yedeklemeler etkinleştirilemedi. Lütfen tekrar deneyin veya desteğe başvurun.</string>
+    <string name="activity_backup_restore_title">Yedeği geri yükle</string>
+    <string name="activity_backup_restore_select_file">Bir dosya seçin</string>
+    <string name="activity_backup_restore_explanation_1">Bir yedekleme dosyası seçin ve oluşturulduğu parolayı girin.</string>
+    <string name="activity_backup_restore_passphrase">30 basamaklı parola</string>
+    <string name="activity_link_device_skip_prompt">Bu biraz uzun sürüyor, atlamak ister misiniz?</string>
+    <string name="activity_link_device_link_device">Bir Cihazı Bağla</string>
+    <string name="activity_link_device_recovery_phrase">Kurtarma Sözcük Grubu</string>
+    <string name="activity_link_device_scan_qr_code">QR Kodunu Tara</string>
+    <string name="activity_link_device_qr_message">QR kodunuzu göstermek için diğer cihazınızda Ayarlar → Kurtarma İfadesi\'ne gidin.</string>
+    <string name="activity_join_public_chat_join_rooms">Veya bunlardan birine katılın…</string>
+    <string name="activity_pn_mode_message_notifications">Mesaj Bildirimleri</string>
+    <string name="activity_pn_mode_explanation">Session\'ın sizi yeni mesajlar hakkında bilgilendirmesinin iki yolu vardır.</string>
+    <string name="activity_pn_mode_fast_mode">Hızlı Mod</string>
+    <string name="activity_pn_mode_slow_mode">Yavaş Mod</string>
+    <string name="activity_pn_mode_fast_mode_explanation">Google\'ın bildirim sunucularını kullanarak yeni iletilerden güvenilir ve anında haberdar olacaksınız.</string>
+    <string name="activity_pn_mode_slow_mode_explanation">Session ara sıra arka planda yeni mesajları kontrol eder.</string>
+    <string name="fragment_recovery_phrase_title">Kurtarma Sözcük Grubu</string>
+    <string name="activity_prompt_passphrase_session_locked">Oturum kilitli</string>
+    <string name="activity_prompt_passphrase_tap_to_unlock">Açmak için dokun</string>
+    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Bir kullanıcı adı girin</string>
+    <string name="invalid_public_key">Geçersiz ortak anahtar</string>
+    <string name="document">Doküman</string>
+    <string name="dialog_blocked_title">%s engeli kaldırılsın mı?</string>
+    <string name="dialog_blocked_explanation">%s kişisine ait engeli kaldırmak istediğinizden emin misiniz?</string>
+    <string name="dialog_join_open_group_title">%s\'e katıl?</string>
+    <string name="dialog_join_open_group_explanation">%s açık gurubuna katılmak istediğinize emin misiniz?</string>
+    <string name="dialog_open_url_title">URL açılsın mı?</string>
+    <string name="dialog_open_url_explanation">%s açmak istediğinizden emin misiniz?</string>
+    <string name="open">Aç</string>
+    <string name="dialog_link_preview_title">Bağlantı Önizlemeleri Etkinleştirilsin mi?</string>
+    <string name="dialog_link_preview_explanation">Bağlantı önizlemelerini etkinleştirmek, gönderdiğiniz ve aldığınız URL\'lerin önizlemelerini gösterir. Bu yararlı olabilir, ancak Oturum\'un önizleme oluşturmak için bağlantılı web siteleriyle iletişim kurması gerekir. Bağlantı önizlemelerini her zaman Session ayarlarından devre dışı bırakabilirsiniz.</string>
+    <string name="dialog_link_preview_enable_button_title">Etkinleştir</string>
+    <string name="dialog_download_title">Güven %s?</string>
+    <string name="dialog_download_explanation">%s tarafından gönderilen medyayı indirmek istediğinizden emin misiniz?</string>
     <string name="dialog_download_button_title">İndir</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="activity_conversation_blocked_banner_text">%s engellendi. Engelleme kaldırılsın mı?</string>
+    <string name="activity_conversation_attachment_prep_failed">Ek, gönderilmek üzere hazırlanamadı.</string>
+    <string name="media">Medya</string>
+    <string name="UntrustedAttachmentView_download_attachment">İndirmek için dokunun %s</string>
+    <string name="message_details_header__error">Hata</string>
+    <string name="dialog_send_seed_title">Uyarı</string>
+    <string name="dialog_send_seed_explanation">Bu sizin kurtarma ifadenizdir. Birine gönderirseniz, hesabınızda tam erişime sahip olurlar.</string>
+    <string name="dialog_send_seed_send_button_title">Gönder</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2eebb46ad..b391e5288 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -4,7 +4,7 @@
     <string name="yes">Так</string>
     <string name="no">Ні</string>
     <string name="delete">Видалити</string>
-    <string name="ban">Ban</string>
+    <string name="ban">Бан</string>
     <string name="please_wait">Будь ласка, зачекайте...</string>
     <string name="save">Зберегти</string>
     <string name="note_to_self">Замітка для себе</string>
@@ -35,7 +35,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(звук)</string>
     <string name="DraftDatabase_Draft_video_snippet">(відео)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(відповісти)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Неможливо знайти програму для обраного медіа.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session потребує дозволу \"Зберігання\" для прикріплення фото, відео та аудіо, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Зберігання\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session потребує дозволу \"Контакти\", щоб прикріпити контакт, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Контакти\".</string>
@@ -58,18 +58,19 @@
     <string name="ConversationItem_click_to_approve_unencrypted">Відправити не вдалося, натисніть для незахищеного запасного варіанту</string>
     <string name="ConversationItem_unable_to_open_media">Неможливо знайти програму для відкриття цього медіа.</string>
     <string name="ConversationItem_copied_text">Скопійовано %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">Читати далі</string>
     <string name="ConversationItem_download_more">  Завантажити ще</string>
     <string name="ConversationItem_pending">  Очікування</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">Додати вкладення</string>
     <string name="ConversationActivity_select_contact_info">Оберіть інформацію контакту</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Вибачте, сталася помилка при обробці вкладення.</string>
-    <string name="ConversationActivity_message">Message</string>
-    <string name="ConversationActivity_compose">Compose</string>
-    <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
-    <string name="ConversationActivity_member_count">%1$d members</string>
-    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_message">Написати</string>
+    <string name="ConversationActivity_compose">Написати лист</string>
+    <string name="ConversationActivity_muted_until_date">Без звуку до %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">%1$d учасників</string>
+    <string name="ConversationActivity_open_group_guidelines">Правила спільноти</string>
     <string name="ConversationActivity_invalid_recipient">Неприпустимий отримувач!</string>
     <string name="ConversationActivity_added_to_home_screen">Додано до домашнього екрану</string>
     <string name="ConversationActivity_leave_group">Покинути групу?</string>
@@ -81,12 +82,13 @@
     <string name="ConversationActivity_attachment_exceeds_size_limits">Вкладення перевищує обмеження за розміром для типу повідомлення, яке ви надсилаєте.</string>
     <string name="ConversationActivity_unable_to_record_audio">Не вдалося записати аудіо!</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Немає програми на вашому пристрої, що може відкрити це посилання.</string>
-    <string name="ConversationActivity_invite_to_open_group">Add members</string>
-    <string name="ConversationActivity_join_open_group">Join %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_invite_to_open_group">Додати учасників</string>
+    <string name="ConversationActivity_join_open_group">Приєднатись до \'%s\'</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">Ви впевнені, що хочете приєднатися до <b>%s</b> відкритої групи?</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Щоб надсилати аудіо повідомлення, дозвольте Session доступ до мікрофона.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session потребує дозволу \"Мікрофон\", щоб надсилати аудіоповідомлення але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Мікрофон\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Щоб фотографувати або знімати відео дозвольте Session доступ до камери.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session потребує дозволу \"Камера\", для фотографій, відео.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session потребує дозволу \"Камера\", щоб фотографувати або знімати відео,  але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Камера\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session потребує дозволу \"Камера\", щоб фотографувати або фільмувати.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -112,7 +114,7 @@
         <item quantity="many">Це назавжди видалить усі %1$d обраних повідомлень.</item>
         <item quantity="other">Це назавжди видалить усі %1$d обраних повідомлень.</item>
     </plurals>
-    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_ban_selected_user">Забанити цього користувача?</string>
     <string name="ConversationFragment_save_to_sd_card">Зберегти на носій?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="one">Збереження цього файлу до пам\'яті пристрою зробить його доступним іншим програмам на вашому пристрої.\n\nПродовжити?</item>
@@ -144,8 +146,8 @@
     <string name="ConversationFragment_sms">СМС</string>
     <string name="ConversationFragment_deleting">Видалення</string>
     <string name="ConversationFragment_deleting_messages">Видалення повідомлень...</string>
-    <string name="ConversationFragment_banning">Banning</string>
-    <string name="ConversationFragment_banning_user">Banning user…</string>
+    <string name="ConversationFragment_banning">Баннінг</string>
+    <string name="ConversationFragment_banning_user">Бан користувача…</string>
     <string name="ConversationFragment_quoted_message_not_found">Оригінальне повідомлення не знайдено</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">Оригінальне повідомлення більше не доступно</string>
     <!-- ConversationListItem -->
@@ -235,6 +237,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Розблокувати контакт?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Ви знову зможете одержувати повідомлення та виклики від цього контакту.</string>
     <string name="RecipientPreferenceActivity_unblock">Розблокувати</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Зображення</string>
     <string name="Slide_audio">Аудіо</string>
@@ -260,14 +263,14 @@
     <string name="ThreadRecord_s_is_on_signal">%s приєднався до Session!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Зникаючі повідомлення заборонені</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">Час зникнення повідомлень встановлено на %s</string>
-    <string name="ThreadRecord_s_took_a_screenshot">%s took a screenshot.</string>
-    <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
+    <string name="ThreadRecord_s_took_a_screenshot">%s зробив скриншот.</string>
+    <string name="ThreadRecord_media_saved_by_s">%s скачав медіафайл.</string>
     <string name="ThreadRecord_safety_number_changed">Номер безпеки змінено</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">Ваш номер безпеки із %s змінився.</string>
     <string name="ThreadRecord_you_marked_verified">Ви перевірили</string>
     <string name="ThreadRecord_you_marked_unverified"> Номер безпеки є НЕперевіреним</string>
-    <string name="ThreadRecord_empty_message">This conversation is empty</string>
-    <string name="ThreadRecord_open_group_invitation">Open group invitation</string>
+    <string name="ThreadRecord_empty_message">Ця історія розмови порожня</string>
+    <string name="ThreadRecord_open_group_invitation">Запрошення до відкритих груп</string>
     <!-- UpdateApkReadyListener -->
     <string name="UpdateApkReadyListener_Signal_update">Оновлення Session</string>
     <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">Нова версія Session доступна, натисніть для оновлення</string>
@@ -287,7 +290,7 @@
     <string name="MediaPreviewActivity_you">Ви</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Непідтримуваний тип медіа</string>
     <string name="MediaPreviewActivity_draft">Чернетка</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session потребує дозволу \"Зберігання\", щоб зберігати файли, але наразі цей дозвіл ви постійно відхиляли. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Зберігання\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Без доступу до файлової системи зберегти файли неможливо</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Видалити повідомлення?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Це назавжди видалить це повідомлення.</string>
@@ -382,11 +385,11 @@
     <string name="audio_view__pause_accessibility_description">Пауза</string>
     <string name="audio_view__download_accessibility_description">Завантажити</string>
     <!-- open_group_invitation_view -->
-    <string name="open_group_invitation_view__join_accessibility_description">Join</string>
-    <string name="open_group_invitation_view__open_group_invitation">Open group invitation</string>
-    <string name="open_group_guidelines_pinned_message">Pinned message</string>
-    <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
-    <string name="open_group_guidelines_read">Read</string>
+    <string name="open_group_invitation_view__join_accessibility_description">Увійти</string>
+    <string name="open_group_invitation_view__open_group_invitation">Запрошення до відкритих груп</string>
+    <string name="open_group_guidelines_pinned_message">Прикріплені повідомлення</string>
+    <string name="open_group_guidelines_community_guidelines">Правила спільноти</string>
+    <string name="open_group_guidelines_read">Прочитано</string>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Аудіо</string>
     <string name="QuoteView_video">Відео</string>
@@ -429,6 +432,7 @@
     <string name="arrays__mute_for_one_day">Вимкнути звук на 1 день</string>
     <string name="arrays__mute_for_seven_days">Вимкнути звук на 7 днів</string>
     <string name="arrays__mute_for_one_year">Вимкнути звук на 1 рік</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Типові налаштування</string>
     <string name="arrays__enabled">Увімкнено</string>
     <string name="arrays__disabled">Вимкнено</string>
@@ -457,7 +461,7 @@
     <string name="preferences__pref_enter_sends_title">Enter надсилає повідомлення</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Натиснення кнопки Enter відправить повідомлення</string>
     <string name="preferences__send_link_previews">Перегляд відправлених посилань</string>
-    <string name="preferences__previews_are_supported_for">Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links</string>
+    <string name="preferences__previews_are_supported_for">Попередній перегляд підтримується для Imgur, Instagram, Pinterest, Reddit та YouTube посилань</string>
     <string name="preferences__screen_security">Безпека екрану</string>
     <string name="preferences__disable_screen_security_to_allow_screen_shots">Блокувати знімки екрану в списку недавніх та в програмі</string>
     <string name="preferences__notifications">Сповіщення</string>
@@ -518,7 +522,8 @@
     <string name="conversation_context__menu_message_details">Деталі повідомлення</string>
     <string name="conversation_context__menu_copy_text">Скопіювати текст</string>
     <string name="conversation_context__menu_delete_message">Видалити повідомлення</string>
-    <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_user">Бан користувача</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Забанити та видалити все</string>
     <string name="conversation_context__menu_resend_message">Переслати повідомлення</string>
     <string name="conversation_context__menu_reply_to_message">Відповісти на повідомлення</string>
     <!-- conversation_context_image -->
@@ -580,182 +585,193 @@
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">Затримка блокування екрану при бездіяльності</string>
     <string name="AppProtectionPreferenceFragment_none">Жодного</string>
     <!-- Conversation activity -->
-    <string name="activity_conversation_copy_public_key_button_title">Copy public key</string>
+    <string name="activity_conversation_copy_public_key_button_title">Копіювати публічкий ключ</string>
     <!-- Session -->
-    <string name="continue_2">Continue</string>
-    <string name="copy">Copy</string>
-    <string name="invalid_url">Invalid URL</string>
-    <string name="copied_to_clipboard">Copied to clipboard</string>
-    <string name="next">Next</string>
-    <string name="share">Share</string>
-    <string name="invalid_session_id">Invalid Session ID</string>
-    <string name="cancel">Cancel</string>
-    <string name="your_session_id">Your Session ID</string>
-    <string name="activity_landing_title_2">Your Session begins here...</string>
-    <string name="activity_landing_register_button_title">Create Session ID</string>
-    <string name="activity_landing_restore_button_title">Continue Your Session</string>
-    <string name="view_fake_chat_bubble_1">What\'s Session?</string>
-    <string name="view_fake_chat_bubble_2">It\'s a decentralized, encrypted messaging app</string>
-    <string name="view_fake_chat_bubble_3">So it doesn\'t collect my personal information or my conversation metadata? How does it work?</string>
-    <string name="view_fake_chat_bubble_4">Using a combination of advanced anonymous routing and end-to-end encryption technologies.</string>
-    <string name="view_fake_chat_bubble_5">Friends don\'t let friends use compromised messengers. You\'re welcome.</string>
-    <string name="activity_register_title">Say hello to your Session ID</string>
-    <string name="activity_register_explanation">Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.</string>
-    <string name="activity_restore_title">Restore your account</string>
-    <string name="activity_restore_explanation">Enter the recovery phrase that was given to you when you signed up to restore your account.</string>
-    <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
-    <string name="activity_display_name_title_2">Pick your display name</string>
-    <string name="activity_display_name_explanation">This will be your name when you use Session. It can be your real name, an alias, or anything else you like.</string>
-    <string name="activity_display_name_edit_text_hint">Enter a display name</string>
-    <string name="activity_display_name_display_name_missing_error">Please pick a display name</string>
-    <string name="activity_display_name_display_name_too_long_error">Please pick a shorter display name</string>
-    <string name="activity_pn_mode_recommended_option_tag">Recommended</string>
-    <string name="activity_pn_mode_no_option_picked_dialog_title">Please Pick an Option</string>
-    <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
-    <string name="activity_home_empty_state_button_title">Start a Session</string>
-    <string name="activity_home_leave_group_dialog_message">Are you sure you want to leave this group?</string>
-    <string name="activity_home_leaving_group_failed_message">"Couldn't leave group"</string>
-    <string name="activity_home_delete_conversation_dialog_message">Are you sure you want to delete this conversation?</string>
-    <string name="activity_home_conversation_deleted_message">Conversation deleted</string>
-    <string name="activity_seed_title">Your Recovery Phrase</string>
-    <string name="activity_seed_title_2">Meet your recovery phrase</string>
-    <string name="activity_seed_explanation">Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don\'t give it to anyone.</string>
-    <string name="activity_seed_reveal_button_title">Hold to reveal</string>
-    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
-    <string name="view_seed_reminder_subtitle_1">Secure your account by saving your recovery phrase</string>
-    <string name="view_seed_reminder_subtitle_2">Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID.</string>
-    <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
-    <string name="activity_path_title">Path</string>
-    <string name="activity_path_explanation">Session hides your IP by bouncing your messages through several Service Nodes in Session\'s decentralized network. These are the countries your connection is currently being bounced through:</string>
-    <string name="activity_path_device_row_title">You</string>
-    <string name="activity_path_guard_node_row_title">Entry Node</string>
-    <string name="activity_path_service_node_row_title">Service Node</string>
-    <string name="activity_path_destination_row_title">Destination</string>
-    <string name="activity_path_learn_more_button_title">Learn More</string>
-    <string name="activity_path_resolving_progress">Resolving…</string>
-    <string name="activity_create_private_chat_title">New Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Enter Session ID</string>
-    <string name="activity_create_private_chat_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_create_private_chat_scan_qr_code_explanation">Scan a user\'s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
-    <string name="fragment_enter_public_key_explanation">Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.</string>
-    <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
-    <string name="fragment_scan_qr_code_camera_access_explanation">Session needs camera access to scan QR codes</string>
-    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Grant Camera Access</string>
-    <string name="activity_create_closed_group_title">New Closed Group</string>
-    <string name="activity_create_closed_group_edit_text_hint">Enter a group name</string>
-    <string name="activity_create_closed_group_empty_state_message">You don\'t have any contacts yet</string>
-    <string name="activity_create_closed_group_empty_state_button_title">Start a Session</string>
-    <string name="activity_create_closed_group_group_name_missing_error">Please enter a group name</string>
-    <string name="activity_create_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
-    <string name="activity_create_closed_group_not_enough_group_members_error">Please pick at least 1 group member</string>
-    <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 100 members</string>
-    <string name="activity_join_public_chat_title">Join Open Group</string>
-    <string name="activity_join_public_chat_error">Couldn\'t join group</string>
-    <string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
-    <string name="activity_join_public_chat_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_join_public_chat_scan_qr_code_explanation">Scan the QR code of the open group you\'d like to join</string>
-    <string name="fragment_enter_chat_url_edit_text_hint">Enter an open group URL</string>
-    <string name="activity_settings_title">Settings</string>
-    <string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
-    <string name="activity_settings_display_name_missing_error">Please pick a display name</string>
-    <string name="activity_settings_display_name_too_long_error">Please pick a shorter display name</string>
-    <string name="activity_settings_privacy_button_title">Privacy</string>
-    <string name="activity_settings_notifications_button_title">Notifications</string>
-    <string name="activity_settings_chats_button_title">Chats</string>
-    <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
-    <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
-    <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
-    <string name="activity_settings_help_translate_session">Help us Translate Session</string>
-    <string name="activity_notification_settings_title">Notifications</string>
-    <string name="activity_notification_settings_style_section_title">Notification Style</string>
-    <string name="activity_notification_settings_content_section_title">Notification Content</string>
-    <string name="activity_privacy_settings_title">Privacy</string>
-    <string name="activity_chat_settings_title">Chats</string>
-    <string name="preferences_notifications_strategy_category_title">Notification Strategy</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
-    <string name="fragment_device_list_bottom_sheet_change_name_button_title">Change name</string>
-    <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Unlink device</string>
-    <string name="dialog_seed_title">Your Recovery Phrase</string>
-    <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
-    <string name="dialog_clear_all_data_title">Clear All Data</string>
-    <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
-    <string name="activity_qr_code_title">QR Code</string>
-    <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
-    <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
-    <string name="activity_qr_code_view_scan_qr_code_explanation">Scan someone\'s QR code to start a conversation with them</string>
-    <string name="fragment_view_my_qr_code_title">Scan Me</string>
-    <string name="fragment_view_my_qr_code_explanation">This is your QR code. Other users can scan it to start a session with you.</string>
-    <string name="fragment_view_my_qr_code_share_title">Share QR Code</string>
-    <string name="fragment_contact_selection_contacts_title">Contacts</string>
-    <string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
-    <string name="fragment_contact_selection_open_groups_title">Open Groups</string>
-    <string name="fragment_contact_selection_empty_contacts">You don\'t have any contacts yet</string>
+    <string name="continue_2">Далі</string>
+    <string name="copy">Скопіювати</string>
+    <string name="invalid_url">Недійсне URL посилання</string>
+    <string name="copied_to_clipboard">Скопійовано в буфер обміну</string>
+    <string name="next">Далі</string>
+    <string name="share">Поділитися</string>
+    <string name="invalid_session_id">Невірна Session ID адресса</string>
+    <string name="cancel">Відміна</string>
+    <string name="your_session_id">Ваша Session ID адресса</string>
+    <string name="activity_landing_title_2">Ваша сесія починається тут...</string>
+    <string name="activity_landing_register_button_title">Створити Session ID адрессу</string>
+    <string name="activity_landing_restore_button_title">Продовжити вашу сесію</string>
+    <string name="view_fake_chat_bubble_1">Що таке Session?</string>
+    <string name="view_fake_chat_bubble_2">Це децентралізований, шифрований мессенджер обміну повідомленнями</string>
+    <string name="view_fake_chat_bubble_3">Отже, він не збирає мою особисту інформацію чи мою метадані розмови? Як це працює?</string>
+    <string name="view_fake_chat_bubble_4">Він використовує комбінацію анонімної мережі та скрізного енд-ту-енд шифрування.</string>
+    <string name="view_fake_chat_bubble_5">Друзі не дозволяють друзям користуватися скомпромітованими мессенджерами. Ласкаво просимо.</string>
+    <string name="activity_register_title">Привітайтесь з вашою Session ID адрессою</string>
+    <string name="activity_register_explanation">Ваш Session ID є унікальною адресою, якою люди будуть зв’язуватимися з вами в Session. При відсутньому з\'єднанні з вашою реальною особистістю, Session ID є абсолютно анонімним та приватним, по дизайну.</string>
+    <string name="activity_restore_title">Відновити обліковий запис</string>
+    <string name="activity_restore_explanation">Введіть фразу відновлення, яку вам було сказано записати на папері під час реєстрації, для відновлення облікового запису.</string>
+    <string name="activity_restore_seed_edit_text_hint">Введіть вашу фразу відновлення</string>
+    <string name="activity_display_name_title_2">Виберіть ваш псевдонім для показу</string>
+    <string name="activity_display_name_explanation">Це буде ваше ім\'я яке ви використовуєте в Session. Воно може бути вашим дійсним ім\'ям, альясом або чимусь іншим.</string>
+    <string name="activity_display_name_edit_text_hint">Введіть відображуватинимий псевдонім</string>
+    <string name="activity_display_name_display_name_missing_error">Будь ласка, виберіть відображуватимий псевдонім</string>
+    <string name="activity_display_name_display_name_too_long_error">Будь ласка, виберіть коротший псевдонім</string>
+    <string name="activity_pn_mode_recommended_option_tag">Рекомендовано</string>
+    <string name="activity_pn_mode_no_option_picked_dialog_title">Будь ласка виберіть варіант</string>
+    <string name="activity_home_empty_state_message">У вас ще немає Session контактів</string>
+    <string name="activity_home_empty_state_button_title">Почати сесію</string>
+    <string name="activity_home_leave_group_dialog_message">Ви дійсно хочете покинути цю групу?</string>
+    <string name="activity_home_leaving_group_failed_message">"Не вдалося покинути групу"</string>
+    <string name="activity_home_delete_conversation_dialog_message">Ви дійсно хочете видалити цю бесіду?</string>
+    <string name="activity_home_conversation_deleted_message">Бесіду видалено</string>
+    <string name="activity_seed_title">Ваша фраза відновлення</string>
+    <string name="activity_seed_title_2">Знайомтесь з вашою фразою відновлення</string>
+    <string name="activity_seed_explanation">Ваша фраза відновлення - це головний ключ до вашогї Session ID адреси - ви можете використовувати її для відновлення вашої Session ID адреси якщо ви втратите доступ до пристрою. Запишіть на папері та зберігайте вашу фразу відновлення у безпечному місці і не дайте її нікому.</string>
+    <string name="activity_seed_reveal_button_title">Натисніть, щоб відобразити</string>
+    <string name="view_seed_reminder_title">Ви майже закінчили! 80%</string>
+    <string name="view_seed_reminder_subtitle_1">Захистіть свій обліковий запис, записавши на папері відновлювальну фразу</string>
+    <string name="view_seed_reminder_subtitle_2">Натисніть і втримуйте приховані слова, щоб розкрити вашу фразу відновлення, запишіть її на папері, щоб безпечно захистити вашу Session ID адресу.</string>
+    <string name="view_seed_reminder_subtitle_3">Переконайтеся, що ви записали свою фразу відновлення на папері і поклали її в безпечне місце</string>
+    <string name="activity_path_title">Шлях</string>
+    <string name="activity_path_explanation">Сесія приховує вашу IP-адресу, перенаправляючи ваші повідомлення через декілька сервісних вузлів в децентралізованій мережі Session. Це країни, через які зараз перенаправляєтся ваше з\'єднання:</string>
+    <string name="activity_path_device_row_title">Ви</string>
+    <string name="activity_path_guard_node_row_title">Вхідний Вузел</string>
+    <string name="activity_path_service_node_row_title">Сервісний Вузел</string>
+    <string name="activity_path_destination_row_title">Місце призначення</string>
+    <string name="activity_path_learn_more_button_title">Дізнатися більше</string>
+    <string name="activity_path_resolving_progress">Визначаємо…</string>
+    <string name="activity_create_private_chat_title">Новий діалог</string>
+    <string name="activity_create_private_chat_enter_session_id_tab_title">Введіть Session ID адрессу</string>
+    <string name="activity_create_private_chat_scan_qr_code_tab_title">Сканувати QR-код</string>
+    <string name="activity_create_private_chat_scan_qr_code_explanation">Проскануйте QR-код користувача, аби почати сессію. QR-код можна знайти, натиснувши на значок QR-коду в налаштуваннях облікового запису.</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Введіть Session ID або ONS ім\'я</string>
+    <string name="fragment_enter_public_key_explanation">Користувачі можуть поділитися своїм Session ID, увійшовши в налаштування свого облікового запису та натиснувши \"Поділитися Session ID\", або поділившись своїм QR-кодом.</string>
+    <string name="fragment_enter_public_key_error_message">Будь ласка, перевірте Session ID або ONS ім\'я та спробуйте ще раз.</string>
+    <string name="fragment_scan_qr_code_camera_access_explanation">Session потрібен дозвіл до камери, щоб сканувати QR-код</string>
+    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Дозволити доступ до камери</string>
+    <string name="activity_create_closed_group_title">Нова Закрита Група</string>
+    <string name="activity_create_closed_group_edit_text_hint">Введіть ім\'я групи</string>
+    <string name="activity_create_closed_group_empty_state_message">У вас ще немає Session контактів</string>
+    <string name="activity_create_closed_group_empty_state_button_title">Почати сесію</string>
+    <string name="activity_create_closed_group_group_name_missing_error">Будь ласка, введіть ім\'я групи</string>
+    <string name="activity_create_closed_group_group_name_too_long_error">Будь ласка, введіть коротше ім\'я групи</string>
+    <string name="activity_create_closed_group_not_enough_group_members_error">Будь ласка виберіть принаймні 1 учасника групи</string>
+    <string name="activity_create_closed_group_too_many_group_members_error">Закрита група не може мати більше 100 учасників</string>
+    <string name="activity_join_public_chat_title">Вступити до відкритої групи</string>
+    <string name="activity_join_public_chat_error">Не вдалося приєднатися до групи</string>
+    <string name="activity_join_public_chat_enter_group_url_tab_title">URL-посилання відкритої групи</string>
+    <string name="activity_join_public_chat_scan_qr_code_tab_title">Сканувати QR-код</string>
+    <string name="activity_join_public_chat_scan_qr_code_explanation">Відскануйте QR-код відкритої групи, до якої ви хотіли б приєднатися</string>
+    <string name="fragment_enter_chat_url_edit_text_hint">Введіть URL-посилання відкритої групи</string>
+    <string name="activity_settings_title">Параметри</string>
+    <string name="activity_settings_display_name_edit_text_hint">Введіть відображуватиниме ім’я</string>
+    <string name="activity_settings_display_name_missing_error">Будь ласка, виберіть відображуватиме ім\'я</string>
+    <string name="activity_settings_display_name_too_long_error">Будь ласка, виберіть коротше ім\'я</string>
+    <string name="activity_settings_privacy_button_title">Конфіденційність</string>
+    <string name="activity_settings_notifications_button_title">Сповіщення</string>
+    <string name="activity_settings_chats_button_title">Чати</string>
+    <string name="activity_settings_devices_button_title">Пристрої</string>
+    <string name="activity_settings_invite_button_title">Запросити друга</string>
+    <string name="activity_settings_faq_button_title">Часті питання</string>
+    <string name="activity_settings_recovery_phrase_button_title">Фраза відновлення</string>
+    <string name="activity_settings_clear_all_data_button_title">Видалити дані</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Видалити дані та аккаунт</string>
+    <string name="activity_settings_help_translate_session">Допоможіть нам перекласти Session</string>
+    <string name="activity_notification_settings_title">Сповіщення</string>
+    <string name="activity_notification_settings_style_section_title">Стиль сповіщень</string>
+    <string name="activity_notification_settings_content_section_title">Вміст сповіщення</string>
+    <string name="activity_privacy_settings_title">Конфіденційність</string>
+    <string name="activity_chat_settings_title">Чати</string>
+    <string name="preferences_notifications_strategy_category_title">Стратегія сповіщення</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_title">Використовувати швидкий режим</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">Вас надійно повідомлятимуть про нові сповіщення негайно, використовуючи сервери сповіщень Google.</string>
+    <string name="fragment_device_list_bottom_sheet_change_name_button_title">Змінити їм’я</string>
+    <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Відв’язати цей пристрій</string>
+    <string name="dialog_seed_title">Ваша фраза відновлення</string>
+    <string name="dialog_seed_explanation">Запишіть це на папері. Це ваша фраза відновлення. З нею ви можете відновити або перенести ваш Session ID на новий пристрій.</string>
+    <string name="dialog_clear_all_data_title">Видалити всі дані</string>
+    <string name="dialog_clear_all_data_explanation">Це остаточно видалить ваші повідомлення, сеанси та контакти.</string>
+    <string name="dialog_clear_all_data_network_explanation">Ви хочете видалити тільки цей пристрій або видалити весь обліковий запис?</string>
+    <string name="dialog_clear_all_data_local_only">Видалити тільки цей пристрій</string>
+    <string name="dialog_clear_all_data_clear_network">Видалити весь обліковий запис</string>
+    <string name="activity_qr_code_title">QR-код</string>
+    <string name="activity_qr_code_view_my_qr_code_tab_title">Показати мій QR-код</string>
+    <string name="activity_qr_code_view_scan_qr_code_tab_title">Сканувати QR-код</string>
+    <string name="activity_qr_code_view_scan_qr_code_explanation">Скануйте чийсь QR-код, щоб почати розмову з ними</string>
+    <string name="fragment_view_my_qr_code_title">Скануйте мене</string>
+    <string name="fragment_view_my_qr_code_explanation">Це ваш QR-код. Інші користувачі можуть сканувати його, щоб почати розмову з вами.</string>
+    <string name="fragment_view_my_qr_code_share_title">Поділіться кудись QR-кодом</string>
+    <string name="fragment_contact_selection_contacts_title">Контакти</string>
+    <string name="fragment_contact_selection_closed_groups_title">Групи з закритим членством</string>
+    <string name="fragment_contact_selection_open_groups_title">Відкриті Групи</string>
+    <string name="fragment_contact_selection_empty_contacts">У вас ще немає Session контактів</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Apply</string>
-    <string name="menu_done_button">Done</string>
-    <string name="activity_edit_closed_group_title">Edit Group</string>
-    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
-    <string name="activity_edit_closed_group_edit_members">Members</string>
-    <string name="activity_edit_closed_group_add_members">Add members</string>
-    <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
-    <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
-    <string name="activity_edit_closed_group_not_enough_group_members_error">Groups must have at least 1 group member</string>
-    <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
-    <string name="activity_select_contacts_title">Select Contacts</string>
-    <string name="view_reset_secure_session_done_message">Secure session reset done</string>
-    <string name="dialog_ui_mode_title">Theme</string>
-    <string name="dialog_ui_mode_option_day">Day</string>
-    <string name="dialog_ui_mode_option_night">Night</string>
-    <string name="dialog_ui_mode_option_system_default">System default</string>
-    <string name="activity_conversation_menu_copy_session_id">Copy Session ID</string>
-    <string name="attachment">Attachment</string>
-    <string name="attachment_type_voice_message">Voice Message</string>
-    <string name="details">Details</string>
-    <string name="dialog_backup_activation_failed">Failed to activate backups. Please try again or contact support.</string>
-    <string name="activity_backup_restore_title">Restore backup</string>
-    <string name="activity_backup_restore_select_file">Select a file</string>
-    <string name="activity_backup_restore_explanation_1">Select a backup file and enter the passphrase it was created with.</string>
-    <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
-    <string name="activity_link_device_skip_prompt">This is taking a while, would you like to skip?</string>
-    <string name="activity_link_device_link_device">Link a Device</string>
-    <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
-    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
-    <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
-    <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
-    <string name="activity_pn_mode_message_notifications">Message Notifications</string>
-    <string name="activity_pn_mode_explanation">There are two ways Session can notify you of new messages.</string>
-    <string name="activity_pn_mode_fast_mode">Fast Mode</string>
-    <string name="activity_pn_mode_slow_mode">Slow Mode</string>
-    <string name="activity_pn_mode_fast_mode_explanation">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
-    <string name="activity_pn_mode_slow_mode_explanation">Session will occasionally check for new messages in the background.</string>
-    <string name="fragment_recovery_phrase_title">Recovery Phrase</string>
-    <string name="activity_prompt_passphrase_session_locked">Session is Locked</string>
-    <string name="activity_prompt_passphrase_tap_to_unlock">Tap to Unlock</string>
-    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Enter a nickname</string>
-    <string name="invalid_public_key">Invalid public key</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="menu_apply_button">Застосувати</string>
+    <string name="menu_done_button">Готово</string>
+    <string name="activity_edit_closed_group_title">Редагувати Групу</string>
+    <string name="activity_edit_closed_group_edit_text_hint">Введіть нове ім’я группи</string>
+    <string name="activity_edit_closed_group_edit_members">Учасники</string>
+    <string name="activity_edit_closed_group_add_members">Додати учасників</string>
+    <string name="activity_edit_closed_group_group_name_missing_error">Ім\'я групи не може бути пусте</string>
+    <string name="activity_edit_closed_group_group_name_too_long_error">Будь ласка, введіть коротше ім\'я групи</string>
+    <string name="activity_edit_closed_group_not_enough_group_members_error">Групи повинні мати принаймні 1 учасника</string>
+    <string name="fragment_edit_group_bottom_sheet_remove">Викинути користувача з групи</string>
+    <string name="activity_select_contacts_title">Обрати контакти</string>
+    <string name="view_reset_secure_session_done_message">Скидання безпечної сесії завершено</string>
+    <string name="dialog_ui_mode_title">Тема</string>
+    <string name="dialog_ui_mode_option_day">День</string>
+    <string name="dialog_ui_mode_option_night">Ніч</string>
+    <string name="dialog_ui_mode_option_system_default">За замовчуванням системи</string>
+    <string name="activity_conversation_menu_copy_session_id">Скопіювати Session ID адрессу</string>
+    <string name="attachment">Вкладення</string>
+    <string name="attachment_type_voice_message">Голосове повідомлення</string>
+    <string name="details">Подробиці</string>
+    <string name="dialog_backup_activation_failed">Не вдалося активувати резервну копію. Будь ласка, спробуйте ще раз або зверніться до служби підтримки.</string>
+    <string name="activity_backup_restore_title">Відновити резервну копію</string>
+    <string name="activity_backup_restore_select_file">Виберіть файл</string>
+    <string name="activity_backup_restore_explanation_1">Виберіть файл резервної копії та введіть секретну фразу, з якою він був створений.</string>
+    <string name="activity_backup_restore_passphrase">30-символьний пароль</string>
+    <string name="activity_link_device_skip_prompt">Це займає деякий час, ви б хотіли це пропустити?</string>
+    <string name="activity_link_device_link_device">Зв\'язати пристрій</string>
+    <string name="activity_link_device_recovery_phrase">Фраза відновлення</string>
+    <string name="activity_link_device_scan_qr_code">Сканувати QR-код</string>
+    <string name="activity_link_device_qr_message">Перейдіть до Налаштувань → Фраза відновлення на вашому іншому пристрої, щоб відобразити ваш QR-код.</string>
+    <string name="activity_join_public_chat_join_rooms">Або приєднуйтесь до одного з цих…</string>
+    <string name="activity_pn_mode_message_notifications">Сповіщення повідомлень</string>
+    <string name="activity_pn_mode_explanation">Існує два способи Session може сповіщати вас про нові повідомлення.</string>
+    <string name="activity_pn_mode_fast_mode">Швидкий режим</string>
+    <string name="activity_pn_mode_slow_mode">Медленний режим</string>
+    <string name="activity_pn_mode_fast_mode_explanation">Вас надійно повідомлятимуть про нові сповіщщеня негайно, використовуючи сервери сповіщень Google.</string>
+    <string name="activity_pn_mode_slow_mode_explanation">Session буде періодично перевіряти наявність нових повідомлень у фоновому режимі.</string>
+    <string name="fragment_recovery_phrase_title">Фраза відновлення</string>
+    <string name="activity_prompt_passphrase_session_locked">Ви заблоковали Session</string>
+    <string name="activity_prompt_passphrase_tap_to_unlock">Торкніться, щоб розблокувати</string>
+    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Введіть псевдонім</string>
+    <string name="invalid_public_key">Неправильний пубюлічний ключ</string>
+    <string name="document">Документ</string>
+    <string name="dialog_blocked_title">Розблокувати %s?</string>
+    <string name="dialog_blocked_explanation">Ви впевнені що хочете розблокувати %s?</string>
+    <string name="dialog_join_open_group_title">Приєднатись до %s?</string>
+    <string name="dialog_join_open_group_explanation">Ви впевнені, що хочете приєднатися до %s відкритої групи?</string>
+    <string name="dialog_open_url_title">Відкрити URL-адресу?</string>
+    <string name="dialog_open_url_explanation">Ви впевнені що хочете відкрити %s?</string>
+    <string name="open">Відкрити</string>
+    <string name="dialog_link_preview_title">Генерувати попередній перегляд посилань?</string>
+    <string name="dialog_link_preview_explanation">Увімкнення попереднього перегляду для посиланнь які ви надсилаєте та отримуєте. Це може бути корисним, але Session потрібно буде зв\'язуватися з веб-сайтами для створення попереднього перегляду. Ви завжди можете вимкнути попередній перегляд в налаштуваннях Session.</string>
+    <string name="dialog_link_preview_enable_button_title">Включити</string>
+    <string name="dialog_download_title">Довіряти %s?</string>
+    <string name="dialog_download_explanation">Ви дійсно хочете скачати цей медіа файл відправлений %s?</string>
+    <string name="dialog_download_button_title">Скачати</string>
+    <string name="activity_conversation_blocked_banner_text">%s ви заблоковали. Розблокувати їх?</string>
+    <string name="activity_conversation_attachment_prep_failed">Не вдалося підготувати файл для надсилання.</string>
+    <string name="media">Медіа-файли</string>
+    <string name="UntrustedAttachmentView_download_attachment">Тап, щоб скачати %s</string>
+    <string name="message_details_header__error">Помилка</string>
+    <string name="dialog_send_seed_title">Увага</string>
+    <string name="dialog_send_seed_explanation">Це ваша фраза відновлення. Якщо ви надішлете її комусь, вони матимуть повний доступ до вашого аккаунту.</string>
+    <string name="dialog_send_seed_send_button_title">Відправити</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-ur-rIN/strings.xml b/app/src/main/res/values-ur-rIN/strings.xml
index 62328c1fc..39b0b69bb 100644
--- a/app/src/main/res/values-ur-rIN/strings.xml
+++ b/app/src/main/res/values-ur-rIN/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Image</string>
     <string name="Slide_audio">Audio</string>
@@ -403,6 +406,7 @@
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
     <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>
     <string name="arrays__disabled">Disabled</string>
@@ -491,6 +495,7 @@
     <string name="conversation_context__menu_copy_text">Copy text</string>
     <string name="conversation_context__menu_delete_message">Delete message</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Resend message</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -634,9 +639,11 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -652,6 +659,9 @@
     <string name="dialog_seed_explanation">This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.</string>
     <string name="dialog_clear_all_data_title">Clear All Data</string>
     <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
+    <string name="dialog_clear_all_data_local_only">Delete Only</string>
+    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
     <string name="activity_qr_code_title">QR Code</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
@@ -722,4 +732,16 @@
     <string name="dialog_download_button_title">Download</string>
     <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
+    <string name="media">Media</string>
+    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 11a0b9a4f..fb934b05a 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(âm thanh)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(trả lời)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Không tìm thấy ứng dụng để chọn dữ liệu truyền thông.</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -62,6 +62,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Người nhận không đúng!</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session cần được truy cập microphone để gửi tin nhắn thoại.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session cần truy cập microphone để gửi tin nhắn thoại, nhưng quyền này đã bị chặn. Hãy đến phần cài đặt, chọn \"Quyền truy cập\" và kích hoạt \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">Không chặn liên lạc này?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Bạn sẽ lại có thể nhận tin nhắn và cuộc gọi từ liên hệ này.</string>
     <string name="RecipientPreferenceActivity_unblock">Không chặn</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">Ảnh</string>
     <string name="Slide_audio">Đoạn nhạc</string>
@@ -388,6 +391,7 @@ trao đổi chìa khóa bị hỏng!</string>
     <string name="arrays__mute_for_one_day">Tạm im 1 ngày</string>
     <string name="arrays__mute_for_seven_days">Tạm im 7 ngày</string>
     <string name="arrays__mute_for_one_year">Không báo trong 1 năm</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Thiết đặt mặc định</string>
     <string name="arrays__enabled">Mở</string>
     <string name="arrays__disabled">Tắt</string>
@@ -475,6 +479,7 @@ trao đổi chìa khóa bị hỏng!</string>
     <string name="conversation_context__menu_copy_text">Sao chép văn bản</string>
     <string name="conversation_context__menu_delete_message">Xóa tin nhắn</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Gửi lại tin nhắn</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -618,7 +623,8 @@ trao đổi chìa khóa bị hỏng!</string>
     <string name="activity_settings_notifications_button_title">Thông báo</string>
     <string name="activity_settings_chats_button_title">Trò chuyện</string>
     <string name="activity_settings_devices_button_title">Thiết bị</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Cụm từ khôi phục</string>
     <string name="activity_settings_clear_all_data_button_title">Xóa dữ liệu</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -712,4 +718,14 @@ trao đổi chìa khóa bị hỏng!</string>
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-xh/strings.xml b/app/src/main/res/values-xh/strings.xml
index 5538b2477..93da835cf 100644
--- a/app/src/main/res/values-xh/strings.xml
+++ b/app/src/main/res/values-xh/strings.xml
@@ -31,7 +31,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">(doboozi)</string>
     <string name="DraftDatabase_Draft_video_snippet">olutambi</string>
     <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Tosobodde kufuna app okulonda ku media </string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
@@ -64,6 +64,7 @@
     <string name="ConversationActivity_message">Message</string>
     <string name="ConversationActivity_compose">Compose</string>
     <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d members</string>
     <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
     <string name="ConversationActivity_invalid_recipient">Afuna mukyamu</string>
@@ -83,6 +84,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session needs storage access to send photos and videos.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -210,6 +212,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">sumulula contact eno?</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Ojjakudamu okufuna obubaka ne ssimu okuva ew\'omuntu ono</string>
     <string name="RecipientPreferenceActivity_unblock">sumulula</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">ekifaananyi</string>
     <string name="Slide_audio">edoboozi</string>
@@ -402,6 +405,7 @@
     <string name="arrays__mute_for_one_day">Silisa okumala olunaku 1</string>
     <string name="arrays__mute_for_seven_days">Silisa okumala enaku 7</string>
     <string name="arrays__mute_for_one_year">Silisa okumala omwaka 1</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">Settingi ngabwezaali</string>
     <string name="arrays__enabled">Etereddwaako</string>
     <string name="arrays__disabled">Egyiddwaako</string>
@@ -490,6 +494,7 @@
     <string name="conversation_context__menu_copy_text">yozaamu obubaka.</string>
     <string name="conversation_context__menu_delete_message">Siimula obubaka</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">Ddamu osindike obubaka.</string>
     <string name="conversation_context__menu_reply_to_message">Reply to message</string>
     <!-- conversation_context_image -->
@@ -633,7 +638,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -727,4 +733,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8da17ea0b..98ffc72a7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">（音频）</string>
     <string name="DraftDatabase_Draft_video_snippet">（视频）</string>
     <string name="DraftDatabase_Draft_quote_snippet">(回复)</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">无法找到用于选择媒体的应用。</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal 需要\"存储空间\"权限才能发送图片、视频以及音频，但是该权限已被永久禁用。请转到系统的应用设置菜单，找到权限设置，选择 Session 应用，并启用\"存储空间\"权限。</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal 需要\"通讯录\"权限才能发送联系人名片信息，但是该权限已被永久禁用。请转到系统的应用设置菜单，找到权限设置，选择 Session 应用，并启用\"通讯录\"权限。</string>
@@ -52,7 +52,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted">发送失败，点击使用不安全的方式发送</string>
     <string name="ConversationItem_unable_to_open_media">无法找到能打开该媒体的应用。</string>
     <string name="ConversationItem_copied_text">已复制 %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">了解更多</string>
     <string name="ConversationItem_download_more"> 下载更多</string>
     <string name="ConversationItem_pending"> 等待中</string>
     <!-- ConversationActivity -->
@@ -60,8 +60,9 @@
     <string name="ConversationActivity_select_contact_info">选择联系信息</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">抱歉，设置附件时出现错误。</string>
     <string name="ConversationActivity_message">消息</string>
-    <string name="ConversationActivity_compose">Compose</string>
+    <string name="ConversationActivity_compose">撰写</string>
     <string name="ConversationActivity_muted_until_date">禁言至 %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
     <string name="ConversationActivity_member_count">%1$d 位成员</string>
     <string name="ConversationActivity_open_group_guidelines">社群准则</string>
     <string name="ConversationActivity_invalid_recipient">无效收件人！</string>
@@ -81,6 +82,7 @@
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">如果想要发送语音信息，请允许 Session 使用您设备的麦克风。</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session 需要麦克风权限才能发送语音信息，但是该权限已经被永久拒绝，请进入应用程序设置，点击权限，并启用“麦克风”。</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">要拍照或录像，请允许 Session 访问相机。</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session 需要相机权限以拍摄照片或视频</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session 需要相机权限来拍摄照片或录制视频。但是该权限已经被永久拒绝，请进入应用程序设置，点击权限，并启用“相机”。</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session 需要相机权限以拍摄照片或视频</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">解除此联系人的屏蔽？</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">您将可以再次收到来自此联系人的信息和呼叫。</string>
     <string name="RecipientPreferenceActivity_unblock">解除屏蔽</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">图片</string>
     <string name="Slide_audio">音频</string>
@@ -249,7 +252,7 @@
     <string name="MediaPreviewActivity_you">您</string>
     <string name="MediaPreviewActivity_unssuported_media_type">不支持的媒体类型。</string>
     <string name="MediaPreviewActivity_draft">草稿</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session 需要存储权限以写入外部存储，但是该权限已经被永久拒绝。请进入应用程序设置，点击权限，并启用“存储”。</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">无法在没有写入到外部存储的权限时保存到外部存储</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">删除消息吗？</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">这将会永久删除消息。</string>
@@ -288,7 +291,7 @@
     <!-- ShortcutLauncherActivity -->
     <string name="ShortcutLauncherActivity_invalid_shortcut">无效的快捷方式</string>
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Session</string>
+    <string name="SingleRecipientNotificationBuilder_signal"> Session</string>
     <string name="SingleRecipientNotificationBuilder_new_message">新信息</string>
     <!-- TransferControlView -->
     <plurals name="TransferControlView_n_items">
@@ -388,6 +391,7 @@
     <string name="arrays__mute_for_one_day">静音 1 天</string>
     <string name="arrays__mute_for_seven_days">静音 7 天</string>
     <string name="arrays__mute_for_one_year">静音 1 年</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">设为默认</string>
     <string name="arrays__enabled">启用</string>
     <string name="arrays__disabled">禁用</string>
@@ -475,6 +479,7 @@
     <string name="conversation_context__menu_copy_text">复制文本</string>
     <string name="conversation_context__menu_delete_message">删除</string>
     <string name="conversation_context__menu_ban_user">封禁用户</string>
+    <string name="conversation_context__menu_ban_and_delete_all">封禁并删除全部</string>
     <string name="conversation_context__menu_resend_message">重新发送信息</string>
     <string name="conversation_context__menu_reply_to_message">回复该消息</string>
     <!-- conversation_context_image -->
@@ -586,14 +591,14 @@
     <string name="activity_path_service_node_row_title">服务节点</string>
     <string name="activity_path_destination_row_title">目的地</string>
     <string name="activity_path_learn_more_button_title">了解更多</string>
-    <string name="activity_path_resolving_progress">Resolving…</string>
+    <string name="activity_path_resolving_progress">正在解决…</string>
     <string name="activity_create_private_chat_title">新建私人聊天</string>
     <string name="activity_create_private_chat_enter_session_id_tab_title">输入Session ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">扫描二维码</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">扫描其他用户的二维码来发起对话。您可以在帐号设置中点击二维码图标找到二维码。</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID or ONS name</string>
+    <string name="fragment_enter_public_key_edit_text_hint">输入Session ID或ONS名称</string>
     <string name="fragment_enter_public_key_explanation">用户可以通过进入帐号设置并点击“共享Session ID”来分享自己的Session ID，或通过共享其二维码来分享其Session ID。</string>
-    <string name="fragment_enter_public_key_error_message">Please check the Session ID or ONS name and try again.</string>
+    <string name="fragment_enter_public_key_error_message">请检查会话 ID 或 ONS 名称，然后重试。</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session需要摄像头访问权限才能扫描二维码</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">授予摄像头访问权限</string>
     <string name="activity_create_closed_group_title">创建私密群组</string>
@@ -618,10 +623,11 @@
     <string name="activity_settings_notifications_button_title">通知</string>
     <string name="activity_settings_chats_button_title">聊天</string>
     <string name="activity_settings_devices_button_title">设备</string>
-    <string name="activity_settings_invite_button_title">邀请</string>
+    <string name="activity_settings_invite_button_title">邀请朋友</string>
+    <string name="activity_settings_faq_button_title">常见问题</string>
     <string name="activity_settings_recovery_phrase_button_title">恢复口令</string>
     <string name="activity_settings_clear_all_data_button_title">清除数据</string>
-    <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
+    <string name="activity_settings_clear_all_data_and_network_button_title">清除包括网络在内的数据</string>
     <string name="activity_settings_help_translate_session">帮助我们翻译 Session</string>
     <string name="activity_notification_settings_title">通知</string>
     <string name="activity_notification_settings_style_section_title">通知风格</string>
@@ -629,17 +635,17 @@
     <string name="activity_privacy_settings_title">隐私</string>
     <string name="activity_chat_settings_title">会话</string>
     <string name="preferences_notifications_strategy_category_title">通知选项</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_title">Use Fast Mode</string>
-    <string name="preferences_notifications_strategy_category_fast_mode_summary">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_title">使用快速模式</string>
+    <string name="preferences_notifications_strategy_category_fast_mode_summary">新消息将快捷可靠地通过 Google 的通知服务器发送。</string>
     <string name="fragment_device_list_bottom_sheet_change_name_button_title">更换名称</string>
     <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">断开设备关联</string>
     <string name="dialog_seed_title">您的恢复口令</string>
     <string name="dialog_seed_explanation">这是您的恢复口令。您可以通过该口令将Session ID还原或迁移到新设备上。</string>
     <string name="dialog_clear_all_data_title">清除所有数据</string>
     <string name="dialog_clear_all_data_explanation">这将永久删除您的消息、对话和联系人。</string>
-    <string name="dialog_clear_all_data_network_explanation">Would you like to clear only this device, or delete your entire account?</string>
-    <string name="dialog_clear_all_data_local_only">Delete Only</string>
-    <string name="dialog_clear_all_data_clear_network">Entire Account</string>
+    <string name="dialog_clear_all_data_network_explanation">你想只清除这个设备，还是删除你的整个账户？</string>
+    <string name="dialog_clear_all_data_local_only">仅删除</string>
+    <string name="dialog_clear_all_data_clear_network">整个账户</string>
     <string name="activity_qr_code_title">二维码</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">查看我的二维码</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">扫描二维码</string>
@@ -671,17 +677,17 @@
     <string name="activity_conversation_menu_copy_session_id">复制 Session ID</string>
     <string name="attachment">附件</string>
     <string name="attachment_type_voice_message">语音消息</string>
-    <string name="details">Details</string>
+    <string name="details">详细信息</string>
     <string name="dialog_backup_activation_failed">无法激活备份，请稍后重试或联系客服。</string>
     <string name="activity_backup_restore_title">恢复备份</string>
     <string name="activity_backup_restore_select_file">选择文件</string>
-    <string name="activity_backup_restore_explanation_1">Select a backup file and enter the passphrase it was created with.</string>
-    <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
+    <string name="activity_backup_restore_explanation_1">选择一个备份文件，并输入创建该文件时使用的密码。</string>
+    <string name="activity_backup_restore_passphrase">30位数的密码</string>
     <string name="activity_link_device_skip_prompt">这需要一点时间，您想要跳过吗？</string>
     <string name="activity_link_device_link_device">关联设备</string>
-    <string name="activity_link_device_recovery_phrase">Recovery Phrase</string>
-    <string name="activity_link_device_scan_qr_code">Scan QR Code</string>
-    <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
+    <string name="activity_link_device_recovery_phrase">恢复口令</string>
+    <string name="activity_link_device_scan_qr_code">扫描二维码</string>
+    <string name="activity_link_device_qr_message">在您的其他设备上导航到设置 -> 恢复口令以显示您的 QR 代码。</string>
     <string name="activity_join_public_chat_join_rooms">或加入下列群组…</string>
     <string name="activity_pn_mode_message_notifications">消息通知</string>
     <string name="activity_pn_mode_explanation">我们有两种方式来向您发送消息通知。</string>
@@ -689,27 +695,37 @@
     <string name="activity_pn_mode_slow_mode">慢速模式</string>
     <string name="activity_pn_mode_fast_mode_explanation">新消息将快捷可靠地通过 Google 的通知服务器发送。</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session 将不时在后台获取新消息。</string>
-    <string name="fragment_recovery_phrase_title">Recovery Phrase</string>
+    <string name="fragment_recovery_phrase_title">恢复口令</string>
     <string name="activity_prompt_passphrase_session_locked">Session 已锁定</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">点击解锁</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">输入昵称</string>
     <string name="invalid_public_key">无效公钥</string>
-    <string name="document">Document</string>
-    <string name="dialog_blocked_title">Unblock %s?</string>
-    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
-    <string name="dialog_join_open_group_title">Join %s?</string>
-    <string name="dialog_join_open_group_explanation">Are you sure you want to join the %s open group?</string>
-    <string name="dialog_open_url_title">Open URL?</string>
-    <string name="dialog_open_url_explanation">Are you sure you want to open %s?</string>
-    <string name="open">Open</string>
-    <string name="dialog_link_preview_title">Enable Link Previews?</string>
-    <string name="dialog_link_preview_explanation">Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session\'s settings.</string>
-    <string name="dialog_link_preview_enable_button_title">Enable</string>
-    <string name="dialog_download_title">Trust %s?</string>
-    <string name="dialog_download_explanation">Are you sure you want to download media sent by %s?</string>
-    <string name="dialog_download_button_title">Download</string>
-    <string name="activity_conversation_blocked_banner_text">%s is blocked. Unblock them?</string>
-    <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
-    <string name="media">Media</string>
-    <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="document">文档</string>
+    <string name="dialog_blocked_title">从黑名单中移除 %s 吗？</string>
+    <string name="dialog_blocked_explanation">确定解除屏蔽%s吗?</string>
+    <string name="dialog_join_open_group_title">加入 %s?</string>
+    <string name="dialog_join_open_group_explanation">您确定要加入公开群组 %s 吗？</string>
+    <string name="dialog_open_url_title">打开链接?</string>
+    <string name="dialog_open_url_explanation">确定要打开 %s 吗?</string>
+    <string name="open">打开</string>
+    <string name="dialog_link_preview_title">是否启用链接预览?</string>
+    <string name="dialog_link_preview_explanation">链接预览将为您发送或收到的URL生成预览内容。 该功能非常实用，但Session需要访问该链接指向的网站以生成预览。您可以随后在会话设置中禁用该功能。</string>
+    <string name="dialog_link_preview_enable_button_title">启用</string>
+    <string name="dialog_download_title">是否信任 %s?</string>
+    <string name="dialog_download_explanation">您确定要下载%s发送的媒体消息吗?</string>
+    <string name="dialog_download_button_title">下载</string>
+    <string name="activity_conversation_blocked_banner_text">%s 已被屏蔽。是否解除屏蔽？</string>
+    <string name="activity_conversation_attachment_prep_failed">准备发送附件失败。</string>
+    <string name="media">媒体文件</string>
+    <string name="UntrustedAttachmentView_download_attachment">点击下载 %s</string>
+    <string name="message_details_header__error">错误</string>
+    <string name="dialog_send_seed_title">警告</string>
+    <string name="dialog_send_seed_explanation">这是您的恢复口令。如果您将其发送给某人，他们将完全有权访问您的帐户。</string>
+    <string name="dialog_send_seed_send_button_title">发送</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 62d7353a2..e6c1dc0e5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -4,11 +4,11 @@
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="delete">刪除</string>
-    <string name="ban">Ban</string>
+    <string name="ban">封鎖</string>
     <string name="please_wait">請稍候...</string>
     <string name="save">儲存</string>
     <string name="note_to_self">給自己的筆記</string>
-    <string name="version_s">Version %s</string>
+    <string name="version_s">版本 %s</string>
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">新訊息</string>
     <!-- AlbumThumbnailView -->
@@ -29,7 +29,7 @@
     <string name="DraftDatabase_Draft_audio_snippet">（音訊）</string>
     <string name="DraftDatabase_Draft_video_snippet">（影片）</string>
     <string name="DraftDatabase_Draft_quote_snippet">（回覆）</string>
-    <!-- AttchmentManager -->
+    <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">找不到合適的應用程式來選擇媒體檔案。</string>
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Session 需要儲存的權限，以存取照片、影片或聲音檔。但是現在被設定為永久拒絕存取。請到應用程式設定中，選擇「權限」及開啟「儲存」。 </string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Session 需要聯絡人的權限以存取聯絡人資訊，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「聯絡人」的權限。</string>
@@ -52,18 +52,19 @@
     <string name="ConversationItem_click_to_approve_unencrypted">傳送失敗，點擊不安全的訊息退回</string>
     <string name="ConversationItem_unable_to_open_media">找不到合適的應用程式來開啟媒體檔案。</string>
     <string name="ConversationItem_copied_text">已複製 %s</string>
-    <string name="ConversationItem_read_more">Read More</string>
+    <string name="ConversationItem_read_more">閱讀更多</string>
     <string name="ConversationItem_download_more">下載更多</string>
     <string name="ConversationItem_pending">等待中</string>
     <!-- ConversationActivity -->
     <string name="ConversationActivity_add_attachment">增加附件檔案</string>
     <string name="ConversationActivity_select_contact_info">選擇聯絡人資訊</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">抱歉，無法成功設定您指定的附件檔案</string>
-    <string name="ConversationActivity_message">Message</string>
-    <string name="ConversationActivity_compose">Compose</string>
-    <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
-    <string name="ConversationActivity_member_count">%1$d members</string>
-    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
+    <string name="ConversationActivity_message">訊息</string>
+    <string name="ConversationActivity_compose">撰寫訊息</string>
+    <string name="ConversationActivity_muted_until_date">關閉通知直到 %1$s</string>
+    <string name="ConversationActivity_muted_forever">Muted</string>
+    <string name="ConversationActivity_member_count">%1$d 位成員</string>
+    <string name="ConversationActivity_open_group_guidelines">社群規範</string>
     <string name="ConversationActivity_invalid_recipient">無效的聯絡人！</string>
     <string name="ConversationActivity_added_to_home_screen">新增到主畫面</string>
     <string name="ConversationActivity_leave_group">離開群組？</string>
@@ -75,12 +76,13 @@
     <string name="ConversationActivity_attachment_exceeds_size_limits">當前訊息的附件類型已經超越大小限制。</string>
     <string name="ConversationActivity_unable_to_record_audio">無法錄製音訊！</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">您的裝置上沒有應用程式可以處理這個連結</string>
-    <string name="ConversationActivity_invite_to_open_group">Add members</string>
-    <string name="ConversationActivity_join_open_group">Join %s</string>
-    <string name="ConversationActivity_join_open_group_confirmation_message">Are you sure you want to join the <b>%s</b> open group?</string>
+    <string name="ConversationActivity_invite_to_open_group">新增成員</string>
+    <string name="ConversationActivity_join_open_group">加入 %s</string>
+    <string name="ConversationActivity_join_open_group_confirmation_message">您確定要加入 <b>%s</b> 公開群組嗎？</string>
     <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">若要傳送語音訊息，請允許 Session 使用您的麥克風</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal 需要麥克風的權限來傳送語音訊息，但是現在系統設定為總是拒絕 Signal。請到 Session 的應用程式設定中，點選「權限」，並啟用「麥克風」的權限。</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">請授予 Session 使用相機的權限，才能拍攝照片和影片</string>
+    <string name="ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage">Session 需要使用存取存儲空間的權限來發送照片和影片</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal 需要相機的權限來拍攝照片或是影片 ，但是現在系統設定為總是拒絕 Signal。請到 Session 的應用程式設定中，點選「權限」，並啟用相機的權限。</string>
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session 需要使用相機的權限來拍攝照片和影片</string>
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
@@ -97,7 +99,7 @@
     <plurals name="ConversationFragment_this_will_permanently_delete_all_n_selected_messages">
         <item quantity="other">這將會永久刪除所有 %1$d 已選訊息</item>
     </plurals>
-    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_ban_selected_user">確認封鎖此用戶？</string>
     <string name="ConversationFragment_save_to_sd_card">儲存？</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="other">保存所有的 %1$d 媒體至存儲將會允許您設備上的其它軟體開啓它們。\n\n繼續嗎？</item>
@@ -117,7 +119,7 @@
     <string name="ConversationFragment_sms">簡訊</string>
     <string name="ConversationFragment_deleting">正在刪除</string>
     <string name="ConversationFragment_deleting_messages">正在刪除訊息...</string>
-    <string name="ConversationFragment_banning">Banning</string>
+    <string name="ConversationFragment_banning">封鎖</string>
     <string name="ConversationFragment_banning_user">Banning user…</string>
     <string name="ConversationFragment_quoted_message_not_found">無法找到原始訊息</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">原始訊息已不存在</string>
@@ -198,6 +200,7 @@
     <string name="RecipientPreferenceActivity_unblock_this_contact_question">解除封鎖此聯絡人？</string>
     <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">您將可以再次收到來自此聯絡人的訊息與通話。</string>
     <string name="RecipientPreferenceActivity_unblock">解除封鎖</string>
+    <string name="RecipientPreferenceActivity_notification_settings">Notification settings</string>
     <!-- Slide -->
     <string name="Slide_image">圖片</string>
     <string name="Slide_audio">音訊</string>
@@ -223,7 +226,7 @@
     <string name="ThreadRecord_s_is_on_signal">%s 在 Session 了！</string>
     <string name="ThreadRecord_disappearing_messages_disabled">自動銷毀訊息功能已被關閉。</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">訊息銷毀時間設定為 %s</string>
-    <string name="ThreadRecord_s_took_a_screenshot">%s took a screenshot.</string>
+    <string name="ThreadRecord_s_took_a_screenshot">%s 擷取了螢幕畫面</string>
     <string name="ThreadRecord_media_saved_by_s">Media saved by %s.</string>
     <string name="ThreadRecord_safety_number_changed">安全碼已改變</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">您與 %s 的安全碼已改變</string>
@@ -389,6 +392,7 @@
     <string name="arrays__mute_for_one_day">靜音 1 天</string>
     <string name="arrays__mute_for_seven_days">靜音 7 天</string>
     <string name="arrays__mute_for_one_year">靜音 1 年</string>
+    <string name="arrays__mute_forever">Mute forever</string>
     <string name="arrays__settings_default">預設設定</string>
     <string name="arrays__enabled">啟用</string>
     <string name="arrays__disabled">停用</string>
@@ -476,6 +480,7 @@
     <string name="conversation_context__menu_copy_text">複製文字</string>
     <string name="conversation_context__menu_delete_message">刪除訊息</string>
     <string name="conversation_context__menu_ban_user">Ban user</string>
+    <string name="conversation_context__menu_ban_and_delete_all">Ban and delete all</string>
     <string name="conversation_context__menu_resend_message">重送訊息</string>
     <string name="conversation_context__menu_reply_to_message">回覆訊息</string>
     <!-- conversation_context_image -->
@@ -619,7 +624,8 @@
     <string name="activity_settings_notifications_button_title">Notifications</string>
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_invite_button_title">Invite a Friend</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
@@ -713,4 +719,14 @@
     <string name="activity_conversation_attachment_prep_failed">Failed to prepare attachment for sending.</string>
     <string name="media">Media</string>
     <string name="UntrustedAttachmentView_download_attachment">Tap to download %s</string>
+    <string name="message_details_header__error">Error</string>
+    <string name="dialog_send_seed_title">Warning</string>
+    <string name="dialog_send_seed_explanation">This is your recovery phrase. If you send it to someone they\'ll have full access to your account.</string>
+    <string name="dialog_send_seed_send_button_title">Send</string>
+    <string name="notify_type_all">All</string>
+    <string name="notify_type_mentions">Mentions</string>
+    <string name="deleted_message">This message has been deleted</string>
+    <string name="delete_message_for_me">Delete just for me</string>
+    <string name="delete_message_for_everyone">Delete for everyone</string>
+    <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
 </resources>

From 71d2c1d1df853a31a38b8c0b8139d83bde866358 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Wed, 1 Sep 2021 14:33:37 +1000
Subject: [PATCH 43/43] build: update build numbers

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 647b5a4c4..addf8c5c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -153,8 +153,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.4'
 }
 
-def canonicalVersionCode = 218
-def canonicalVersionName = "1.11.8"
+def canonicalVersionCode = 221
+def canonicalVersionName = "1.11.9"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,