Merge remote-tracking branch 'upstream/dev' into storage_access_warning

.tx/config

@@ -1,10 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = da_DK:da-rDK,he:iw,id:in,kn_IN:kn-rIN,pt_BR:pt-rBR,pt_PT:pt,qu_EC:qu-rEC,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW
-
-[signal-android.master]
-file_filter = app/src/main/res/values-<lang>/strings.xml
-source_file = app/src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
-

BUILDING.md

@@ -15,11 +15,11 @@ You will need Java 8 set up on your machine.
 Ensure that the following packages are installed from the Android SDK manager:
 
 * Android SDK Build Tools (see buildToolsVersion in build.gradle)
-* SDK Platform (All API levels)
+* SDK Platform (all API levels)
 * Android Support Repository
 * Google Repository
 
-In Android studio, this can be done from the Quickstart panel, choose "Configure" then "SDK Manager". In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel. You may also need to install API version 28 in the SDK platforms tab.
+In Android studio, this can be done from the Quickstart panel. Just choose "Configure", then "SDK Manager". In the SDK Tools tab of the SDK Manager, make sure that "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel. You may also need to install API version 28 in the SDK platforms tab.
 
 Setting up a development environment and building from Android Studio
 ------------------------------------
@@ -33,27 +33,7 @@ Setting up a development environment and building from Android Studio
 5. Default config options should be good enough.
 6. Project initialization and building should proceed.
 
-Building Session from the command line
----------------
-
-The following steps should help you (re)build Session from the command line once all dependencies have been acquired.
-
-1. Checkout the session-android project source with the command:
-
-        git clone https://github.com/oxen-io/session-android.git
-
-2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
-3. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it. For example:
-
-        sdk.dir=/Application/android-sdk-macosx
-
-4. Execute Gradle:
-
-        ./gradlew :app:build
-
 Contributing code
 -----------------
 
-The bulk of the Session code can be found under src/org/thoughtcrime/securesms/loki on this repo and java/main/java/org/whispersystems/signalservice/loki on the session-android-service repo.
+Code contributions should be sent via Github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).
-
-Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).

NOTICE

@@ -1,34 +0,0 @@
-TextSecure provides encrypted text messages for Android.
-Copyright 2011 Whisper Systems
-
-This software has the follow third party dependencies:
-
-Bouncy Castle 1.42
-http://www.bouncycastle.org/
-MIT License
-
-Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-ZXing
-http://code.google.com/p/zxing/
-Apache License 2.0
-
-Copyright 2009 ZXing authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

README.md

@@ -10,7 +10,7 @@ Add the [F-Droid repo](https://fdroid.getsession.org/)
 
 Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about-the-oxen-blockchain/oxen-service-nodes), which are a set of distributed, decentralized and Sybil resistant nodes. Service Nodes act as servers which store messages offline, and a set of nodes which allow for onion routing functionality obfuscating users' IP addresses. For a full understanding of how Session works, read the [Session Whitepaper](https://getsession.org/whitepaper).
 
-![AndroidSession](https://i.imgur.com/0YC9TyI.png)
+<img src="https://i.imgur.com/RSMrR1F.png" width="320" />
 
 ## Want to contribute? Found a bug or have a feature request?
 
@@ -20,12 +20,53 @@ Please search for any [existing issues](https://github.com/oxen-io/session-andro
 
 Build instructions can be found in [BUILDING.md](BUILDING.md).
 
+## Translations
+
+Want to help us translate Session into your language? You can do so at https://crowdin.com/project/session-android!
+
+## Verifying signatures
+
+**Step 1:**
+
+```
+wget https://raw.githubusercontent.com/oxen-io/oxen-core/master/utils/gpg_keys/KeeJef.asc
+gpg --import KeeJef.asc
+```
+
+**Step 2:**
+
+Get the signed hash for this release. `SESSION_VERSION` needs to be updated for the release you want to verify.
+
+```
+export SESSION_VERSION=1.10.4
+wget https://github.com/oxen-io/session-android/releases/download/$SESSION_VERSION/signatures.asc
+```
+
+**Step 3:**
+
+Verify the signature of the hashes of the files.
+
+```
+gpg --verify signatures.asc 2>&1 |grep "Good signature from"
+```
+
+The command above should print "`Good signature from "Kee Jefferys...`". If it does, the hashes are valid but we still have to make the sure the signed hashes matches the downloaded files.
+
+**Step 4:**
+
+Make sure the two commands below returns the same hash. If they do, files are valid.
+
+```
+sha256sum session-$SESSION_VERSION-universal.apk
+grep universal.apk signatures.asc
+```
+
 ## License
 
 Copyright 2011 Whisper Systems
 
 Copyright 2013-2017 Open Whisper Systems
 
-Copyright 2019-2020 The Loki Project
+Copyright 2019-2021 The Loki Project
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html

TRANSLATION.md

@@ -1,54 +0,0 @@
-## How to translate Session into new languages quickly and easily
-
-There are people all around the world who can benefit from access to Session — and that means we need to make Session available in as many languages as possible. We’ve had a number of requests from community members wanting to help out by translating Session into currently unsupported (or only partially supported) languages. If you speak multiple languages and you want to help us make Session available in another language you speak, this guide will show you how to translate Session’s iOS and Android apps quickly and easily.
-
-### Translating Session for iOS:
-
-Translating Session iOS into a new language is easy! You’ll need a web browser, a plaintext editor (TextEdit on macOS or Notepad on Windows will do), and a little bit of time and patience.
-
-#### Step 1: Retrieving English strings
-- Go to [Session’s iOS GitHub page](https://github.com/loki-project/session-ios)
-- In the list of folders and files, click **Session**
-- Click **Meta**
-- Click **Translations**
-- Click **en.lproj**
-- Click **localizable.strings**
-- Scroll down to Line #2557 (using the line numbers on the left-hand side of the text). This line should contain the text `// MARK: - Session` (note: if this line does not contain that text, use Ctrl+F, Cmd+F, or your browser’s Find on Page function to find the line which contains that text)
-- Select and copy all text from that line down to the end of the file
-- Open a plaintext editor (TextEdit on macOS, Notepad on Windows, or your preferred plaintext editor) and create a new file
-- Paste the text you copied earlier into this blank file
-
-#### Step 2: Translate!
-This file will now have a large number of lines of code. Each line contains 2 sets of information, both in quotation marks, like this:
-
-`"continue_2" = "Continue";`
-
-For each line of code, translate the word or sentence to the **right** of the equals sign into the language you are translating into. Do **not** edit the text to the **left** of the equals sign. 
-
-Once you are finished translating, save the file with a filename that specifies which language you have translated the app into, and email the file to us at support@getsession.org along with information about the language you have translated the app into. Be sure to specify in your email that you have translated the iOS app (for information on translating the Android app, see below). Our developers will then take your translation and apply it to the Session iOS app. Thank you for helping make Session more accessible for everyone!
-
-
-### Translating for Android:
-
-It’s just as easy to add new translations on Session Android! Once again, you’ll need a web browser, a plaintext editor (TextEdit on macOS or Notepad on Windows will do), and a little bit of time and patience.
-
-#### Step 1: Retrieving English strings
-- Go to [Session’s Android GitHub page](https://github.com/loki-project/session-android)
-- In the list of files and folders, click **res**
-- Click **values** (you will need to scroll down to find this folder; make sure you click the folder named **values** and not any of the folders named **values-xx** or with other suffixes)
-- Click **strings.xml**
-- Scroll down to Line #1657 (using the line numbers on the left-hand side of the text). This line should contain the text `<!-- Session -->` (note: if this line does not contain that text, use Ctrl+F, Cmd+F, or your browser’s Find on Page function to find the line which contains that text)
-- Select and copy all text from that line down to the end of the file
-- Open a plaintext editor (TextEdit on macOS, Notepad on Windows, or your preferred plaintext editor) and create a new file
-- Paste the text you copied earlier into this blank file
-
-#### Step 2: Translate!
-This file will now have a large number of lines of code. Each line will contain `<string name=”xxx”>` and `</string>` tags. To translate Session Android, translate the text between these tags. For example:
-
-`<string name="continue_2">Continue</string>`
-
-In this line, translate the word **Continue** into the language you are translating into. Do not translate any other text. Do **not** translate the text inside either pair of angled brackets <>.
-
-Translate the word or sentence between each pair of `<string></string>` tags, on each line. 
-
-Once you are finished translating, save the file with a filename that specifies which language you have translated the app into, and email the file to us at support@getsession.org along with information about the language you have translated the app into. Be sure to specify in your email that you have translated the Android app (for information on translating the iOS app, see above). Our developers will then take your translation and apply it to the Session Android app. Thank you for helping make Session more accessible for everyone!

app/build.gradle

@@ -143,7 +143,7 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 171
+def canonicalVersionCode = 174
 def canonicalVersionName = "1.10.8"
 
 def postFixSize = 10

app/src/main/AndroidManifest.xml

@@ -171,9 +171,6 @@
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.ChatSettingsActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name="org.thoughtcrime.securesms.loki.activities.LinkedDevicesActivity"
-            android:screenOrientation="portrait" />
         <!-- Session -->
         <activity
             android:name="org.thoughtcrime.securesms.ShareActivity"
@@ -223,24 +220,6 @@
                 android:resource="@mipmap/ic_launcher" />
         </activity-alias>
 
-        <activity
-            android:name="org.thoughtcrime.securesms.stickers.StickerPackPreviewActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:launchMode="singleTask"
-            android:noHistory="true"
-            android:theme="@style/Theme.TextSecure.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="addstickers"
-                    android:scheme="sgnl" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="org.thoughtcrime.securesms.conversation.ConversationActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -281,23 +260,11 @@
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
             android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar" />
-        <activity
-            android:name="org.thoughtcrime.securesms.PassphraseCreateActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:label="@string/AndroidManifest__create_passphrase"
-            android:launchMode="singleTask"
-            android:theme="@style/Theme.Session.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateUnchanged" />
         <activity
             android:name="org.thoughtcrime.securesms.PassphrasePromptActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
             android:theme="@style/Theme.Session.DayNight.NoActionBar"/>
-        <activity
-            android:name="org.thoughtcrime.securesms.PushContactSelectionActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:label="@string/AndroidManifest__select_contacts"
-            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.thoughtcrime.securesms.giph.ui.GiphyActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -1,5 +1,4 @@
-/*
+/* Copyright (C) 2013 Open Whisper Systems
- * Copyright (C) 2013 Open Whisper Systems
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,26 +29,25 @@ import androidx.multidex.MultiDexApplication;
 import org.conscrypt.Conscrypt;
 import org.session.libsession.avatars.AvatarHelper;
 import org.session.libsession.messaging.MessagingModuleConfiguration;
-import org.session.libsession.messaging.mentions.MentionsManager;
+import org.session.libsession.messaging.contacts.Contact;
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2;
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
 import org.session.libsession.snode.SnodeModule;
 import org.session.libsession.utilities.Address;
-import org.session.libsession.utilities.IdentityKeyUtil;
-import org.session.libsession.utilities.ProfileKeyUtil;
 import org.session.libsession.utilities.ProfilePictureUtilities;
 import org.session.libsession.utilities.SSKEnvironment;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.session.libsession.utilities.dynamiclanguage.LocaleParser;
-import org.session.libsignal.database.LokiAPIDatabaseProtocol;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsignal.utilities.Log;
 import org.session.libsignal.utilities.ThreadUtils;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.dependencies.SignalCommunicationModule;
 import org.thoughtcrime.securesms.jobmanager.DependencyInjector;
@@ -65,9 +63,10 @@ import org.thoughtcrime.securesms.loki.api.BackgroundPollWorker;
 import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager;
 import org.thoughtcrime.securesms.loki.api.OpenGroupManager;
 import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
+import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
 import org.thoughtcrime.securesms.loki.utilities.Broadcaster;
+import org.thoughtcrime.securesms.loki.utilities.ContactUtilities;
 import org.thoughtcrime.securesms.loki.utilities.FcmUtils;
 import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities;
 import org.thoughtcrime.securesms.notifications.DefaultMessageNotifier;
@@ -85,14 +84,12 @@ import org.webrtc.PeerConnectionFactory;
 import org.webrtc.PeerConnectionFactory.InitializationOptions;
 import org.webrtc.voiceengine.WebRtcAudioManager;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
-
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.security.Security;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-
 import dagger.ObjectGraph;
 import kotlin.Unit;
 import kotlinx.coroutines.Job;
@@ -153,30 +150,20 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         initializeDependencyInjection();
         NotificationChannels.create(this);
         ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
-        // Loki
-        // ========
         AppContext.INSTANCE.configureKovenant();
         messageNotifier = new OptimizedMessageNotifier(new DefaultMessageNotifier());
         broadcaster = new Broadcaster(this);
         threadNotificationHandler = new Handler(Looper.getMainLooper());
         LokiAPIDatabase apiDB = DatabaseFactory.getLokiAPIDatabase(this);
-        LokiThreadDatabase threadDB = DatabaseFactory.getLokiThreadDatabase(this);
-        LokiUserDatabase userDB = DatabaseFactory.getLokiUserDatabase(this);
-        String userPublicKey = TextSecurePreferences.getLocalNumber(this);
         MessagingModuleConfiguration.Companion.configure(this,
             DatabaseFactory.getStorage(this),
             DatabaseFactory.getAttachmentProvider(this));
         SnodeModule.Companion.configure(apiDB, broadcaster);
-        if (userPublicKey != null) {
+        String userPublicKey = TextSecurePreferences.getLocalNumber(this);
-            MentionsManager.Companion.configureIfNeeded(userPublicKey, userDB);
-        }
-        resubmitProfilePictureIfNeeded();
         if (userPublicKey != null) {
             registerForFCMIfNeeded(false);
         }
-        // Set application UI mode (day/night theme) to the user selected one.
         UiModeUtilities.setupUiModeToUserSelected(this);
-        // ========
         initializeExpiringMessageManager();
         initializeTypingStatusRepository();
         initializeTypingStatusSender();
@@ -187,6 +174,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         initializeJobManager();
         initializeWebRtc();
         initializeBlobProvider();
+        resubmitProfilePictureIfNeeded();
     }
 
     @Override
@@ -194,13 +182,33 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         isAppVisible = true;
         Log.i(TAG, "App is now visible.");
         KeyCachingService.onAppForegrounded(this);
-        // Loki
+
+        boolean hasPerformedContactMigration = TextSecurePreferences.INSTANCE.hasPerformedContactMigration(this);
+        if (!hasPerformedContactMigration) {
+            TextSecurePreferences.INSTANCE.setPerformedContactMigration(this);
+            Set<Recipient> allContacts = ContactUtilities.getAllContacts(this);
+            SessionContactDatabase contactDB = DatabaseFactory.getSessionContactDatabase(this);
+            LokiUserDatabase userDB = DatabaseFactory.getLokiUserDatabase(this);
+            for (Recipient recipient : allContacts) {
+                if (recipient.isGroupRecipient()) { continue; }
+                String sessionID = recipient.getAddress().serialize();
+                Contact contact = contactDB.getContactWithSessionID(sessionID);
+                if (contact == null) {
+                    contact = new Contact(sessionID);
+                    String name = userDB.getDisplayName(sessionID);
+                    contact.setName(name);
+                    contact.setProfilePictureURL(recipient.getProfileAvatar());
+                    contact.setProfilePictureEncryptionKey(recipient.getProfileKey());
+                    contact.setTrusted(true);
+                }
+                contactDB.setContact(contact);
+            }
+        }
         if (poller != null) {
             poller.setCaughtUp(false);
         }
         startPollingIfNeeded();
 
-        OpenGroupManager.INSTANCE.setAllCaughtUp(false);
         OpenGroupManager.INSTANCE.startPolling();
     }
 
@@ -210,7 +218,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         Log.i(TAG, "App is no longer visible.");
         KeyCachingService.onAppBackgrounded(this);
         messageNotifier.setVisibleThread(-1);
-        // Loki
         if (poller != null) {
             poller.stopIfNeeded();
         }
@@ -319,7 +326,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         this.objectGraph = ObjectGraph.create(communicationModule);
     }
 
-
     private void initializeExpiringMessageManager() {
         this.expiringMessageManager = new ExpiringMessageManager(this);
     }
@@ -341,7 +347,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     }
 
     private void initializePeriodicTasks() {
-        BackgroundPollWorker.schedulePeriodic(this); // Loki
+        BackgroundPollWorker.schedulePeriodic(this);
 
         if (BuildConfig.PLAY_STORE_DISABLED) {
             UpdateApkRefreshListener.schedule(this);

app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java

@@ -18,8 +18,11 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.session.libsession.messaging.contacts.Contact;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
 import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -197,7 +200,14 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
     if (senderHexEncodedPublicKey.equalsIgnoreCase(TextSecurePreferences.getLocalNumber(getContext()))) {
       quoteeDisplayName = TextSecurePreferences.getProfileName(getContext());
     } else {
-      quoteeDisplayName = DatabaseFactory.getLokiUserDatabase(getContext()).getDisplayName(senderHexEncodedPublicKey);
+      SessionContactDatabase contactDB = DatabaseFactory.getSessionContactDatabase(getContext());
+      Contact contact = contactDB.getContactWithSessionID(senderHexEncodedPublicKey);
+      if (contact != null) {
+        Contact.ContactContext context = (this.conversationRecipient.isOpenGroupRecipient()) ? Contact.ContactContext.OPEN_GROUP : Contact.ContactContext.REGULAR;
+        quoteeDisplayName = contact.displayName(context);
+      } else {
+        quoteeDisplayName = senderHexEncodedPublicKey;
+      }
     }
 
     authorView.setText(isOwnNumber ? getContext().getString(R.string.QuoteView_you) : quoteeDisplayName);

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -62,7 +62,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -103,6 +102,7 @@ import org.session.libsession.utilities.recipients.RecipientModifiedListener;
 import org.session.libsession.utilities.ExpirationUtil;
 import org.session.libsession.utilities.GroupUtil;
 import org.session.libsession.utilities.MediaTypes;
+import org.session.libsession.utilities.SSKEnvironment;
 import org.session.libsession.utilities.ServiceUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
@@ -157,8 +157,6 @@ import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.thoughtcrime.securesms.loki.activities.SelectContactsActivity;
 import org.thoughtcrime.securesms.loki.api.PublicChatInfoUpdateWorker;
-import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
-import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
 import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
 import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities;
@@ -234,11 +232,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public static final String LAST_SEEN_EXTRA         = "last_seen";
   public static final String STARTING_POSITION_EXTRA = "starting_position";
 
-//  private static final int PICK_GALLERY        = 1;
+  //  private static final int PICK_GALLERY        = 1;
   private static final int PICK_DOCUMENT       = 2;
   private static final int PICK_AUDIO          = 3;
   private static final int PICK_CONTACT        = 4;
-//  private static final int GET_CONTACT_DETAILS = 5;
+  //  private static final int GET_CONTACT_DETAILS = 5;
 //  private static final int GROUP_EDIT          = 6;
   private static final int TAKE_PHOTO          = 7;
   private static final int ADD_CONTACT         = 8;
@@ -590,7 +588,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
             });
           }
         });
-
         break;
       case INVITE_CONTACTS:
         if (data.getExtras() == null || !data.hasExtra(SelectContactsActivity.Companion.getSelectedContactsKey())) return;
@@ -676,14 +673,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     if (isSingleConversation() && getRecipient().getContactUri() == null) {
       inflater.inflate(R.menu.conversation_add_to_contacts, menu);
     }
-
-
     if (recipient != null && recipient.isLocalNumber()) {
       if (isSecureText) menu.findItem(R.id.menu_call_secure).setVisible(false);
       else              menu.findItem(R.id.menu_call_insecure).setVisible(false);
-
       MenuItem muteItem = menu.findItem(R.id.menu_mute_notifications);
-
       if (muteItem != null) {
         muteItem.setVisible(false);
       }
@@ -1100,7 +1093,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     /* Loki - We don't support SMS
     if (!isSecureText && !isPushGroupConversation()) sendButton.disableTransport(Type.TEXTSECURE);
     if (recipient.isPushGroupRecipient())            sendButton.disableTransport(Type.SMS);
-
     if (!recipient.isPushGroupRecipient() && recipient.isForceSmsSelection()) {
       sendButton.setDefaultTransport(Type.SMS);
     } else {
@@ -2184,11 +2176,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         if (lastCharacterIndex > 0) {
           secondToLastCharacter = text.charAt(lastCharacterIndex - 1);
         }
-        String userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(ConversationActivity.this);
-        LokiThreadDatabase threadDatabase = DatabaseFactory.getLokiThreadDatabase(ConversationActivity.this);
-        LokiUserDatabase userDatabase = DatabaseFactory.getLokiUserDatabase(ConversationActivity.this);
         if (lastCharacter == '@' && Character.isWhitespace(secondToLastCharacter)) {
-          List<Mention> mentionCandidates = MentionsManager.shared.getMentionCandidates("", threadId);
+          List<Mention> mentionCandidates = MentionsManager.INSTANCE.getMentionCandidates("", threadId, recipient.isOpenGroupRecipient());
           currentMentionStartIndex = lastCharacterIndex;
           mentionCandidateSelectionViewContainer.setVisibility(View.VISIBLE);
           mentionCandidateSelectionView.show(mentionCandidates, threadId);
@@ -2199,7 +2188,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         } else {
           if (currentMentionStartIndex != -1) {
             String query = text.substring(currentMentionStartIndex + 1); // + 1 to get rid of the @
-            List<Mention> mentionCandidates = MentionsManager.shared.getMentionCandidates(query, threadId);
+            List<Mention> mentionCandidates = MentionsManager.INSTANCE.getMentionCandidates(query, threadId, recipient.isOpenGroupRecipient());
             mentionCandidateSelectionViewContainer.setVisibility(View.VISIBLE);
             mentionCandidateSelectionView.show(mentionCandidates, threadId);
           }
@@ -2340,12 +2329,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void updateTitleTextView(Recipient recipient) {
     String userPublicKey = TextSecurePreferences.getLocalNumber(this);
     if (recipient == null) {
-      titleTextView.setText("Compose");
+      titleTextView.setText(R.string.ConversationActivity_compose);
     } else if (recipient.getAddress().toString().toLowerCase().equals(userPublicKey)) {
-      titleTextView.setText(getResources().getString(R.string.note_to_self));
+      titleTextView.setText(R.string.note_to_self);
     } else {
-      boolean hasName = (recipient.getName() != null && !recipient.getName().isEmpty());
+      String displayName = recipient.getName(); // Uses the Contact API internally
-      titleTextView.setText(hasName ? recipient.getName() : recipient.getAddress().toString());
+      boolean hasName = (displayName != null);
+      titleTextView.setText(hasName ? displayName : recipient.getAddress().toString());
     }
   }
 
@@ -2363,13 +2353,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     subtitleTextView.setVisibility(View.VISIBLE);
     if (recipient.isMuted()) {
       muteIndicatorImageView.setVisibility(View.VISIBLE);
-      subtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
+      subtitleTextView.setText(getString(R.string.ConversationActivity_muted_until_date,DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault())));
     } else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Session Updates") && !recipient.getName().equals("Loki News")) {
       OpenGroupV2 openGroup = DatabaseFactory.getLokiThreadDatabase(this).getOpenGroupChat(threadId);
       if (openGroup != null) {
         Integer userCount = DatabaseFactory.getLokiAPIDatabase(this).getUserCount(openGroup.getRoom(),openGroup.getServer());
         if (userCount == null) { userCount = 0; }
-        subtitleTextView.setText(userCount + " members");
+        subtitleTextView.setText(getString(R.string.ConversationActivity_member_count,userCount));
       } else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
         subtitleTextView.setText(recipient.getAddress().toString());
       } else {

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -49,6 +49,8 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.annimon.stream.Stream;
+
+import org.session.libsession.messaging.contacts.Contact;
 import org.session.libsession.messaging.jobs.AttachmentDownloadJob;
 import org.session.libsession.messaging.jobs.JobQueue;
 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2;
@@ -889,7 +891,15 @@ public class ConversationItem extends LinearLayout
   @SuppressLint("SetTextI18n")
   private void setGroupMessageStatus(MessageRecord messageRecord, Recipient recipient) {
     if (groupThread && !messageRecord.isOutgoing()) {
-      String displayName = recipient.toShortString();
+      String sessionID = recipient.getAddress().serialize();
+      Contact contact = DatabaseFactory.getSessionContactDatabase(context).getContactWithSessionID(sessionID);
+      String displayName;
+      if (contact != null) {
+        Contact.ContactContext context = (this.conversationRecipient.isOpenGroupRecipient()) ? Contact.ContactContext.OPEN_GROUP : Contact.ContactContext.REGULAR;
+        displayName = contact.displayName(context);
+      } else {
+        displayName = sessionID;
+      }
 
       this.groupSender.setText(displayName);
 

app/src/main/java/org/thoughtcrime/securesms/database/Database.java

@@ -41,7 +41,7 @@ public abstract class Database {
   public Database(Context context, SQLCipherOpenHelper databaseHelper) {
     this.context        = context;
     this.databaseHelper = databaseHelper;
-    this.threadNotificationDebouncer = new Debouncer(ApplicationContext.getInstance(context).getThreadNotificationHandler(), 100);
+    this.threadNotificationDebouncer = new Debouncer(ApplicationContext.getInstance(context).getThreadNotificationHandler(), 250);
   }
 
   protected void notifyConversationListeners(Set<Long> threadIds) {

app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java

@@ -17,11 +17,8 @@
 package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
-
 import androidx.annotation.NonNull;
-
 import net.sqlcipher.database.SQLiteDatabase;
-
 import org.thoughtcrime.securesms.attachments.DatabaseAttachmentProvider;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
@@ -34,6 +31,7 @@ import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
 import org.thoughtcrime.securesms.loki.database.SessionJobDatabase;
+import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
 
 public class DatabaseFactory {
 
@@ -55,16 +53,13 @@ public class DatabaseFactory {
   private final GroupReceiptDatabase  groupReceiptDatabase;
   private final SearchDatabase        searchDatabase;
   private final JobDatabase           jobDatabase;
-
-  // Loki
   private final LokiAPIDatabase lokiAPIDatabase;
   private final LokiMessageDatabase lokiMessageDatabase;
   private final LokiThreadDatabase lokiThreadDatabase;
   private final LokiUserDatabase lokiUserDatabase;
   private final LokiBackupFilesDatabase lokiBackupFilesDatabase;
   private final SessionJobDatabase sessionJobDatabase;
-
+  private final SessionContactDatabase sessionContactDatabase;
-  // Refactor
   private final Storage storage;
   private final DatabaseAttachmentProvider attachmentProvider;
 
@@ -157,6 +152,10 @@ public class DatabaseFactory {
   public static SessionJobDatabase getSessionJobDatabase(Context context) {
     return getInstance(context).sessionJobDatabase;
   }
+
+  public static SessionContactDatabase getSessionContactDatabase(Context context) {
+    return getInstance(context).sessionContactDatabase;
+  }
   // endregion
 
   // region Refactor
@@ -202,6 +201,7 @@ public class DatabaseFactory {
     this.storage                   = new Storage(context, databaseHelper);
     this.attachmentProvider        = new DatabaseAttachmentProvider(context, databaseHelper);
     this.sessionJobDatabase        = new SessionJobDatabase(context, databaseHelper);
+    this.sessionContactDatabase    = new SessionContactDatabase(context, databaseHelper);
   }
 
 }

app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java

@@ -248,6 +248,7 @@ public class RecipientDatabase extends Database {
     ContentValues contentValues = new ContentValues(1);
     contentValues.put(SYSTEM_DISPLAY_NAME, profileName);
     updateOrInsert(recipient.getAddress(), contentValues);
+    recipient.resolve().setName(profileName);
     recipient.resolve().setProfileName(profileName);
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -3,10 +3,8 @@ package org.thoughtcrime.securesms.database
 import android.content.Context
 import android.net.Uri
 import org.session.libsession.database.StorageProtocol
-import org.session.libsession.messaging.jobs.AttachmentUploadJob
+import org.session.libsession.messaging.jobs.*
-import org.session.libsession.messaging.jobs.Job
+import org.session.libsession.messaging.contacts.Contact
-import org.session.libsession.messaging.jobs.JobQueue
-import org.session.libsession.messaging.jobs.MessageSendJob
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.messages.signal.*
 import org.session.libsession.messaging.messages.signal.IncomingTextMessage
@@ -79,23 +77,6 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         ApplicationContext.getInstance(context).jobManager.add(RetrieveProfileAvatarJob(ourRecipient, newValue))
     }
 
-    override fun getProfileKeyForRecipient(recipientPublicKey: String): ByteArray? {
-        val address = Address.fromSerialized(recipientPublicKey)
-        val recipient = Recipient.from(context, address, false)
-        return recipient.profileKey
-    }
-
-    override fun getDisplayNameForRecipient(recipientPublicKey: String): String? {
-        val database = DatabaseFactory.getLokiUserDatabase(context)
-        return database.getDisplayName(recipientPublicKey)
-    }
-
-    override fun setProfileKeyForRecipient(recipientPublicKey: String, profileKey: ByteArray) {
-        val address = Address.fromSerialized(recipientPublicKey)
-        val recipient = Recipient.from(context, address, false)
-        DatabaseFactory.getRecipientDatabase(context).setProfileKey(recipient, profileKey)
-    }
-
     override fun getOrGenerateRegistrationID(): Int {
         var registrationID = TextSecurePreferences.getLocalRegistrationId(context)
         if (registrationID == 0) {
@@ -207,6 +188,10 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         return DatabaseFactory.getSessionJobDatabase(context).getMessageSendJob(messageSendJobID)
     }
 
+    override fun getMessageReceiveJob(messageReceiveJobID: String): MessageReceiveJob? {
+        return DatabaseFactory.getSessionJobDatabase(context).getMessageReceiveJob(messageReceiveJobID)
+    }
+
     override fun resumeMessageSendJobIfNeeded(messageSendJobID: String) {
         val job = DatabaseFactory.getSessionJobDatabase(context).getMessageSendJob(messageSendJobID) ?: return
         JobQueue.shared.add(job)
@@ -507,16 +492,16 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         return threadId
     }
 
-    override fun getDisplayName(publicKey: String): String? {
+    override fun getContactWithSessionID(sessionID: String): Contact? {
-        return DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey)
+        return DatabaseFactory.getSessionContactDatabase(context).getContactWithSessionID(sessionID)
     }
 
-    override fun setDisplayName(publicKey: String, newName: String) {
+    override fun getAllContacts(): Set<Contact> {
-        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(publicKey, newName)
+        return DatabaseFactory.getSessionContactDatabase(context).getAllContacts()
     }
 
-    override fun getProfilePictureURL(publicKey: String): String? {
+    override fun setContact(contact: Contact) {
-        return DatabaseFactory.getLokiUserDatabase(context).getProfilePictureURL(publicKey)
+        DatabaseFactory.getSessionContactDatabase(context).setContact(contact)
     }
 
     override fun getRecipientSettings(address: Address): Recipient.RecipientSettings? {

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

@@ -28,6 +28,7 @@ import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
+import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
 import org.thoughtcrime.securesms.loki.database.SessionJobDatabase;
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsMigration;
 
@@ -57,9 +58,10 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
   private static final int lokiV23                          = 44;
   private static final int lokiV24                          = 45;
   private static final int lokiV25                          = 46;
+  private static final int lokiV26                          = 47;
 
   // Loki - onUpgrade(...) must be updated to use Loki version numbers if Signal makes any database changes
-  private static final int    DATABASE_VERSION = lokiV25;
+  private static final int    DATABASE_VERSION = lokiV26;
   private static final String DATABASE_NAME    = "signal.db";
 
   private final Context        context;
@@ -124,11 +126,11 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
     db.execSQL(LokiThreadDatabase.getCreateSessionResetTableCommand());
     db.execSQL(LokiThreadDatabase.getCreatePublicChatTableCommand());
     db.execSQL(LokiUserDatabase.getCreateDisplayNameTableCommand());
-    db.execSQL(LokiUserDatabase.getCreateServerDisplayNameTableCommand());
     db.execSQL(LokiBackupFilesDatabase.getCreateTableCommand());
     db.execSQL(SessionJobDatabase.getCreateSessionJobTableCommand());
     db.execSQL(LokiMessageDatabase.getUpdateMessageIDTableForType());
     db.execSQL(LokiMessageDatabase.getUpdateMessageMappingTable());
+    db.execSQL(SessionContactDatabase.getCreateSessionContactTableCommand());
 
     executeStatements(db, SmsDatabase.CREATE_INDEXS);
     executeStatements(db, MmsDatabase.CREATE_INDEXS);
@@ -298,6 +300,10 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
         db.execSQL(SessionJobDatabase.getCreateSessionJobTableCommand());
       }
 
+      if (oldVersion < lokiV26) {
+        db.execSQL(SessionContactDatabase.getCreateSessionContactTableCommand());
+      }
+
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();

app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt

@@ -31,6 +31,7 @@ import org.greenrobot.eventbus.ThreadMode
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.mentions.MentionsManager
 import org.session.libsession.messaging.sending_receiving.MessageSender
+import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPollerV2
 import org.session.libsession.utilities.*
 import org.session.libsignal.utilities.toHexString
 import org.session.libsignal.utilities.ThreadUtils
@@ -132,12 +133,8 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         })
         // Set up remaining components if needed
         val application = ApplicationContext.getInstance(this)
-        val apiDB = DatabaseFactory.getLokiAPIDatabase(this)
-        val threadDB = DatabaseFactory.getLokiThreadDatabase(this)
-        val userDB = DatabaseFactory.getLokiUserDatabase(this)
         val userPublicKey = TextSecurePreferences.getLocalNumber(this)
         if (userPublicKey != null) {
-            MentionsManager.configureIfNeeded(userPublicKey, userDB)
             OpenGroupManager.startPolling()
             JobQueue.shared.resumePendingJobs()
         }

app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt

@@ -29,6 +29,7 @@ import org.session.libsession.utilities.DistributionTypes
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsignal.utilities.Log
+import org.session.libsignal.utilities.PublicKeyValidation
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.ConversationActivity
@@ -37,7 +38,6 @@ import org.thoughtcrime.securesms.loki.api.OpenGroupManager
 import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment
 import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate
 import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
-import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
 import org.thoughtcrime.securesms.loki.viewmodel.DefaultGroupsViewModel
 import org.thoughtcrime.securesms.loki.viewmodel.State
 
@@ -86,6 +86,9 @@ class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCode
         val room = url.pathSegments().firstOrNull()
         val publicKey = url.queryParameter("public_key")
         val isV2OpenGroup = !room.isNullOrEmpty()
+        if (isV2OpenGroup && (publicKey == null || !PublicKeyValidation.isValid(publicKey, 64,false))) {
+            return Toast.makeText(this, R.string.invalid_public_key, Toast.LENGTH_SHORT).show()
+        }
         showLoader()
         lifecycleScope.launch(Dispatchers.IO) {
             try {

app/src/main/java/org/thoughtcrime/securesms/loki/activities/OpenGroupGuidelinesActivity.kt

@@ -12,11 +12,27 @@ class OpenGroupGuidelinesActivity : BaseActionBarActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_open_group_guidelines)
         communityGuidelinesTextView.text = """
+        Welcome to Oxen.
+
+        Oxen believes privacy is an important part of our future. People have been safeguarding the right to privacy since the dawn of humanity, but the digital world has turned privacy into a privilege. Enough is enough. We're taking it back. For you. For us. For everyone.
+        
+        Oxen is a private technology stack including the Oxen blockchain, Oxen service nodes (Session’s servers), the Oxen cryptocurrency, an onion-router called Lokinet, and Session itself.
+        
+        Oxen is what makes Session possible — Session is running on the Oxen network right now.
+        
+        Find out more at https://oxen.io, or ask here!
+        
+        —
+        
         In order for our open group to be a fun environment, full of robust and constructive discussion, please follow these four simple rules:
         
-        1. Keep conversations on-topic and add value to the discussion (no referral links, spamming, or off-topic discussion).
+        1. Keep conversations on-topic and add value to the discussion.
         
-        2. You don't have to love everyone, but be civil (no baiting, excessively partisan arguments, threats, and so on; use common sense).
+        (No referral links, spamming, or off-topic discussion)
+        
+        2. You don't have to love everyone, but be civil.
+        
+        (No baiting, excessively partisan arguments, threats, and so on. Use common sense.)
         
         3. Do not be a shill. Comparison and criticism is reasonable, but blatant shilling is not.
         
@@ -30,7 +46,7 @@ class OpenGroupGuidelinesActivity : BaseActionBarActivity() {
         
         SCAMMER WARNING
         
-        Trust only those with an admin tag in the chat. No admin will ever DM you first. No admin will ever message you for Oxen coins.
+        Trust only those with an admin crown in chat. No admin will ever DM you first. No admin will ever message you for Oxen coins.
         """.trimIndent()
     }
     // endregion

app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt

@@ -43,6 +43,7 @@ class PNModeActivity : BaseActionBarActivity() {
         backgroundPollingOptionView.mainColor = resources.getColorWithID(R.color.pn_option_background, theme)
         backgroundPollingOptionView.strokeColor = resources.getColorWithID(R.color.pn_option_border, theme)
         registerButton.setOnClickListener { register() }
+        toggleFCM()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {

app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt

@@ -72,7 +72,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
         setContentView(R.layout.activity_settings)
-        val displayName = DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
+        val displayName = TextSecurePreferences.getProfileName(this) ?: hexEncodedPublicKey
         glide = GlideApp.with(this)
         profilePictureView.glide = glide
         profilePictureView.publicKey = hexEncodedPublicKey

app/src/main/java/org/thoughtcrime/securesms/loki/api/OpenGroupManager.kt

@@ -20,7 +20,22 @@ object OpenGroupManager {
     private var pollers = mutableMapOf<String, OpenGroupPollerV2>() // One for each server
     private var isPolling = false
 
-    var isAllCaughtUp = false
+    val isAllCaughtUp: Boolean
+        get() {
+            pollers.values.forEach { poller ->
+                val jobID = poller.secondToLastJob?.id
+                jobID?.let {
+                    val storage = MessagingModuleConfiguration.shared.storage
+                    if (storage.getMessageReceiveJob(jobID) == null) {
+                        // If the second to last job is done, it means we are now handling the last job
+                        poller.isCaughtUp = true
+                        poller.secondToLastJob = null
+                    }
+                }
+                if (!poller.isCaughtUp) { return false }
+            }
+            return true
+        }
 
     fun startPolling() {
         if (isPolling) { return }
@@ -86,7 +101,8 @@ object OpenGroupManager {
         val threadDB = DatabaseFactory.getThreadDatabase(context)
         val openGroupID = "$server.$room"
         val threadID = GroupManager.getOpenGroupThreadID(openGroupID, context)
-        val groupID = threadDB.getRecipientForThreadId(threadID)!!.address.serialize()
+        val recipient = threadDB.getRecipientForThreadId(threadID) ?: return
+        val groupID = recipient.address.serialize()
         // Stop the poller if needed
         val openGroups = storage.getAllV2OpenGroups().filter { it.value.server == server }
         if (openGroups.count() == 1) {

app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt

@@ -278,14 +278,6 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         }
     }
 
-    override fun getLastMessageServerID(group: Long, server: String): Long? {
-        val database = databaseHelper.readableDatabase
-        val index = "$server.$group"
-        return database.get(lastMessageServerIDTable, "$lastMessageServerIDTableIndex = ?", wrap(index)) { cursor ->
-            cursor.getInt(lastMessageServerID)
-        }?.toLong()
-    }
-
     override fun getLastMessageServerID(room: String, server: String): Long? {
         val database = databaseHelper.writableDatabase
         val index = "$server.$room"
@@ -294,13 +286,6 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         }?.toLong()
     }
 
-    override fun setLastMessageServerID(group: Long, server: String, newValue: Long) {
-        val database = databaseHelper.writableDatabase
-        val index = "$server.$group"
-        val row = wrap(mapOf( lastMessageServerIDTableIndex to index, lastMessageServerID to newValue.toString() ))
-        database.insertOrUpdate(lastMessageServerIDTable, row, "$lastMessageServerIDTableIndex = ?", wrap(index))
-    }
-
     override fun setLastMessageServerID(room: String, server: String, newValue: Long) {
         val database = databaseHelper.writableDatabase
         val index = "$server.$room"
@@ -308,26 +293,12 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         database.insertOrUpdate(lastMessageServerIDTable, row, "$lastMessageServerIDTableIndex = ?", wrap(index))
     }
 
-    fun removeLastMessageServerID(group: Long, server: String) {
-        val database = databaseHelper.writableDatabase
-        val index = "$server.$group"
-        database.delete(lastMessageServerIDTable,"$lastMessageServerIDTableIndex = ?", wrap(index))
-    }
-
     fun removeLastMessageServerID(room: String, server:String) {
         val database = databaseHelper.writableDatabase
         val index = "$server.$room"
         database.delete(lastMessageServerIDTable, "$lastMessageServerIDTableIndex = ?", wrap(index))
     }
 
-    override fun getLastDeletionServerID(group: Long, server: String): Long? {
-        val database = databaseHelper.readableDatabase
-        val index = "$server.$group"
-        return database.get(lastDeletionServerIDTable, "$lastDeletionServerIDTableIndex = ?", wrap(index)) { cursor ->
-            cursor.getInt(lastDeletionServerID)
-        }?.toLong()
-    }
-
     override fun getLastDeletionServerID(room: String, server: String): Long? {
         val database = databaseHelper.readableDatabase
         val index = "$server.$room"
@@ -336,13 +307,6 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         }?.toLong()
     }
 
-    override fun setLastDeletionServerID(group: Long, server: String, newValue: Long) {
-        val database = databaseHelper.writableDatabase
-        val index = "$server.$group"
-        val row = wrap(mapOf( lastDeletionServerIDTableIndex to index, lastDeletionServerID to newValue.toString() ))
-        database.insertOrUpdate(lastDeletionServerIDTable, row, "$lastDeletionServerIDTableIndex = ?", wrap(index))
-    }
-
     override fun setLastDeletionServerID(room: String, server: String, newValue: Long) {
         val database = databaseHelper.writableDatabase
         val index = "$server.$room"
@@ -392,32 +356,6 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         database.insertOrUpdate(userCountTable, row, "$publicChatID = ?", wrap(index))
     }
 
-    override fun getSessionRequestSentTimestamp(publicKey: String): Long? {
-        val database = databaseHelper.readableDatabase
-        return database.get(sessionRequestSentTimestampTable, "${LokiAPIDatabase.publicKey} = ?", wrap(publicKey)) { cursor ->
-            cursor.getLong(LokiAPIDatabase.timestamp)
-        }?.toLong()
-    }
-
-    override fun setSessionRequestSentTimestamp(publicKey: String, newValue: Long) {
-        val database = databaseHelper.writableDatabase
-        val row = wrap(mapOf( LokiAPIDatabase.publicKey to publicKey, LokiAPIDatabase.timestamp to newValue.toString() ))
-        database.insertOrUpdate(sessionRequestSentTimestampTable, row, "${LokiAPIDatabase.publicKey} = ?", wrap(publicKey))
-    }
-
-    override fun getSessionRequestProcessedTimestamp(publicKey: String): Long? {
-        val database = databaseHelper.readableDatabase
-        return database.get(sessionRequestProcessedTimestampTable, "${LokiAPIDatabase.publicKey} = ?", wrap(publicKey)) { cursor ->
-            cursor.getInt(LokiAPIDatabase.timestamp)
-        }?.toLong()
-    }
-
-    override fun setSessionRequestProcessedTimestamp(publicKey: String, newValue: Long) {
-        val database = databaseHelper.writableDatabase
-        val row = wrap(mapOf(LokiAPIDatabase.publicKey to publicKey, LokiAPIDatabase.timestamp to newValue.toString()))
-        database.insertOrUpdate(sessionRequestProcessedTimestampTable, row, "${LokiAPIDatabase.publicKey} = ?", wrap(publicKey))
-    }
-
     override fun getOpenGroupPublicKey(server: String): String? {
         val database = databaseHelper.readableDatabase
         return database.get(openGroupPublicKeyTable, "${LokiAPIDatabase.server} = ?", wrap(server)) { cursor ->
@@ -431,27 +369,6 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         database.insertOrUpdate(openGroupPublicKeyTable, row, "${LokiAPIDatabase.server} = ?", wrap(server))
     }
 
-    override fun getOpenGroupProfilePictureURL(group: Long, server: String): String? {
-        val database = databaseHelper.readableDatabase
-        val index = "$server.$group"
-        return database.get(openGroupProfilePictureTable, "$publicChatID = ?", wrap(index)) { cursor ->
-            cursor.getString(openGroupProfilePicture)
-        }?.toString()
-    }
-
-    override fun setOpenGroupProfilePictureURL(group: Long, server: String, newValue: String) {
-        val database = databaseHelper.writableDatabase
-        val index = "$server.$group"
-        val row = wrap(mapOf(publicChatID to index, openGroupProfilePicture to newValue))
-        database.insertOrUpdate(openGroupProfilePictureTable, row, "$publicChatID = ?", wrap(index))
-    }
-
-    fun clearOpenGroupProfilePictureURL(group: Long, server: String): Boolean {
-        val database = databaseHelper.writableDatabase
-        val index = "$server.$group"
-        return database.delete(openGroupProfilePictureTable, "$publicChatID = ?", arrayOf(index)) > 0
-    }
-
     override fun getLastSnodePoolRefreshDate(): Date? {
         val time = TextSecurePreferences.getLastSnodePoolRefreshDate(context)
         if (time <= 0) { return null }

app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt

@@ -37,11 +37,6 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
 
     }
 
-    override fun getQuoteServerID(quoteID: Long, quoteePublicKey: String): Long? {
-        val message = DatabaseFactory.getMmsSmsDatabase(context).getMessageFor(quoteID, quoteePublicKey)
-        return if (message != null) getServerID(message.getId(), !message.isMms) else null
-    }
-
     fun getServerID(messageID: Long): Long? {
         val database = databaseHelper.readableDatabase
         return database.get(messageIDTable, "${Companion.messageID} = ?", arrayOf(messageID.toString())) { cursor ->

app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt

@@ -1,19 +1,12 @@
 package org.thoughtcrime.securesms.loki.database
 
-import android.content.ContentValues
 import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import org.session.libsignal.utilities.Log
-import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.loki.utilities.get
-import org.thoughtcrime.securesms.loki.utilities.insertOrUpdate
-import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.database.LokiUserDatabaseProtocol
 
-class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiUserDatabaseProtocol {
+class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) {
 
     companion object {
         // Shared
@@ -28,7 +21,7 @@ class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database
         @JvmStatic val createServerDisplayNameTableCommand = "CREATE TABLE $serverDisplayNameTable ($publicKey TEXT, $serverID TEXT, $displayName TEXT, PRIMARY KEY ($publicKey, $serverID));"
     }
 
-    override fun getDisplayName(publicKey: String): String? {
+    fun getDisplayName(publicKey: String): String? {
         if (publicKey == TextSecurePreferences.getLocalNumber(context)) {
             return TextSecurePreferences.getProfileName(context)
         } else {
@@ -44,21 +37,4 @@ class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database
             }
         }
     }
-
-    fun setDisplayName(publicKey: String, displayName: String) {
-        val database = databaseHelper.writableDatabase
-        val row = ContentValues(2)
-        row.put(Companion.publicKey, publicKey)
-        row.put(Companion.displayName, displayName)
-        database.insertOrUpdate(displayNameTable, row, "${Companion.publicKey} = ?", arrayOf( publicKey ))
-        Recipient.from(context, Address.fromSerialized(publicKey), false).notifyListeners()
-    }
-
-    override fun getProfilePictureURL(publicKey: String): String? {
-        return if (publicKey == TextSecurePreferences.getLocalNumber(context)) {
-            TextSecurePreferences.getProfilePictureURL(context)
-        } else {
-            Recipient.from(context, Address.fromSerialized(publicKey), false).resolve().profileAvatar
-        }
-    }
 }

app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionContactDatabase.kt

@@ -0,0 +1,81 @@
+package org.thoughtcrime.securesms.loki.database
+
+import android.content.ContentValues
+import android.content.Context
+import net.sqlcipher.Cursor
+import org.session.libsession.messaging.contacts.Contact
+import org.session.libsignal.utilities.Base64
+import org.thoughtcrime.securesms.database.Database
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
+import org.thoughtcrime.securesms.loki.utilities.*
+
+class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) {
+
+    companion object {
+        private const val sessionContactTable = "session_contact_database"
+        const val sessionID = "session_id"
+        const val name = "name"
+        const val nickname = "nickname"
+        const val profilePictureURL = "profile_picture_url"
+        const val profilePictureFileName = "profile_picture_file_name"
+        const val profilePictureEncryptionKey = "profile_picture_encryption_key"
+        const val threadID = "thread_id"
+        const val isTrusted = "is_trusted"
+        @JvmStatic val createSessionContactTableCommand =
+            "CREATE TABLE $sessionContactTable " +
+                "($sessionID STRING PRIMARY KEY, " +
+                "$name TEXT DEFAULT NULL, " +
+                "$nickname TEXT DEFAULT NULL, " +
+                "$profilePictureURL TEXT DEFAULT NULL, " +
+                "$profilePictureFileName TEXT DEFAULT NULL, " +
+                "$profilePictureEncryptionKey BLOB DEFAULT NULL, " +
+                "$threadID INTEGER DEFAULT -1, " +
+                "$isTrusted INTEGER DEFAULT 0);"
+    }
+
+    fun getContactWithSessionID(sessionID: String): Contact? {
+        val database = databaseHelper.readableDatabase
+        return database.get(sessionContactTable, "${SessionContactDatabase.sessionID} = ?", arrayOf( sessionID )) { cursor ->
+            contactFromCursor(cursor)
+        }
+    }
+
+    fun getAllContacts(): Set<Contact> {
+        val database = databaseHelper.readableDatabase
+        return database.getAll(sessionContactTable, null, null) { cursor ->
+            contactFromCursor(cursor)
+        }.toSet()
+    }
+
+    fun setContact(contact: Contact) {
+        val database = databaseHelper.writableDatabase
+        val contentValues = ContentValues(8)
+        contentValues.put(sessionID, contact.sessionID)
+        contentValues.put(name, contact.name)
+        contentValues.put(nickname, contact.nickname)
+        contentValues.put(profilePictureURL, contact.profilePictureURL)
+        contentValues.put(profilePictureFileName, contact.profilePictureFileName)
+        contact.profilePictureEncryptionKey?.let {
+            contentValues.put(profilePictureEncryptionKey, Base64.encodeBytes(it))
+        }
+        contentValues.put(threadID, threadID)
+        contentValues.put(isTrusted, if (contact.isTrusted) 1 else 0)
+        database.insertOrUpdate(sessionContactTable, contentValues, "$sessionID = ?", arrayOf( contact.sessionID ))
+        notifyConversationListListeners()
+    }
+
+    private fun contactFromCursor(cursor: Cursor): Contact {
+        val sessionID = cursor.getString(sessionID)
+        val contact = Contact(sessionID)
+        contact.name = cursor.getStringOrNull(name)
+        contact.nickname = cursor.getStringOrNull(nickname)
+        contact.profilePictureURL = cursor.getStringOrNull(profilePictureURL)
+        contact.profilePictureFileName = cursor.getStringOrNull(profilePictureFileName)
+        cursor.getStringOrNull(profilePictureEncryptionKey)?.let {
+            contact.profilePictureEncryptionKey = Base64.decode(it)
+        }
+        contact.threadID = cursor.getLong(threadID)
+        contact.isTrusted = cursor.getInt(isTrusted) != 0
+        return contact
+    }
+}

app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt

@@ -71,6 +71,13 @@ class SessionJobDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
         }
     }
 
+    fun getMessageReceiveJob(messageReceiveJobID: String): MessageReceiveJob? {
+        val database = databaseHelper.readableDatabase
+        return database.get(sessionJobTable, "$jobID = ? AND $jobType = ?", arrayOf( messageReceiveJobID, MessageReceiveJob.KEY )) { cursor ->
+            jobFromCursor(cursor) as MessageReceiveJob?
+        }
+    }
+
     fun cancelPendingMessageSendJobs(threadID: Long) {
         val database = databaseHelper.writableDatabase
         val attachmentUploadJobKeys = mutableListOf<String>()

app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationBottomSheet.kt

@@ -1,54 +0,0 @@
-package org.thoughtcrime.securesms.loki.dialogs
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.fragment_key_pair_migration_bottom_sheet.*
-import network.loki.messenger.R
-import org.thoughtcrime.securesms.ApplicationContext
-
-class KeyPairMigrationBottomSheet : BottomSheetDialogFragment() {
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_key_pair_migration_bottom_sheet, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        upgradeNowButton.setOnClickListener { upgradeNow() }
-        upgradeLaterButton.setOnClickListener { upgradeLater() }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val dialog = super.onCreateDialog(savedInstanceState)
-        dialog.setOnShowListener {
-            val d = dialog as BottomSheetDialog
-            val bottomSheet = d.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)!!
-            BottomSheetBehavior.from(bottomSheet).state = BottomSheetBehavior.STATE_EXPANDED
-            BottomSheetBehavior.from(bottomSheet).isHideable = false
-        }
-        isCancelable = false
-        return dialog
-    }
-
-    private fun upgradeNow() {
-        val applicationContext = requireContext().applicationContext as ApplicationContext
-        applicationContext.clearAllData(true)
-    }
-
-    private fun upgradeLater() {
-        val dialog = AlertDialog.Builder(requireContext())
-        dialog.setMessage("You won't be able to send or receive messages until you upgrade.")
-        dialog.setPositiveButton(R.string.ok) { _, _ ->
-            dismiss()
-        }
-        dialog.create().show()
-    }
-}

app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationSuccessBottomSheet.kt

@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms.loki.dialogs
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.Toast
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.fragment_key_pair_migration_success_bottom_sheet.*
-import network.loki.messenger.R
-import org.session.libsession.utilities.TextSecurePreferences
-
-class KeyPairMigrationSuccessBottomSheet : BottomSheetDialogFragment() {
-
-    private val sessionID by lazy {
-        TextSecurePreferences.getLocalNumber(requireContext())
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_key_pair_migration_success_bottom_sheet, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        sessionIDTextView.text = sessionID
-        copyButton.setOnClickListener { copySessionID() }
-        okButton.setOnClickListener { dismiss() }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val dialog = super.onCreateDialog(savedInstanceState)
-        // Expand the bottom sheet by default
-        dialog.setOnShowListener {
-            val d = dialog as BottomSheetDialog
-            val bottomSheet = d.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
-            BottomSheetBehavior.from(bottomSheet!!).setState(BottomSheetBehavior.STATE_EXPANDED);
-        }
-        return dialog
-    }
-
-    private fun copySessionID() {
-        val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        val clip = ClipData.newPlainText("Session ID", sessionID)
-        clipboard.setPrimaryClip(clip)
-        Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
-    }
-}

app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.loki.dialogs
 
+import android.annotation.SuppressLint
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
@@ -8,14 +9,19 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import kotlinx.android.synthetic.main.fragment_user_details_bottom_sheet.*
-import kotlinx.android.synthetic.main.view_conversation.view.*
 import network.loki.messenger.R
+import org.session.libsession.messaging.contacts.Contact
+import org.session.libsession.utilities.Address
+import org.session.libsession.utilities.recipients.Recipient
+import org.session.libsession.utilities.SSKEnvironment
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.mms.GlideApp
 
-public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
+class UserDetailsBottomSheet : BottomSheetDialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_user_details_bottom_sheet, container, false)
@@ -24,11 +30,38 @@ public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val publicKey = arguments?.getString("publicKey") ?: return dismiss()
+        val recipient = Recipient.from(requireContext(), Address.fromSerialized(publicKey), false)
         profilePictureView.publicKey = publicKey
         profilePictureView.glide = GlideApp.with(this)
         profilePictureView.isLarge = true
         profilePictureView.update()
-        nameTextView.text = DatabaseFactory.getLokiUserDatabase(requireContext()).getDisplayName(publicKey) ?: "Anonymous"
+        nameTextViewContainer.visibility = View.VISIBLE
+        nameTextViewContainer.setOnClickListener {
+            nameTextViewContainer.visibility = View.INVISIBLE
+            nameEditTextContainer.visibility = View.VISIBLE
+            nicknameEditText.text = null
+            nicknameEditText.requestFocus()
+            showSoftKeyboard()
+        }
+        cancelNicknameEditingButton.setOnClickListener {
+            nicknameEditText.clearFocus()
+            hideSoftKeyboard()
+            nameTextViewContainer.visibility = View.VISIBLE
+            nameEditTextContainer.visibility = View.INVISIBLE
+        }
+        saveNicknameButton.setOnClickListener {
+            saveNickName(recipient)
+        }
+        nicknameEditText.setOnEditorActionListener { _, actionId, _ ->
+            when (actionId) {
+                EditorInfo.IME_ACTION_DONE -> {
+                    saveNickName(recipient)
+                    return@setOnEditorActionListener true
+                }
+                else -> return@setOnEditorActionListener false
+            }
+        }
+        nameTextView.text = recipient.name ?: publicKey // Uses the Contact API internally
         publicKeyTextView.text = publicKey
         copyButton.setOnClickListener {
             val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
@@ -37,4 +70,32 @@ public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
             Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
         }
     }
+
+    fun saveNickName(recipient: Recipient) {
+        nicknameEditText.clearFocus()
+        hideSoftKeyboard()
+        nameTextViewContainer.visibility = View.VISIBLE
+        nameEditTextContainer.visibility = View.INVISIBLE
+        var newNickName: String? = null
+        if (nicknameEditText.text.isNotEmpty()) {
+            newNickName = nicknameEditText.text.toString()
+        }
+        val publicKey = recipient.address.serialize()
+        val contactDB = DatabaseFactory.getSessionContactDatabase(context)
+        val contact = contactDB.getContactWithSessionID(publicKey) ?: Contact(publicKey)
+        contact.nickname = newNickName
+        contactDB.setContact(contact)
+        nameTextView.text = recipient.name ?: publicKey // Uses the Contact API internally
+    }
+
+    @SuppressLint("ServiceCast")
+    fun showSoftKeyboard() {
+        val imm = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+        imm?.showSoftInput(nicknameEditText, 0)
+    }
+
+    fun hideSoftKeyboard() {
+        val imm = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+        imm?.hideSoftInputFromWindow(nicknameEditText.windowToken, 0)
+    }
 }

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt

@@ -1,15 +1,8 @@
 package org.thoughtcrime.securesms.loki.protocol
 
-import android.content.Context
-import org.thoughtcrime.securesms.ApplicationContext
 import org.session.libsession.utilities.Address
-import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
 import org.session.libsession.utilities.recipients.Recipient
-import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.messages.SignalServiceContent
 import org.session.libsignal.messages.SignalServiceDataMessage
-import java.security.MessageDigest
 
 object SessionMetaProtocol {
 
@@ -39,19 +32,6 @@ object SessionMetaProtocol {
         return shouldIgnoreMessage
     }
 
-    @JvmStatic
-    fun handleProfileUpdateIfNeeded(context: Context, content: SignalServiceContent) {
-        val displayName = content.senderDisplayName.orNull() ?: return
-        if (displayName.isBlank()) { return }
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)
-        val sender = content.sender.toLowerCase()
-        if (userPublicKey == sender) {
-            // Update the user's local name if the message came from their master device
-            TextSecurePreferences.setProfileName(context, displayName)
-        }
-        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, displayName)
-    }
-
     @JvmStatic
     fun canUserReplyToNotification(recipient: Recipient): Boolean {
         // TODO return !recipient.address.isRSSFeed

app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.loki.utilities
 
 import android.content.ContentValues
+import androidx.core.database.getStringOrNull
 import net.sqlcipher.Cursor
 import net.sqlcipher.database.SQLiteDatabase
 import org.session.libsignal.utilities.Base64
@@ -57,3 +58,7 @@ fun Cursor.getLong(columnName: String): Long {
 fun Cursor.getBase64EncodedData(columnName: String): ByteArray {
     return Base64.decode(getString(columnName))
 }
+
+fun Cursor.getStringOrNull(columnName: String): String? {
+    return getStringOrNull(getColumnIndexOrThrow(columnName))
+}

app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt

@@ -15,7 +15,7 @@ object MentionManagerUtilities {
             val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.address.toGroupString(), false).map { it.address.serialize() }
             result.addAll(members)
         } else {
-            if (MentionsManager.shared.userPublicKeyCache[threadID] != null) { return }
+            if (MentionsManager.userPublicKeyCache[threadID] != null) { return }
             val messageDatabase = DatabaseFactory.getMmsSmsDatabase(context)
             val reader = messageDatabase.readerFor(messageDatabase.getConversation(threadID))
             var record: MessageRecord? = reader.next
@@ -30,6 +30,6 @@ object MentionManagerUtilities {
             reader.close()
             result.add(TextSecurePreferences.getLocalNumber(context)!!)
         }
-        MentionsManager.shared.userPublicKeyCache[threadID] = result
+        MentionsManager.userPublicKeyCache[threadID] = result
     }
 }

app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt

@@ -9,6 +9,7 @@ import android.text.style.StyleSpan
 import android.util.Range
 import network.loki.messenger.R
 import nl.komponents.kovenant.combine.Tuple2
+import org.session.libsession.messaging.contacts.Contact
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.session.libsession.utilities.TextSecurePreferences
 import java.util.regex.Pattern
@@ -23,6 +24,8 @@ object MentionUtilities {
     @JvmStatic
     fun highlightMentions(text: CharSequence, isOutgoingMessage: Boolean, threadID: Long, context: Context): SpannableString {
         var text = text
+        val threadDB = DatabaseFactory.getThreadDatabase(context)
+        val isOpenGroup = threadDB.getRecipientForThreadId(threadID)?.isOpenGroupRecipient ?: false
         val pattern = Pattern.compile("@[0-9a-fA-F]*")
         var matcher = pattern.matcher(text)
         val mentions = mutableListOf<Tuple2<Range<Int>, String>>()
@@ -31,10 +34,12 @@ object MentionUtilities {
         if (matcher.find(startIndex)) {
             while (true) {
                 val publicKey = text.subSequence(matcher.start() + 1, matcher.end()).toString() // +1 to get rid of the @
-                val userDisplayName: String? = if (publicKey.toLowerCase() == userPublicKey.toLowerCase()) {
+                val userDisplayName: String? = if (publicKey.equals(userPublicKey, ignoreCase = true)) {
                     TextSecurePreferences.getProfileName(context)
                 } else {
-                    DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey)
+                    val contact = DatabaseFactory.getSessionContactDatabase(context).getContactWithSessionID(publicKey)
+                    val context = if (isOpenGroup) Contact.ContactContext.OPEN_GROUP else Contact.ContactContext.REGULAR
+                    contact?.displayName(context)
                 }
                 if (userDisplayName != null) {
                     text = text.subSequence(0, matcher.start()).toString() + "@" + userDisplayName + text.subSequence(matcher.end(), text.length)

app/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt

@@ -1,13 +0,0 @@
-@file:JvmName("NotificationUtilities")
-package org.thoughtcrime.securesms.loki.utilities
-
-import android.content.Context
-import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.session.libsession.utilities.recipients.Recipient
-
-fun getOpenGroupDisplayName(recipient: Recipient, threadRecipient: Recipient, context: Context): String {
-    val publicKey = recipient.address.toString()
-    val displayName = DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey)
-    // FIXME: Add short ID here?
-    return displayName ?: publicKey
-}

app/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt

@@ -2,13 +2,15 @@ package org.thoughtcrime.securesms.loki.views
 
 import android.content.Context
 import android.graphics.Typeface
-import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.view_conversation.view.*
 import network.loki.messenger.R
+import org.session.libsession.messaging.contacts.Contact
+import org.session.libsession.utilities.recipients.Recipient
+import org.session.libsession.utilities.SSKEnvironment
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities.populateUserPublicKeyCacheIfNeeded
@@ -56,7 +58,7 @@ class ConversationView : LinearLayout {
         }
         profilePictureView.glide = glide
         profilePictureView.update(thread.recipient, thread.threadId)
-        val senderDisplayName = if (thread.recipient.isLocalNumber) context.getString(R.string.note_to_self) else if (!thread.recipient.name.isNullOrEmpty()) thread.recipient.name else thread.recipient.address.toString()
+        val senderDisplayName = getUserDisplayName(thread.recipient) ?: thread.recipient.address.toString()
         btnGroupNameDisplay.text = senderDisplayName
         timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date)
         muteIndicatorImageView.visibility = if (thread.recipient.isMuted) VISIBLE else GONE
@@ -85,9 +87,12 @@ class ConversationView : LinearLayout {
         profilePictureView.recycle()
     }
 
-    private fun getUserDisplayName(publicKey: String?): String? {
+    private fun getUserDisplayName(recipient: Recipient): String? {
-        if (TextUtils.isEmpty(publicKey)) return null
+        if (recipient.isLocalNumber) {
-        return DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey!!)
+            return context.getString(R.string.note_to_self)
+        } else {
+            return recipient.name // Internally uses the Contact API
+        }
     }
     // endregion
 }

app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt

@@ -11,6 +11,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import kotlinx.android.synthetic.main.view_profile_picture.view.*
 import network.loki.messenger.R
 import org.session.libsession.avatars.ProfileContactPhoto
+import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.mentions.MentionsManager
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
@@ -57,19 +58,15 @@ class ProfilePictureView : RelativeLayout {
 
     // region Updating
     fun update(recipient: Recipient, threadID: Long) {
-        fun getUserDisplayName(publicKey: String?): String? {
+        fun getUserDisplayName(publicKey: String): String {
-            if (publicKey == null || publicKey.isBlank()) {
+            val contact = DatabaseFactory.getSessionContactDatabase(context).getContactWithSessionID(publicKey)
-                return null
+            return contact?.displayName(Contact.ContactContext.REGULAR) ?: publicKey
-            } else {
-                val result = DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey)
-                return result ?: publicKey
-            }
         }
         fun isOpenGroupWithProfilePicture(recipient: Recipient): Boolean {
             return recipient.isOpenGroupRecipient && recipient.groupAvatarId != null
         }
         if (recipient.isGroupRecipient && !isOpenGroupWithProfilePicture(recipient)) {
-            val users = MentionsManager.shared.userPublicKeyCache[threadID]?.toMutableList() ?: mutableListOf()
+            val users = MentionsManager.userPublicKeyCache[threadID]?.toMutableList() ?: mutableListOf()
             users.remove(TextSecurePreferences.getLocalNumber(context))
             val randomUsers = users.sorted().toMutableList() // Sort to provide a level of stability
             if (users.count() == 1) {
@@ -86,7 +83,8 @@ class ProfilePictureView : RelativeLayout {
                     recipient.name == "Session Updates" ||
                     recipient.name == "Session Public Chat"
         } else {
-            publicKey = recipient.address.toString()
+            val publicKey = recipient.address.toString()
+            this.publicKey = publicKey
             displayName = getUserDisplayName(publicKey)
             additionalPublicKey = null
             isRSSFeed = false

app/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt

@@ -8,6 +8,7 @@ import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.view_conversation.view.profilePictureView
 import kotlinx.android.synthetic.main.view_user.view.*
 import network.loki.messenger.R
+import org.session.libsession.messaging.contacts.Contact
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities
 import org.thoughtcrime.securesms.mms.GlideRequests
@@ -48,13 +49,9 @@ class UserView : LinearLayout {
 
     // region Updating
     fun bind(user: Recipient, glide: GlideRequests, actionIndicator: ActionIndicator, isSelected: Boolean = false) {
-        fun getUserDisplayName(publicKey: String?): String? {
+        fun getUserDisplayName(publicKey: String): String {
-            if (publicKey == null || publicKey.isBlank()) {
+            val contact = DatabaseFactory.getSessionContactDatabase(context).getContactWithSessionID(publicKey)
-                return null
+            return contact?.displayName(Contact.ContactContext.REGULAR) ?: publicKey
-            } else {
-                val result = DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey)
-                return result ?: publicKey
-            }
         }
         val threadID = DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(user)
         MentionManagerUtilities.populateUserPublicKeyCacheIfNeeded(threadID, context) // FIXME: This is a bad place to do this

app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java

@@ -287,9 +287,6 @@ public class DefaultMessageNotifier implements MessageNotifier {
     } finally {
       if (telcoCursor != null) telcoCursor.close();
       if (pushCursor != null)  pushCursor.close();
-      if (!OpenGroupManager.INSTANCE.isAllCaughtUp()) {
-        OpenGroupManager.INSTANCE.setAllCaughtUp(true);
-      }
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java

@@ -8,14 +8,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import android.text.SpannableStringBuilder;
-
+import org.session.libsession.messaging.contacts.Contact;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
-import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities;
+import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
 import org.session.libsession.utilities.NotificationPrivacyPreference;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-
 import java.util.LinkedList;
 import java.util.List;
 
@@ -49,8 +49,15 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
 
   public void setMostRecentSender(Recipient recipient, Recipient threadRecipient) {
     String displayName = recipient.toShortString();
-    if (threadRecipient.isGroupRecipient()) {
+    if (threadRecipient.isOpenGroupRecipient()) {
-      displayName = NotificationUtilities.getOpenGroupDisplayName(recipient, threadRecipient, context);
+      SessionContactDatabase contactDB = DatabaseFactory.getSessionContactDatabase(context);
+      String sessionID = recipient.getAddress().serialize();
+      Contact contact = contactDB.getContactWithSessionID(sessionID);
+      if (contact != null) {
+        displayName = contact.displayName(Contact.ContactContext.OPEN_GROUP);
+      } else {
+        displayName = sessionID;
+      }
     }
     if (privacy.isDisplayContact()) {
       setContentText(context.getString(R.string.MessageNotifier_most_recent_from_s, displayName));
@@ -71,8 +78,15 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
 
   public void addMessageBody(@NonNull Recipient sender, Recipient threadRecipient, @Nullable CharSequence body) {
     String displayName = sender.toShortString();
-    if (threadRecipient.isGroupRecipient()) {
+    if (threadRecipient.isOpenGroupRecipient()) {
-      displayName = NotificationUtilities.getOpenGroupDisplayName(sender, threadRecipient, context);
+      SessionContactDatabase contactDB = DatabaseFactory.getSessionContactDatabase(context);
+      String sessionID = sender.getAddress().serialize();
+      Contact contact = contactDB.getContactWithSessionID(sessionID);
+      if (contact != null) {
+        displayName = contact.displayName(Contact.ContactContext.OPEN_GROUP);
+      } else {
+        displayName = sessionID;
+      }
     }
     if (privacy.isDisplayMessage()) {
       SpannableStringBuilder builder = new SpannableStringBuilder();

app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java

@@ -10,6 +10,7 @@ import org.session.libsession.messaging.sending_receiving.notifications.MessageN
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.Debouncer;
+import org.session.libsignal.utilities.Log;
 import org.session.libsignal.utilities.ThreadUtils;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.loki.api.OpenGroupManager;
@@ -23,7 +24,7 @@ public class OptimizedMessageNotifier implements MessageNotifier {
   @MainThread
   public OptimizedMessageNotifier(@NonNull MessageNotifier wrapped) {
     this.wrapped   = wrapped;
-    this.debouncer = new Debouncer(TimeUnit.SECONDS.toMillis(1));
+    this.debouncer = new Debouncer(TimeUnit.SECONDS.toMillis(2));
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java

@@ -15,22 +15,21 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.text.SpannableStringBuilder;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationCompat.Action;
 import androidx.core.app.RemoteInput;
-
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
 import org.session.libsession.avatars.ContactColors;
 import org.session.libsession.avatars.ContactPhoto;
 import org.session.libsession.avatars.GeneratedContactPhoto;
+import org.session.libsession.messaging.contacts.Contact;
 import org.session.libsignal.utilities.Log;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.loki.database.SessionContactDatabase;
 import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
-import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.Slide;
@@ -40,11 +39,9 @@ import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-
 import network.loki.messenger.R;
 
 public class SingleRecipientNotificationBuilder extends AbstractNotificationBuilder {
@@ -121,8 +118,16 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
   {
     SpannableStringBuilder stringBuilder = new SpannableStringBuilder();
 
-    if (privacy.isDisplayContact() && threadRecipients.isGroupRecipient()) {
+    if (privacy.isDisplayContact() && threadRecipients.isOpenGroupRecipient()) {
-      String displayName = NotificationUtilities.getOpenGroupDisplayName(individualRecipient, threadRecipients, context);
+      String displayName;
+      SessionContactDatabase contactDB = DatabaseFactory.getSessionContactDatabase(context);
+      String sessionID = individualRecipient.getAddress().serialize();
+      Contact contact = contactDB.getContactWithSessionID(sessionID);
+      if (contact != null) {
+        displayName = contact.displayName(Contact.ContactContext.OPEN_GROUP);
+      } else {
+        displayName = sessionID;
+      }
       if (displayName != null) {
         stringBuilder.append(Util.getBoldedString(displayName + ": "));
       }
@@ -209,8 +214,16 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
   {
     SpannableStringBuilder stringBuilder = new SpannableStringBuilder();
 
-    if (privacy.isDisplayContact() && threadRecipient.isGroupRecipient()) {
+    if (privacy.isDisplayContact() && threadRecipient.isOpenGroupRecipient()) {
-      String displayName = NotificationUtilities.getOpenGroupDisplayName(individualRecipient, threadRecipient, context);
+      String displayName;
+      SessionContactDatabase contactDB = DatabaseFactory.getSessionContactDatabase(context);
+      String sessionID = individualRecipient.getAddress().serialize();
+      Contact contact = contactDB.getContactWithSessionID(sessionID);
+      if (contact != null) {
+        displayName = contact.displayName(Contact.ContactContext.OPEN_GROUP);
+      } else {
+        displayName = sessionID;
+      }
       if (displayName != null) {
         stringBuilder.append(Util.getBoldedString(displayName + ": "));
       }

app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt

@@ -1,22 +1,70 @@
 package org.thoughtcrime.securesms.sskenvironment
 
 import android.content.Context
+import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.SSKEnvironment
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
 
-class ProfileManager: SSKEnvironment.ProfileManagerProtocol {
+class ProfileManager : SSKEnvironment.ProfileManagerProtocol {
-    override fun setDisplayName(context: Context, recipient: Recipient, displayName: String) {
+
-        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(recipient.address.serialize(), displayName)
+    override fun setNickname(context: Context, recipient: Recipient, nickname: String?) {
+        val sessionID = recipient.address.serialize()
+        val contactDatabase = DatabaseFactory.getSessionContactDatabase(context)
+        var contact = contactDatabase.getContactWithSessionID(sessionID)
+        if (contact == null) contact = Contact(sessionID)
+        contact.threadID = DatabaseFactory.getStorage(context).getThreadId(recipient.address)
+        if (contact.nickname != nickname) {
+            contact.nickname = nickname
+            contactDatabase.setContact(contact)
+        }
+    }
+
+    override fun setName(context: Context, recipient: Recipient, name: String) {
+        // New API
+        val sessionID = recipient.address.serialize()
+        val contactDatabase = DatabaseFactory.getSessionContactDatabase(context)
+        var contact = contactDatabase.getContactWithSessionID(sessionID)
+        if (contact == null) contact = Contact(sessionID)
+        contact.threadID = DatabaseFactory.getStorage(context).getThreadId(recipient.address)
+        if (contact.name != name) {
+            contact.name = name
+            contactDatabase.setContact(contact)
+        }
+        // Old API
+        val database = DatabaseFactory.getRecipientDatabase(context)
+        database.setProfileName(recipient, name)
+        recipient.notifyListeners()
     }
 
     override fun setProfilePictureURL(context: Context, recipient: Recipient, profilePictureURL: String) {
-        ApplicationContext.getInstance(context).jobManager.add(RetrieveProfileAvatarJob(recipient, profilePictureURL))
+        val job = RetrieveProfileAvatarJob(recipient, profilePictureURL)
+        ApplicationContext.getInstance(context).jobManager.add(job)
+        val sessionID = recipient.address.serialize()
+        val contactDatabase = DatabaseFactory.getSessionContactDatabase(context)
+        var contact = contactDatabase.getContactWithSessionID(sessionID)
+        if (contact == null) contact = Contact(sessionID)
+        contact.threadID = DatabaseFactory.getStorage(context).getThreadId(recipient.address)
+        if (contact.profilePictureURL != profilePictureURL) {
+            contact.profilePictureURL = profilePictureURL
+            contactDatabase.setContact(contact)
+        }
     }
 
     override fun setProfileKey(context: Context, recipient: Recipient, profileKey: ByteArray) {
+        // New API
+        val sessionID = recipient.address.serialize()
+        val contactDatabase = DatabaseFactory.getSessionContactDatabase(context)
+        var contact = contactDatabase.getContactWithSessionID(sessionID)
+        if (contact == null) contact = Contact(sessionID)
+        contact.threadID = DatabaseFactory.getStorage(context).getThreadId(recipient.address)
+        if (!contact.profilePictureEncryptionKey.contentEquals(profileKey)) {
+            contact.profilePictureEncryptionKey = profileKey
+            contactDatabase.setContact(contact)
+        }
+        // Old API
         val database = DatabaseFactory.getRecipientDatabase(context)
         database.setProfileKey(recipient, profileKey)
     }

app/src/main/res/layout-sw400dp/activity_landing.xml

@@ -59,6 +59,6 @@
         android:background="@color/transparent"
         android:textAllCaps="false"
         android:textSize="@dimen/medium_font_size"
-        android:text="Link a Device" />
+        android:text="@string/activity_link_device_link_device" />
 
 </LinearLayout>

app/src/main/res/layout-sw400dp/activity_pn_mode.xml

@@ -19,7 +19,7 @@
             android:textSize="@dimen/very_large_font_size"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Message Notifications" />
+            android:text="@string/activity_pn_mode_message_notifications" />
 
         <TextView
             android:layout_width="match_parent"
@@ -29,7 +29,7 @@
             android:layout_marginRight="@dimen/very_large_spacing"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:text="There are two ways Session can notify you of new messages." />
+            android:text="@string/activity_pn_mode_explanation" />
 
         <org.thoughtcrime.securesms.loki.views.PNModeView
             android:id="@+id/fcmOptionView"
@@ -48,7 +48,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textStyle="bold"
-                android:text="Fast Mode" />
+                android:text="@string/activity_pn_mode_fast_mode" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -56,7 +56,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/very_small_font_size"
                 android:textColor="@color/text"
-                android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers." />
+                android:text="@string/activity_pn_mode_fast_mode_explanation" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -86,7 +86,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textStyle="bold"
-                android:text="Slow Mode" />
+                android:text="@string/activity_pn_mode_slow_mode" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -94,7 +94,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/very_small_font_size"
                 android:textColor="@color/text"
-                android:text="Session will occasionally check for new messages in the background." />
+                android:text="@string/activity_pn_mode_slow_mode_explanation" />
 
         </org.thoughtcrime.securesms.loki.views.PNModeView>
 

app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -34,7 +35,7 @@
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="12dp"
         android:layout_marginRight="@dimen/very_large_spacing"
@@ -42,7 +43,7 @@
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
-        android:maxLines="2"
+        android:maxLines="3"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View
@@ -69,6 +70,7 @@
         android:textColor="?android:textColorTertiary"
         android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
+        android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
+        tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>

app/src/main/res/layout-sw400dp/activity_register.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -38,7 +39,7 @@
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/very_large_spacing"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <View
         android:layout_width="match_parent"
@@ -74,6 +75,7 @@
         android:textColor="?android:textColorTertiary"
         android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
+        android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
+        tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>

app/src/main/res/layout-sw400dp/activity_seed.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
@@ -47,7 +47,7 @@
         android:gravity="center"
         android:textSize="16sp"
         android:textAlignment="center"
-        android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
+        tools:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
 
     <TextView
         android:id="@+id/revealButton"

app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml

@@ -18,7 +18,7 @@
         android:textSize="@dimen/very_large_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
-        android:text="Recovery Phrase" />
+        android:text="@string/fragment_recovery_phrase_title" />
 
     <TextView
         android:layout_width="match_parent"
@@ -28,13 +28,13 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
-        android:text="To link your device, enter the recovery phrase that was given to you when you signed up." />
+        android:text="@string/activity_restore_explanation" />
 
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="12dp"
         android:layout_marginRight="@dimen/very_large_spacing"
@@ -42,7 +42,7 @@
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
-        android:maxLines="2"
+        android:maxLines="3"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View

app/src/main/res/layout-sw400dp/view_seed_reminder.xml

@@ -36,7 +36,7 @@
                 android:textColor="@color/text"
                 android:textSize="@dimen/small_font_size"
                 android:textStyle="bold"
-                android:text="You're almost finished! 80%" />
+                android:text="@string/view_seed_reminder_title" />
 
             <TextView
                 android:id="@+id/subtitleTextView"
@@ -47,7 +47,7 @@
                 android:textSize="@dimen/very_small_font_size"
                 android:lines="2"
                 android:alpha="0.6"
-                android:text="Secure your account by saving your recovery phrase" />
+                android:text="@string/view_seed_reminder_subtitle_1" />
 
         </LinearLayout>
 
@@ -64,7 +64,7 @@
             android:layout_height="28dp"
             android:layout_marginLeft="4dp"
             android:textStyle="normal"
-            android:text="Continue" />
+            android:text="@string/continue_2" />
 
     </LinearLayout>
 

app/src/main/res/layout/activity_backup_restore.xml

@@ -99,7 +99,8 @@
                 android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
                 android:textColor="@color/text"
                 android:textColorLink="@color/text"
-                android:textSize="@dimen/very_small_font_size" /> <!-- Intentionally not yet translated -->
+                android:textSize="@dimen/very_small_font_size"
+                tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
         </LinearLayout>
 

app/src/main/res/layout/activity_home.xml

@@ -42,7 +42,7 @@
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="64dp"
                     android:fontFamily="sans-serif-medium"
-                    android:text="Session"
+                    android:text="@string/app_name"
                     android:textColor="@color/text"
                     android:textSize="@dimen/very_large_font_size" />
 

app/src/main/res/layout/activity_landing.xml

@@ -59,6 +59,6 @@
         android:background="@color/transparent"
         android:textAllCaps="false"
         android:textSize="@dimen/medium_font_size"
-        android:text="Link a Device" />
+        android:text="@string/activity_link_device_link_device" />
 
 </LinearLayout>

app/src/main/res/layout/activity_open_group_guidelines.xml

@@ -18,7 +18,7 @@
             android:textSize="@dimen/large_font_size"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Community Guidelines" />
+            android:text="@string/ConversationActivity_open_group_guidelines" />
 
         <TextView
             android:id="@+id/communityGuidelinesTextView"

app/src/main/res/layout/activity_pn_mode.xml

@@ -19,7 +19,7 @@
             android:textSize="@dimen/large_font_size"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Message Notifications" />
+            android:text="@string/activity_pn_mode_message_notifications" />
 
         <TextView
             android:layout_width="match_parent"
@@ -29,7 +29,7 @@
             android:layout_marginRight="@dimen/very_large_spacing"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:text="There are two ways Session can notify you of new messages." />
+            android:text="@string/activity_pn_mode_explanation" />
 
         <org.thoughtcrime.securesms.loki.views.PNModeView
             android:id="@+id/fcmOptionView"
@@ -48,7 +48,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textStyle="bold"
-                android:text="Fast Mode" />
+                android:text="@string/activity_pn_mode_fast_mode" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -56,7 +56,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/very_small_font_size"
                 android:textColor="@color/text"
-                android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers." />
+                android:text="@string/activity_pn_mode_fast_mode_explanation" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -86,7 +86,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textStyle="bold"
-                android:text="Slow Mode" />
+                android:text="@string/activity_pn_mode_slow_mode" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -94,7 +94,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/very_small_font_size"
                 android:textColor="@color/text"
-                android:text="Session will occasionally check for new messages in the background." />
+                android:text="@string/activity_pn_mode_slow_mode_explanation" />
 
         </org.thoughtcrime.securesms.loki.views.PNModeView>
 
@@ -104,7 +104,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/medium_button_height"
             android:layout_marginLeft="@dimen/massive_spacing"
-            android:layout_marginTop="@dimen/very_large_spacing"
+            android:layout_marginTop="20dp"
             android:layout_marginRight="@dimen/massive_spacing"
             android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
             android:text="@string/continue_2" />

app/src/main/res/layout/activity_recovery_phrase_restore.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -34,7 +35,7 @@
         style="@style/SmallSessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
@@ -42,7 +43,7 @@
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
-        android:maxLines="2"
+        android:maxLines="3"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View
@@ -69,6 +70,7 @@
         android:textColorLink="@color/text"
         android:textSize="@dimen/very_small_font_size"
         android:textColor="@color/text"
-        android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
+        android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
+        tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>

app/src/main/res/layout/activity_register.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -35,11 +36,11 @@
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="18dp"
+        android:textSize="18sp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <View
         android:layout_width="match_parent"
@@ -75,6 +76,7 @@
         android:textColor="?android:textColorTertiary"
         android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
+        android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
+        tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>

app/src/main/res/layout/activity_seed.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
@@ -47,7 +47,7 @@
         android:gravity="center"
         android:textSize="14sp"
         android:textAlignment="center"
-        android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
+        tools:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
 
     <TextView
         android:id="@+id/revealButton"

app/src/main/res/layout/activity_settings.xml

@@ -76,7 +76,7 @@
                 android:textColor="@color/text"
                 android:fontFamily="@font/space_mono_regular"
                 android:textAlignment="center"
-                android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+                tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -211,7 +211,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textStyle="bold"
                 android:gravity="center"
-                android:text="Help us Translate Session" />
+                android:text="@string/activity_settings_help_translate_session" />
 
             <TextView
                 android:id="@+id/versionTextView"

app/src/main/res/layout/contact_selection_list_fragment.xml

@@ -13,7 +13,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="You don't have any contacts yet"
+            android:text="@string/fragment_contact_selection_empty_contacts"
             android:textSize="@dimen/medium_font_size" />
 
     </LinearLayout>

app/src/main/res/layout/conversation_activity.xml

@@ -55,9 +55,10 @@
                     android:id="@+id/titleTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="@null"
                     android:maxLines="1"
                     android:ellipsize="end"
-                    android:text="Conversation"
+                    tools:text="Conversation"
                     android:textColor="@color/text"
                     android:textSize="@dimen/large_font_size"
                     android:fontFamily="sans-serif-medium" />
@@ -83,7 +84,7 @@
                         android:layout_height="wrap_content"
                         android:maxLines="1"
                         android:ellipsize="end"
-                        android:text="26 members"
+                        tools:text="26 members"
                         android:textColor="@color/text"
                         android:textSize="@dimen/small_font_size" />
 
@@ -217,7 +218,7 @@
                 android:layout_height="wrap_content"
                 android:background="?android:attr/windowBackground"
                 android:paddingStart="5dip"
-                android:text="160/160 (1)"
+                tools:text="160/160 (1)"
                 android:visibility="gone" />
 
             <ViewStub

app/src/main/res/layout/dialog_seed.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/default_dialog_background_inset"
     android:gravity="center_horizontal"
     android:orientation="vertical"
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
         android:padding="@dimen/small_spacing"
-        android:text="habitat kiwi amply iceberg dog nerves spiderman soft match partial awakened maximum degrees"
+        tools:text="habitat kiwi amply iceberg dog nerves spiderman soft match partial awakened maximum degrees"
         android:textColor="@color/text"
         android:textSize="@dimen/small_font_size"
         android:textAlignment="center" />

app/src/main/res/layout/fragment_enter_public_key.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -60,7 +60,7 @@
         android:textColor="@color/text"
         android:fontFamily="@font/space_mono_regular"
         android:textAlignment="center"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_key_pair_migration_bottom_sheet.xml

@@ -1,60 +0,0 @@
-<?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"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:padding="@dimen/large_spacing"
-    app:behavior_hideable="false"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-    <ImageView
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_shield"
-        android:tint="?android:textColorPrimary" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="Session IDs Just Got Better"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="We’ve upgraded Session IDs to make them even more private and secure. To ensure your continued privacy you're now required to upgrade."
-        android:textSize="@dimen/medium_font_size"
-        android:textAlignment="center" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="Your existing contacts and conversations will be lost, but you’ll be able to use Session knowing you have the best privacy and security possible."
-        android:textSize="@dimen/medium_font_size"
-        android:textAlignment="center" />
-
-    <Button
-        style="@style/Widget.Session.Button.Common.UnimportantOutline"
-        android:id="@+id/upgradeNowButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/very_large_spacing"
-        android:text="Upgrade Now" />
-
-    <Button
-        style="@style/Widget.Session.Button.Common.UnimportantOutline"
-        android:id="@+id/upgradeLaterButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="Upgrade Later" />
-
-</LinearLayout>

app/src/main/res/layout/fragment_key_pair_migration_success_bottom_sheet.xml

@@ -1,61 +0,0 @@
-<?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"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:padding="@dimen/large_spacing"
-    app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-    <ImageView
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_shield"
-        android:tint="?android:textColorPrimary" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="Upgrade Successful!"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="Your new and improved Session ID is:"
-        android:textSize="@dimen/medium_font_size"
-        android:textAlignment="center" />
-
-    <TextView
-        style="@style/SessionIDTextView"
-        android:id="@+id/sessionIDTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="18dp"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
-
-    <Button
-        style="@style/Widget.Session.Button.Common.UnimportantOutline"
-        android:id="@+id/copyButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/very_large_spacing"
-        android:text="Copy" />
-
-    <Button
-        style="@style/Widget.Session.Button.Common.UnimportantOutline"
-        android:id="@+id/okButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="@string/ok" />
-
-</LinearLayout>

app/src/main/res/layout/fragment_recovery_phrase.xml

@@ -18,7 +18,7 @@
         android:textSize="@dimen/large_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
-        android:text="Recovery Phrase" />
+        android:text="@string/fragment_recovery_phrase_title" />
 
     <TextView
         android:layout_width="match_parent"
@@ -34,7 +34,7 @@
         style="@style/SmallSessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
@@ -42,7 +42,7 @@
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
-        android:maxLines="2"
+        android:maxLines="3"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View

app/src/main/res/layout/fragment_scan_qr_code.xml

@@ -30,7 +30,7 @@
             android:layout_weight="1"
             android:padding="@dimen/very_large_spacing"
             android:gravity="center"
-            android:text="Scan a user’s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings."
+            android:text="@string/activity_create_private_chat_scan_qr_code_explanation"
             android:background="?android:windowBackground"
             android:textSize="@dimen/small_font_size"
             android:textColor="?android:textColorTertiary" />

app/src/main/res/layout/fragment_user_details_bottom_sheet.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    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="vertical"
     android:gravity="center_horizontal"
     android:paddingLeft="@dimen/large_spacing"
@@ -16,27 +16,97 @@
         android:id="@+id/profilePictureView"
         android:layout_width="@dimen/large_profile_picture_size"
         android:layout_height="@dimen/large_profile_picture_size"
-        android:layout_marginTop="@dimen/large_spacing" />
+        android:layout_marginTop="@dimen/large_spacing"/>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:gravity="center">
+
+        <LinearLayout
+            android:id="@+id/nameTextViewContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_centerInParent="true"
+            android:visibility="visible">
+
+            <View
+                android:layout_width="24dp"
+                android:layout_height="24dp" />
 
             <TextView
                 android:id="@+id/nameTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/medium_spacing"
+                android:layout_gravity="center"
-        android:textSize="@dimen/massive_font_size"
+                android:layout_marginStart="@dimen/small_spacing"
+                android:layout_marginEnd="@dimen/small_spacing"
+                android:textSize="@dimen/large_font_size"
                 android:textStyle="bold"
                 android:textColor="@color/text"
+                android:textAlignment="center"
                 android:text="Spiderman" />
 
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="22dp"
+                android:paddingTop="2dp"
+                android:src="@drawable/ic_baseline_edit_24" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/nameEditTextContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="invisible">
+
+            <ImageView
+                android:id="@+id/cancelNicknameEditingButton"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_baseline_clear_24" />
+
+            <EditText
+                android:id="@+id/nicknameEditText"
+                style="@style/SmallSessionEditText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="@dimen/small_spacing"
+                android:layout_marginEnd="@dimen/small_spacing"
+                android:textAlignment="center"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:inputType="text"
+                android:singleLine="true"
+                android:imeOptions="actionDone"
+                android:hint="@string/fragment_user_details_bottom_sheet_edit_text_hint" />
+
+            <ImageView
+                android:id="@+id/saveNicknameButton"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_baseline_done_24" />
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
     <TextView
         style="@style/SessionIDTextView"
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/large_font_size"
+        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginTop="@dimen/large_spacing"
+        android:textSize="@dimen/medium_font_size"
         android:textIsSelectable="true"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"

app/src/main/res/layout/fragment_view_my_qr_code.xml

@@ -32,7 +32,7 @@
                 android:textColor="@color/text"
                 android:textStyle="bold"
                 android:textAlignment="center"
-                android:text="Scan Me" />
+                android:text="@string/fragment_view_my_qr_code_title" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -59,7 +59,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textAlignment="center"
-                android:text="This is your QR code. Other users can scan it to start a session with you." />
+                android:text="@string/fragment_view_my_qr_code_explanation" />
 
             <Button
                 style="@style/Widget.Session.Button.Common.UnimportantOutline"
@@ -68,7 +68,7 @@
                 android:layout_height="@dimen/medium_button_height"
                 android:layout_marginTop="28dp"
                 android:layout_marginBottom="@dimen/medium_spacing"
-                android:text="Share" />
+                android:text="@string/share" />
 
         </LinearLayout>
 

app/src/main/res/layout/prompt_passphrase_activity.xml

@@ -50,7 +50,7 @@
             style="@style/Signal.Text.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Session is Locked"
+            android:text="@string/activity_prompt_passphrase_session_locked"
             android:textStyle="bold"
             android:textSize="@dimen/large_font_size"
             android:textAlignment="center"
@@ -73,7 +73,6 @@
             android:id="@+id/lock_screen_auth_container"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
-            android:text="Tap to Unlock"/>
+            android:text="@string/activity_prompt_passphrase_tap_to_unlock"/>
-
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/share_activity.xml

@@ -23,7 +23,7 @@
 
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:text="Share"
+                      android:text="@string/share"
                       android:fontFamily="sans-serif-medium"
                       android:textSize="@dimen/very_large_font_size"
                       android:layout_alignParentStart="true"

app/src/main/res/layout/view_conversation.xml

@@ -63,7 +63,7 @@
                     android:textSize="@dimen/small_font_size"
                     android:textColor="@color/text"
                     android:alpha="0.4"
-                    android:text="9:41 AM" />
+                    tools:text="9:41 AM" />
 
             </LinearLayout>
 

app/src/main/res/layout/view_open_group_guidelines.xml

@@ -33,7 +33,7 @@
                 android:textColor="@color/text"
                 android:textSize="@dimen/small_font_size"
                 android:textStyle="bold"
-                android:text="Pinned message" />
+                android:text="@string/open_group_guidelines_pinned_message" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -42,7 +42,7 @@
                 android:textColor="@color/text"
                 android:textSize="@dimen/small_font_size"
                 android:maxLines="2"
-                android:text="Community guidelines" />
+                android:text="@string/open_group_guidelines_community_guidelines" />
 
         </LinearLayout>
 
@@ -60,7 +60,7 @@
             android:layout_marginRight="12dp"
             android:textSize="@dimen/small_font_size"
             android:textStyle="normal"
-            android:text="Read" />
+            android:text="@string/open_group_guidelines_read" />
 
     </LinearLayout>
 

app/src/main/res/layout/view_seed_reminder.xml

@@ -36,7 +36,7 @@
                 android:textColor="@color/text"
                 android:textSize="@dimen/small_font_size"
                 android:textStyle="bold"
-                android:text="You're almost finished! 80%" />
+                android:text="@string/view_seed_reminder_title" />
 
             <TextView
                 android:id="@+id/subtitleTextView"
@@ -47,7 +47,7 @@
                 android:textSize="@dimen/very_small_font_size"
                 android:lines="2"
                 android:alpha="0.6"
-                android:text="Secure your account by saving your recovery phrase" />
+                android:text="@string/view_seed_reminder_subtitle_1" />
 
         </LinearLayout>
 
@@ -64,7 +64,7 @@
             android:layout_height="28dp"
             android:layout_marginLeft="4dp"
             android:textStyle="normal"
-            android:text="Continue" />
+            android:text="@string/continue_2" />
 
     </LinearLayout>
 

app/src/main/res/menu/conversation_list_search.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <item
         android:id="@+id/action_filter_search"
-            android:title=" "
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-            app:showAsAction="collapseActionView|always" />
+        app:showAsAction="collapseActionView|always"
+        android:title="" />
 
 </menu>

app/src/main/res/menu/menu_pn_mode.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="Learn More"
+        android:title="@string/activity_path_learn_more_button_title"
         android:id="@+id/learnMoreButton"
         android:icon="@drawable/ic_info_outline_white_24dp"
         app:showAsAction="always" />

app/src/main/res/values-af/strings.xml

@@ -62,6 +62,10 @@
     <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">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_invalid_recipient">Invalid recipient!</string>
     <string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
     <string name="ConversationActivity_leave_group">Leave group?</string>
@@ -354,6 +358,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
@@ -584,6 +591,7 @@
     <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>
@@ -627,6 +635,7 @@
     <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_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>
@@ -643,11 +652,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -674,7 +685,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-az/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Əlaqə məlumatını seç</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Üzr istəyirik, faylın yüklənməsində xəta baş verdi.</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_invalid_recipient">Səhv qəbul edən!</string>
     <string name="ConversationActivity_added_to_home_screen">Baş səhifəyə əlavə edildi</string>
     <string name="ConversationActivity_leave_group">Qrupdan çıxırsan?</string>
@@ -354,6 +358,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Səs</string>
     <string name="QuoteView_video">Video</string>
@@ -584,6 +591,7 @@
     <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>
@@ -627,6 +635,7 @@
     <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_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>
@@ -643,11 +652,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -674,7 +685,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-bal/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Pilih info kontak</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Maaf, terjadi kesalahan pada pengaturan lampiran anda.</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_invalid_recipient">Penerima tidak lengkap!</string>
     <string name="ConversationActivity_added_to_home_screen">Tambahkan ke layar utama</string>
     <string name="ConversationActivity_leave_group">Tinggalkan grup?</string>
@@ -352,6 +356,9 @@ memproses pertukaran kunci korupsi.</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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
@@ -582,6 +589,7 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_seed_title_2">Inilah kata pemulihan anda</string>
     <string name="activity_seed_explanation">Kata pemulihan adalah kunci Session ID -- bisa digunakan untuk mengembalikan Session ID ketika anda kehilangan perangkat. Simpan kata pemulihan di tempat yang aman dan jangan berikan kepada siapapun</string>
     <string name="activity_seed_reveal_button_title">Tekan untuk melihat</string>
+    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Amankan akun anda dengan menyimpan kata pemulihan</string>
     <string name="view_seed_reminder_subtitle_2">Ketuk dan tekan kata yang disensor untuk mengetahui kata pemulihan anda, lalu simpan baik-baik untuk mengamnkan Session ID anda</string>
     <string name="view_seed_reminder_subtitle_3">Pastikan untuk menyimpan kata pemulihan di tempat yang aman</string>
@@ -625,6 +633,7 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_settings_invite_button_title">Invite</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_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifikasi</string>
     <string name="activity_notification_settings_style_section_title">Gaya notifikasi</string>
     <string name="activity_notification_settings_content_section_title">Isi notifikasi</string>
@@ -641,11 +650,13 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_qr_code_view_my_qr_code_tab_title">Lihat kode QR saya</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Pindai kode QR</string>
     <string name="activity_qr_code_view_scan_qr_code_explanation">Pindai kode QR pengguna lain untuk memulai percakapan</string>
+    <string name="fragment_view_my_qr_code_title">Scan Me</string>
     <string name="fragment_view_my_qr_code_explanation">Ini adalah kode QR anda. Pengguna lain bisa memindainya untuk memulai percakapan dengan anda</string>
     <string name="fragment_view_my_qr_code_share_title">Bagikan kode QR</string>
     <string name="fragment_contact_selection_contacts_title">Kontak</string>
     <string name="fragment_contact_selection_closed_groups_title">Grup tertutup</string>
     <string name="fragment_contact_selection_open_groups_title">Grup terbuka</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>
@@ -672,7 +683,18 @@ memproses pertukaran kunci korupsi.</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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-be/strings.xml

@@ -66,6 +66,10 @@
     <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">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_invalid_recipient">Invalid recipient!</string>
     <string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
     <string name="ConversationActivity_leave_group">Leave group?</string>
@@ -380,6 +384,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
@@ -612,6 +619,7 @@
     <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>
@@ -655,6 +663,7 @@
     <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_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>
@@ -671,11 +680,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -702,7 +713,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-ca/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Seleccioneu informació del contacte</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">S\'ha produït un error en afegir el fitxer adjunt.</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_invalid_recipient">Destinatari no vàlid.</string>
     <string name="ConversationActivity_added_to_home_screen">S\'ha afegit a la pantalla d\'inici.</string>
     <string name="ConversationActivity_leave_group">Voleu abandonar el grup?</string>
@@ -352,6 +356,9 @@ d\'intercanvi de claus!</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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Àudio</string>
     <string name="QuoteView_video">Vídeo</string>
@@ -582,6 +589,7 @@ d\'intercanvi de claus!</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>
@@ -625,6 +633,7 @@ d\'intercanvi de claus!</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_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>
@@ -641,11 +650,13 @@ d\'intercanvi de claus!</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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -672,7 +683,18 @@ d\'intercanvi de claus!</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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-cs/strings.xml

@@ -66,6 +66,10 @@
     <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_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>
@@ -377,6 +381,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
@@ -609,6 +616,7 @@
     <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>
@@ -652,6 +660,7 @@
     <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_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>
@@ -668,11 +677,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -699,7 +710,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-cy/strings.xml

@@ -70,6 +70,10 @@
     <string name="ConversationActivity_select_contact_info">Dewis manylion cyswllt</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Mae\'n ddrwg gennym, bu gwall wrth osod eich atodiad.</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_invalid_recipient">Derbynnydd annilys!</string>
     <string name="ConversationActivity_added_to_home_screen">Ychwanegwyd at y sgrin gartref</string>
     <string name="ConversationActivity_leave_group">Gadael y grŵp</string>
@@ -404,6 +408,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Sain</string>
     <string name="QuoteView_video">Fideo</string>
@@ -638,6 +645,7 @@
     <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>
@@ -681,6 +689,7 @@
     <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_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>
@@ -697,11 +706,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -728,7 +739,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Vælg kontaktinformation</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Beklager, der opstod en fejl ved vedhæftning af fil</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_invalid_recipient">Ugyldig modtager!</string>
     <string name="ConversationActivity_added_to_home_screen">Føjet til startskærm</string>
     <string name="ConversationActivity_leave_group">Forlad gruppe?</string>
@@ -352,6 +356,9 @@ udveksel besked!</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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Lyd</string>
     <string name="QuoteView_video">Video</string>
@@ -582,6 +589,7 @@ udveksel besked!</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>
@@ -625,6 +633,7 @@ udveksel besked!</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_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>
@@ -641,11 +650,13 @@ udveksel besked!</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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -672,7 +683,18 @@ udveksel besked!</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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Kontaktinfo wählen</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Leider ist ein Fehler beim Hinzufügen des Anhangs aufgetreten.</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_invalid_recipient">Ungültiger Kontakt!</string>
     <string name="ConversationActivity_added_to_home_screen">Zum Startbildschirm hinzugefügt</string>
     <string name="ConversationActivity_leave_group">Gruppe verlassen?</string>
@@ -351,6 +355,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
@@ -581,6 +588,7 @@
     <string name="activity_seed_title_2">Das ist Ihr Wiederherstellungssatz.</string>
     <string name="activity_seed_explanation">Ihr Wiederherstellungssatz ist der Hauptschlüssel für Ihre Session ID. Mit diesem Satz können Sie Ihre Session ID wiederherstellen, wenn Sie den Zugriff auf Ihr Gerät verlieren. Bewahren Sie Ihren Wiederherstellungssatz an einem sicheren Ort auf und geben Sie ihn an niemandem weiter.</string>
     <string name="activity_seed_reveal_button_title">Zur Anzeige gedrückt halten</string>
+    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Sichern Sie Ihr Konto, indem Sie Ihren Wiederherstellungssatz speichern</string>
     <string name="view_seed_reminder_subtitle_2">Tippen und halten Sie die verborgenen Wörter, um Ihren Wiederherstellungssatz anzuzeigen, und speichern Sie ihn dann sicher, um Ihre Session ID zu sichern.</string>
     <string name="view_seed_reminder_subtitle_3">Bewahren Sie Ihren Wiederherstellungssatz an einem sicheren Ort auf.</string>
@@ -624,6 +632,7 @@
     <string name="activity_settings_invite_button_title">Invite</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_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Benachrichtigungen</string>
     <string name="activity_notification_settings_style_section_title">Stil der Benachrichtigungen</string>
     <string name="activity_notification_settings_content_section_title">Inhalt der Benachrichtigungen</string>
@@ -640,11 +649,13 @@
     <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>
     <string name="activity_qr_code_view_scan_qr_code_explanation">Scannen Sie den QR-Code einer Person, um ein Gespräch mit ihr zu beginnen.</string>
+    <string name="fragment_view_my_qr_code_title">Scan Me</string>
     <string name="fragment_view_my_qr_code_explanation">Das ist Ihr QR-Code. Andere Benutzer können ihn scannen, um eine Session mit Ihnen zu starten.</string>
     <string name="fragment_view_my_qr_code_share_title">QR-Code freigeben</string>
     <string name="fragment_contact_selection_contacts_title">Kontakte</string>
     <string name="fragment_contact_selection_closed_groups_title">Geschlossene Gruppen</string>
     <string name="fragment_contact_selection_open_groups_title">Gruppen öffnen</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>
@@ -671,7 +682,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-el/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 -->
@@ -61,7 +61,11 @@
     <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">Δημιουργία</string>
+    <string name="ConversationActivity_muted_until_date">Σε σίγαση μέχρι %1$s</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>
@@ -73,15 +77,15 @@
     <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">Εγγραφή %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_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_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 -->
@@ -98,7 +102,7 @@
         <item quantity="one">Αυτό θα διαγράψει οριστικά το επιλεγμένο μήνυμα.</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>
@@ -122,8 +126,8 @@
     <string name="ConversationFragment_sms">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_banning_user">Αποβολή Μέλους…</string>
     <string name="ConversationFragment_quoted_message_not_found">Το αρχικό μήνυμα δε βρέθηκε</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">Το αρχικό μήνυμα δεν είναι πια διαθέσιμο</string>
     <!-- ConversationListItem -->
@@ -231,14 +235,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_s_took_a_screenshot">%s Στιγμιότυπο οθόνης.</string>
-    <string name="ThreadRecord_media_saved_by_s">Media saved by %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>
+    <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>
@@ -274,7 +278,7 @@
     <string name="MessageNotifier_reply">Απάντηση</string>
     <string name="MessageNotifier_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_contact_message">%1$s, %2$s</string>
     <string name="MessageNotifier_unknown_contact_message">Επαφή</string>
     <!-- Notification Channels -->
     <string name="NotificationChannel_messages">Προκαθορισμένο</string>
@@ -297,7 +301,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">
@@ -351,8 +355,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__join_accessibility_description">Εγγραφείτε</string>
-    <string name="open_group_invitation_view__open_group_invitation">Open group invitation</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>
@@ -482,7 +489,7 @@
     <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_resend_message">Αποστολή ξανά</string>
     <string name="conversation_context__menu_reply_to_message">Απαντήστε στο μήνυμα</string>
     <!-- conversation_context_image -->
@@ -542,138 +549,153 @@
     <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="copy">Αντιγραφή</string>
-    <string name="invalid_url">Invalid URL</string>
+    <string name="invalid_url">Μη έγκυρη διεύθυνση URL</string>
-    <string name="copied_to_clipboard">Copied to clipboard</string>
+    <string name="copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
-    <string name="next">Next</string>
+    <string name="next">Επόμενο</string>
-    <string name="share">Share</string>
+    <string name="share">Διαμοιρασμός</string>
-    <string name="invalid_session_id">Invalid Session ID</string>
+    <string name="invalid_session_id">Μη έγκυρη Session ταυτότητα</string>
-    <string name="cancel">Cancel</string>
+    <string name="cancel">Ακύρωση</string>
-    <string name="your_session_id">Your Session ID</string>
+    <string name="your_session_id">Η ταυτότητά σας</string>
-    <string name="activity_landing_title_2">Your Session begins here...</string>
+    <string name="activity_landing_title_2">Η συνομιλία σας ξεκινά εδώ...</string>
-    <string name="activity_landing_register_button_title">Create Session ID</string>
+    <string name="activity_landing_register_button_title">Δημιουργία Session ταυτότητας</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_1">Τι είναι το Session;</string>
-    <string name="view_fake_chat_bubble_2">It\'s a decentralized, encrypted messaging app</string>
+    <string name="view_fake_chat_bubble_2">Είναι μια αποκεντρωμένη, κρυπτογραφημένη εφαρμογή μηνυμάτων</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_3">Δηλαδή δεν συλλέγει τα προσωπικά μου στοιχεία ή τα μεταδεδομένα των συνομιλιών μου; Πώς λειτουργεί;</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_4">Χρησιμοποιώντας ένα συνδυασμό προηγμένων ανώνυμων τεχνολογιών δρομολόγησης και τεχνολογίας κρυπτογράφησης από άκρο σε άκρο.</string>
-    <string name="view_fake_chat_bubble_5">Friends don\'t let friends use compromised messengers. You\'re welcome.</string>
+    <string name="view_fake_chat_bubble_5">Οι φίλοι δεν αφήνουν τους φίλους να χρησιμοποιούν ευάλωτες εφαρμογές μηνυμάτων. Είστε ευπρόσδεκτοι.</string>
-    <string name="activity_register_title">Say hello to your Session ID</string>
+    <string name="activity_register_title">Πείτε γεια στη 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_register_explanation">Η Session ταυτότητά σας είναι η μοναδική διεύθυνση που μπορούν να χρησιμοποιήσουν τα άτομα για να επικοινωνήσουν μαζί σας στο Session. Χωρίς σύνδεση με την πραγματική σας ταυτότητα, η Session ταυτότητά σας είναι εντελώς ανώνυμη και ιδιωτική.</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_explanation">Εισάγετε τη φράση ανάκτησης που σας δόθηκε κατά την εγγραφή σας για να επαναφέρετε το λογαριασμό σας.</string>
-    <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
+    <string name="activity_restore_seed_edit_text_hint">Εισάγετε τη φράση ανάκτησης σας</string>
-    <string name="activity_display_name_title_2">Pick your display name</string>
+    <string name="activity_display_name_title_2">Επιλέξτε το εμφανιζόμενο όνομα σας</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_explanation">Αυτό θα είναι το όνομά σας όταν χρησιμοποιείτε το Session. Μπορεί να είναι το πραγματικό σας όνομα, ένα ψευδώνυμο ή οτιδήποτε άλλο θέλετε.</string>
-    <string name="activity_display_name_edit_text_hint">Enter a display name</string>
+    <string name="activity_display_name_edit_text_hint">Εισάγετε όνομα εμφάνισης</string>
-    <string name="activity_display_name_display_name_missing_error">Please pick a display name</string>
+    <string name="activity_display_name_display_name_missing_error">Παρακαλώ επιλέξτε ένα εμφανιζόμενο όνομα</string>
-    <string name="activity_display_name_display_name_too_long_error">Please pick a shorter display name</string>
+    <string name="activity_display_name_display_name_too_long_error">Παρακαλώ επιλέξτε ένα μικρότερο όνομα εμφάνισης</string>
-    <string name="activity_pn_mode_recommended_option_tag">Recommended</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_pn_mode_no_option_picked_dialog_title">Παρακαλούμε κάντε μια επιλογή</string>
-    <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
+    <string name="activity_home_empty_state_message">Δεν υπάρχουν επαφές</string>
-    <string name="activity_home_empty_state_button_title">Start a Session</string>
+    <string name="activity_home_empty_state_button_title">Ξεκινήστε μια συνομιλία</string>
-    <string name="activity_home_leave_group_dialog_message">Are you sure you want to leave this group?</string>
+    <string name="activity_home_leave_group_dialog_message">Είστε βέβαιοι ότι θέλετε να φύγετε από αυτή την ομάδα;</string>
-    <string name="activity_home_leaving_group_failed_message">"Couldn't leave group"</string>
+    <string name="activity_home_leaving_group_failed_message">"Αδυναμία αποχώρησης από την ομάδα"</string>
-    <string name="activity_home_delete_conversation_dialog_message">Are you sure you want to delete this conversation?</string>
+    <string name="activity_home_delete_conversation_dialog_message">Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την συνομιλία;</string>
-    <string name="activity_home_conversation_deleted_message">Conversation deleted</string>
+    <string name="activity_home_conversation_deleted_message">Η συνομιλία διαγράφηκε</string>
-    <string name="activity_seed_title">Your Recovery Phrase</string>
+    <string name="activity_seed_title">Φράση ανάκτησης</string>
-    <string name="activity_seed_title_2">Meet your recovery phrase</string>
+    <string name="activity_seed_title_2">Γνωρίστε τη φράση ανάκτησής σας</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_explanation">Η φράση ανάκτησης είναι το κύριο κλειδί στο Session ID σας - μπορείτε να τη χρησιμοποιήσετε για να επαναφέρετε το Session ID σας εάν χάσετε πρόσβαση στη συσκευή σας. Αποθηκεύστε τη φράση ανάκτησης σε ασφαλές μέρος, και μην τη δώσετε σε κανέναν.</string>
-    <string name="activity_seed_reveal_button_title">Hold to reveal</string>
+    <string name="activity_seed_reveal_button_title">Πατήστε για εμφάνιση</string>
-    <string name="view_seed_reminder_subtitle_1">Secure your account by saving your recovery phrase</string>
+    <string name="view_seed_reminder_title">Σχεδόν τελειώσατε! 80%</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_1">Ασφαλίστε το λογαριασμό σας αποθηκεύοντας τη φράση ανάκτησής σας</string>
-    <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
+    <string name="view_seed_reminder_subtitle_2">Πατήστε παρατεταμένα τις λέξεις που τροποποιήθηκαν για να αποκαλύψετε τη φράση ανάκτησης και μετά αποθηκεύστε την με ασφάλεια για να εξασφαλίσετε το αναγνωριστικό σας.</string>
-    <string name="activity_path_title">Path</string>
+    <string name="view_seed_reminder_subtitle_3">Φροντίστε να αποθηκεύσετε τη φράση ανάκτησής σας σε ασφαλές μέρος</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_title">Διαδρομή</string>
-    <string name="activity_path_device_row_title">You</string>
+    <string name="activity_path_explanation">Το Session αποκρύπτει την IP σας, δρομολογώντας τα μηνύματά σας μέσω αρκετών Κόμβων υπηρεσιών στο αποκεντρωμένο Session δίκτυο. Αυτές είναι οι χώρες που δρομολογείται η σύνδεσή σας αυτή τη στιγμή:</string>
-    <string name="activity_path_guard_node_row_title">Entry Node</string>
+    <string name="activity_path_device_row_title">Εσείς</string>
-    <string name="activity_path_service_node_row_title">Service Node</string>
+    <string name="activity_path_guard_node_row_title">Κόμβος Εισόδου</string>
-    <string name="activity_path_destination_row_title">Destination</string>
+    <string name="activity_path_service_node_row_title">Κόμβος Υπηρεσίας</string>
-    <string name="activity_path_learn_more_button_title">Learn More</string>
+    <string name="activity_path_destination_row_title">Προορισμός</string>
-    <string name="activity_create_private_chat_title">New Session</string>
+    <string name="activity_path_learn_more_button_title">Μάθετε περισσότερα</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Enter Session ID</string>
+    <string name="activity_create_private_chat_title">Νέα συνομιλία</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">Εισαγωγή Session Ταυτότητας</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_create_private_chat_scan_qr_code_tab_title">Σαρώστε τον κωδικό QR</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Enter Session ID of recipient</string>
+    <string name="activity_create_private_chat_scan_qr_code_explanation">Σαρώστε τον κωδικό QR ενός χρήστη για να ξεκινήσετε μια συνομιλία. Οι κωδικοί QR μπορούν να βρεθούν πατώντας το εικονίδιο QR κώδικα στις ρυθμίσεις λογαριασμού.</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_edit_text_hint">Εισάγετε τη ταυτότητα του παραλήπτη</string>
-    <string name="fragment_scan_qr_code_camera_access_explanation">Session needs camera access to scan QR codes</string>
+    <string name="fragment_enter_public_key_explanation">Οι χρήστες μπορούν να μοιραστούν τη ταυτότητα τους πηγαίνοντας στις ρυθμίσεις του λογαριασμού τους και πατώντας το \"Διαμοιρασμό Session ταυτότητας\" ή κοινοποιώντας τον κωδικό QR.</string>
-    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Grant Camera Access</string>
+    <string name="fragment_scan_qr_code_camera_access_explanation">Το Session χρειάζεται πρόσβαση στην κάμερα για σάρωση κωδικών QR</string>
-    <string name="activity_create_closed_group_title">New Closed Group</string>
+    <string name="fragment_scan_qr_code_grant_camera_access_button_title">Χορήγηση Πρόσβασης Κάμερας</string>
-    <string name="activity_create_closed_group_edit_text_hint">Enter a group name</string>
+    <string name="activity_create_closed_group_title">Νέα Κλειστή Ομάδα</string>
-    <string name="activity_create_closed_group_empty_state_message">You don\'t have any contacts yet</string>
+    <string name="activity_create_closed_group_edit_text_hint">Εισαγωγή ονόματος ομάδας</string>
-    <string name="activity_create_closed_group_empty_state_button_title">Start a Session</string>
+    <string name="activity_create_closed_group_empty_state_message">Δεν υπάρχουν επαφές</string>
-    <string name="activity_create_closed_group_group_name_missing_error">Please enter a group name</string>
+    <string name="activity_create_closed_group_empty_state_button_title">Ξεκινήστε μια συνομιλία</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_group_name_missing_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_group_name_too_long_error">Παρακαλούμε εισάγετε ένα μικρότερο όνομα ομάδας</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_not_enough_group_members_error">Παρακαλώ επιλέξτε τουλάχιστον 1 μέλος ομάδας</string>
-    <string name="activity_join_public_chat_title">Join Open Group</string>
+    <string name="activity_create_closed_group_too_many_group_members_error">Μια κλειστή ομάδα δεν μπορεί να έχει περισσότερα από 100 μέλη</string>
-    <string name="activity_join_public_chat_error">Couldn\'t join group</string>
+    <string name="activity_join_public_chat_title">Συμμετοχή Σε Ανοιχτή Ομάδα</string>
-    <string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
+    <string name="activity_join_public_chat_error">Αδυναμία συμμετοχής στην ομάδα</string>
-    <string name="activity_join_public_chat_scan_qr_code_tab_title">Scan QR Code</string>
+    <string name="activity_join_public_chat_enter_group_url_tab_title">Διεύθυνση Ανοιχτής Ομάδας</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 κωδικού</string>
-    <string name="fragment_enter_chat_url_edit_text_hint">Enter an open group URL</string>
+    <string name="activity_join_public_chat_scan_qr_code_explanation">Σαρώστε τον κωδικό QR της ανοικτής ομάδας που θα θέλατε να συμμετάσχετε</string>
-    <string name="activity_settings_title">Settings</string>
+    <string name="fragment_enter_chat_url_edit_text_hint">Εισάγετε μια διεύθυνση ανοικτής ομάδας</string>
-    <string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
+    <string name="activity_settings_title">Ρυθμίσεις</string>
-    <string name="activity_settings_display_name_missing_error">Please pick a display name</string>
+    <string name="activity_settings_display_name_edit_text_hint">Εισάγετε ένα όνομα</string>
-    <string name="activity_settings_display_name_too_long_error">Please pick a shorter display name</string>
+    <string name="activity_settings_display_name_missing_error">Παρακαλώ διαλέξτε ένα όνομα εμφάνισης</string>
-    <string name="activity_settings_privacy_button_title">Privacy</string>
+    <string name="activity_settings_display_name_too_long_error">Παρακαλώ επιλέξτε ένα μικρότερο όνομα εμφάνισης</string>
-    <string name="activity_settings_notifications_button_title">Notifications</string>
+    <string name="activity_settings_privacy_button_title">Ιδιωτικότητα</string>
-    <string name="activity_settings_chats_button_title">Chats</string>
+    <string name="activity_settings_notifications_button_title">Ειδοποιήσεις</string>
-    <string name="activity_settings_devices_button_title">Devices</string>
+    <string name="activity_settings_chats_button_title">Συνομιλίες</string>
-    <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_devices_button_title">Συσκευές</string>
-    <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
+    <string name="activity_settings_invite_button_title">Πρόσκληση</string>
-    <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_recovery_phrase_button_title">Φράση Ανάκτησης</string>
-    <string name="activity_notification_settings_title">Notifications</string>
+    <string name="activity_settings_clear_all_data_button_title">Εκκαθάριση Δεδομένων</string>
-    <string name="activity_notification_settings_style_section_title">Notification Style</string>
+    <string name="activity_settings_help_translate_session">Βοηθήστε μας να μεταφράσουμε τη συνεδρία</string>
-    <string name="activity_notification_settings_content_section_title">Notification Content</string>
+    <string name="activity_notification_settings_title">Ειδοποιήσεις</string>
-    <string name="activity_privacy_settings_title">Privacy</string>
+    <string name="activity_notification_settings_style_section_title">Στυλ ειδοποιήσεων</string>
-    <string name="activity_chat_settings_title">Chats</string>
+    <string name="activity_notification_settings_content_section_title">Περιεχόμενο Ειδοποιήσεων</string>
-    <string name="preferences_notifications_strategy_category_title">Notification Strategy</string>
+    <string name="activity_privacy_settings_title">Απόρρητο</string>
-    <string name="fragment_device_list_bottom_sheet_change_name_button_title">Change name</string>
+    <string name="activity_chat_settings_title">Συνομιλίες</string>
-    <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Unlink device</string>
+    <string name="preferences_notifications_strategy_category_title">Περιεχόμενο Ειδοποιήσεων</string>
-    <string name="dialog_seed_title">Your Recovery Phrase</string>
+    <string name="fragment_device_list_bottom_sheet_change_name_button_title">Αλλαγή ονόματος</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="fragment_device_list_bottom_sheet_unlink_device_button_title">Αποσύνδεση Συσκευής</string>
-    <string name="dialog_clear_all_data_title">Clear All Data</string>
+    <string name="dialog_seed_title">Η φράση ανάκτησής σας</string>
-    <string name="dialog_clear_all_data_explanation">This will permanently delete your messages, sessions, and contacts.</string>
+    <string name="dialog_seed_explanation">Αυτή είναι η φράση ανάκτησης σας. Με αυτή, μπορείτε να επαναφέρετε ή να μεταφέρετε τη Session ταυτότητά σας σε μια νέα συσκευή.</string>
-    <string name="activity_qr_code_title">QR Code</string>
+    <string name="dialog_clear_all_data_title">Εκκαθάριση όλων των δεδομένων</string>
-    <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
+    <string name="dialog_clear_all_data_explanation">Αυτό θα διαγράψει μόνιμα τα μηνύματα, τις συνομιλίες και τις επαφές σας.</string>
-    <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
+    <string name="activity_qr_code_title">QR κωδικός</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_my_qr_code_tab_title">Προβολή Του Qr Κώδικά Μου</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_qr_code_view_scan_qr_code_tab_title">Σαρώστε τον κωδικό QR</string>
-    <string name="fragment_view_my_qr_code_share_title">Share QR Code</string>
+    <string name="activity_qr_code_view_scan_qr_code_explanation">Σαρώστε τον κωδικό QR κάποιου για να ξεκινήσετε μια συνομιλία μαζί του</string>
-    <string name="fragment_contact_selection_contacts_title">Contacts</string>
+    <string name="fragment_view_my_qr_code_title">Σάρωσέ Με</string>
-    <string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
+    <string name="fragment_view_my_qr_code_explanation">Αυτός είναι ο προσωπικός σας κωδικός QR. Άλλοι χρήστες μπορούν να τον σαρώσουν για να ξεκινήσουν μια συνομιλία μαζί σας.</string>
-    <string name="fragment_contact_selection_open_groups_title">Open Groups</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">Δεν έχετε επαφές ακόμη</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Apply</string>
+    <string name="menu_apply_button">Εφαρμογή</string>
-    <string name="menu_done_button">Done</string>
+    <string name="menu_done_button">Τέλος</string>
-    <string name="activity_edit_closed_group_title">Edit Group</string>
+    <string name="activity_edit_closed_group_title">Επεξεργασία Ομάδας</string>
-    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
+    <string name="activity_edit_closed_group_edit_text_hint">Εισαγωγή νέου ονόματος ομάδας</string>
-    <string name="activity_edit_closed_group_edit_members">Members</string>
+    <string name="activity_edit_closed_group_edit_members">Μέλη</string>
-    <string name="activity_edit_closed_group_add_members">Add members</string>
+    <string name="activity_edit_closed_group_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_missing_error">Το όνομα ομάδας δεν μπορεί να είναι κενό</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_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="activity_edit_closed_group_not_enough_group_members_error">Οι ομάδες πρέπει να έχουν τουλάχιστον 1 μέλος ομάδας</string>
-    <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
+    <string name="fragment_edit_group_bottom_sheet_remove">Αφαίρεση Χρήστη Από την Ομάδα</string>
-    <string name="activity_select_contacts_title">Select Contacts</string>
+    <string name="activity_select_contacts_title">Επιλογή Επαφών</string>
-    <string name="view_reset_secure_session_done_message">Secure session reset done</string>
+    <string name="view_reset_secure_session_done_message">Η ασφαλής επαναφορά ολοκληρώθηκε</string>
-    <string name="dialog_ui_mode_title">Theme</string>
+    <string name="dialog_ui_mode_title">Θέμα</string>
-    <string name="dialog_ui_mode_option_day">Day</string>
+    <string name="dialog_ui_mode_option_day">Ημέρα</string>
-    <string name="dialog_ui_mode_option_night">Night</string>
+    <string name="dialog_ui_mode_option_night">Νύχτα</string>
-    <string name="dialog_ui_mode_option_system_default">System default</string>
+    <string name="dialog_ui_mode_option_system_default">Προεπιλογή συστήματος</string>
-    <string name="activity_conversation_menu_copy_session_id">Copy Session ID</string>
+    <string name="activity_conversation_menu_copy_session_id">Αντιγραφή Ταυτότητας</string>
-    <string name="attachment">Attachment</string>
+    <string name="attachment">Συνημμένο</string>
-    <string name="attachment_type_voice_message">Voice Message</string>
+    <string name="attachment_type_voice_message">Ηχητικό μήνυμα</string>
-    <string name="details">Details</string>
+    <string name="details">Λεπτομέρειες</string>
-    <string name="dialog_backup_activation_failed">Failed to activate backups. Please try again or contact support.</string>
+    <string name="dialog_backup_activation_failed">Αποτυχία ενεργοποίησης αντιγράφων ασφαλείας. Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με την υποστήριξη.</string>
-    <string name="activity_backup_restore_title">Restore backup</string>
+    <string name="activity_backup_restore_title">Επαναφορά αντίγραφου ασφαλείας</string>
-    <string name="activity_backup_restore_select_file">Select a file</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_explanation_1">Επιλέξτε ένα αντίγραφο ασφαλείας και εισάγετε τη φράση πρόσβασης με την οποία δημιουργήθηκε.</string>
-    <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
+    <string name="activity_backup_restore_passphrase">φράση 30-ψηφίων</string>
-    <!--  LinkDeviceActivity  -->
+    <string name="activity_link_device_skip_prompt">Αυτό παίρνει λίγο χρόνο, θα θέλατε να παραλείψετε;</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">Σύνδεση Συσκευής</string>
-    <string name="activity_join_public_chat_join_rooms">Or join one of these…</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">Enter a nickname</string>
+    <string name="invalid_public_key">Invalid public key</string>
 </resources>

app/src/main/res/values-eo/strings.xml

@@ -4,7 +4,7 @@
     <string name="yes">Jes</string>
     <string name="no">Ne</string>
     <string name="delete">Forviŝi</string>
-    <string name="ban">Ban</string>
+    <string name="ban">Forbari</string>
     <string name="please_wait">Bonvolu atendi...</string>
     <string name="save">Konservi</string>
     <string name="note_to_self">Noto al Mi mem</string>
@@ -53,7 +53,7 @@
     <string name="ConversationItem_group_action_left">%1$s estas forlasinta la grupon.</string>
     <string name="ConversationItem_click_to_approve_unencrypted">Sendado malsukcesis, tuŝeti por nesekura retropaŝo</string>
     <string name="ConversationItem_unable_to_open_media">Ne povas trovi aplikaĵon, kiu kapablas malfermi ĉi tiun aŭdvidaĵon.</string>
-    <string name="ConversationItem_copied_text">Kopinta %s</string>
+    <string name="ConversationItem_copied_text">Kopiinta %s</string>
     <string name="ConversationItem_read_more">&#160; Legi pli</string>
     <string name="ConversationItem_download_more">   Elŝuti pli</string>
     <string name="ConversationItem_pending">  Pritraktota</string>
@@ -61,7 +61,11 @@
     <string name="ConversationActivity_add_attachment">Aldoni kunsendaĵon</string>
     <string name="ConversationActivity_select_contact_info">Elekti kontaktinformon</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Bedaŭrinde estis eraro dum aldono de via kunsendaĵo.</string>
-    <string name="ConversationActivity_message">Message</string>
+    <string name="ConversationActivity_message">Mesaĝo</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_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>
@@ -73,7 +77,7 @@
     <string name="ConversationActivity_attachment_exceeds_size_limits">Kunsendaĵo transpasas la grandlimon por tia mesaĝo, kian vi sendas.</string>
     <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">Add members</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_to_send_audio_messages_allow_signal_access_to_your_microphone">Por registri aŭdajn mesaĝojn, donu al Session permeson uzi vian mikrofonon.</string>
@@ -98,7 +102,7 @@
         <item quantity="one">Tio daŭre forviŝos la elektitan mesaĝon.</item>
         <item quantity="other">Tio daŭre forviŝos ĉiujn %1$d elektitajn mesaĝojn.</item>
     </plurals>
-    <string name="ConversationFragment_ban_selected_user">Ban this user?</string>
+    <string name="ConversationFragment_ban_selected_user">Ĉu forbari ĉi tiun uzanton?</string>
     <string name="ConversationFragment_save_to_sd_card">Ĉu konservi al konservejo?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="one">Konservi tiun aŭdvidaĵon al konservejo ebligas al iuj ajn aplikaĵoj ĉe via aparato aliri al ili.\n\nĈu daŭrigi?</item>
@@ -122,8 +126,8 @@
     <string name="ConversationFragment_sms">SMS</string>
     <string name="ConversationFragment_deleting">Forviŝante</string>
     <string name="ConversationFragment_deleting_messages">Forviŝante mesaĝojn...</string>
-    <string name="ConversationFragment_banning">Banning</string>
+    <string name="ConversationFragment_banning">Forbarante</string>
-    <string name="ConversationFragment_banning_user">Banning user…</string>
+    <string name="ConversationFragment_banning_user">Forbarante uzanton…</string>
     <string name="ConversationFragment_quoted_message_not_found">Origina mesaĝo ne troveblas</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">Origina mesaĝo ne plu disponeblas</string>
     <!-- ConversationListItem -->
@@ -178,7 +182,7 @@
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Sendi al %s</string>
     <!-- MediaSendActivity -->
-    <string name="MediaSendActivity_add_a_caption">Aldoni klarigon...</string>
+    <string name="MediaSendActivity_add_a_caption">Aldoni apudskribon...</string>
     <string name="MediaSendActivity_an_item_was_removed_because_it_exceeded_the_size_limit">Elemento estis forigita, ĉar ĝi transpasis la grandlimon.</string>
     <string name="MediaSendActivity_camera_unavailable">Fotilo ne disponeblas.</string>
     <string name="MediaSendActivity_message_to_s">Mesaĝo al %s</string>
@@ -353,6 +357,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Sonaĵo</string>
     <string name="QuoteView_video">Videaĵo</string>
@@ -482,7 +489,7 @@
     <string name="conversation_context__menu_message_details">Detaloj de mesaĝo</string>
     <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">Ban user</string>
+    <string name="conversation_context__menu_ban_user">Forbari uzanton</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 -->
@@ -533,7 +540,7 @@
     <string name="BackupDialog_delete_backups">Ĉu forviŝi savkopiojn?</string>
     <string name="BackupDialog_disable_and_delete_all_local_backups">Ĉu malŝalti kaj forviŝi ĉiujn lokajn savkopiojn?</string>
     <string name="BackupDialog_delete_backups_statement">Forviŝi savkopiojn</string>
-    <string name="BackupDialog_copied_to_clipboard">Kopiita al tondujo</string>
+    <string name="BackupDialog_copied_to_clipboard">Kopiite al tondujo</string>
     <string name="LocalBackupJob_creating_backup">Kreo de savkopio...</string>
     <string name="ProgressPreference_d_messages_so_far">%d mesaĝoj ĝis nun</string>
     <string name="BackupUtil_never">Neniam</string>
@@ -556,7 +563,7 @@
     <string name="activity_landing_title_2">Via Sesio komenci ĉi tie...</string>
     <string name="activity_landing_register_button_title">Krei Session ID-on</string>
     <string name="activity_landing_restore_button_title">Daŭrigi Vian Sesion</string>
-    <string name="view_fake_chat_bubble_1">Kio estas Sesio?</string>
+    <string name="view_fake_chat_bubble_1">Kio estas Session?</string>
     <string name="view_fake_chat_bubble_2">Ĝi estas malcentraliza kaj ĉifrita mesaĝilo</string>
     <string name="view_fake_chat_bubble_3">Do ĝi ne kolektas miajn personajn informojn aŭ miajn konversaciajn metadatumojn? Kiel ĝi funkcias?</string>
     <string name="view_fake_chat_bubble_4">Uzante kombinon de progresinta anonima enkursigo kaj tutvoje ĉifraj teknologioj.</string>
@@ -583,6 +590,7 @@
     <string name="activity_seed_title_2">Ekkonu vian riparan frazon</string>
     <string name="activity_seed_explanation">Via ripara frazo estas la ĉefŝlosilo de via Session ID — vi povas uzi ĝin por restaŭri vian Session ID-on se vi malgajros aliron al via aparato. Konservu vian riparan frazon en sekura loko, kaj donu ĝin al neniu.</string>
     <string name="activity_seed_reveal_button_title">Tuŝadu por malkaŝi</string>
+    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Sekurigi vian konton per konservi vian riparan frazon</string>
     <string name="view_seed_reminder_subtitle_2">Tuŝadu la kaŝitajn vortojn por malkaŝi vian riparan frazon, tiam konservi ĝin sekure por sekurigi vian Session ID-on.</string>
     <string name="view_seed_reminder_subtitle_3">Certigu konservi vian riparan frazon en sekura loko</string>
@@ -608,7 +616,7 @@
     <string name="activity_create_closed_group_group_name_missing_error">Bonvolu entajpi grupnomon</string>
     <string name="activity_create_closed_group_group_name_too_long_error">Bonvolu entajpi plej mallongan grupnomon</string>
     <string name="activity_create_closed_group_not_enough_group_members_error">Bonvolu elekti almenaŭ unu grupanon</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">Ferma grupo ne povas havi pli ol 100 membrojn</string>
     <string name="activity_join_public_chat_title">Aniĝi al Malferma Grupo</string>
     <string name="activity_join_public_chat_error">Ne povis aniĝi al grupo</string>
     <string name="activity_join_public_chat_enter_group_url_tab_title">URL de Malferma Grupo</string>
@@ -623,9 +631,10 @@
     <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">Invite</string>
+    <string name="activity_settings_invite_button_title">Inviti</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_help_translate_session">Helpu nin Traduki Session</string>
     <string name="activity_notification_settings_title">Sciigoj</string>
     <string name="activity_notification_settings_style_section_title">Sciiga Stilo</string>
     <string name="activity_notification_settings_content_section_title">Sciiga Enhavo</string>
@@ -642,11 +651,13 @@
     <string name="activity_qr_code_view_my_qr_code_tab_title">Vidi Mian QR-Kodon</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Skani QR-Kodon</string>
     <string name="activity_qr_code_view_scan_qr_code_explanation">Skani ies QR-kodon por komenci konversacion kun si</string>
+    <string name="fragment_view_my_qr_code_title">Scan Me</string>
     <string name="fragment_view_my_qr_code_explanation">Ĉi tio estas via QR-kodo. Aliaj uzantoj povas skani ĝin por komenci sesion kun vi.</string>
     <string name="fragment_view_my_qr_code_share_title">Kunhavigi QR-Kodon</string>
     <string name="fragment_contact_selection_contacts_title">Kontaktoj</string>
     <string name="fragment_contact_selection_closed_groups_title">Fermaj Grupoj</string>
     <string name="fragment_contact_selection_open_groups_title">Malfermaj Grupoj</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">Apliki</string>
     <string name="menu_done_button">Farite</string>
@@ -669,11 +680,22 @@
     <string name="attachment_type_voice_message">Voĉmesaĝo</string>
     <string name="details">Detaloj</string>
     <string name="dialog_backup_activation_failed">Malsukcesis aktivigi savkopiojn. Bonvolu provi denove aŭ kontaktu subtenon.</string>
-    <string name="activity_backup_restore_title">Restore backup</string>
+    <string name="activity_backup_restore_title">Restaŭri savkopion</string>
-    <string name="activity_backup_restore_select_file">Select a file</string>
+    <string name="activity_backup_restore_select_file">Elekti dosieron</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>
-    <!--  LinkDeviceActivity  -->
     <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">Ligi Aparaton</string>
     <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
+    <string name="activity_pn_mode_message_notifications">Sciigoj pri Mesaĝoj</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">Rapida Reĝimo</string>
+    <string name="activity_pn_mode_slow_mode">Malrapida Maniero</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">Ripara Frazo</string>
+    <string name="activity_prompt_passphrase_session_locked">Session estas Ŝlosita</string>
+    <string name="activity_prompt_passphrase_tap_to_unlock">Tuŝetu por Malŝlosi</string>
+    <string name="fragment_user_details_bottom_sheet_edit_text_hint">Enter a nickname</string>
+    <string name="invalid_public_key">Invalid public key</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Seleccionar información de contacto</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Lo sentimos, ha habido un fallo al adjuntar el archivo.</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_invalid_recipient">¡Destinatario inválido!</string>
     <string name="ConversationActivity_added_to_home_screen">Añadido a la pantalla de inicio</string>
     <string name="ConversationActivity_leave_group">¿Abandonar grupo?</string>
@@ -352,6 +356,9 @@ de intercambio de claves!</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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Vídeo</string>
@@ -582,6 +589,7 @@ de intercambio de claves!</string>
     <string name="activity_seed_title_2">Guarda tu frase de recuperación</string>
     <string name="activity_seed_explanation">Tu frase de recuperación es la llave maestra de tu ID de Session, puedes usarla para recuperar tu ID de Session en caso de pérdida de acceso a tu dispositivo. Guarda tu frase de recuperación en un lugar seguro y no se la digas a nadie.</string>
     <string name="activity_seed_reveal_button_title">Mantén pulsado para revelar</string>
+    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Protege tu cuenta guardando tu frase de recuperación</string>
     <string name="view_seed_reminder_subtitle_2">Toca y mantén presionadas las palabras redactadas para revelar tu frase de recuperación, después guárdala de manera segura para proteger tu ID de Session.</string>
     <string name="view_seed_reminder_subtitle_3">Asegúrate de guardar tu frase de recuperación en un lugar seguro</string>
@@ -625,6 +633,7 @@ de intercambio de claves!</string>
     <string name="activity_settings_invite_button_title">Invite</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_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notificaciones</string>
     <string name="activity_notification_settings_style_section_title">Estilo de Notificación</string>
     <string name="activity_notification_settings_content_section_title">Contenido de Notificación</string>
@@ -641,11 +650,13 @@ de intercambio de claves!</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>
     <string name="activity_qr_code_view_scan_qr_code_explanation">Escanea el código QR de una persona para comenzar una conversación con ella</string>
+    <string name="fragment_view_my_qr_code_title">Scan Me</string>
     <string name="fragment_view_my_qr_code_explanation">Este es tu código QR. Otros usuarios pueden escanearlo para empezar una sesión contigo.</string>
     <string name="fragment_view_my_qr_code_share_title">Compartir código QR</string>
     <string name="fragment_contact_selection_contacts_title">Contactos</string>
     <string name="fragment_contact_selection_closed_groups_title">Grupos cerrados</string>
     <string name="fragment_contact_selection_open_groups_title">Grupos abiertos</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>
@@ -672,7 +683,18 @@ de intercambio de claves!</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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-et/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Vali kontaktandmed</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Vabandust, sinu manuse seadmisega tekkis viga.</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_invalid_recipient">Sobimatu saaja!</string>
     <string name="ConversationActivity_added_to_home_screen">Avakuvale lisatud</string>
     <string name="ConversationActivity_leave_group">Lahkud grupist?</string>
@@ -354,6 +358,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Heli</string>
     <string name="QuoteView_video">Video</string>
@@ -584,6 +591,7 @@
     <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>
@@ -627,6 +635,7 @@
     <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_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>
@@ -643,11 +652,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -674,7 +685,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-fa/strings.xml

@@ -62,6 +62,10 @@
     <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_invalid_recipient">گیرنده نامعتبر است!</string>
     <string name="ConversationActivity_added_to_home_screen">اضافه شده به صفحه اصلی</string>
     <string name="ConversationActivity_leave_group">ترک گروه؟</string>
@@ -352,6 +356,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">صوت</string>
     <string name="QuoteView_video">ویدئو</string>
@@ -582,6 +589,7 @@
     <string name="activity_seed_title_2">این عبارت بازیابی شماست</string>
     <string name="activity_seed_explanation">عبارت بازیابی شما کلید اصلی شناسه‌ی Session شما است - در صورت عدم دسترسی به دستگاه خود می توانید از آن برای بازگرداندن شناسه‌ی Session خود استفاده کنید. عبارت بازیابی خود را در مکانی امن ذخیره کنید و آن را به کسی ندهید.</string>
     <string name="activity_seed_reveal_button_title">نگه دارید تا نشان داده شود</string>
+    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
     <string name="view_seed_reminder_subtitle_1">با ذخیره کردن عبارت بازیابی، از حساب خود را محافظت کنید</string>
     <string name="view_seed_reminder_subtitle_2">برای فاش کردن عبارت بازیابی، بر روی کلمات redacted ضربه زده و نگه دارید، سپس با خیال راحت آن را ذخیره کنید تا از شناسه‌ی Session خود محافظت نمایید.</string>
     <string name="view_seed_reminder_subtitle_3">حتماً عبارت بازیابی خود را در مکانی امن ذخیره کنید</string>
@@ -625,6 +633,7 @@
     <string name="activity_settings_invite_button_title">Invite</string>
     <string name="activity_settings_recovery_phrase_button_title">عبارت بازیابی</string>
     <string name="activity_settings_clear_all_data_button_title">پاک کردن اطلاعات</string>
+    <string name="activity_settings_help_translate_session">Help us Translate 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>
@@ -641,11 +650,13 @@
     <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">Scan Me</string>
     <string name="fragment_view_my_qr_code_explanation">این کد QR شماست. سایر کاربران می‌توانند برای شروع Session با شما آن را اسکن کنند.</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">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>
@@ -672,7 +683,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -62,6 +62,10 @@
     <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_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>
@@ -352,6 +356,9 @@ on viallinen!</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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Äänitallenne</string>
     <string name="QuoteView_video">Video</string>
@@ -582,6 +589,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_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>
@@ -625,6 +633,7 @@ on viallinen!</string>
     <string name="activity_settings_invite_button_title">Invite</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_help_translate_session">Help us Translate 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>
@@ -641,11 +650,13 @@ on viallinen!</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_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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Käytä</string>
     <string name="menu_done_button">Valmis</string>
@@ -672,7 +683,18 @@ on viallinen!</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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Sélectionner les renseignements du contact</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Une erreur est survenue lors du chargement de la pièce jointe.</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_invalid_recipient">Le destinataire est invalide !</string>
     <string name="ConversationActivity_added_to_home_screen">Ajouté à l’écran d’accueil</string>
     <string name="ConversationActivity_leave_group">Quitter le groupe ?</string>
@@ -351,6 +355,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Contenu audio</string>
     <string name="QuoteView_video">Vidéo</string>
@@ -581,6 +588,7 @@
     <string name="activity_seed_title_2">Voici votre phrase de récupération</string>
     <string name="activity_seed_explanation">Votre phrase de récupération est la clé principale de votre Session ID - vous pouvez l\'utiliser pour restaurer votre Session ID si vous perdez l\'accès à votre appareil. Conservez la dans un endroit sûr et ne la donnez à personne.</string>
     <string name="activity_seed_reveal_button_title">Appuyer pour révéler</string>
+    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Sécurisez votre compte en sauvegardant votre phrase de récupération</string>
     <string name="view_seed_reminder_subtitle_2">Appuyez et maintenez les mots masqués pour révéler votre phrase de récupération, puis stockez-la en toute sécurité pour sécuriser votre Session ID.</string>
     <string name="view_seed_reminder_subtitle_3">Assurez-vous de conserver votre phrase de récupération dans un endroit sûr</string>
@@ -624,6 +632,7 @@
     <string name="activity_settings_invite_button_title">Invite</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_help_translate_session">Help us Translate Session</string>
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Style de notification</string>
     <string name="activity_notification_settings_content_section_title">Contenu de notification</string>
@@ -640,11 +649,13 @@
     <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>
     <string name="activity_qr_code_view_scan_qr_code_explanation">Scannez le code QR d\'un autre utilisateur pour démarrer une session</string>
+    <string name="fragment_view_my_qr_code_title">Scan Me</string>
     <string name="fragment_view_my_qr_code_explanation">Ceci est votre code QR. Les autres utilisateurs peuvent le scanner pour démarrer une session avec vous.</string>
     <string name="fragment_view_my_qr_code_share_title">Partager le code QR</string>
     <string name="fragment_contact_selection_contacts_title">Contacts</string>
     <string name="fragment_contact_selection_closed_groups_title">Groupes privés</string>
     <string name="fragment_contact_selection_open_groups_title">Groupes publics</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">Appliquer</string>
     <string name="menu_done_button">Terminé</string>
@@ -671,7 +682,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-gl/strings.xml

@@ -62,6 +62,10 @@
     <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_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>
@@ -354,6 +358,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Vídeo</string>
@@ -584,6 +591,7 @@
     <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>
@@ -627,6 +635,7 @@
     <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_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>
@@ -643,11 +652,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -674,7 +685,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-ha/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Agahiya têkiliyê bibijêre</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Bibore, di sazkirina servehiyê de çewtiyek rû da.</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_invalid_recipient">Stînerê nederbasdar!</string>
     <string name="ConversationActivity_added_to_home_screen">Tevlî ekrana destpêkê bû</string>
     <string name="ConversationActivity_leave_group">Ji komê derkeve?</string>
@@ -354,6 +358,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Deng</string>
     <string name="QuoteView_video">Vidyo</string>
@@ -584,6 +591,7 @@
     <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>
@@ -627,6 +635,7 @@
     <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_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>
@@ -643,11 +652,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -674,7 +685,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-he/strings.xml

@@ -66,6 +66,10 @@
     <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_invalid_recipient">מקבל לא תקף!</string>
     <string name="ConversationActivity_added_to_home_screen">התווסף אל מסך הבית</string>
     <string name="ConversationActivity_leave_group">לעזוב קבוצה?</string>
@@ -378,6 +382,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">שמע</string>
     <string name="QuoteView_video">וידיאו</string>
@@ -610,6 +617,7 @@
     <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>
@@ -653,6 +661,7 @@
     <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_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>
@@ -669,11 +678,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -700,7 +711,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Session</string>
+    <string name="app_name">सेशन</string>
     <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">Note to Self</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">नया Session सन्देश</string>
     <!-- AlbumThumbnailView -->
@@ -44,7 +44,7 @@
     <string name="BucketedThreadMedia_This_week">इस सप्ताह</string>
     <string name="BucketedThreadMedia_This_month">इस महीना</string>
     <!-- CommunicationActions -->
-    <string name="CommunicationActions_no_browser_found">No web browser found.</string>
+    <string name="CommunicationActions_no_browser_found">कोई ब्राउज़र नहीं मिला!</string>
     <!-- ContactsCursorLoader -->
     <string name="ContactsCursorLoader_groups">समूह </string>
     <!-- ConversationItem -->
@@ -61,7 +61,11 @@
     <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">लिखें</string>
+    <string name="ConversationActivity_muted_until_date">%s तक मौन किया</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>
     <string name="ConversationActivity_added_to_home_screen">होम स्क्रीन में जोड़ा गया</string>
     <string name="ConversationActivity_leave_group">समूह छोड़ दें?</string>
@@ -352,6 +356,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">ऑडियो</string>
     <string name="QuoteView_video">वीडियो </string>
@@ -582,6 +589,7 @@
     <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>
@@ -625,6 +633,7 @@
     <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_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>
@@ -641,11 +650,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -672,7 +683,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-hr/strings.xml

@@ -64,6 +64,10 @@
     <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">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_invalid_recipient">Invalid recipient!</string>
     <string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
     <string name="ConversationActivity_leave_group">Leave group?</string>
@@ -367,6 +371,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
@@ -598,6 +605,7 @@
     <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>
@@ -641,6 +649,7 @@
     <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_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>
@@ -657,11 +666,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -688,7 +699,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -62,6 +62,10 @@
     <string name="ConversationActivity_select_contact_info">Válassz kontakt infót</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sajnos hiba történt a melléklet csatolása során.</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_invalid_recipient">Érvénytelen címzett!</string>
     <string name="ConversationActivity_added_to_home_screen">Hozzáadva a kezdőképernyőhöz</string>
     <string name="ConversationActivity_leave_group">Kilépsz a csoportból?</string>
@@ -354,6 +358,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Hang</string>
     <string name="QuoteView_video">Videó</string>
@@ -584,6 +591,7 @@
     <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>
@@ -627,6 +635,7 @@
     <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_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>
@@ -643,11 +652,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -674,7 +685,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-hy-rAM/strings.xml

@@ -62,6 +62,10 @@
     <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_invalid_recipient">Invalid recipient!</string>
     <string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
     <string name="ConversationActivity_leave_group">Leave group?</string>
@@ -354,6 +358,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
@@ -584,6 +591,7 @@
     <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>
@@ -627,6 +635,7 @@
     <string name="activity_settings_invite_button_title">Invite</string>
     <string name="activity_settings_recovery_phrase_button_title">Վերականգնման Արտահայտություն</string>
     <string name="activity_settings_clear_all_data_button_title">Զրոյացնել</string>
+    <string name="activity_settings_help_translate_session">Help us Translate 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>
@@ -643,11 +652,13 @@
     <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">Կոնտակտներ</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">You don\'t have any contacts yet</string>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Հաստատել</string>
     <string name="menu_done_button">Վերջ</string>
@@ -674,7 +685,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>

app/src/main/res/values-id/strings.xml

@@ -60,6 +60,10 @@
     <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">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_invalid_recipient">Invalid recipient!</string>
     <string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
     <string name="ConversationActivity_leave_group">Leave group?</string>
@@ -341,6 +345,9 @@
     <!-- 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>
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
@@ -570,6 +577,7 @@
     <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>
@@ -613,6 +621,7 @@
     <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_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>
@@ -629,11 +638,13 @@
     <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>
     <!-- Next round of translation -->
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
@@ -660,7 +671,18 @@
     <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>
-    <!--  LinkDeviceActivity  -->
     <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_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>
 </resources>