Remove session id refs

app/src/androidTest/java/network/loki/messenger/LibSessionTests.kt

@@ -39,7 +39,7 @@ class LibSessionTests {
 
     private fun randomSeedBytes() = (0 until 16).map { Random.nextInt(UByte.MAX_VALUE.toInt()).toByte() }
     private fun randomKeyPair() = KeyPairUtilities.generate(randomSeedBytes().toByteArray())
-    private fun randomSessionId() = randomKeyPair().x25519KeyPair.hexEncodedPublicKey
+    private fun randomAccountId() = randomKeyPair().x25519KeyPair.hexEncodedPublicKey
 
     private var fakeHashI = 0
     private val nextFakeHash: String
@@ -102,7 +102,7 @@ class LibSessionTests {
         val storageSpy = spy(app.storage)
         app.storage = storageSpy
 
-        val newContactId = randomSessionId()
+        val newContactId = randomAccountId()
         val singleContact = Contact(
             id = newContactId,
             approved = true,
@@ -123,7 +123,7 @@ class LibSessionTests {
         val storageSpy = spy(app.storage)
         app.storage = storageSpy
 
-        val randomRecipient = randomSessionId()
+        val randomRecipient = randomAccountId()
         val newContact = Contact(
             id = randomRecipient,
             approved = true,
@@ -158,7 +158,7 @@ class LibSessionTests {
         app.storage = storageSpy
 
         // Initial state
-        val randomRecipient = randomSessionId()
+        val randomRecipient = randomAccountId()
         val currentContact = Contact(
             id = randomRecipient,
             approved = true,

app/src/androidTest/java/network/loki/messenger/SodiumUtilitiesTest.kt

@@ -143,7 +143,7 @@ class SodiumUtilitiesTest {
     }
 
     @Test
-    fun sessionIdFailureInvalidSessionId() {
+    fun sessionIdFailureInvalidAccountId() {
         val result = SodiumUtilities.sessionId("AB$publicKey", "15$blindedPublicKey", serverPublicKey)
 
         assertFalse(result)

app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt

@@ -365,7 +365,7 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity() {
 
     private fun getUserDisplayName(publicKey: String): String {
         val contact =
-            DatabaseComponent.get(this).sessionContactDatabase().getContactWithSessionID(publicKey)
+            DatabaseComponent.get(this).sessionContactDatabase().getContactWithAccountID(publicKey)
         return contact?.displayName(Contact.ContactContext.REGULAR) ?: publicKey
     }
 

app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt

@@ -47,7 +47,7 @@ class ProfilePictureView @JvmOverloads constructor(
     // region Updating
     fun update(recipient: Recipient) {
         fun getUserDisplayName(publicKey: String): String {
-            val contact = DatabaseComponent.get(context).sessionContactDatabase().getContactWithSessionID(publicKey)
+            val contact = DatabaseComponent.get(context).sessionContactDatabase().getContactWithAccountID(publicKey)
             return contact?.displayName(Contact.ContactContext.REGULAR) ?: publicKey
         }
 
@@ -71,7 +71,7 @@ class ProfilePictureView @JvmOverloads constructor(
                 additionalDisplayName = getUserDisplayName(apk)
             }
         } else if(recipient.isOpenGroupInboxRecipient) {
-            val publicKey = GroupUtil.getDecodedOpenGroupInboxSessionId(recipient.address.serialize())
+            val publicKey = GroupUtil.getDecodedOpenGroupInboxAccountId(recipient.address.serialize())
             this.publicKey = publicKey
             displayName = getUserDisplayName(publicKey)
             additionalPublicKey = null

app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt

@@ -51,7 +51,7 @@ class UserView : LinearLayout {
         val isLocalUser = user.isLocalNumber
         fun getUserDisplayName(publicKey: String): String {
             if (isLocalUser) return context.getString(R.string.MessageRecord_you)
-            val contact = DatabaseComponent.get(context).sessionContactDatabase().getContactWithSessionID(publicKey)
+            val contact = DatabaseComponent.get(context).sessionContactDatabase().getContactWithAccountID(publicKey)
             return contact?.displayName(Contact.ContactContext.REGULAR) ?: publicKey
         }
         val address = user.address.serialize()

app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt

@@ -72,7 +72,7 @@ internal class NewMessageViewModel @Inject constructor(
 
         loadOnsJob = viewModelScope.launch(Dispatchers.IO) {
             try {
-                val publicKey = SnodeAPI.getSessionID(ons).timeout(30_000).get()
+                val publicKey = SnodeAPI.getAccountID(ons).timeout(30_000).get()
                 if (isActive) onPublicKey(publicKey)
             } catch (e: Exception) {
                 if (isActive) onError(e)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -82,7 +82,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
-import org.session.libsession.messaging.utilities.SessionId
+import org.session.libsession.messaging.utilities.AccountId
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.fromSerialized
@@ -235,7 +235,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             intent.getParcelableExtra<Address>(ADDRESS)?.let { it ->
                 threadId = threadDb.getThreadIdIfExistsFor(it.serialize())
                 if (threadId == -1L) {
-                    val sessionId = SessionId(it.serialize())
+                    val sessionId = AccountId(it.serialize())
                     val openGroup = lokiThreadDb.getOpenGroupChat(intent.getLongExtra(FROM_GROUP_THREAD_ID, -1))
                     val address = if (sessionId.prefix == IdPrefix.BLINDED && openGroup != null) {
                         storage.getOrCreateBlindedIdMapping(sessionId.hexString, openGroup.server, openGroup.publicKey).sessionId?.let {
@@ -732,8 +732,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     // called from onCreate
     private fun setUpBlockedBanner() {
         val recipient = viewModel.recipient?.takeUnless { it.isGroupRecipient } ?: return
-        val sessionID = recipient.address.toString()
+        val accountID = recipient.address.toString()
-        val name = sessionContactDb.getContactWithSessionID(sessionID)?.displayName(Contact.ContactContext.REGULAR) ?: sessionID
+        val name = sessionContactDb.getContactWithAccountID(accountID)?.displayName(Contact.ContactContext.REGULAR) ?: accountID
         binding?.blockedBannerTextView?.text = resources.getString(R.string.activity_conversation_blocked_banner_text, name)
         binding?.blockedBanner?.isVisible = recipient.isBlocked
         binding?.blockedBanner?.setOnClickListener { viewModel.unblock() }
@@ -1183,8 +1183,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         }
     }
 
-    override fun copySessionID(sessionId: String) {
+    override fun copyAccountID(sessionId: String) {
-        val clip = ClipData.newPlainText("Session ID", sessionId)
+        val clip = ClipData.newPlainText("Account ID", sessionId)
         val manager = getSystemService(PassphraseRequiredActionBarActivity.CLIPBOARD_SERVICE) as ClipboardManager
         manager.setPrimaryClip(clip)
         Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
@@ -1977,9 +1977,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         endActionMode()
     }
 
-    override fun copySessionID(messages: Set<MessageRecord>) {
+    override fun copyAccountID(messages: Set<MessageRecord>) {
-        val sessionID = messages.first().individualRecipient.address.toString()
+        val accountID = messages.first().individualRecipient.address.toString()
-        val clip = ClipData.newPlainText("Session ID", sessionID)
+        val clip = ClipData.newPlainText("Account ID", accountID)
         val manager = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
         manager.setPrimaryClip(clip)
         Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
@@ -2189,7 +2189,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 ConversationReactionOverlay.Action.DELETE -> deleteMessages(selectedItems)
                 ConversationReactionOverlay.Action.BAN_AND_DELETE_ALL -> banAndDeleteAll(selectedItems)
                 ConversationReactionOverlay.Action.BAN_USER -> banUser(selectedItems)
-                ConversationReactionOverlay.Action.COPY_ACCOUNT_ID -> copySessionID(selectedItems)
+                ConversationReactionOverlay.Action.COPY_ACCOUNT_ID -> copyAccountID(selectedItems)
             }
         }
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt

@@ -74,7 +74,7 @@ class ConversationAdapter(
 
     @WorkerThread
     private fun getSenderInfo(sender: String): Contact? {
-        return contactDB.getContactWithSessionID(sender)
+        return contactDB.getContactWithAccountID(sender)
     }
 
     sealed class ViewType(val rawValue: Int) {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

@@ -21,7 +21,7 @@ import kotlinx.coroutines.launch
 import org.session.libsession.messaging.messages.ExpirationConfiguration
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.open_groups.OpenGroupApi
-import org.session.libsession.messaging.utilities.SessionId
+import org.session.libsession.messaging.utilities.AccountId
 import org.session.libsession.messaging.utilities.SodiumUtilities
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
@@ -78,7 +78,7 @@ class ConversationViewModel(
     val blindedPublicKey: String?
         get() = if (openGroup == null || edKeyPair == null || !serverCapabilities.contains(OpenGroupApi.Capability.BLIND.name.lowercase())) null else {
             SodiumUtilities.blindedKeyPair(openGroup!!.publicKey, edKeyPair)?.publicKey?.asBytes
-                ?.let { SessionId(IdPrefix.BLINDED, it) }?.hexString
+                ?.let { AccountId(IdPrefix.BLINDED, it) }?.hexString
         }
 
     val isMessageRequestThread : Boolean

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DeleteOptionsBottomSheet.kt

@@ -26,7 +26,7 @@ class DeleteOptionsBottomSheet : BottomSheetDialogFragment(), View.OnClickListen
     val contact by lazy {
         val senderId = recipient.address.serialize()
         // this dialog won't show for open group contacts
-        contactDatabase.getContactWithSessionID(senderId)
+        contactDatabase.getContactWithAccountID(senderId)
             ?.displayName(Contact.ContactContext.REGULAR)
     }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt

@@ -20,9 +20,9 @@ class BlockedDialog(private val recipient: Recipient, private val context: Conte
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         val contactDB = DatabaseComponent.get(requireContext()).sessionContactDatabase()
-        val sessionID = recipient.address.toString()
+        val accountID = recipient.address.toString()
-        val contact = contactDB.getContactWithSessionID(sessionID)
+        val contact = contactDB.getContactWithAccountID(accountID)
-        val name = contact?.displayName(Contact.ContactContext.REGULAR) ?: sessionID
+        val name = contact?.displayName(Contact.ContactContext.REGULAR) ?: accountID
 
         val explanation = resources.getString(R.string.dialog_blocked_explanation, name)
         val spannable = SpannableStringBuilder(explanation)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt

@@ -26,9 +26,9 @@ class DownloadDialog(private val recipient: Recipient) : DialogFragment() {
     @Inject lateinit var contactDB: SessionContactDatabase
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
-        val sessionID = recipient.address.toString()
+        val accountID = recipient.address.toString()
-        val contact = contactDB.getContactWithSessionID(sessionID)
+        val contact = contactDB.getContactWithAccountID(accountID)
-        val name = contact?.displayName(Contact.ContactContext.REGULAR) ?: sessionID
+        val name = contact?.displayName(Contact.ContactContext.REGULAR) ?: accountID
         title(resources.getString(R.string.dialog_download_title, name))
 
         val explanation = resources.getString(R.string.dialog_download_explanation, name)
@@ -42,8 +42,8 @@ class DownloadDialog(private val recipient: Recipient) : DialogFragment() {
     }
 
     private fun trust() {
-        val sessionID = recipient.address.toString()
+        val accountID = recipient.address.toString()
-        val contact = contactDB.getContactWithSessionID(sessionID) ?: return
+        val contact = contactDB.getContactWithAccountID(accountID) ?: return
         val threadID = DatabaseComponent.get(requireContext()).threadDatabase().getThreadIdIfExistsFor(recipient)
         contactDB.setContactIsTrusted(contact, true, threadID)
         JobQueue.shared.resumePendingJobs(AttachmentDownloadJob.KEY)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt

@@ -6,7 +6,7 @@ import android.view.Menu
 import android.view.MenuItem
 import network.loki.messenger.R
 import org.session.libsession.messaging.MessagingModuleConfiguration
-import org.session.libsession.messaging.utilities.SessionId
+import org.session.libsession.messaging.utilities.AccountId
 import org.session.libsession.messaging.utilities.SodiumUtilities
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.IdPrefix
@@ -39,7 +39,7 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
         val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
         val edKeyPair = MessagingModuleConfiguration.shared.getUserED25519KeyPair()!!
         val blindedPublicKey = openGroup?.publicKey?.let { SodiumUtilities.blindedKeyPair(it, edKeyPair)?.publicKey?.asBytes }
-            ?.let { SessionId(IdPrefix.BLINDED, it) }?.hexString
+            ?.let { AccountId(IdPrefix.BLINDED, it) }?.hexString
         fun userCanDeleteSelectedItems(): Boolean {
             val allSentByCurrentUser = selectedItems.all { it.isOutgoing }
             val allReceivedByCurrentUser = selectedItems.all { !it.isOutgoing }
@@ -91,7 +91,7 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
             R.id.menu_context_ban_user -> delegate?.banUser(selectedItems)
             R.id.menu_context_ban_and_delete_all -> delegate?.banAndDeleteAll(selectedItems)
             R.id.menu_context_copy -> delegate?.copyMessages(selectedItems)
-            R.id.menu_context_copy_public_key -> delegate?.copySessionID(selectedItems)
+            R.id.menu_context_copy_public_key -> delegate?.copyAccountID(selectedItems)
             R.id.menu_context_resync -> delegate?.resyncMessage(selectedItems)
             R.id.menu_context_resend -> delegate?.resendMessage(selectedItems)
             R.id.menu_message_details -> delegate?.showMessageDetail(selectedItems)
@@ -115,7 +115,7 @@ interface ConversationActionModeCallbackDelegate {
     fun banUser(messages: Set<MessageRecord>)
     fun banAndDeleteAll(messages: Set<MessageRecord>)
     fun copyMessages(messages: Set<MessageRecord>)
-    fun copySessionID(messages: Set<MessageRecord>)
+    fun copyAccountID(messages: Set<MessageRecord>)
     fun resyncMessage(messages: Set<MessageRecord>)
     fun resendMessage(messages: Set<MessageRecord>)
     fun showMessageDetail(messages: Set<MessageRecord>)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt

@@ -59,7 +59,7 @@ object ConversationMenuHelper {
         }
         // One-on-one chat menu allows copying the session id
         if (thread.isContactRecipient) {
-            inflater.inflate(R.menu.menu_conversation_copy_session_id, menu)
+            inflater.inflate(R.menu.menu_conversation_copy_account_id, menu)
         }
         // One-on-one chat menu (options that should only be present for one-on-one chats)
         if (thread.isContactRecipient) {
@@ -135,7 +135,7 @@ object ConversationMenuHelper {
             R.id.menu_unblock -> { unblock(context, thread) }
             R.id.menu_block -> { block(context, thread, deleteThread = false) }
             R.id.menu_block_delete -> { blockAndDelete(context, thread) }
-            R.id.menu_copy_account_id -> { copySessionID(context, thread) }
+            R.id.menu_copy_account_id -> { copyAccountID(context, thread) }
             R.id.menu_copy_open_group_url -> { copyOpenGroupUrl(context, thread) }
             R.id.menu_edit_group -> { editClosedGroup(context, thread) }
             R.id.menu_leave_group -> { leaveClosedGroup(context, thread) }
@@ -246,10 +246,10 @@ object ConversationMenuHelper {
         listener.block(deleteThread = true)
     }
 
-    private fun copySessionID(context: Context, thread: Recipient) {
+    private fun copyAccountID(context: Context, thread: Recipient) {
         if (!thread.isContactRecipient) { return }
         val listener = context as? ConversationMenuListener ?: return
-        listener.copySessionID(thread.address.toString())
+        listener.copyAccountID(thread.address.toString())
     }
 
     private fun copyOpenGroupUrl(context: Context, thread: Recipient) {
@@ -271,8 +271,8 @@ object ConversationMenuHelper {
 
         val group = DatabaseComponent.get(context).groupDatabase().getGroup(thread.address.toGroupString()).orNull()
         val admins = group.admins
-        val sessionID = TextSecurePreferences.getLocalNumber(context)
+        val accountID = TextSecurePreferences.getLocalNumber(context)
-        val isCurrentUserAdmin = admins.any { it.toString() == sessionID }
+        val isCurrentUserAdmin = admins.any { it.toString() == accountID }
         val message = if (isCurrentUserAdmin) {
             "Because you are the creator of this group it will be deleted for everyone. This cannot be undone."
         } else {
@@ -325,7 +325,7 @@ object ConversationMenuHelper {
     interface ConversationMenuListener {
         fun block(deleteThread: Boolean = false)
         fun unblock()
-        fun copySessionID(sessionId: String)
+        fun copyAccountID(sessionId: String)
         fun copyOpenGroupUrl(thread: Recipient)
         fun showDisappearingMessages(thread: Recipient)
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt

@@ -70,9 +70,9 @@ class QuoteView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         isOutgoingMessage: Boolean, isOpenGroupInvitation: Boolean, threadID: Long,
         isOriginalMissing: Boolean, glide: GlideRequests) {
         // Author
-        val author = contactDb.getContactWithSessionID(authorPublicKey)
+        val author = contactDb.getContactWithAccountID(authorPublicKey)
         val localNumber = TextSecurePreferences.getLocalNumber(context)
-        val quoteIsLocalUser = localNumber != null && localNumber == author?.sessionID
+        val quoteIsLocalUser = localNumber != null && localNumber == author?.accountID
 
         val authorDisplayName =
             if (quoteIsLocalUser) context.getString(R.string.QuoteView_you)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -132,7 +132,7 @@ class VisibleMessageView : LinearLayout {
         glide: GlideRequests = GlideApp.with(this),
         searchQuery: String? = null,
         contact: Contact? = null,
-        senderSessionID: String,
+        senderAccountID: String,
         lastSeen: Long,
         delegate: VisibleMessageViewDelegate? = null,
         onAttachmentNeedsDownload: (Long, Long) -> Unit,
@@ -167,30 +167,30 @@ class VisibleMessageView : LinearLayout {
 
         if (isGroupThread && !message.isOutgoing) {
             if (isEndOfMessageCluster) {
-                binding.profilePictureView.publicKey = senderSessionID
+                binding.profilePictureView.publicKey = senderAccountID
                 binding.profilePictureView.update(message.individualRecipient)
                 binding.profilePictureView.setOnClickListener {
                     if (thread.isCommunityRecipient) {
                         val openGroup = lokiThreadDb.getOpenGroupChat(threadID)
-                        if (IdPrefix.fromValue(senderSessionID) == IdPrefix.BLINDED && openGroup?.canWrite == true) {
+                        if (IdPrefix.fromValue(senderAccountID) == IdPrefix.BLINDED && openGroup?.canWrite == true) {
                             // TODO: support v2 soon
                             val intent = Intent(context, ConversationActivityV2::class.java)
                             intent.putExtra(ConversationActivityV2.FROM_GROUP_THREAD_ID, threadID)
-                            intent.putExtra(ConversationActivityV2.ADDRESS, Address.fromSerialized(senderSessionID))
+                            intent.putExtra(ConversationActivityV2.ADDRESS, Address.fromSerialized(senderAccountID))
                             context.startActivity(intent)
                         }
                     } else {
-                        maybeShowUserDetails(senderSessionID, threadID)
+                        maybeShowUserDetails(senderAccountID, threadID)
                     }
                 }
                 if (thread.isCommunityRecipient) {
                     val openGroup = lokiThreadDb.getOpenGroupChat(threadID) ?: return
                     var standardPublicKey = ""
                     var blindedPublicKey: String? = null
-                    if (IdPrefix.fromValue(senderSessionID)?.isBlinded() == true) {
+                    if (IdPrefix.fromValue(senderAccountID)?.isBlinded() == true) {
-                        blindedPublicKey = senderSessionID
+                        blindedPublicKey = senderAccountID
                     } else {
-                        standardPublicKey = senderSessionID
+                        standardPublicKey = senderAccountID
                     }
                     val isModerator = OpenGroupManager.isUserModerator(context, openGroup.groupId, standardPublicKey, blindedPublicKey)
                     binding.moderatorIconImageView.isVisible = !message.isOutgoing && isModerator
@@ -200,7 +200,7 @@ class VisibleMessageView : LinearLayout {
         binding.senderNameTextView.isVisible = !message.isOutgoing && (isStartOfMessageCluster && (isGroupThread || snIsSelected))
         val contactContext =
             if (thread.isCommunityRecipient) ContactContext.OPEN_GROUP else ContactContext.REGULAR
-        binding.senderNameTextView.text = contact?.displayName(contactContext) ?: senderSessionID
+        binding.senderNameTextView.text = contact?.displayName(contactContext) ?: senderAccountID
 
         // Unread marker
         binding.unreadMarkerContainer.isVisible = lastSeen != -1L && message.timestamp > lastSeen && (previous == null || previous.timestamp <= lastSeen) && !message.isOutgoing

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

@@ -48,7 +48,7 @@ object MentionUtilities {
                 val userDisplayName: String? = if (publicKey.equals(userPublicKey, ignoreCase = true) || isUserBlindedPublicKey) {
                     context.getString(R.string.MessageRecord_you)
                 } else {
-                    val contact = DatabaseComponent.get(context).sessionContactDatabase().getContactWithSessionID(publicKey)
+                    val contact = DatabaseComponent.get(context).sessionContactDatabase().getContactWithAccountID(publicKey)
                     @Suppress("NAME_SHADOWING") val context = if (openGroup != null) Contact.ContactContext.OPEN_GROUP else Contact.ContactContext.REGULAR
                     contact?.displayName(context)
                 }

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

@@ -5,7 +5,7 @@ import android.content.Context
 import android.database.Cursor
 import androidx.core.database.getStringOrNull
 import org.session.libsession.messaging.contacts.Contact
-import org.session.libsession.messaging.utilities.SessionId
+import org.session.libsession.messaging.utilities.AccountId
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.IdPrefix
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
@@ -14,7 +14,7 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
 
     companion object {
         private const val sessionContactTable = "session_contact_database"
-        const val sessionID = "session_id"
+        const val accountID = "account_id"
         const val name = "name"
         const val nickname = "nickname"
         const val profilePictureURL = "profile_picture_url"
@@ -24,7 +24,7 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
         const val isTrusted = "is_trusted"
         @JvmStatic val createSessionContactTableCommand =
             "CREATE TABLE $sessionContactTable " +
-                "($sessionID STRING PRIMARY KEY, " +
+                "($accountID STRING PRIMARY KEY, " +
                 "$name TEXT DEFAULT NULL, " +
                 "$nickname TEXT DEFAULT NULL, " +
                 "$profilePictureURL TEXT DEFAULT NULL, " +
@@ -34,9 +34,9 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
                 "$isTrusted INTEGER DEFAULT 0);"
     }
 
-    fun getContactWithSessionID(sessionID: String): Contact? {
+    fun getContactWithAccountID(accountID: String): Contact? {
         val database = databaseHelper.readableDatabase
-        return database.get(sessionContactTable, "${Companion.sessionID} = ?", arrayOf( sessionID )) { cursor ->
+        return database.get(sessionContactTable, "${Companion.accountID} = ?", arrayOf( accountID )) { cursor ->
             contactFromCursor(cursor)
         }
     }
@@ -46,7 +46,7 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
         return database.getAll(sessionContactTable, null, null) { cursor ->
             contactFromCursor(cursor)
         }.filter { contact ->
-            val sessionId = SessionId(contact.sessionID)
+            val sessionId = AccountId(contact.accountID)
             sessionId.prefix == IdPrefix.STANDARD
         }.toSet()
     }
@@ -55,7 +55,7 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
         val database = databaseHelper.writableDatabase
         val contentValues = ContentValues(1)
         contentValues.put(Companion.isTrusted, if (isTrusted) 1 else 0)
-        database.update(sessionContactTable, contentValues, "$sessionID = ?", arrayOf( contact.sessionID ))
+        database.update(sessionContactTable, contentValues, "$accountID = ?", arrayOf( contact.accountID ))
         if (threadID >= 0) {
             notifyConversationListeners(threadID)
         }
@@ -65,7 +65,7 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
     fun setContact(contact: Contact) {
         val database = databaseHelper.writableDatabase
         val contentValues = ContentValues(8)
-        contentValues.put(sessionID, contact.sessionID)
+        contentValues.put(accountID, contact.accountID)
         contentValues.put(name, contact.name)
         contentValues.put(nickname, contact.nickname)
         contentValues.put(profilePictureURL, contact.profilePictureURL)
@@ -75,13 +75,13 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
         }
         contentValues.put(threadID, contact.threadID)
         contentValues.put(isTrusted, if (contact.isTrusted) 1 else 0)
-        database.insertOrUpdate(sessionContactTable, contentValues, "$sessionID = ?", arrayOf( contact.sessionID ))
+        database.insertOrUpdate(sessionContactTable, contentValues, "$accountID = ?", arrayOf( contact.accountID ))
         notifyConversationListListeners()
     }
 
     fun contactFromCursor(cursor: Cursor): Contact {
-        val sessionID = cursor.getString(cursor.getColumnIndexOrThrow(sessionID))
+        val accountID = cursor.getString(cursor.getColumnIndexOrThrow(accountID))
-        val contact = Contact(sessionID)
+        val contact = Contact(accountID)
         contact.name = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(name))
         contact.nickname = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(nickname))
         contact.profilePictureURL = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(profilePictureURL))

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

@@ -55,7 +55,7 @@ import org.session.libsession.messaging.sending_receiving.link_preview.LinkPrevi
 import org.session.libsession.messaging.sending_receiving.notifications.PushRegistryV1
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
-import org.session.libsession.messaging.utilities.SessionId
+import org.session.libsession.messaging.utilities.AccountId
 import org.session.libsession.messaging.utilities.SodiumUtilities
 import org.session.libsession.messaging.utilities.UpdateMessageData
 import org.session.libsession.snode.OnionRequestAPI
@@ -126,7 +126,7 @@ open class Storage(
             }
         } else if (address.isContact) {
             // non-standard contact prefixes: 15, 00 etc shouldn't be stored in config
-            if (SessionId(address.serialize()).prefix != IdPrefix.STANDARD) return
+            if (AccountId(address.serialize()).prefix != IdPrefix.STANDARD) return
             // don't update our own address into the contacts DB
             if (getUserPublicKey() != address.serialize()) {
                 val contacts = configFactory.contacts ?: return
@@ -157,7 +157,7 @@ open class Storage(
             }
         } else {
             // non-standard contact prefixes: 15, 00 etc shouldn't be stored in config
-            if (SessionId(address.serialize()).prefix != IdPrefix.STANDARD) return
+            if (AccountId(address.serialize()).prefix != IdPrefix.STANDARD) return
             volatile.eraseOneToOne(address.serialize())
             if (getUserPublicKey() != address.serialize()) {
                 val contacts = configFactory.contacts ?: return
@@ -265,7 +265,7 @@ open class Storage(
                     // otherwise recipient is one to one
                     recipient.isContactRecipient -> {
                         // don't process non-standard session IDs though
-                        val sessionId = SessionId(recipient.address.serialize())
+                        val sessionId = AccountId(recipient.address.serialize())
                         if (sessionId.prefix != IdPrefix.STANDARD) return
 
                         config.getOrConstructOneToOne(recipient.address.serialize())
@@ -1175,8 +1175,8 @@ open class Storage(
         return threadId ?: -1
     }
 
-    override fun getContactWithSessionID(sessionID: String): Contact? {
+    override fun getContactWithAccountID(accountID: String): Contact? {
-        return DatabaseComponent.get(context).sessionContactDatabase().getContactWithSessionID(sessionID)
+        return DatabaseComponent.get(context).sessionContactDatabase().getContactWithAccountID(accountID)
     }
 
     override fun getAllContacts(): Set<Contact> {
@@ -1185,7 +1185,7 @@ open class Storage(
 
     override fun setContact(contact: Contact) {
         DatabaseComponent.get(context).sessionContactDatabase().setContact(contact)
-        val address = fromSerialized(contact.sessionID)
+        val address = fromSerialized(contact.accountID)
         if (!getRecipientApproved(address)) return
         val recipientHash = SSKEnvironment.shared.profileManager.contactUpdatedInternal(contact)
         val recipient = Recipient.from(context, address, false)
@@ -1203,7 +1203,7 @@ open class Storage(
     override fun addLibSessionContacts(contacts: List<LibSessionContact>, timestamp: Long) {
         val mappingDb = DatabaseComponent.get(context).blindedIdMappingDatabase()
         val moreContacts = contacts.filter { contact ->
-            val id = SessionId(contact.id)
+            val id = AccountId(contact.id)
             id.prefix?.isBlinded() == false || mappingDb.getBlindedIdMapping(contact.id).none { it.sessionId != null }
         }
         val profileManager = SSKEnvironment.shared.profileManager
@@ -1256,7 +1256,7 @@ open class Storage(
         val threadDatabase = DatabaseComponent.get(context).threadDatabase()
         val mappingDb = DatabaseComponent.get(context).blindedIdMappingDatabase()
         val moreContacts = contacts.filter { contact ->
-            val id = SessionId(contact.publicKey)
+            val id = AccountId(contact.publicKey)
             id.prefix != IdPrefix.BLINDED || mappingDb.getBlindedIdMapping(contact.publicKey).none { it.sessionId != null }
         }
         for (contact in moreContacts) {
@@ -1491,8 +1491,8 @@ open class Storage(
                     val address = recipient.address.serialize()
                     val blindedId = when {
                         recipient.isGroupRecipient -> null
-                        recipient.isOpenGroupInboxRecipient -> GroupUtil.getDecodedOpenGroupInboxSessionId(address)
+                        recipient.isOpenGroupInboxRecipient -> GroupUtil.getDecodedOpenGroupInboxAccountId(address)
-                        else -> address.takeIf { SessionId(it).prefix == IdPrefix.BLINDED }
+                        else -> address.takeIf { AccountId(it).prefix == IdPrefix.BLINDED }
                     } ?: continue
                     mappingDb.getBlindedIdMapping(blindedId).firstOrNull()?.let {
                         mappings[address] = it
@@ -1613,7 +1613,7 @@ open class Storage(
             return mapping
         }
         getAllContacts().forEach { contact ->
-            val sessionId = SessionId(contact.sessionID)
+            val sessionId = AccountId(contact.accountID)
             if (sessionId.prefix == IdPrefix.STANDARD && SodiumUtilities.sessionId(sessionId.hexString, blindedId, serverPublicKey)) {
                 val contactMapping = mapping.copy(sessionId = sessionId.hexString)
                 db.addBlindedIdMapping(contactMapping)
@@ -1738,7 +1738,7 @@ open class Storage(
 
         if (recipient.isClosedGroupRecipient) {
             val userGroups = configFactory.userGroups ?: return
-            val groupPublicKey = GroupUtil.addressToGroupSessionId(recipient.address)
+            val groupPublicKey = GroupUtil.addressToGroupAccountId(recipient.address)
             val groupInfo = userGroups.getLegacyGroupInfo(groupPublicKey)
                 ?.copy(disappearingTimer = expiryMode.expirySeconds) ?: return
             userGroups.set(groupInfo)

app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt

@@ -165,7 +165,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
                 push(intent)
             }
             is GlobalSearchAdapter.Model.Contact -> {
-                val address = model.contact.sessionID
+                val address = model.contact.accountID
 
                 val intent = Intent(this, ConversationActivityV2::class.java)
                 intent.putExtra(ConversationActivityV2.ADDRESS, Address.fromSerialized(address))
@@ -296,7 +296,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
                             .flatMap { (key, contacts) -> listOf(GlobalSearchAdapter.Model.SubHeader(key)) + contacts.sortedBy { it.nickname ?: it.name }.map(GlobalSearchAdapter.Model::Contact) }
 
                         val noNames = result.contacts.filter { it.nickname == null && it.name == null }
-                            .sortedBy { it.sessionID }
+                            .sortedBy { it.accountID }
                             .map { GlobalSearchAdapter.Model.Contact(it) }
 
                         buildList {
@@ -319,7 +319,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
                             contactResults.add(GlobalSearchAdapter.Model.SavedMessages(currentUserPublicKey))
                         }
 
-                        val userIndex = contactResults.indexOfFirst { it is GlobalSearchAdapter.Model.Contact && it.contact.sessionID == currentUserPublicKey }
+                        val userIndex = contactResults.indexOfFirst { it is GlobalSearchAdapter.Model.Contact && it.contact.accountID == currentUserPublicKey }
                         if (userIndex >= 0) {
                             contactResults[userIndex] = GlobalSearchAdapter.Model.SavedMessages(currentUserPublicKey)
                         }
@@ -464,7 +464,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         bottomSheet.onCopyConversationId = onCopyConversationId@{
             bottomSheet.dismiss()
             if (!thread.recipient.isGroupRecipient && !thread.recipient.isLocalNumber) {
-                val clip = ClipData.newPlainText("Session ID", thread.recipient.address.toString())
+                val clip = ClipData.newPlainText("Account ID", thread.recipient.address.toString())
                 val manager = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
                 manager.setPrimaryClip(clip)
                 Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()

app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt

@@ -99,7 +99,7 @@ class UserDetailsBottomSheet: BottomSheetDialogFragment() {
             publicKeyTextView.setOnLongClickListener {
                 val clipboard =
                     requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                val clip = ClipData.newPlainText("Session ID", publicKey)
+                val clip = ClipData.newPlainText("Account ID", publicKey)
                 clipboard.setPrimaryClip(clip)
                 Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT)
                     .show()
@@ -138,7 +138,7 @@ class UserDetailsBottomSheet: BottomSheetDialogFragment() {
         else { newNickName = previousContactNickname }
         val publicKey = recipient.address.serialize()
         val storage = MessagingModuleConfiguration.shared.storage
-        val contact = storage.getContactWithSessionID(publicKey) ?: Contact(publicKey)
+        val contact = storage.getContactWithAccountID(publicKey) ?: Contact(publicKey)
         contact.nickname = newNickName
         storage.setContact(contact)
         nameTextView.text = recipient.name ?: publicKey // Uses the Contact API internally

app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchAdapterUtils.kt

@@ -116,7 +116,7 @@ fun ContentView.bindModel(query: String?, model: ContactModel) {
     binding.searchResultTimestamp.isVisible = false
     binding.searchResultSubtitle.text = null
     val recipient =
-        Recipient.from(binding.root.context, Address.fromSerialized(model.contact.sessionID), false)
+        Recipient.from(binding.root.context, Address.fromSerialized(model.contact.accountID), false)
     binding.searchResultProfilePicture.update(recipient)
     val nameString = model.contact.getSearchName()
     binding.searchResultTitle.text = getHighlight(query, nameString)
@@ -159,5 +159,5 @@ fun ContentView.bindModel(query: String?, model: Message) {
 fun Recipient.getSearchName(): String = name ?: address.serialize().let { address -> "${address.take(4)}...${address.takeLast(4)}" }
 
 fun Contact.getSearchName(): String =
-        if (nickname.isNullOrEmpty()) name ?: "${sessionID.take(4)}...${sessionID.takeLast(4)}"
+        if (nickname.isNullOrEmpty()) name ?: "${accountID.take(4)}...${accountID.takeLast(4)}"
-        else "${name ?: "${sessionID.take(4)}...${sessionID.takeLast(4)}"} ($nickname)"
+        else "${name ?: "${accountID.take(4)}...${accountID.takeLast(4)}"} ($nickname)"

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

@@ -42,7 +42,7 @@ import com.goterl.lazysodium.utils.KeyPair;
 
 import org.session.libsession.messaging.open_groups.OpenGroup;
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
-import org.session.libsession.messaging.utilities.SessionId;
+import org.session.libsession.messaging.utilities.AccountId;
 import org.session.libsession.messaging.utilities.SodiumUtilities;
 import org.session.libsession.snode.SnodeAPI;
 import org.session.libsession.utilities.Address;
@@ -561,7 +561,7 @@ public class DefaultMessageNotifier implements MessageNotifier {
     if (openGroup != null && edKeyPair != null) {
       KeyPair blindedKeyPair = SodiumUtilities.blindedKeyPair(openGroup.getPublicKey(), edKeyPair);
       if (blindedKeyPair != null) {
-        return new SessionId(IdPrefix.BLINDED, blindedKeyPair.getPublicKey().getAsBytes()).getHexString();
+        return new AccountId(IdPrefix.BLINDED, blindedKeyPair.getPublicKey().getAsBytes()).getHexString();
       }
     }
     return null;

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

@@ -118,11 +118,11 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
    */
   private String getGroupDisplayName(Recipient recipient, boolean openGroupRecipient) {
     SessionContactDatabase contactDB = DatabaseComponent.get(context).sessionContactDatabase();
-    String sessionID = recipient.getAddress().serialize();
+    String accountID = recipient.getAddress().serialize();
-    Contact contact = contactDB.getContactWithSessionID(sessionID);
+    Contact contact = contactDB.getContactWithAccountID(accountID);
-    if (contact == null) { return sessionID; }
+    if (contact == null) { return accountID; }
     String displayName = contact.displayName(openGroupRecipient ? Contact.ContactContext.OPEN_GROUP : Contact.ContactContext.REGULAR);
-    if (displayName == null) { return sessionID; }
+    if (displayName == null) { return accountID; }
     return displayName;
   }
 }

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

@@ -339,11 +339,11 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
    */
   private String getGroupDisplayName(Recipient recipient, boolean openGroupRecipient) {
     SessionContactDatabase contactDB = DatabaseComponent.get(context).sessionContactDatabase();
-    String sessionID = recipient.getAddress().serialize();
+    String accountID = recipient.getAddress().serialize();
-    Contact contact = contactDB.getContactWithSessionID(sessionID);
+    Contact contact = contactDB.getContactWithAccountID(accountID);
-    if (contact == null) { return sessionID; }
+    if (contact == null) { return accountID; }
     String displayName = contact.displayName(openGroupRecipient ? Contact.ContactContext.OPEN_GROUP : Contact.ContactContext.REGULAR);
-    if (displayName == null) { return sessionID; }
+    if (displayName == null) { return accountID; }
     return displayName;
   }
 }

app/src/main/java/org/thoughtcrime/securesms/preferences/Util.kt

@@ -25,7 +25,7 @@ fun Context.sendInvitationToUseSession() {
 
 fun Context.copyPublicKey() {
     val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-    val clip = ClipData.newPlainText("Session ID", TextSecurePreferences.getLocalNumber(this))
+    val clip = ClipData.newPlainText("Account ID", TextSecurePreferences.getLocalNumber(this))
     clipboard.setPrimaryClip(clip)
     Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
 }

app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java

@@ -9,7 +9,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.session.libsession.messaging.utilities.SessionId;
+import org.session.libsession.messaging.utilities.AccountId;
 import org.thoughtcrime.securesms.components.ProfilePictureView;
 import org.thoughtcrime.securesms.components.emoji.EmojiImageView;
 import org.thoughtcrime.securesms.database.model.MessageId;
@@ -161,7 +161,7 @@ final class ReactionRecipientsAdapter extends RecyclerView.Adapter<ReactionRecip
         this.remove.setVisibility(View.VISIBLE);
       } else {
         String name = reaction.getSender().getName();
-        if (name != null && new SessionId(name).getPrefix() != null) {
+        if (name != null && new AccountId(name).getPrefix() != null) {
           name = name.substring(0, 4) + "..." + name.substring(name.length() - 4);
         }
         this.recipient.setText(name);

app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt

@@ -99,7 +99,7 @@ class DefaultConversationRepository @Inject constructor(
         if (!recipient.isOpenGroupInboxRecipient) return null
         return Recipient.from(
             context,
-            Address.fromSerialized(GroupUtil.getDecodedOpenGroupInboxSessionId(recipient.address.serialize())),
+            Address.fromSerialized(GroupUtil.getDecodedOpenGroupInboxAccountId(recipient.address.serialize())),
             false
         )
     }
@@ -281,9 +281,9 @@ class DefaultConversationRepository @Inject constructor(
 
     override suspend fun banUser(threadId: Long, recipient: Recipient): ResultOf<Unit> =
         suspendCoroutine { continuation ->
-            val sessionID = recipient.address.toString()
+            val accountID = recipient.address.toString()
             val openGroup = lokiThreadDb.getOpenGroupChat(threadId)!!
-            OpenGroupApi.ban(sessionID, openGroup.room, openGroup.server)
+            OpenGroupApi.ban(accountID, openGroup.room, openGroup.server)
                 .success {
                     continuation.resume(ResultOf.Success(Unit))
                 }.fail { error ->
@@ -294,10 +294,10 @@ class DefaultConversationRepository @Inject constructor(
     override suspend fun banAndDeleteAll(threadId: Long, recipient: Recipient): ResultOf<Unit> =
         suspendCoroutine { continuation ->
             // Note: This sessionId could be the blinded Id
-            val sessionID = recipient.address.toString()
+            val accountID = recipient.address.toString()
             val openGroup = lokiThreadDb.getOpenGroupChat(threadId)!!
 
-            OpenGroupApi.banAndDeleteAll(sessionID, openGroup.room, openGroup.server)
+            OpenGroupApi.banAndDeleteAll(accountID, openGroup.room, openGroup.server)
                 .success {
                     continuation.resume(ResultOf.Success(Unit))
                 }.fail { error ->

app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java

@@ -114,10 +114,10 @@ public class SearchRepository {
     while (contacts.moveToNext()) {
       try {
         Contact contact = contactDatabase.contactFromCursor(contacts);
-        String contactSessionId = contact.getSessionID();
+        String contactAccountId = contact.getAccountID();
-        Address address = Address.fromSerialized(contactSessionId);
+        Address address = Address.fromSerialized(contactAccountId);
         contactList.add(address);
-        contactStrings.add(contactSessionId);
+        contactStrings.add(contactAccountId);
       } catch (Exception e) {
         Log.e("Loki", "Error building Contact from cursor in query", e);
       }
@@ -207,7 +207,7 @@ public class SearchRepository {
     @Override
     public Contact build(@NonNull Cursor cursor) {
       ThreadRecord threadRecord = threadDb.readerFor(cursor).getCurrent();
-      Contact contact = contactDb.getContactWithSessionID(threadRecord.getRecipient().getAddress().serialize());
+      Contact contact = contactDb.getContactWithAccountID(threadRecord.getRecipient().getAddress().serialize());
       if (contact == null) {
         contact = new Contact(threadRecord.getRecipient().getAddress().serialize());
         contact.setThreadID(threadRecord.getThreadId());

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

@@ -5,7 +5,7 @@ import network.loki.messenger.libsession_util.util.UserPic
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.jobs.RetrieveProfileAvatarJob
-import org.session.libsession.messaging.utilities.SessionId
+import org.session.libsession.messaging.utilities.AccountId
 import org.session.libsession.utilities.SSKEnvironment
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.recipients.Recipient
@@ -18,10 +18,10 @@ class ProfileManager(private val context: Context, private val configFactory: Co
 
     override fun setNickname(context: Context, recipient: Recipient, nickname: String?) {
         if (recipient.isLocalNumber) return
-        val sessionID = recipient.address.serialize()
+        val accountID = recipient.address.serialize()
         val contactDatabase = DatabaseComponent.get(context).sessionContactDatabase()
-        var contact = contactDatabase.getContactWithSessionID(sessionID)
+        var contact = contactDatabase.getContactWithAccountID(accountID)
-        if (contact == null) contact = Contact(sessionID)
+        if (contact == null) contact = Contact(accountID)
         contact.threadID = DatabaseComponent.get(context).storage().getThreadId(recipient.address)
         if (contact.nickname != nickname) {
             contact.nickname = nickname
@@ -33,10 +33,10 @@ class ProfileManager(private val context: Context, private val configFactory: Co
     override fun setName(context: Context, recipient: Recipient, name: String?) {
         // New API
         if (recipient.isLocalNumber) return
-        val sessionID = recipient.address.serialize()
+        val accountID = recipient.address.serialize()
         val contactDatabase = DatabaseComponent.get(context).sessionContactDatabase()
-        var contact = contactDatabase.getContactWithSessionID(sessionID)
+        var contact = contactDatabase.getContactWithAccountID(accountID)
-        if (contact == null) contact = Contact(sessionID)
+        if (contact == null) contact = Contact(accountID)
         contact.threadID = DatabaseComponent.get(context).storage().getThreadId(recipient.address)
         if (contact.name != name) {
             contact.name = name
@@ -67,10 +67,10 @@ class ProfileManager(private val context: Context, private val configFactory: Co
             newProfileKey = profileKey,
             newProfilePicture = profilePictureURL
         )
-        val sessionID = recipient.address.serialize()
+        val accountID = recipient.address.serialize()
         val contactDatabase = DatabaseComponent.get(context).sessionContactDatabase()
-        var contact = contactDatabase.getContactWithSessionID(sessionID)
+        var contact = contactDatabase.getContactWithAccountID(accountID)
-        if (contact == null) contact = Contact(sessionID)
+        if (contact == null) contact = Contact(accountID)
         contact.threadID = DatabaseComponent.get(context).storage().getThreadId(recipient.address)
         if (!contact.profilePictureEncryptionKey.contentEquals(profileKey) || contact.profilePictureURL != profilePictureURL) {
             contact.profilePictureEncryptionKey = profileKey
@@ -91,10 +91,10 @@ class ProfileManager(private val context: Context, private val configFactory: Co
 
     override fun contactUpdatedInternal(contact: Contact): String? {
         val contactConfig = configFactory.contacts ?: return null
-        if (contact.sessionID == TextSecurePreferences.getLocalNumber(context)) return null
+        if (contact.accountID == TextSecurePreferences.getLocalNumber(context)) return null
-        val sessionId = SessionId(contact.sessionID)
+        val sessionId = AccountId(contact.accountID)
         if (sessionId.prefix != IdPrefix.STANDARD) return null // only internally store standard session IDs
-        contactConfig.upsertContact(contact.sessionID) {
+        contactConfig.upsertContact(contact.accountID) {
             this.name = contact.name.orEmpty()
             this.nickname = contact.nickname.orEmpty()
             val url = contact.profilePictureURL
@@ -108,7 +108,7 @@ class ProfileManager(private val context: Context, private val configFactory: Co
         if (contactConfig.needsPush()) {
             ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(context)
         }
-        return contactConfig.get(contact.sessionID)?.hashCode()?.toString()
+        return contactConfig.get(contact.accountID)?.hashCode()?.toString()
     }
 
 }

app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt

@@ -142,10 +142,10 @@ object ConfigurationMessageUtilities {
         val storage = MessagingModuleConfiguration.shared.storage
         val localUserKey = storage.getUserPublicKey() ?: return null
         val contactsWithSettings = storage.getAllContacts().filter { recipient ->
-            recipient.sessionID != localUserKey && recipient.sessionID.startsWith(IdPrefix.STANDARD.value)
+            recipient.accountID != localUserKey && recipient.accountID.startsWith(IdPrefix.STANDARD.value)
-                    && storage.getThreadId(recipient.sessionID) != null
+                    && storage.getThreadId(recipient.accountID) != null
         }.map { contact ->
-            val address = Address.fromSerialized(contact.sessionID)
+            val address = Address.fromSerialized(contact.accountID)
             val thread = storage.getThreadId(address)
             val isPinned = if (thread != null) {
                 storage.isPinned(thread)
@@ -164,7 +164,7 @@ object ConfigurationMessageUtilities {
             }
 
             val contactInfo = Contact(
-                id = contact.sessionID,
+                id = contact.accountID,
                 name = contact.name.orEmpty(),
                 nickname = contact.nickname.orEmpty(),
                 blocked = settings.isBlocked,

app/src/main/java/org/thoughtcrime/securesms/util/MockDataGenerator.kt

@@ -55,7 +55,7 @@ object MockDataGenerator {
         val stringContent: List<String> = "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789 ".map { it.toString() }
         val wordContent: List<String> = listOf("alias", "consequatur", "aut", "perferendis", "sit", "voluptatem", "accusantium", "doloremque", "aperiam", "eaque", "ipsa", "quae", "ab", "illo", "inventore", "veritatis", "et", "quasi", "architecto", "beatae", "vitae", "dicta", "sunt", "explicabo", "aspernatur", "aut", "odit", "aut", "fugit", "sed", "quia", "consequuntur", "magni", "dolores", "eos", "qui", "ratione", "voluptatem", "sequi", "nesciunt", "neque", "dolorem", "ipsum", "quia", "dolor", "sit", "amet", "consectetur", "adipisci", "velit", "sed", "quia", "non", "numquam", "eius", "modi", "tempora", "incidunt", "ut", "labore", "et", "dolore", "magnam", "aliquam", "quaerat", "voluptatem", "ut", "enim", "ad", "minima", "veniam", "quis", "nostrum", "exercitationem", "ullam", "corporis", "nemo", "enim", "ipsam", "voluptatem", "quia", "voluptas", "sit", "suscipit", "laboriosam", "nisi", "ut", "aliquid", "ex", "ea", "commodi", "consequatur", "quis", "autem", "vel", "eum", "iure", "reprehenderit", "qui", "in", "ea", "voluptate", "velit", "esse", "quam", "nihil", "molestiae", "et", "iusto", "odio", "dignissimos", "ducimus", "qui", "blanditiis", "praesentium", "laudantium", "totam", "rem", "voluptatum", "deleniti", "atque", "corrupti", "quos", "dolores", "et", "quas", "molestias", "excepturi", "sint", "occaecati", "cupiditate", "non", "provident", "sed", "ut", "perspiciatis", "unde", "omnis", "iste", "natus", "error", "similique", "sunt", "in", "culpa", "qui", "officia", "deserunt", "mollitia", "animi", "id", "est", "laborum", "et", "dolorum", "fuga", "et", "harum", "quidem", "rerum", "facilis", "est", "et", "expedita", "distinctio", "nam", "libero", "tempore", "cum", "soluta", "nobis", "est", "eligendi", "optio", "cumque", "nihil", "impedit", "quo", "porro", "quisquam", "est", "qui", "minus", "id", "quod", "maxime", "placeat", "facere", "possimus", "omnis", "voluptas", "assumenda", "est", "omnis", "dolor", "repellendus", "temporibus", "autem", "quibusdam", "et", "aut", "consequatur", "vel", "illum", "qui", "dolorem", "eum", "fugiat", "quo", "voluptas", "nulla", "pariatur", "at", "vero", "eos", "et", "accusamus", "officiis", "debitis", "aut", "rerum", "necessitatibus", "saepe", "eveniet", "ut", "et", "voluptates", "repudiandae", "sint", "et", "molestiae", "non", "recusandae", "itaque", "earum", "rerum", "hic", "tenetur", "a", "sapiente", "delectus", "ut", "aut", "reiciendis", "voluptatibus", "maiores", "doloribus", "asperiores", "repellat")
         val timestampNow: Long = System.currentTimeMillis()
-        val userSessionId: String = MessagingModuleConfiguration.shared.storage.getUserPublicKey()!!
+        val userAccountId: String = MessagingModuleConfiguration.shared.storage.getUserPublicKey()!!
         val logProgress: ((String, String) -> Unit) = logProgress@{ title, event ->
             if (!printProgress) { return@logProgress }
 
@@ -84,7 +84,7 @@ object MockDataGenerator {
                 logProgress("DM Thread $threadIndex", "Start")
 
                 val dataBytes = (0 until 16).map { dmThreadRandomGenerator.nextInt(UByte.MAX_VALUE.toInt()).toByte() }
-                val randomSessionId: String = KeyPairUtilities.generate(dataBytes.toByteArray()).x25519KeyPair.hexEncodedPublicKey
+                val randomAccountId: String = KeyPairUtilities.generate(dataBytes.toByteArray()).x25519KeyPair.hexEncodedPublicKey
                 val isMessageRequest: Boolean = dmThreadRandomGenerator.nextBoolean()
                 val contactNameLength: Int = (5 + dmThreadRandomGenerator.nextInt(15))
 
@@ -94,8 +94,8 @@ object MockDataGenerator {
                 )
 
                 // Generate the thread
-                val recipient = Recipient.from(context, Address.fromSerialized(randomSessionId), false)
+                val recipient = Recipient.from(context, Address.fromSerialized(randomAccountId), false)
-                val contact = Contact(randomSessionId)
+                val contact = Contact(randomAccountId)
                 val threadId = threadDb.getOrCreateThreadIdFor(recipient)
 
                 // Generate the contact
@@ -194,16 +194,16 @@ object MockDataGenerator {
                 )
 
                 // Generate the Contacts in the group
-                val members: MutableList<String> = mutableListOf(userSessionId)
+                val members: MutableList<String> = mutableListOf(userAccountId)
                 logProgress("Closed Group Thread $threadIndex", "Generate $numGroupMembers Contacts")
 
                 (0 until numGroupMembers).forEach {
                     val contactBytes = (0 until 16).map { cgThreadRandomGenerator.nextInt(UByte.MAX_VALUE.toInt()).toByte() }
-                    val randomSessionId: String = KeyPairUtilities.generate(contactBytes.toByteArray()).x25519KeyPair.hexEncodedPublicKey
+                    val randomAccountId: String = KeyPairUtilities.generate(contactBytes.toByteArray()).x25519KeyPair.hexEncodedPublicKey
                     val contactNameLength: Int = (5 + cgThreadRandomGenerator.nextInt(15))
 
-                    val recipient = Recipient.from(context, Address.fromSerialized(randomSessionId), false)
+                    val recipient = Recipient.from(context, Address.fromSerialized(randomAccountId), false)
-                    val contact = Contact(randomSessionId)
+                    val contact = Contact(randomAccountId)
                     contactDb.setContact(contact)
                     recipientDb.setApproved(recipient, true)
                     recipientDb.setApprovedMe(recipient, true)
@@ -213,7 +213,7 @@ object MockDataGenerator {
                             .joinToString()
                     recipientDb.setProfileName(recipient, contact.name)
                     contactDb.setContact(contact)
-                    members.add(randomSessionId)
+                    members.add(randomAccountId)
                 }
 
                 val groupId = GroupUtil.doubleEncodeGroupID(randomGroupPublicKey)
@@ -237,7 +237,7 @@ object MockDataGenerator {
                 storage.createInitialConfigGroup(randomGroupPublicKey, groupName, GroupUtil.createConfigMemberMap(members, setOf(adminUserId)), System.currentTimeMillis(), encryptionKeyPair, 0)
 
                 // Add the group created message
-                if (userSessionId == adminUserId) {
+                if (userAccountId == adminUserId) {
                     storage.insertOutgoingInfoMessage(context, groupId, SignalServiceGroup.Type.CREATION, groupName, members, listOf(adminUserId), threadId, (timestampNow - (numMessages * 5000)))
                 } else {
                     storage.insertIncomingInfoMessage(context, adminUserId, groupId, SignalServiceGroup.Type.CREATION, groupName, members, listOf(adminUserId), (timestampNow - (numMessages * 5000)))
@@ -250,7 +250,7 @@ object MockDataGenerator {
                     val messageWords: Int = (1 + cgThreadRandomGenerator.nextInt(19))
                     val senderId: String = members.random(cgThreadRandomGenerator.asKotlinRandom())
 
-                    if (senderId != userSessionId) {
+                    if (senderId != userAccountId) {
                         smsDb.insertMessageInbox(
                             IncomingTextMessage(
                                 Address.fromSerialized(senderId),
@@ -331,16 +331,16 @@ object MockDataGenerator {
                 )
 
                 // Generate the Contacts in the group
-                val members: MutableList<String> = mutableListOf(userSessionId)
+                val members: MutableList<String> = mutableListOf(userAccountId)
                 logProgress("Open Group Thread $threadIndex", "Generate $numGroupMembers Contacts")
 
                 (0 until numGroupMembers).forEach {
                     val contactBytes = (0 until 16).map { ogThreadRandomGenerator.nextInt(UByte.MAX_VALUE.toInt()).toByte() }
-                    val randomSessionId: String = KeyPairUtilities.generate(contactBytes.toByteArray()).x25519KeyPair.hexEncodedPublicKey
+                    val randomAccountId: String = KeyPairUtilities.generate(contactBytes.toByteArray()).x25519KeyPair.hexEncodedPublicKey
                     val contactNameLength: Int = (5 + ogThreadRandomGenerator.nextInt(15))
 
-                    val recipient = Recipient.from(context, Address.fromSerialized(randomSessionId), false)
+                    val recipient = Recipient.from(context, Address.fromSerialized(randomAccountId), false)
-                    val contact = Contact(randomSessionId)
+                    val contact = Contact(randomAccountId)
                     contactDb.setContact(contact)
                     recipientDb.setApproved(recipient, true)
                     recipientDb.setApprovedMe(recipient, true)
@@ -350,7 +350,7 @@ object MockDataGenerator {
                             .joinToString()
                     recipientDb.setProfileName(recipient, contact.name)
                     contactDb.setContact(contact)
-                    members.add(randomSessionId)
+                    members.add(randomAccountId)
                 }
 
                 // Create the open group model and the thread
@@ -377,7 +377,7 @@ object MockDataGenerator {
                     val messageWords: Int = (1 + ogThreadRandomGenerator.nextInt(19))
                     val senderId: String = members.random(ogThreadRandomGenerator.asKotlinRandom())
 
-                    if (senderId != userSessionId) {
+                    if (senderId != userAccountId) {
                         smsDb.insertMessageInbox(
                             IncomingTextMessage(
                                 Address.fromSerialized(senderId),

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

@@ -33,7 +33,7 @@
                 android:layout_height="64dp"
                 android:layout_marginHorizontal="@dimen/large_spacing"
                 android:layout_marginTop="@dimen/large_spacing"
-                android:contentDescription="@string/AccessibilityId_session_id_input"
+                android:contentDescription="@string/AccessibilityId_account_id_input"
                 android:gravity="center_vertical"
                 android:hint="@string/fragment_enter_public_key_edit_text_hint"
                 android:imeOptions="actionDone"

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

@@ -110,12 +110,12 @@
     </RelativeLayout>
 
     <TextView
-        style="@style/SessionIDTextView"
+        style="@style/AccountIdTextView"
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/medium_spacing"
-        android:contentDescription="@string/AccessibilityId_session_id"
+        android:contentDescription="@string/AccessibilityId_account_id"
         android:textSize="@dimen/medium_font_size"
         android:textIsSelectable="true"
         tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />

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

@@ -27,7 +27,7 @@
             android:gravity="center"
             android:textColor="?android:textColorTertiary"
             android:textSize="@dimen/small_font_size"
-            android:text="@string/your_session_id" />
+            android:text="@string/your_account_id" />
     </FrameLayout>
 
 </FrameLayout>

app/src/main/res/values-ar-rSA/strings.xml

@@ -574,9 +574,9 @@
     <string name="copied_to_clipboard">تم النسخ الى الحافظة المؤقتة</string>
     <string name="next">التالي</string>
     <string name="share">شارك</string>
-    <string name="invalid_session_id">عنوان تعريف خاطئ</string>
+    <string name="invalid_account_id">عنوان تعريف خاطئ</string>
     <string name="cancel">إلغاء</string>
-    <string name="your_session_id">عنوان تعريفك</string>
+    <string name="your_account_id">عنوان تعريفك</string>
     <string name="view_fake_chat_bubble_1">ما هي الجلسة (Session)؟</string>
     <string name="view_fake_chat_bubble_2">هو تطبيق مراسلة مشفر, لامركزي</string>
     <string name="view_fake_chat_bubble_3">اِذن لا يقوم بجمع المعلومات الشخصية أو المعلومات الوصفية لمحادثاتي؟ كيف يعمل؟</string>
@@ -612,7 +612,7 @@
     <string name="activity_path_learn_more_button_title">لمعرفة المزيد</string>
     <string name="activity_path_resolving_progress">جار ربط الاِتصال…</string>
     <string name="activity_create_private_chat_title">جلسة جديدة</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">أدخِل معرّف الجلسة</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">أدخِل معرّف الجلسة</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">مسح رمز الاستجابة السريع\"QR\"</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">امسح رمز QR المستخدم لبدء جلسة معه. يمكن الحصول على رموز الـQR بالضغط على أيقونة رمز الـQR في إعدادات الحساب.</string>
     <string name="fragment_enter_public_key_edit_text_hint">أدخل عنوان التعريف أو اسم ONS</string>

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

@@ -574,9 +574,9 @@
     <string name="copied_to_clipboard">تم النسخ الى الحافظة المؤقتة</string>
     <string name="next">التالي</string>
     <string name="share">شارك</string>
-    <string name="invalid_session_id">عنوان تعريف خاطئ</string>
+    <string name="invalid_account_id">عنوان تعريف خاطئ</string>
     <string name="cancel">إلغاء</string>
-    <string name="your_session_id">عنوان تعريفك</string>
+    <string name="your_account_id">عنوان تعريفك</string>
     <string name="view_fake_chat_bubble_1">ما هي الجلسة (Session)؟</string>
     <string name="view_fake_chat_bubble_2">هو تطبيق مراسلة مشفر, لامركزي</string>
     <string name="view_fake_chat_bubble_3">اِذن لا يقوم بجمع المعلومات الشخصية أو المعلومات الوصفية لمحادثاتي؟ كيف يعمل؟</string>
@@ -612,7 +612,7 @@
     <string name="activity_path_learn_more_button_title">لمعرفة المزيد</string>
     <string name="activity_path_resolving_progress">جار ربط الاِتصال…</string>
     <string name="activity_create_private_chat_title">جلسة جديدة</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">أدخِل معرّف الجلسة</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">أدخِل معرّف الجلسة</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">مسح رمز الاستجابة السريع\"QR\"</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">امسح رمز QR المستخدم لبدء جلسة معه. يمكن الحصول على رموز الـQR بالضغط على أيقونة رمز الـQR في إعدادات الحساب.</string>
     <string name="fragment_enter_public_key_edit_text_hint">أدخل عنوان التعريف أو اسم ONS</string>

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

@@ -528,9 +528,9 @@
     <string name="copied_to_clipboard">Lövhəyə kopyalandı</string>
     <string name="next">Növbəti</string>
     <string name="share">Paylaş</string>
-    <string name="invalid_session_id">Etibarsız Session Kimliyi</string>
+    <string name="invalid_account_id">Etibarsız Session Kimliyi</string>
     <string name="cancel">İmtina</string>
-    <string name="your_session_id">Session Kimliyiniz</string>
+    <string name="your_account_id">Session Kimliyiniz</string>
     <string name="view_fake_chat_bubble_1">Session nədir?</string>
     <string name="view_fake_chat_bubble_2">Mərkəzi olmayan, şifrəli bir mesajlaşma tətbiqidir</string>
     <string name="view_fake_chat_bubble_3">Yəni, şəxsi məlumatlarımı və ya danışıq meta verilənlərimi yığmır? Necə işləyir?</string>
@@ -566,7 +566,7 @@
     <string name="activity_path_learn_more_button_title">Daha Ətraflı</string>
     <string name="activity_path_resolving_progress">Həll edilir…</string>
     <string name="activity_create_private_chat_title">Yeni Seans</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Session kimliyini daxil edin</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Session kimliyini daxil edin</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR kodu skan edin</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Bir seans başlatmaq üçün istifadəçinin QR kodunu skan edin. QR kodları, hesab tənzimləmələrindəki QR kodu nişanına toxunaraq tapıla bilər.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Session kimliyini və ya ONS adını daxil edin</string>

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

@@ -528,9 +528,9 @@
     <string name="copied_to_clipboard">Lövhəyə kopyalandı</string>
     <string name="next">Növbəti</string>
     <string name="share">Paylaş</string>
-    <string name="invalid_session_id">Etibarsız Session Kimliyi</string>
+    <string name="invalid_account_id">Etibarsız Session Kimliyi</string>
     <string name="cancel">İmtina</string>
-    <string name="your_session_id">Session Kimliyiniz</string>
+    <string name="your_account_id">Session Kimliyiniz</string>
     <string name="view_fake_chat_bubble_1">Session nədir?</string>
     <string name="view_fake_chat_bubble_2">Mərkəzi olmayan, şifrəli bir mesajlaşma tətbiqidir</string>
     <string name="view_fake_chat_bubble_3">Yəni, şəxsi məlumatlarımı və ya danışıq meta verilənlərimi yığmır? Necə işləyir?</string>
@@ -564,7 +564,7 @@
     <string name="activity_path_learn_more_button_title">Daha Ətraflı</string>
     <string name="activity_path_resolving_progress">Həll edilir…</string>
     <string name="activity_create_private_chat_title">Yeni Seans</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Session kimliyini daxil edin</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Session kimliyini daxil edin</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR kodu skan edin</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Bir seans başlatmaq üçün istifadəçinin QR kodunu skan edin. QR kodları, hesab tənzimləmələrindəki QR kodu nişanına toxunaraq tapıla bilər.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Session kimliyini və ya ONS adını daxil edin</string>

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

@@ -426,9 +426,9 @@ memproses pertukaran kunci korupsi.</string>
     <string name="copied_to_clipboard">Salin ke clipboard</string>
     <string name="next">Selanjutnya</string>
     <string name="share">Bagikan</string>
-    <string name="invalid_session_id">Session salah</string>
+    <string name="invalid_account_id">Session salah</string>
     <string name="cancel">Batal</string>
-    <string name="your_session_id">Session ID anda</string>
+    <string name="your_account_id">Account ID anda</string>
     <string name="view_fake_chat_bubble_1">Apa itu Session?</string>
     <string name="view_fake_chat_bubble_2">Session adalah aplikasi pesan terenkripsi yang terdesentralisasi</string>
     <string name="view_fake_chat_bubble_3">Bagaimana dengan pengumpulan informasi personal atau metadata percakapan? Bagaimana cara kerjanya?</string>
@@ -453,7 +453,7 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_home_delete_conversation_dialog_message">Apakah anda yakin ingin menghapus percakapan ini?</string>
     <string name="activity_home_conversation_deleted_message">Percakapan terhapus</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_2">Ketuk dan tekan kata yang disensor untuk mengetahui kata pemulihan anda, lalu simpan baik-baik untuk mengamnkan Account ID anda</string>
     <string name="view_seed_reminder_subtitle_3">Pastikan untuk menyimpan kata pemulihan di tempat yang aman</string>
     <string name="activity_path_explanation">Session menyembunyikan IP dengan memantulkan pesan melalui berbagai simpul layanan di jaringan Session yang terdesentralisasi. Ini adalah negara yang menjadi lokasi pesan anda dipantulkan</string>
     <string name="activity_path_device_row_title">Anda</string>
@@ -462,10 +462,10 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_path_destination_row_title">Tujuan</string>
     <string name="activity_path_learn_more_button_title">Pelajari lebih lanjut</string>
     <string name="activity_create_private_chat_title">Session baru</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Masukkan Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Masukkan Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Pindai kode QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Pindai kode QR pengguna lain untuk memulai Session. Kode QR bisa ditemukan dengan mengetukan gambar kode QR di pengaturan akun</string>
-    <string name="fragment_enter_public_key_explanation">Pengguna bisa membagikan Session ID miliknya dengan masuk ke pengaturan akun dan mengetuk \"Bagikan Session ID\" atau dengan membagikan kode QR mereka</string>
+    <string name="fragment_enter_public_key_explanation">Pengguna bisa membagikan Account ID miliknya dengan masuk ke pengaturan akun dan mengetuk \"Bagikan Account ID\" atau dengan membagikan kode QR mereka</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session membutuhkan akses kamera untuk memindai kode QR</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Berikan akses kamera</string>
     <string name="activity_create_closed_group_title">Grup tertutup baru</string>

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

@@ -426,9 +426,9 @@ memproses pertukaran kunci korupsi.</string>
     <string name="copied_to_clipboard">Salin ke clipboard</string>
     <string name="next">Selanjutnya</string>
     <string name="share">Bagikan</string>
-    <string name="invalid_session_id">Session salah</string>
+    <string name="invalid_account_id">Session salah</string>
     <string name="cancel">Batal</string>
-    <string name="your_session_id">Session ID anda</string>
+    <string name="your_account_id">Account ID anda</string>
     <string name="view_fake_chat_bubble_1">Apa itu Session?</string>
     <string name="view_fake_chat_bubble_2">Session adalah aplikasi pesan terenkripsi yang terdesentralisasi</string>
     <string name="view_fake_chat_bubble_3">Bagaimana dengan pengumpulan informasi personal atau metadata percakapan? Bagaimana cara kerjanya?</string>
@@ -453,7 +453,7 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_home_delete_conversation_dialog_message">Apakah anda yakin ingin menghapus percakapan ini?</string>
     <string name="activity_home_conversation_deleted_message">Percakapan terhapus</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_2">Ketuk dan tekan kata yang disensor untuk mengetahui kata pemulihan anda, lalu simpan baik-baik untuk mengamnkan Account ID anda</string>
     <string name="view_seed_reminder_subtitle_3">Pastikan untuk menyimpan kata pemulihan di tempat yang aman</string>
     <string name="activity_path_explanation">Session menyembunyikan IP dengan memantulkan pesan melalui berbagai simpul layanan di jaringan Session yang terdesentralisasi. Ini adalah negara yang menjadi lokasi pesan anda dipantulkan</string>
     <string name="activity_path_device_row_title">Anda</string>
@@ -462,10 +462,10 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_path_destination_row_title">Tujuan</string>
     <string name="activity_path_learn_more_button_title">Pelajari lebih lanjut</string>
     <string name="activity_create_private_chat_title">Session baru</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Masukkan Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Masukkan Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Pindai kode QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Pindai kode QR pengguna lain untuk memulai Session. Kode QR bisa ditemukan dengan mengetukan gambar kode QR di pengaturan akun</string>
-    <string name="fragment_enter_public_key_explanation">Pengguna bisa membagikan Session ID miliknya dengan masuk ke pengaturan akun dan mengetuk \"Bagikan Session ID\" atau dengan membagikan kode QR mereka</string>
+    <string name="fragment_enter_public_key_explanation">Pengguna bisa membagikan Account ID miliknya dengan masuk ke pengaturan akun dan mengetuk \"Bagikan Account ID\" atau dengan membagikan kode QR mereka</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session membutuhkan akses kamera untuk memindai kode QR</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Berikan akses kamera</string>
     <string name="activity_create_closed_group_title">Grup tertutup baru</string>

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

@@ -520,9 +520,9 @@ d\'intercanvi de claus!</string>
     <string name="copied_to_clipboard">Copiat al porta-retalls</string>
     <string name="next">Següent</string>
     <string name="share">Comparteix</string>
-    <string name="invalid_session_id">ID de Session invàlid</string>
+    <string name="invalid_account_id">ID de Session invàlid</string>
     <string name="cancel">Cancel·la</string>
-    <string name="your_session_id">El teu ID de Session</string>
+    <string name="your_account_id">El teu ID de Session</string>
     <string name="view_fake_chat_bubble_1">Què és Session?</string>
     <string name="view_fake_chat_bubble_2">És una app xifrada i descentralitzada</string>
     <string name="view_fake_chat_bubble_3">Per tant, no agafa les meves dades personals o les metadades de les meves converses? Com funciona?</string>
@@ -557,7 +557,7 @@ d\'intercanvi de claus!</string>
     <string name="activity_path_destination_row_title">Destinació</string>
     <string name="activity_path_learn_more_button_title">Aprèn-ne més</string>
     <string name="activity_create_private_chat_title">Nova sessió</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Introdueix el teu ID de Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Introdueix el teu ID de Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escaneja el codi QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Escaneja el codi QR d’un usuari per a iniciar una sessió. Es poden trobar codis QR tocant la icona de codi QR a la configuració del compte.</string>
     <string name="fragment_enter_public_key_explanation">Els usuaris poden compartir el seu ID de Session accedint a la configuració del compte i tocant \'Comparteix l\'ID de Session\' o compartint el seu codi QR.</string>

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

@@ -520,9 +520,9 @@ d\'intercanvi de claus!</string>
     <string name="copied_to_clipboard">Copiat al porta-retalls</string>
     <string name="next">Següent</string>
     <string name="share">Comparteix</string>
-    <string name="invalid_session_id">ID de Session invàlid</string>
+    <string name="invalid_account_id">ID de Session invàlid</string>
     <string name="cancel">Cancel·la</string>
-    <string name="your_session_id">El teu ID de Session</string>
+    <string name="your_account_id">El teu ID de Session</string>
     <string name="view_fake_chat_bubble_1">Què és Session?</string>
     <string name="view_fake_chat_bubble_2">És una app xifrada i descentralitzada</string>
     <string name="view_fake_chat_bubble_3">Per tant, no agafa les meves dades personals o les metadades de les meves converses? Com funciona?</string>
@@ -557,7 +557,7 @@ d\'intercanvi de claus!</string>
     <string name="activity_path_destination_row_title">Destinació</string>
     <string name="activity_path_learn_more_button_title">Aprèn-ne més</string>
     <string name="activity_create_private_chat_title">Nova sessió</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Introdueix el teu ID de Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Introdueix el teu ID de Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escaneja el codi QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Escaneja el codi QR d’un usuari per a iniciar una sessió. Es poden trobar codis QR tocant la icona de codi QR a la configuració del compte.</string>
     <string name="fragment_enter_public_key_explanation">Els usuaris poden compartir el seu ID de Session accedint a la configuració del compte i tocant \'Comparteix l\'ID de Session\' o compartint el seu codi QR.</string>

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

@@ -550,9 +550,9 @@
     <string name="copied_to_clipboard">Zkopírováno do schránky</string>
     <string name="next">Další</string>
     <string name="share">Sdílet</string>
-    <string name="invalid_session_id">Neplatné Session ID</string>
+    <string name="invalid_account_id">Neplatné Account ID</string>
     <string name="cancel">Zrušit</string>
-    <string name="your_session_id">ID vaší relace</string>
+    <string name="your_account_id">ID vaší relace</string>
     <string name="view_fake_chat_bubble_1">Co je Session?</string>
     <string name="view_fake_chat_bubble_2">Je to decentralizovaná a šifrovaná aplikace pro zasílání zpráv</string>
     <string name="view_fake_chat_bubble_3">Takže neshromažďuje mé osobní údaje ani metadata mých konverzací? Jak to funguje?</string>
@@ -577,7 +577,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Opravdu chcete smazat tuto konverzaci?</string>
     <string name="activity_home_conversation_deleted_message">Konverzace byla smazána</string>
     <string name="view_seed_reminder_subtitle_1">Zabezpečte svůj účet uložením Vašich klíčových slov</string>
-    <string name="view_seed_reminder_subtitle_2">Pro zobrazení fráze pro obnovení klepněte a podržte redigovaná slova a poté ji bezpečně uložte, abyste si ochránili své Session ID.</string>
+    <string name="view_seed_reminder_subtitle_2">Pro zobrazení fráze pro obnovení klepněte a podržte redigovaná slova a poté ji bezpečně uložte, abyste si ochránili své Account ID.</string>
     <string name="view_seed_reminder_subtitle_3">Uchovejte svou frázi pro obnovení na bezpečném místě</string>
     <string name="activity_path_title">Cesta</string>
     <string name="activity_path_explanation">Session skrývá IP adresu tak, že přesouvá zprávy mezi několika provozními uzly ve své vlastní decentralizované síti. Spojení probíhá v tuto chvíli mezi následujícími státy:</string>
@@ -588,12 +588,12 @@
     <string name="activity_path_learn_more_button_title">Další informace</string>
     <string name="activity_path_resolving_progress">Připojování…</string>
     <string name="activity_create_private_chat_title">Nová relace</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Zadejte Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Zadejte Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Naskenovat QR kód</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Pro zahájení relace naskenujte QR kód uživatele. QR kódy lze nalézt po klepnutí na QR kód v nastavení účtu.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Zadejte Session ID nebo název ONS</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Zadejte Account ID nebo název ONS</string>
-    <string name="fragment_enter_public_key_explanation">Uživatelé mohou sdílet Session ID po klepnutí na \"Sdílet Session ID\" v nastavení účtu nebo sdílením svého QR kódu.</string>
+    <string name="fragment_enter_public_key_explanation">Uživatelé mohou sdílet Account ID po klepnutí na \"Sdílet Account ID\" v nastavení účtu nebo sdílením svého QR kódu.</string>
-    <string name="fragment_enter_public_key_error_message">Zkontrolujte prosím své Session ID nebo název ONS a zkuste to znovu.</string>
+    <string name="fragment_enter_public_key_error_message">Zkontrolujte prosím své Account ID nebo název ONS a zkuste to znovu.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session potřebuje přístup ke kameře, aby bylo možné skenovat QR kódy</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Udělit přístup k fotoaparátu</string>
     <string name="activity_create_closed_group_title">Nová uzavřená skupina</string>
@@ -665,7 +665,7 @@
     <string name="dialog_ui_mode_option_day">Den</string>
     <string name="dialog_ui_mode_option_night">Noc</string>
     <string name="dialog_ui_mode_option_system_default">Výchozí nastavení</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopírovat Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopírovat Account ID</string>
     <string name="attachment">Příloha</string>
     <string name="attachment_type_voice_message">Hlasová zpráva</string>
     <string name="details">Detaily</string>

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

@@ -550,9 +550,9 @@
     <string name="copied_to_clipboard">Zkopírováno do schránky</string>
     <string name="next">Další</string>
     <string name="share">Sdílet</string>
-    <string name="invalid_session_id">Neplatné Session ID</string>
+    <string name="invalid_account_id">Neplatné Account ID</string>
     <string name="cancel">Zrušit</string>
-    <string name="your_session_id">ID vaší relace</string>
+    <string name="your_account_id">ID vaší relace</string>
     <string name="view_fake_chat_bubble_1">Co je Session?</string>
     <string name="view_fake_chat_bubble_2">Je to decentralizovaná a šifrovaná aplikace pro zasílání zpráv</string>
     <string name="view_fake_chat_bubble_3">Takže neshromažďuje mé osobní údaje ani metadata mých konverzací? Jak to funguje?</string>
@@ -577,7 +577,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Opravdu chcete smazat tuto konverzaci?</string>
     <string name="activity_home_conversation_deleted_message">Konverzace byla smazána</string>
     <string name="view_seed_reminder_subtitle_1">Zabezpečte svůj účet uložením Vašich klíčových slov</string>
-    <string name="view_seed_reminder_subtitle_2">Pro zobrazení fráze pro obnovení klepněte a podržte redigovaná slova a poté ji bezpečně uložte, abyste si ochránili své Session ID.</string>
+    <string name="view_seed_reminder_subtitle_2">Pro zobrazení fráze pro obnovení klepněte a podržte redigovaná slova a poté ji bezpečně uložte, abyste si ochránili své Account ID.</string>
     <string name="view_seed_reminder_subtitle_3">Uchovejte svou frázi pro obnovení na bezpečném místě</string>
     <string name="activity_path_title">Cesta</string>
     <string name="activity_path_explanation">Session skrývá IP adresu tak, že přesouvá zprávy mezi několika provozními uzly ve své vlastní decentralizované síti. Spojení probíhá v tuto chvíli mezi následujícími státy:</string>
@@ -588,12 +588,12 @@
     <string name="activity_path_learn_more_button_title">Další informace</string>
     <string name="activity_path_resolving_progress">Připojování…</string>
     <string name="activity_create_private_chat_title">Nová relace</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Zadejte Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Zadejte Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Naskenovat QR kód</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Pro zahájení relace naskenujte QR kód uživatele. QR kódy lze nalézt po klepnutí na QR kód v nastavení účtu.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Zadejte Session ID nebo název ONS</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Zadejte Account ID nebo název ONS</string>
-    <string name="fragment_enter_public_key_explanation">Uživatelé mohou sdílet Session ID po klepnutí na \"Sdílet Session ID\" v nastavení účtu nebo sdílením svého QR kódu.</string>
+    <string name="fragment_enter_public_key_explanation">Uživatelé mohou sdílet Account ID po klepnutí na \"Sdílet Account ID\" v nastavení účtu nebo sdílením svého QR kódu.</string>
-    <string name="fragment_enter_public_key_error_message">Zkontrolujte prosím své Session ID nebo název ONS a zkuste to znovu.</string>
+    <string name="fragment_enter_public_key_error_message">Zkontrolujte prosím své Account ID nebo název ONS a zkuste to znovu.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session potřebuje přístup ke kameře, aby bylo možné skenovat QR kódy</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Udělit přístup k fotoaparátu</string>
     <string name="activity_create_closed_group_title">Nová uzavřená skupina</string>
@@ -665,7 +665,7 @@
     <string name="dialog_ui_mode_option_day">Den</string>
     <string name="dialog_ui_mode_option_night">Noc</string>
     <string name="dialog_ui_mode_option_system_default">Výchozí nastavení</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopírovat Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopírovat Account ID</string>
     <string name="attachment">Příloha</string>
     <string name="attachment_type_voice_message">Hlasová zpráva</string>
     <string name="details">Detaily</string>

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

@@ -526,9 +526,9 @@ udveksel besked!</string>
     <string name="copied_to_clipboard">Kopieret til udklipsholder</string>
     <string name="next">Næste</string>
     <string name="share">Del</string>
-    <string name="invalid_session_id">Ugyldigt Session ID</string>
+    <string name="invalid_account_id">Ugyldigt Account ID</string>
     <string name="cancel">Annuller</string>
-    <string name="your_session_id">Dit Sessions-ID</string>
+    <string name="your_account_id">Dit Sessions-ID</string>
     <string name="view_fake_chat_bubble_1">Hvad er Session?</string>
     <string name="view_fake_chat_bubble_2">Det er en decentraliseret, krypteret besked app</string>
     <string name="view_fake_chat_bubble_3">Så den indsamler ikke mine personlige oplysninger eller min samtale metadata? Hvordan virker det?</string>
@@ -552,16 +552,16 @@ udveksel besked!</string>
     <string name="activity_home_delete_conversation_dialog_message">Er du sikker på, at du vil slette denne samtale?</string>
     <string name="activity_home_conversation_deleted_message">Samtale slettet</string>
     <string name="view_seed_reminder_subtitle_1">Sikre din konto ved at gemme din gendannelsessætning</string>
-    <string name="view_seed_reminder_subtitle_2">Tryk og hold de redigerede ord for at afsløre din gendannelsessætning, og gem det derefter et sikkert sted for at sikre dit Session ID.</string>
+    <string name="view_seed_reminder_subtitle_2">Tryk og hold de redigerede ord for at afsløre din gendannelsessætning, og gem det derefter et sikkert sted for at sikre dit Account ID.</string>
     <string name="view_seed_reminder_subtitle_3">Sørg for at gemme din gendannelsessætning et sikkert sted</string>
     <string name="activity_path_title">Sti</string>
     <string name="activity_path_device_row_title">Dig</string>
     <string name="activity_path_destination_row_title">Destination</string>
     <string name="activity_path_learn_more_button_title">Læs mere</string>
     <string name="activity_create_private_chat_title">Ny Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Indtast Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Indtast Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skan QR-kode</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Indtast Session ID eller ONS navn</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Indtast Account ID eller ONS navn</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session skal bruge kameraadgang for at scanne QR-koder</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Tildel Adgang Til Kamera</string>
     <string name="activity_create_closed_group_edit_text_hint">Indtast et gruppenavn</string>
@@ -622,7 +622,7 @@ udveksel besked!</string>
     <string name="dialog_ui_mode_option_day">Dag</string>
     <string name="dialog_ui_mode_option_night">Nat</string>
     <string name="dialog_ui_mode_option_system_default">Systemstandard</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopier Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopier Account ID</string>
     <string name="attachment_type_voice_message">Talebesked</string>
     <string name="details">Detaljer</string>
     <string name="dialog_backup_activation_failed">Kunne ikke aktivere sikkerhedskopier. Prøv igen, eller kontakt support.</string>

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

@@ -526,9 +526,9 @@ udveksel besked!</string>
     <string name="copied_to_clipboard">Kopieret til udklipsholder</string>
     <string name="next">Næste</string>
     <string name="share">Del</string>
-    <string name="invalid_session_id">Ugyldigt Session ID</string>
+    <string name="invalid_account_id">Ugyldigt Account ID</string>
     <string name="cancel">Annuller</string>
-    <string name="your_session_id">Dit Sessions-ID</string>
+    <string name="your_account_id">Dit Sessions-ID</string>
     <string name="view_fake_chat_bubble_1">Hvad er Session?</string>
     <string name="view_fake_chat_bubble_2">Det er en decentraliseret, krypteret besked app</string>
     <string name="view_fake_chat_bubble_3">Så den indsamler ikke mine personlige oplysninger eller min samtale metadata? Hvordan virker det?</string>
@@ -552,16 +552,16 @@ udveksel besked!</string>
     <string name="activity_home_delete_conversation_dialog_message">Er du sikker på, at du vil slette denne samtale?</string>
     <string name="activity_home_conversation_deleted_message">Samtale slettet</string>
     <string name="view_seed_reminder_subtitle_1">Sikre din konto ved at gemme din gendannelsessætning</string>
-    <string name="view_seed_reminder_subtitle_2">Tryk og hold de redigerede ord for at afsløre din gendannelsessætning, og gem det derefter et sikkert sted for at sikre dit Session ID.</string>
+    <string name="view_seed_reminder_subtitle_2">Tryk og hold de redigerede ord for at afsløre din gendannelsessætning, og gem det derefter et sikkert sted for at sikre dit Account ID.</string>
     <string name="view_seed_reminder_subtitle_3">Sørg for at gemme din gendannelsessætning et sikkert sted</string>
     <string name="activity_path_title">Sti</string>
     <string name="activity_path_device_row_title">Dig</string>
     <string name="activity_path_destination_row_title">Destination</string>
     <string name="activity_path_learn_more_button_title">Læs mere</string>
     <string name="activity_create_private_chat_title">Ny Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Indtast Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Indtast Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skan QR-kode</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Indtast Session ID eller ONS navn</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Indtast Account ID eller ONS navn</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session skal bruge kameraadgang for at scanne QR-koder</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Tildel Adgang Til Kamera</string>
     <string name="activity_create_closed_group_edit_text_hint">Indtast et gruppenavn</string>
@@ -622,7 +622,7 @@ udveksel besked!</string>
     <string name="dialog_ui_mode_option_day">Dag</string>
     <string name="dialog_ui_mode_option_night">Nat</string>
     <string name="dialog_ui_mode_option_system_default">Systemstandard</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopier Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopier Account ID</string>
     <string name="attachment_type_voice_message">Talebesked</string>
     <string name="details">Detaljer</string>
     <string name="dialog_backup_activation_failed">Kunne ikke aktivere sikkerhedskopier. Prøv igen, eller kontakt support.</string>

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

@@ -526,9 +526,9 @@
     <string name="copied_to_clipboard">In die Zwischenablage kopiert.</string>
     <string name="next">Weiter</string>
     <string name="share">Teilen</string>
-    <string name="invalid_session_id">Ungültige Session ID</string>
+    <string name="invalid_account_id">Ungültige Account ID</string>
     <string name="cancel">Abbrechen</string>
-    <string name="your_session_id">Ihre Session ID</string>
+    <string name="your_account_id">Ihre Account ID</string>
     <string name="view_fake_chat_bubble_1">Was ist Session?</string>
     <string name="view_fake_chat_bubble_2">Es ist eine dezentrale, verschlüsselte Messaging-App.</string>
     <string name="view_fake_chat_bubble_3">Es werden also weder meine persönlichen Daten noch die Metadaten meiner Konversation erfasst? Wie funktioniert das?</string>
@@ -553,7 +553,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Möchten Sie diese Unterhaltung wirklich löschen?</string>
     <string name="activity_home_conversation_deleted_message">Die Unterhaltung wurde gelöscht.</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_2">Tippen und halten Sie die verborgenen Wörter, um Ihren Wiederherstellungssatz anzuzeigen, und speichern Sie ihn dann sicher, um Ihre Account ID zu sichern.</string>
     <string name="view_seed_reminder_subtitle_3">Bewahren Sie Ihren Wiederherstellungssatz an einem sicheren Ort auf.</string>
     <string name="activity_path_title">Pfad</string>
     <string name="activity_path_explanation">Session verbirgt Ihre IP-Adresse, indem Ihre Nachrichten über mehrere Dienstknoten im dezentralen Session-Netzwerk weitergeleitet werden. Dies sind die Länder, durch die Ihre Verbindung derzeit weitergeleitet wird:</string>
@@ -564,11 +564,11 @@
     <string name="activity_path_learn_more_button_title">Mehr erfahren</string>
     <string name="activity_path_resolving_progress">Auflösung…</string>
     <string name="activity_create_private_chat_title">Neue Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Session ID eingeben</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Account ID eingeben</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR-Code scannen</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scannen Sie den QR-Code eines Benutzers, um eine Session zu starten. QR-Codes finden Sie, indem Sie in den Einstellungen auf das QR-Code-Symbol tippen.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Sitzungs-ID oder ONS-Name eingeben</string>
-    <string name="fragment_enter_public_key_explanation">Benutzer können ihre Session ID freigeben, indem sie in ihren Einstellungen auf \"Session ID freigeben\" tippen oder ihren QR-Code freigeben.</string>
+    <string name="fragment_enter_public_key_explanation">Benutzer können ihre Account ID freigeben, indem sie in ihren Einstellungen auf \"Account ID freigeben\" tippen oder ihren QR-Code freigeben.</string>
     <string name="fragment_enter_public_key_error_message">Bitte überprüfe die Session-ID oder den ONS-Namen und versuche es erneut.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session benötigt Kamerazugriff, um die QR-Codes scannen zu können.</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Kamerazugriff gewähren</string>

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

@@ -526,9 +526,9 @@
     <string name="copied_to_clipboard">In die Zwischenablage kopiert.</string>
     <string name="next">Weiter</string>
     <string name="share">Teilen</string>
-    <string name="invalid_session_id">Ungültige Session ID</string>
+    <string name="invalid_account_id">Ungültige Account ID</string>
     <string name="cancel">Abbrechen</string>
-    <string name="your_session_id">Ihre Session ID</string>
+    <string name="your_account_id">Ihre Account ID</string>
     <string name="view_fake_chat_bubble_1">Was ist Session?</string>
     <string name="view_fake_chat_bubble_2">Es ist eine dezentrale, verschlüsselte Messaging-App.</string>
     <string name="view_fake_chat_bubble_3">Es werden also weder meine persönlichen Daten noch die Metadaten meiner Konversation erfasst? Wie funktioniert das?</string>
@@ -553,7 +553,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Möchten Sie diese Unterhaltung wirklich löschen?</string>
     <string name="activity_home_conversation_deleted_message">Die Unterhaltung wurde gelöscht.</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_2">Tippen und halten Sie die verborgenen Wörter, um Ihren Wiederherstellungssatz anzuzeigen, und speichern Sie ihn dann sicher, um Ihre Account ID zu sichern.</string>
     <string name="view_seed_reminder_subtitle_3">Bewahren Sie Ihren Wiederherstellungssatz an einem sicheren Ort auf.</string>
     <string name="activity_path_title">Pfad</string>
     <string name="activity_path_explanation">Session verbirgt Ihre IP-Adresse, indem Ihre Nachrichten über mehrere Dienstknoten im dezentralen Session-Netzwerk weitergeleitet werden. Dies sind die Länder, durch die Ihre Verbindung derzeit weitergeleitet wird:</string>
@@ -564,11 +564,11 @@
     <string name="activity_path_learn_more_button_title">Mehr erfahren</string>
     <string name="activity_path_resolving_progress">Auflösung…</string>
     <string name="activity_create_private_chat_title">Neue Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Session ID eingeben</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Account ID eingeben</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR-Code scannen</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scannen Sie den QR-Code eines Benutzers, um eine Session zu starten. QR-Codes finden Sie, indem Sie in den Einstellungen auf das QR-Code-Symbol tippen.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Sitzungs-ID oder ONS-Name eingeben</string>
-    <string name="fragment_enter_public_key_explanation">Benutzer können ihre Session ID freigeben, indem sie in ihren Einstellungen auf \"Session ID freigeben\" tippen oder ihren QR-Code freigeben.</string>
+    <string name="fragment_enter_public_key_explanation">Benutzer können ihre Account ID freigeben, indem sie in ihren Einstellungen auf \"Account ID freigeben\" tippen oder ihren QR-Code freigeben.</string>
     <string name="fragment_enter_public_key_error_message">Bitte überprüfe die Session-ID oder den ONS-Namen und versuche es erneut.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session benötigt Kamerazugriff, um die QR-Codes scannen zu können.</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Kamerazugriff gewähren</string>

app/src/main/res/values-el-rGR/strings.xml

@@ -528,9 +528,9 @@
     <string name="copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
     <string name="next">Επόμενο</string>
     <string name="share">Διαμοιρασμός</string>
-    <string name="invalid_session_id">Μη έγκυρη Session ταυτότητα</string>
+    <string name="invalid_account_id">Μη έγκυρη Session ταυτότητα</string>
     <string name="cancel">Ακύρωση</string>
-    <string name="your_session_id">Η ταυτότητά σας</string>
+    <string name="your_account_id">Η ταυτότητά σας</string>
     <string name="view_fake_chat_bubble_1">Τι είναι το Session;</string>
     <string name="view_fake_chat_bubble_2">Είναι μια αποκεντρωμένη, κρυπτογραφημένη εφαρμογή μηνυμάτων</string>
     <string name="view_fake_chat_bubble_3">Δηλαδή δεν συλλέγει τα προσωπικά μου στοιχεία ή τα μεταδεδομένα των συνομιλιών μου; Πώς λειτουργεί;</string>
@@ -566,12 +566,12 @@
     <string name="activity_path_learn_more_button_title">Μάθετε περισσότερα</string>
     <string name="activity_path_resolving_progress">Επίλυση…</string>
     <string name="activity_create_private_chat_title">Νέα συνομιλία</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Εισαγωγή Session Ταυτότητας</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Εισαγωγή Session Ταυτότητας</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Σαρώστε τον κωδικό QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Σαρώστε τον κωδικό QR ενός χρήστη για να ξεκινήσετε μια συνομιλία. Οι κωδικοί QR μπορούν να βρεθούν πατώντας το εικονίδιο QR κώδικα στις ρυθμίσεις λογαριασμού.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Εισάγετε το Session ID ή το ONS όνομα</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Εισάγετε το Account ID ή το ONS όνομα</string>
     <string name="fragment_enter_public_key_explanation">Οι χρήστες μπορούν να μοιραστούν τη ταυτότητα τους πηγαίνοντας στις ρυθμίσεις του λογαριασμού τους και πατώντας το \"Διαμοιρασμό Session ταυτότητας\" ή κοινοποιώντας τον κωδικό QR.</string>
-    <string name="fragment_enter_public_key_error_message">Παρακαλώ ελέγξτε το Session ID ή το ONS όνομα και προσπαθήστε ξανά.</string>
+    <string name="fragment_enter_public_key_error_message">Παρακαλώ ελέγξτε το Account ID ή το ONS όνομα και προσπαθήστε ξανά.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Το Session χρειάζεται πρόσβαση στην κάμερα για σάρωση κωδικών QR</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Χορήγηση Πρόσβασης Κάμερας</string>
     <string name="activity_create_closed_group_title">Νέα Κλειστή Ομάδα</string>

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

@@ -528,9 +528,9 @@
     <string name="copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
     <string name="next">Επόμενο</string>
     <string name="share">Διαμοιρασμός</string>
-    <string name="invalid_session_id">Μη έγκυρη Session ταυτότητα</string>
+    <string name="invalid_account_id">Μη έγκυρη Session ταυτότητα</string>
     <string name="cancel">Ακύρωση</string>
-    <string name="your_session_id">Η ταυτότητά σας</string>
+    <string name="your_account_id">Η ταυτότητά σας</string>
     <string name="view_fake_chat_bubble_1">Τι είναι το Session;</string>
     <string name="view_fake_chat_bubble_2">Είναι μια αποκεντρωμένη, κρυπτογραφημένη εφαρμογή μηνυμάτων</string>
     <string name="view_fake_chat_bubble_3">Δηλαδή δεν συλλέγει τα προσωπικά μου στοιχεία ή τα μεταδεδομένα των συνομιλιών μου; Πώς λειτουργεί;</string>
@@ -566,12 +566,12 @@
     <string name="activity_path_learn_more_button_title">Μάθετε περισσότερα</string>
     <string name="activity_path_resolving_progress">Επίλυση…</string>
     <string name="activity_create_private_chat_title">Νέα συνομιλία</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Εισαγωγή Session Ταυτότητας</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Εισαγωγή Session Ταυτότητας</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Σαρώστε τον κωδικό QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Σαρώστε τον κωδικό QR ενός χρήστη για να ξεκινήσετε μια συνομιλία. Οι κωδικοί QR μπορούν να βρεθούν πατώντας το εικονίδιο QR κώδικα στις ρυθμίσεις λογαριασμού.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Εισάγετε το Session ID ή το ONS όνομα</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Εισάγετε το Account ID ή το ONS όνομα</string>
     <string name="fragment_enter_public_key_explanation">Οι χρήστες μπορούν να μοιραστούν τη ταυτότητα τους πηγαίνοντας στις ρυθμίσεις του λογαριασμού τους και πατώντας το \"Διαμοιρασμό Session ταυτότητας\" ή κοινοποιώντας τον κωδικό QR.</string>
-    <string name="fragment_enter_public_key_error_message">Παρακαλώ ελέγξτε το Session ID ή το ONS όνομα και προσπαθήστε ξανά.</string>
+    <string name="fragment_enter_public_key_error_message">Παρακαλώ ελέγξτε το Account ID ή το ONS όνομα και προσπαθήστε ξανά.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Το Session χρειάζεται πρόσβαση στην κάμερα για σάρωση κωδικών QR</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Χορήγηση Πρόσβασης Κάμερας</string>
     <string name="activity_create_closed_group_title">Νέα Κλειστή Ομάδα</string>

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

@@ -527,9 +527,9 @@
     <string name="copied_to_clipboard">Kopiite al tondejo</string>
     <string name="next">Sekva</string>
     <string name="share">Kunhavigi</string>
-    <string name="invalid_session_id">Malvalida Session ID</string>
+    <string name="invalid_account_id">Malvalida Account ID</string>
     <string name="cancel">Nuligi</string>
-    <string name="your_session_id">Via Session ID</string>
+    <string name="your_account_id">Via Account ID</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>
@@ -554,7 +554,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Ĉu vi certas, ke vi volas forviŝi ĉi tiun konversacion?</string>
     <string name="activity_home_conversation_deleted_message">Konversacio forviŝite</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_2">Tuŝadu la kaŝitajn vortojn por malkaŝi vian riparan frazon, tiam konservi ĝin sekure por sekurigi vian Account ID-on.</string>
     <string name="view_seed_reminder_subtitle_3">Certigu konservi vian riparan frazon en sekura loko</string>
     <string name="activity_path_title">Vojo</string>
     <string name="activity_path_explanation">Sesio kaŝas vian IP-adreson per resaltigi viajn mesaĝojn tra multaj Servaj Nodoj en la malcentraliza reto de Sesio. Ĉi tiuj estas la landoj via konekto estas nuntempe resaltigata tra:</string>
@@ -565,10 +565,10 @@
     <string name="activity_path_learn_more_button_title">Lerni pli</string>
     <string name="activity_path_resolving_progress">Solvante…</string>
     <string name="activity_create_private_chat_title">Nova Sesio</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Entajpu Session ID-on</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Entajpu Account ID-on</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skani QR-Kodon</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Skanu QR-kodon de uzanto por komenci sesion. QR-kodoj povas esti trovitaj per tuŝeti la QR-kodan bildeton en la konta agordo.</string>
-    <string name="fragment_enter_public_key_explanation">Uzantoj povas kunhavigi sian Session ID-on per irante en sia konta agordo kaj tuŝeti \"Kunhavigi Session ID-on\", aŭ per kunhavigi sian QR-kodon.</string>
+    <string name="fragment_enter_public_key_explanation">Uzantoj povas kunhavigi sian Account ID-on per irante en sia konta agordo kaj tuŝeti \"Kunhavigi Account ID-on\", aŭ per kunhavigi sian QR-kodon.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Sesio bezonas fotilan aliron por skani QR-kodojn</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Permesi Fotilan Aliron</string>
     <string name="activity_create_closed_group_title">Nova Ferma Grupo</string>
@@ -637,7 +637,7 @@
     <string name="dialog_ui_mode_option_day">Tage</string>
     <string name="dialog_ui_mode_option_night">Nokte</string>
     <string name="dialog_ui_mode_option_system_default">Sistema defaŭlto</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopii Session ID-on</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopii Account ID-on</string>
     <string name="attachment">Kunsendaĵo</string>
     <string name="attachment_type_voice_message">Voĉmesaĝo</string>
     <string name="details">Detaloj</string>

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

@@ -527,9 +527,9 @@
     <string name="copied_to_clipboard">Kopiite al tondejo</string>
     <string name="next">Sekva</string>
     <string name="share">Kunhavigi</string>
-    <string name="invalid_session_id">Malvalida Session ID</string>
+    <string name="invalid_account_id">Malvalida Account ID</string>
     <string name="cancel">Nuligi</string>
-    <string name="your_session_id">Via Session ID</string>
+    <string name="your_account_id">Via Account ID</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>
@@ -554,7 +554,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Ĉu vi certas, ke vi volas forviŝi ĉi tiun konversacion?</string>
     <string name="activity_home_conversation_deleted_message">Konversacio forviŝite</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_2">Tuŝadu la kaŝitajn vortojn por malkaŝi vian riparan frazon, tiam konservi ĝin sekure por sekurigi vian Account ID-on.</string>
     <string name="view_seed_reminder_subtitle_3">Certigu konservi vian riparan frazon en sekura loko</string>
     <string name="activity_path_title">Vojo</string>
     <string name="activity_path_explanation">Sesio kaŝas vian IP-adreson per resaltigi viajn mesaĝojn tra multaj Servaj Nodoj en la malcentraliza reto de Sesio. Ĉi tiuj estas la landoj via konekto estas nuntempe resaltigata tra:</string>
@@ -565,10 +565,10 @@
     <string name="activity_path_learn_more_button_title">Lerni pli</string>
     <string name="activity_path_resolving_progress">Solvante…</string>
     <string name="activity_create_private_chat_title">Nova Sesio</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Entajpu Session ID-on</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Entajpu Account ID-on</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skani QR-Kodon</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Skanu QR-kodon de uzanto por komenci sesion. QR-kodoj povas esti trovitaj per tuŝeti la QR-kodan bildeton en la konta agordo.</string>
-    <string name="fragment_enter_public_key_explanation">Uzantoj povas kunhavigi sian Session ID-on per irante en sia konta agordo kaj tuŝeti \"Kunhavigi Session ID-on\", aŭ per kunhavigi sian QR-kodon.</string>
+    <string name="fragment_enter_public_key_explanation">Uzantoj povas kunhavigi sian Account ID-on per irante en sia konta agordo kaj tuŝeti \"Kunhavigi Account ID-on\", aŭ per kunhavigi sian QR-kodon.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Sesio bezonas fotilan aliron por skani QR-kodojn</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Permesi Fotilan Aliron</string>
     <string name="activity_create_closed_group_title">Nova Ferma Grupo</string>
@@ -637,7 +637,7 @@
     <string name="dialog_ui_mode_option_day">Tage</string>
     <string name="dialog_ui_mode_option_night">Nokte</string>
     <string name="dialog_ui_mode_option_system_default">Sistema defaŭlto</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopii Session ID-on</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopii Account ID-on</string>
     <string name="attachment">Kunsendaĵo</string>
     <string name="attachment_type_voice_message">Voĉmesaĝo</string>
     <string name="details">Detaloj</string>

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

@@ -527,9 +527,9 @@ de intercambio de claves!</string>
     <string name="copied_to_clipboard">Copiado en el portapapeles</string>
     <string name="next">Siguiente</string>
     <string name="share">Compartir</string>
-    <string name="invalid_session_id">ID de Session no válida</string>
+    <string name="invalid_account_id">ID de Session no válida</string>
     <string name="cancel">Cancelar</string>
-    <string name="your_session_id">Tu ID de Session</string>
+    <string name="your_account_id">Tu ID de Session</string>
     <string name="view_fake_chat_bubble_1">¿Qué es Session?</string>
     <string name="view_fake_chat_bubble_2">Es una aplicación de mensajería descentralizada y cifrada</string>
     <string name="view_fake_chat_bubble_3">¿Entonces no recopila mi información personal ni los metadatos de mi conversación? ¿Cómo funciona?</string>
@@ -565,7 +565,7 @@ de intercambio de claves!</string>
     <string name="activity_path_learn_more_button_title">Saber Más</string>
     <string name="activity_path_resolving_progress">Resolviendo…</string>
     <string name="activity_create_private_chat_title">Nueva Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Escanea el código QR de un usuario para empezar una sesión. Los códigos QR se pueden encontrar tocando el icono del código QR en los ajustes de la cuenta.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Introduzca el ID de Session o el nombre ONS</string>

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

@@ -527,9 +527,9 @@ de intercambio de claves!</string>
     <string name="copied_to_clipboard">Copiado en el portapapeles</string>
     <string name="next">Siguiente</string>
     <string name="share">Compartir</string>
-    <string name="invalid_session_id">ID de Session no válida</string>
+    <string name="invalid_account_id">ID de Session no válida</string>
     <string name="cancel">Cancelar</string>
-    <string name="your_session_id">Tu ID de Session</string>
+    <string name="your_account_id">Tu ID de Session</string>
     <string name="view_fake_chat_bubble_1">¿Qué es Session?</string>
     <string name="view_fake_chat_bubble_2">Es una aplicación de mensajería descentralizada y cifrada</string>
     <string name="view_fake_chat_bubble_3">¿Entonces no recopila mi información personal ni los metadatos de mi conversación? ¿Cómo funciona?</string>
@@ -565,7 +565,7 @@ de intercambio de claves!</string>
     <string name="activity_path_learn_more_button_title">Saber Más</string>
     <string name="activity_path_resolving_progress">Resolviendo…</string>
     <string name="activity_create_private_chat_title">Nueva Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Escanea el código QR de un usuario para empezar una sesión. Los códigos QR se pueden encontrar tocando el icono del código QR en los ajustes de la cuenta.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Introduzca el ID de Session o el nombre ONS</string>

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

@@ -550,9 +550,9 @@
     <string name="copied_to_clipboard">در حافظه موقت کپی شد</string>
     <string name="next">بعدی</string>
     <string name="share">اشتراک‌گذاری</string>
-    <string name="invalid_session_id">شناسه‌ی Session نامعتبر است.</string>
+    <string name="invalid_account_id">شناسه‌ی Session نامعتبر است.</string>
     <string name="cancel">لغو</string>
-    <string name="your_session_id">شناسه‌ی Session شما</string>
+    <string name="your_account_id">شناسه‌ی Session شما</string>
     <string name="view_fake_chat_bubble_1">Session چیست؟</string>
     <string name="view_fake_chat_bubble_2">Session یک برنامه پیام‌رسان غیرمتمرکز و رمزگذاری شده است.</string>
     <string name="view_fake_chat_bubble_3">پس اطلاعات شخصی من یا داده‌های گفت‌وگو‌هایم جمع‌آوری نمی‌شود؟ چگونه کار می‌کند؟</string>
@@ -588,11 +588,11 @@
     <string name="activity_path_learn_more_button_title">بیشتر بدانید</string>
     <string name="activity_path_resolving_progress">در حال اصلاح…</string>
     <string name="activity_create_private_chat_title">Session جدید</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">شناسه Session را وارید کنید</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">شناسه Session را وارید کنید</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">اسکن کد QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">برای شروع Session، کد QR کاربر را اسکن کنید. با ضربه زدن روی نماد کد QR در تنظیمات حساب کاربری، کدهای QR را می‌توان یافت.</string>
     <string name="fragment_enter_public_key_edit_text_hint">شماره session نامعتبر</string>
-    <string name="fragment_enter_public_key_explanation">کاربران می‌توانند شناسه‌ی Session خود را با رفتن به تنظیمات حساب خود و ضربه زدن به Share Session ID یا با به اشتراک گذاشتن کد QR خود‌، با دیگران به اشتراک بگذارند.</string>
+    <string name="fragment_enter_public_key_explanation">کاربران می‌توانند شناسه‌ی Session خود را با رفتن به تنظیمات حساب خود و ضربه زدن به Share Account ID یا با به اشتراک گذاشتن کد QR خود‌، با دیگران به اشتراک بگذارند.</string>
     <string name="fragment_enter_public_key_error_message">لطفا آی‌دی سشن یا اسم ONS را بررسی کنید و سپس دوباره امتحان کنید.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">برنامه Session برای اسکن کدهای QR احتیاج دارد به دوربین دسترسی داشته باشد</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">اجازه دسترسی به دوربین</string>

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

@@ -527,9 +527,9 @@
     <string name="copied_to_clipboard">در کلیپ‌بورد کپی شد</string>
     <string name="next">بعدی</string>
     <string name="share">اشتراک‌گذاری</string>
-    <string name="invalid_session_id">شناسه‌ی Session نامعتبر است.</string>
+    <string name="invalid_account_id">شناسه‌ی Session نامعتبر است.</string>
     <string name="cancel">لغو</string>
-    <string name="your_session_id">شناسه‌ی Session شما</string>
+    <string name="your_account_id">شناسه‌ی Session شما</string>
     <string name="view_fake_chat_bubble_1">Session چیست؟</string>
     <string name="view_fake_chat_bubble_2">Session یک برنامه پیام‌رسان غیرمتمرکز و رمزگذاری شده است.</string>
     <string name="view_fake_chat_bubble_3">پس اطلاعات شخصی من یا داده‌های گفت‌وگو‌هایم جمع‌آوری نمی‌شود؟ چگونه کار می‌کند؟</string>
@@ -565,11 +565,11 @@
     <string name="activity_path_learn_more_button_title">بیشتر بدانید</string>
     <string name="activity_path_resolving_progress">در حال اصلاح…</string>
     <string name="activity_create_private_chat_title">Session جدید</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">شناسه‌ی Session را وارد کنید</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">شناسه‌ی Session را وارد کنید</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">کد QR را اسکن کنید</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">برای شروع Session، کد QR کاربر را اسکن کنید. با ضربه زدن روی نماد کد QR در تنظیمات حساب کاربری، کدهای QR را می‌توان یافت.</string>
     <string name="fragment_enter_public_key_edit_text_hint">شماره session نامعتبر</string>
-    <string name="fragment_enter_public_key_explanation">کاربران می‌توانند شناسه‌ی Session خود را با رفتن به تنظیمات حساب خود و ضربه زدن به Share Session ID یا با به اشتراک گذاشتن کد QR خود‌، با دیگران به اشتراک بگذارند.</string>
+    <string name="fragment_enter_public_key_explanation">کاربران می‌توانند شناسه‌ی Session خود را با رفتن به تنظیمات حساب خود و ضربه زدن به Share Account ID یا با به اشتراک گذاشتن کد QR خود‌، با دیگران به اشتراک بگذارند.</string>
     <string name="fragment_enter_public_key_error_message">لطفا آی‌دی سشن یا اسم ONS را بررسی کنید و سپس دوباره امتحان کنید.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">اپ Session برای اسکن کدهای QR احتیاج دارد به دوربین دسترسی داشته باشد</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">اجازه دسترسی به دوربین</string>

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

@@ -526,9 +526,9 @@ on viallinen!</string>
     <string name="copied_to_clipboard">Kopioitu leikepöydälle</string>
     <string name="next">Seuraava</string>
     <string name="share">Jaa</string>
-    <string name="invalid_session_id">Virheellinen Session ID</string>
+    <string name="invalid_account_id">Virheellinen Account ID</string>
     <string name="cancel">Peruuta</string>
-    <string name="your_session_id">Sinun Session ID</string>
+    <string name="your_account_id">Sinun Account ID</string>
     <string name="view_fake_chat_bubble_1">Mikä on Session?</string>
     <string name="view_fake_chat_bubble_2">Se on hajautettu, salattu viestisovellus</string>
     <string name="view_fake_chat_bubble_3">Joten se ei kerää henkilökohtaisia tietoja tai keskustelun metatietoja? Miten se toimii?</string>
@@ -564,11 +564,11 @@ on viallinen!</string>
     <string name="activity_path_learn_more_button_title">Lisätietoja</string>
     <string name="activity_path_resolving_progress">Ratkaistaan…</string>
     <string name="activity_create_private_chat_title">Uusi Istunto</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Anna Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Anna Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Lue QR-koodi</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Skannaa käyttäjän QR-koodi aloittaaksesi istunnon. QR-koodit löytyvät napauttamalla QR-koodin kuvaketta tilin asetuksista.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Syötä Session ID tai ONS-nimi</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Syötä Account ID tai ONS-nimi</string>
-    <string name="fragment_enter_public_key_explanation">Käyttäjät voivat jakaa Session tunnuksensa menemällä tiliasetuksiinsa ja painamalla \"Jaa Session ID\" tai jakamalla QR-koodin.</string>
+    <string name="fragment_enter_public_key_explanation">Käyttäjät voivat jakaa Session tunnuksensa menemällä tiliasetuksiinsa ja painamalla \"Jaa Account ID\" tai jakamalla QR-koodin.</string>
     <string name="fragment_enter_public_key_error_message">Tarkista istunnon tunnus tai ONS nimi ja yritä uudelleen.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session tarvitsee kameran käyttöoikeuden skannatakseensa QR-koodit</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Myönnä Kameran Käyttöoikeus</string>
@@ -641,7 +641,7 @@ on viallinen!</string>
     <string name="dialog_ui_mode_option_day">Päivä</string>
     <string name="dialog_ui_mode_option_night">Yö</string>
     <string name="dialog_ui_mode_option_system_default">Järjestelmän oletus</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopioi Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopioi Account ID</string>
     <string name="attachment">Liite</string>
     <string name="attachment_type_voice_message">Ääniviesti</string>
     <string name="details">Lisätiedot</string>

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

@@ -526,9 +526,9 @@ on viallinen!</string>
     <string name="copied_to_clipboard">Kopioitu leikepöydälle</string>
     <string name="next">Seuraava</string>
     <string name="share">Jaa</string>
-    <string name="invalid_session_id">Virheellinen Session ID</string>
+    <string name="invalid_account_id">Virheellinen Account ID</string>
     <string name="cancel">Peruuta</string>
-    <string name="your_session_id">Sinun Session ID</string>
+    <string name="your_account_id">Sinun Account ID</string>
     <string name="view_fake_chat_bubble_1">Mikä on Session?</string>
     <string name="view_fake_chat_bubble_2">Se on hajautettu, salattu viestisovellus</string>
     <string name="view_fake_chat_bubble_3">Joten se ei kerää henkilökohtaisia tietoja tai keskustelun metatietoja? Miten se toimii?</string>
@@ -564,11 +564,11 @@ on viallinen!</string>
     <string name="activity_path_learn_more_button_title">Lisätietoja</string>
     <string name="activity_path_resolving_progress">Ratkaistaan…</string>
     <string name="activity_create_private_chat_title">Uusi Istunto</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Anna Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Anna Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Lue QR-koodi</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Skannaa käyttäjän QR-koodi aloittaaksesi istunnon. QR-koodit löytyvät napauttamalla QR-koodin kuvaketta tilin asetuksista.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Syötä Session ID tai ONS-nimi</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Syötä Account ID tai ONS-nimi</string>
-    <string name="fragment_enter_public_key_explanation">Käyttäjät voivat jakaa Session tunnuksensa menemällä tiliasetuksiinsa ja painamalla \"Jaa Session ID\" tai jakamalla QR-koodin.</string>
+    <string name="fragment_enter_public_key_explanation">Käyttäjät voivat jakaa Session tunnuksensa menemällä tiliasetuksiinsa ja painamalla \"Jaa Account ID\" tai jakamalla QR-koodin.</string>
     <string name="fragment_enter_public_key_error_message">Tarkista istunnon tunnus tai ONS nimi ja yritä uudelleen.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session tarvitsee kameran käyttöoikeuden skannatakseensa QR-koodit</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Myönnä Kameran Käyttöoikeus</string>
@@ -641,7 +641,7 @@ on viallinen!</string>
     <string name="dialog_ui_mode_option_day">Päivä</string>
     <string name="dialog_ui_mode_option_night">Yö</string>
     <string name="dialog_ui_mode_option_system_default">Järjestelmän oletus</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopioi Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopioi Account ID</string>
     <string name="attachment">Liite</string>
     <string name="attachment_type_voice_message">Ääniviesti</string>
     <string name="details">Lisätiedot</string>

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

@@ -553,9 +553,9 @@
     <string name="copied_to_clipboard">Copié dans le presse-papier</string>
     <string name="next">Suivant</string>
     <string name="share">Partager</string>
-    <string name="invalid_session_id">Session ID non valide</string>
+    <string name="invalid_account_id">Account ID non valide</string>
     <string name="cancel">Annuler</string>
-    <string name="your_session_id">Votre Session ID</string>
+    <string name="your_account_id">Votre Account ID</string>
     <string name="view_fake_chat_bubble_1">Qu\'est-ce que Session ?</string>
     <string name="view_fake_chat_bubble_2">C\'est une application de messagerie décentralisée et cryptée</string>
     <string name="view_fake_chat_bubble_3">Elle ne recueille donc pas mes informations personnelles ou mes métadonnées de conversations ? Comment ça marche ?</string>
@@ -580,7 +580,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Voulez-vous vraiment supprimer cette conversation ?</string>
     <string name="activity_home_conversation_deleted_message">Conversation supprimée</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_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 Account 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>
     <string name="activity_path_title">Chemin</string>
     <string name="activity_path_explanation">Session occulte votre adresse IP en envoyant vos messages via plusieurs nœuds de service dans le réseau décentralisé de Session. Voici les pays par le biais desquels votre connexion est actuellement envoyée :</string>
@@ -591,12 +591,12 @@
     <string name="activity_path_learn_more_button_title">En savoir plus</string>
     <string name="activity_path_resolving_progress">Contact en cours…</string>
     <string name="activity_create_private_chat_title">Nouvelle Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Saisir un Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Saisir un Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Scanner un QR Code</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scannez le QR code d\'un utilisateur pour démarrer une session. Les QR codes peuvent se trouver en touchant l\'icône du QR code dans les paramètres du compte.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Entrer un Session ID ou un nom ONS</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Entrer un Account ID ou un nom ONS</string>
-    <string name="fragment_enter_public_key_explanation">Les utilisateurs peuvent partager leur Session ID depuis les paramètres du compte ou en utilisant le code QR.</string>
+    <string name="fragment_enter_public_key_explanation">Les utilisateurs peuvent partager leur Account ID depuis les paramètres du compte ou en utilisant le code QR.</string>
-    <string name="fragment_enter_public_key_error_message">Veuillez vérifier le Session ID ou le nom ONS et réessayer.</string>
+    <string name="fragment_enter_public_key_error_message">Veuillez vérifier le Account ID ou le nom ONS et réessayer.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session a besoin d\'accéder à l\'appareil photo pour scanner les QR codes</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Autoriser l\'accès</string>
     <string name="activity_create_closed_group_title">Nouveau groupe privé</string>
@@ -683,7 +683,7 @@
     <string name="dialog_ui_mode_option_day">Jour</string>
     <string name="dialog_ui_mode_option_night">Nuit</string>
     <string name="dialog_ui_mode_option_system_default">Défaut du système</string>
-    <string name="activity_conversation_menu_copy_account_id">Copier le Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Copier le Account ID</string>
     <string name="attachment">Fichier joint</string>
     <string name="attachment_type_voice_message">Message vocal</string>
     <string name="details">Détails</string>

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

@@ -553,9 +553,9 @@
     <string name="copied_to_clipboard">Copié dans le presse-papier</string>
     <string name="next">Suivant</string>
     <string name="share">Partager</string>
-    <string name="invalid_session_id">Session ID non valide</string>
+    <string name="invalid_account_id">Account ID non valide</string>
     <string name="cancel">Annuler</string>
-    <string name="your_session_id">Votre Session ID</string>
+    <string name="your_account_id">Votre Account ID</string>
     <string name="view_fake_chat_bubble_1">Qu\'est-ce que Session ?</string>
     <string name="view_fake_chat_bubble_2">C\'est une application de messagerie décentralisée et cryptée</string>
     <string name="view_fake_chat_bubble_3">Elle ne recueille donc pas mes informations personnelles ou mes métadonnées de conversations ? Comment ça marche ?</string>
@@ -580,7 +580,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Voulez-vous vraiment supprimer cette conversation ?</string>
     <string name="activity_home_conversation_deleted_message">Conversation supprimée</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_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 Account 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>
     <string name="activity_path_title">Chemin</string>
     <string name="activity_path_explanation">Session occulte votre adresse IP en envoyant vos messages via plusieurs nœuds de service dans le réseau décentralisé de Session. Voici les pays par le biais desquels votre connexion est actuellement envoyée :</string>
@@ -591,12 +591,12 @@
     <string name="activity_path_learn_more_button_title">En savoir plus</string>
     <string name="activity_path_resolving_progress">Contact en cours…</string>
     <string name="activity_create_private_chat_title">Nouvelle Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Saisir un Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Saisir un Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Scanner un QR Code</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scannez le QR code d\'un utilisateur pour démarrer une session. Les QR codes peuvent se trouver en touchant l\'icône du QR code dans les paramètres du compte.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Entrer un Session ID ou un nom ONS</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Entrer un Account ID ou un nom ONS</string>
-    <string name="fragment_enter_public_key_explanation">Les utilisateurs peuvent partager leur Session ID depuis les paramètres du compte ou en utilisant le code QR.</string>
+    <string name="fragment_enter_public_key_explanation">Les utilisateurs peuvent partager leur Account ID depuis les paramètres du compte ou en utilisant le code QR.</string>
-    <string name="fragment_enter_public_key_error_message">Veuillez vérifier le Session ID ou le nom ONS et réessayer.</string>
+    <string name="fragment_enter_public_key_error_message">Veuillez vérifier le Account ID ou le nom ONS et réessayer.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session a besoin d\'accéder à l\'appareil photo pour scanner les QR codes</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Autoriser l\'accès</string>
     <string name="activity_create_closed_group_title">Nouveau groupe privé</string>
@@ -683,7 +683,7 @@
     <string name="dialog_ui_mode_option_day">Jour</string>
     <string name="dialog_ui_mode_option_night">Nuit</string>
     <string name="dialog_ui_mode_option_system_default">Défaut du système</string>
-    <string name="activity_conversation_menu_copy_account_id">Copier le Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Copier le Account ID</string>
     <string name="attachment">Fichier joint</string>
     <string name="attachment_type_voice_message">Message vocal</string>
     <string name="details">Détails</string>

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

@@ -518,9 +518,9 @@
     <string name="copied_to_clipboard">Copiado ao portapapeis</string>
     <string name="next">Seguinte</string>
     <string name="share">Partillar</string>
-    <string name="invalid_session_id">ID de Session inválido</string>
+    <string name="invalid_account_id">ID de Session inválido</string>
     <string name="cancel">Cancelar</string>
-    <string name="your_session_id">O teu ID de Session</string>
+    <string name="your_account_id">O teu ID de Session</string>
     <string name="view_fake_chat_bubble_1">Que é Session?</string>
     <string name="view_fake_chat_bubble_2">É unha app de mensaxería cifrada e descentralizada</string>
     <string name="view_fake_chat_bubble_3">Entón non recompila a miña información persoal ou os metadatos das miñas conversas? Como funciona?</string>
@@ -534,7 +534,7 @@
     <string name="activity_path_device_row_title">Ti</string>
     <string name="activity_path_resolving_progress">Procesando…</string>
     <string name="activity_create_private_chat_title">Nova sesión</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Introducir ID de Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Introducir ID de Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Conceder acceso á cámara</string>
     <string name="activity_create_closed_group_title">Crear grupo pechado</string>

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

@@ -518,9 +518,9 @@
     <string name="copied_to_clipboard">Copiado ao portapapeis</string>
     <string name="next">Seguinte</string>
     <string name="share">Partillar</string>
-    <string name="invalid_session_id">ID de Session inválido</string>
+    <string name="invalid_account_id">ID de Session inválido</string>
     <string name="cancel">Cancelar</string>
-    <string name="your_session_id">O teu ID de Session</string>
+    <string name="your_account_id">O teu ID de Session</string>
     <string name="view_fake_chat_bubble_1">Que é Session?</string>
     <string name="view_fake_chat_bubble_2">É unha app de mensaxería cifrada e descentralizada</string>
     <string name="view_fake_chat_bubble_3">Entón non recompila a miña información persoal ou os metadatos das miñas conversas? Como funciona?</string>
@@ -534,7 +534,7 @@
     <string name="activity_path_device_row_title">Ti</string>
     <string name="activity_path_resolving_progress">Procesando…</string>
     <string name="activity_create_private_chat_title">Nova sesión</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Introducir ID de Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Introducir ID de Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Conceder acceso á cámara</string>
     <string name="activity_create_closed_group_title">Crear grupo pechado</string>

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

@@ -527,9 +527,9 @@
     <string name="copied_to_clipboard">क्लिपबोर्ड पर कॉपी किया गया है</string>
     <string name="next">अगला</string>
     <string name="share">साझा करें</string>
-    <string name="invalid_session_id">अमान्य सेशन आईडी</string>
+    <string name="invalid_account_id">अमान्य सेशन आईडी</string>
     <string name="cancel">रद्द करें</string>
-    <string name="your_session_id">आपकी सेशन आईडी</string>
+    <string name="your_account_id">आपकी सेशन आईडी</string>
     <string name="view_fake_chat_bubble_1">सेशन क्या है?</string>
     <string name="view_fake_chat_bubble_2">यह एक decentralized, encrypted मेसेजिंग ऐप है</string>
     <string name="view_fake_chat_bubble_3">इसलिए यह मेरी निजी जानकारी या बातचीत का metadata इकठ्ठा नहीं करता? यह कैसे काम करता है?</string>
@@ -554,7 +554,7 @@
     <string name="activity_home_delete_conversation_dialog_message">क्या वाकई आप इस वार्तालाप को हटाना चाहते हैं?</string>
     <string name="activity_home_conversation_deleted_message">बातचीत हटाई गई</string>
     <string name="view_seed_reminder_subtitle_1">अकाउंट सुरक्षित रखने के लिए अपनी पुनर्व्यप्ती वाक्यांश को सेव करके रखें</string>
-    <string name="view_seed_reminder_subtitle_2">अपना पुनर्प्राप्ति वाक्यांश प्रकट करने के लिए संशोधित शब्दों को टैप और होल्ड करें, फिर अपनी Session ID को सुरक्षित करने के लिए इसे सुरक्षित रूप से संग्रहीत करें।</string>
+    <string name="view_seed_reminder_subtitle_2">अपना पुनर्प्राप्ति वाक्यांश प्रकट करने के लिए संशोधित शब्दों को टैप और होल्ड करें, फिर अपनी Account ID को सुरक्षित करने के लिए इसे सुरक्षित रूप से संग्रहीत करें।</string>
     <string name="view_seed_reminder_subtitle_3">अपने रिकवरी फ्रेज को एक सुरक्षित जगह रखे</string>
     <string name="activity_path_title">पथ</string>
     <string name="activity_path_explanation">सेशन आपके मैसेज को सेशन के डेंटरलिज़्ड नेटवर्क की बहुत साडी सर्विस नोड्स में भेज देता है जो आपकी IP को छुपाती है.</string>
@@ -565,7 +565,7 @@
     <string name="activity_path_learn_more_button_title">अधिक जानें</string>
     <string name="activity_path_resolving_progress">हल किया जा रहा है</string>
     <string name="activity_create_private_chat_title">नया सेशन</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">सेशन आईडी डालें</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">सेशन आईडी डालें</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR कोड को स्कैन करें</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">सेशन शुरू करने के लिए यूजर के क्यूआर कोड को स्कैन करें। क्यूआर कोड को अकाउंट सेटिंग में क्यूआर कोड आइकन पर टैप करके पाया जा सकता है।</string>
     <string name="fragment_enter_public_key_edit_text_hint">Session आईडी या ओएनएस नाम दर्ज करें</string>

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

@@ -527,9 +527,9 @@
     <string name="copied_to_clipboard">क्लिपबोर्ड पर कॉपी किया गया है</string>
     <string name="next">अगला</string>
     <string name="share">साझा करें</string>
-    <string name="invalid_session_id">अमान्य सेशन आईडी</string>
+    <string name="invalid_account_id">अमान्य सेशन आईडी</string>
     <string name="cancel">रद्द करें</string>
-    <string name="your_session_id">आपकी सेशन आईडी</string>
+    <string name="your_account_id">आपकी सेशन आईडी</string>
     <string name="view_fake_chat_bubble_1">सेशन क्या है?</string>
     <string name="view_fake_chat_bubble_2">यह एक decentralized, encrypted मेसेजिंग ऐप है</string>
     <string name="view_fake_chat_bubble_3">इसलिए यह मेरी निजी जानकारी या बातचीत का metadata इकठ्ठा नहीं करता? यह कैसे काम करता है?</string>
@@ -554,7 +554,7 @@
     <string name="activity_home_delete_conversation_dialog_message">क्या वाकई आप इस वार्तालाप को हटाना चाहते हैं?</string>
     <string name="activity_home_conversation_deleted_message">बातचीत हटाई गई</string>
     <string name="view_seed_reminder_subtitle_1">अकाउंट सुरक्षित रखने के लिए अपनी पुनर्व्यप्ती वाक्यांश को सेव करके रखें</string>
-    <string name="view_seed_reminder_subtitle_2">अपना पुनर्प्राप्ति वाक्यांश प्रकट करने के लिए संशोधित शब्दों को टैप और होल्ड करें, फिर अपनी Session ID को सुरक्षित करने के लिए इसे सुरक्षित रूप से संग्रहीत करें।</string>
+    <string name="view_seed_reminder_subtitle_2">अपना पुनर्प्राप्ति वाक्यांश प्रकट करने के लिए संशोधित शब्दों को टैप और होल्ड करें, फिर अपनी Account ID को सुरक्षित करने के लिए इसे सुरक्षित रूप से संग्रहीत करें।</string>
     <string name="view_seed_reminder_subtitle_3">अपने रिकवरी फ्रेज को एक सुरक्षित जगह रखे</string>
     <string name="activity_path_title">पथ</string>
     <string name="activity_path_explanation">सेशन आपके मैसेज को सेशन के डेंटरलिज़्ड नेटवर्क की बहुत साडी सर्विस नोड्स में भेज देता है जो आपकी IP को छुपाती है.</string>
@@ -565,7 +565,7 @@
     <string name="activity_path_learn_more_button_title">अधिक जानें</string>
     <string name="activity_path_resolving_progress">हल किया जा रहा है</string>
     <string name="activity_create_private_chat_title">नया सेशन</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">सेशन आईडी डालें</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">सेशन आईडी डालें</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR कोड को स्कैन करें</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">सेशन शुरू करने के लिए यूजर के क्यूआर कोड को स्कैन करें। क्यूआर कोड को अकाउंट सेटिंग में क्यूआर कोड आइकन पर टैप करके पाया जा सकता है।</string>
     <string name="fragment_enter_public_key_edit_text_hint">Session आईडी या ओएनएस नाम दर्ज करें</string>

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

@@ -529,9 +529,9 @@
     <string name="copied_to_clipboard">Vágólapra másolva</string>
     <string name="next">Következő</string>
     <string name="share">Megosztás</string>
-    <string name="invalid_session_id">Érvénytelen Session azonosító</string>
+    <string name="invalid_account_id">Érvénytelen Session azonosító</string>
     <string name="cancel">Mégse</string>
-    <string name="your_session_id">A session azonosítód</string>
+    <string name="your_account_id">A session azonosítód</string>
     <string name="view_fake_chat_bubble_1">Mi az a Session?</string>
     <string name="view_fake_chat_bubble_2">Ez egy decentralizált, titkosított üzenetküldő alkalmazás</string>
     <string name="view_fake_chat_bubble_3">Tehát nem gyűjti a személyes adataimat vagy a beszélgetés metaadatait? Hogyan működik?</string>
@@ -567,7 +567,7 @@
     <string name="activity_path_learn_more_button_title">Tudj meg többet</string>
     <string name="activity_path_resolving_progress">Feloldás...</string>
     <string name="activity_create_private_chat_title">Új Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Adja meg a Session azonosítóját</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Adja meg a Session azonosítóját</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR kód beolvasása</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">A beszélgetés elindításához olvassa be a felhasználó QR kódját. A QR kód a fiókbeállításokban található a QR kód ikonra koppintva.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Írja be Session azonosítóját vagy ONS nevét</string>

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

@@ -529,9 +529,9 @@
     <string name="copied_to_clipboard">Vágólapra másolva</string>
     <string name="next">Következő</string>
     <string name="share">Megosztás</string>
-    <string name="invalid_session_id">Érvénytelen Session azonosító</string>
+    <string name="invalid_account_id">Érvénytelen Session azonosító</string>
     <string name="cancel">Mégse</string>
-    <string name="your_session_id">A session azonosítód</string>
+    <string name="your_account_id">A session azonosítód</string>
     <string name="view_fake_chat_bubble_1">Mi az a Session?</string>
     <string name="view_fake_chat_bubble_2">Ez egy decentralizált, titkosított üzenetküldő alkalmazás</string>
     <string name="view_fake_chat_bubble_3">Tehát nem gyűjti a személyes adataimat vagy a beszélgetés metaadatait? Hogyan működik?</string>
@@ -567,7 +567,7 @@
     <string name="activity_path_learn_more_button_title">Tudj meg többet</string>
     <string name="activity_path_resolving_progress">Feloldás...</string>
     <string name="activity_create_private_chat_title">Új Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Adja meg a Session azonosítóját</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Adja meg a Session azonosítóját</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR kód beolvasása</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">A beszélgetés elindításához olvassa be a felhasználó QR kódját. A QR kód a fiókbeállításokban található a QR kód ikonra koppintva.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Írja be Session azonosítóját vagy ONS nevét</string>

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

@@ -535,9 +535,9 @@
     <string name="copied_to_clipboard">Պատճենվել է կցարանում</string>
     <string name="next">Հաջորդը</string>
     <string name="share">Կիսվել</string>
-    <string name="invalid_session_id">Սխալ Session ID</string>
+    <string name="invalid_account_id">Սխալ Account ID</string>
     <string name="cancel">Փակել</string>
-    <string name="your_session_id">Ձեր Session ID֊ն</string>
+    <string name="your_account_id">Ձեր Account ID֊ն</string>
     <string name="view_fake_chat_bubble_1">Ի՞նչ է Սեանսը։</string>
     <string name="view_fake_chat_bubble_2">Այն ապահով, ծածկագրված նամակների ծրագիր է</string>
     <string name="view_fake_chat_bubble_3">Դա նշանակում է, որ այն չի՞ հավաքում իմ անձնական տվյալները կամ իմ զրույցի մետատվյալները։</string>
@@ -562,7 +562,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Վստա՞հ եք, որ ցանկանում եք ջնջել այս խոսակցությունը:</string>
     <string name="activity_home_conversation_deleted_message">Ջնջված է</string>
     <string name="view_seed_reminder_subtitle_1">Պահեք ձեր անվտանգությունը պահպանելով session-ի բանալին</string>
-    <string name="view_seed_reminder_subtitle_2">Հպեք և պահեք տրված բառերը՝ ձեր վերականգնման բանալին գտնելու համար, այնուհետև պահեք այն ապահով՝ ձեր Session ID-ն ապահով պահելու համար.</string>
+    <string name="view_seed_reminder_subtitle_2">Հպեք և պահեք տրված բառերը՝ ձեր վերականգնման բանալին գտնելու համար, այնուհետև պահեք այն ապահով՝ ձեր Account ID-ն ապահով պահելու համար.</string>
     <string name="view_seed_reminder_subtitle_3">Վստահ եղեք որ ձեր վերականգման բանալին հուսալի տեղում է</string>
     <string name="activity_path_title">Ուղի</string>
     <string name="activity_path_explanation">Սեանսը թաքցնում է Ձեր IP հասցեն Ձեր հաղորդագրությունները տանելով Սեանսի ապահով ցանցերի Ծառայության Հանգույցներով։ Սրանք այն երկրներն են, որոնցով Ձեր հաղորդագրություններն անցնում են․</string>
@@ -573,7 +573,7 @@
     <string name="activity_path_learn_more_button_title">Իմանալ Ավելին</string>
     <string name="activity_path_resolving_progress">Լուծում է…</string>
     <string name="activity_create_private_chat_title">Նոր Սեանս</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Մուտքագրեք Սեանսի ինքնությունը</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Մուտքագրեք Սեանսի ինքնությունը</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Սկանավորել QR Կոդ</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Սկանավորեք մեկի QR կոդը, որ սկսեք սեանս։ QR կոդը կարող եք գտնել հաշվի կարգավորումների մեջ՝ QR կոդի նշանի վրա սեղմելուց հետո։</string>
     <string name="fragment_enter_public_key_edit_text_hint">Գրեք session այդին կամ ONS անունը</string>
@@ -650,7 +650,7 @@
     <string name="dialog_ui_mode_option_day">Ցերեկ</string>
     <string name="dialog_ui_mode_option_night">Գիշեր</string>
     <string name="dialog_ui_mode_option_system_default">Համակարգի լռելյայն</string>
-    <string name="activity_conversation_menu_copy_account_id">Պատճենել Session ID֊ն</string>
+    <string name="activity_conversation_menu_copy_account_id">Պատճենել Account ID֊ն</string>
     <string name="attachment">Կցում</string>
     <string name="attachment_type_voice_message">Ձայնագրություն</string>
     <string name="details">Մանրամասներ</string>

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

@@ -535,9 +535,9 @@
     <string name="copied_to_clipboard">Պատճենվել է կցարանում</string>
     <string name="next">Հաջորդը</string>
     <string name="share">Կիսվել</string>
-    <string name="invalid_session_id">Սխալ Session ID</string>
+    <string name="invalid_account_id">Սխալ Account ID</string>
     <string name="cancel">Փակել</string>
-    <string name="your_session_id">Ձեր Session ID֊ն</string>
+    <string name="your_account_id">Ձեր Account ID֊ն</string>
     <string name="view_fake_chat_bubble_1">Ի՞նչ է Սեանսը։</string>
     <string name="view_fake_chat_bubble_2">Այն ապահով, ծածկագրված նամակների ծրագիր է</string>
     <string name="view_fake_chat_bubble_3">Դա նշանակում է, որ այն չի՞ հավաքում իմ անձնական տվյալները կամ իմ զրույցի մետատվյալները։</string>
@@ -562,7 +562,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Վստա՞հ եք, որ ցանկանում եք ջնջել այս խոսակցությունը:</string>
     <string name="activity_home_conversation_deleted_message">Ջնջված է</string>
     <string name="view_seed_reminder_subtitle_1">Պահեք ձեր անվտանգությունը պահպանելով session-ի բանալին</string>
-    <string name="view_seed_reminder_subtitle_2">Հպեք և պահեք տրված բառերը՝ ձեր վերականգնման բանալին գտնելու համար, այնուհետև պահեք այն ապահով՝ ձեր Session ID-ն ապահով պահելու համար.</string>
+    <string name="view_seed_reminder_subtitle_2">Հպեք և պահեք տրված բառերը՝ ձեր վերականգնման բանալին գտնելու համար, այնուհետև պահեք այն ապահով՝ ձեր Account ID-ն ապահով պահելու համար.</string>
     <string name="view_seed_reminder_subtitle_3">Վստահ եղեք որ ձեր վերականգման բանալին հուսալի տեղում է</string>
     <string name="activity_path_title">Ուղի</string>
     <string name="activity_path_explanation">Սեանսը թաքցնում է Ձեր IP հասցեն Ձեր հաղորդագրությունները տանելով Սեանսի ապահով ցանցերի Ծառայության Հանգույցներով։ Սրանք այն երկրներն են, որոնցով Ձեր հաղորդագրություններն անցնում են․</string>
@@ -573,7 +573,7 @@
     <string name="activity_path_learn_more_button_title">Իմանալ Ավելին</string>
     <string name="activity_path_resolving_progress">Լուծում է…</string>
     <string name="activity_create_private_chat_title">Նոր Սեանս</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Մուտքագրեք Սեանսի ինքնությունը</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Մուտքագրեք Սեանսի ինքնությունը</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Սկանավորել QR Կոդ</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Սկանավորեք մեկի QR կոդը, որ սկսեք սեանս։ QR կոդը կարող եք գտնել հաշվի կարգավորումների մեջ՝ QR կոդի նշանի վրա սեղմելուց հետո։</string>
     <string name="fragment_enter_public_key_edit_text_hint">Գրեք session այդին կամ ONS անունը</string>
@@ -650,7 +650,7 @@
     <string name="dialog_ui_mode_option_day">Ցերեկ</string>
     <string name="dialog_ui_mode_option_night">Գիշեր</string>
     <string name="dialog_ui_mode_option_system_default">Համակարգի լռելյայն</string>
-    <string name="activity_conversation_menu_copy_account_id">Պատճենել Session ID֊ն</string>
+    <string name="activity_conversation_menu_copy_account_id">Պատճենել Account ID֊ն</string>
     <string name="attachment">Կցում</string>
     <string name="attachment_type_voice_message">Ձայնագրություն</string>
     <string name="details">Մանրամասներ</string>

app/src/main/res/values-in-rID/strings.xml

@@ -435,7 +435,7 @@
     <string name="activity_path_destination_row_title">Tujuan</string>
     <string name="activity_path_learn_more_button_title">Selengkapnya</string>
     <string name="activity_create_private_chat_title">Session baru</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Masukkan Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Masukkan Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Pindai kode QR</string>
     <string name="activity_create_closed_group_group_name_missing_error">Masukkan nama grup</string>
     <string name="activity_create_closed_group_group_name_too_long_error">Masukkan nama grup yang lebih pendek</string>
@@ -461,7 +461,7 @@
     <string name="dialog_ui_mode_title">Tema</string>
     <string name="dialog_ui_mode_option_day">Day</string>
     <string name="dialog_ui_mode_option_night">Night</string>
-    <string name="activity_conversation_menu_copy_account_id">Salin Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Salin Account ID</string>
     <string name="attachment_type_voice_message">Pesan Suara</string>
     <string name="details">Detail</string>
     <string name="activity_backup_restore_select_file">Pilih file</string>

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

@@ -433,7 +433,7 @@
     <string name="activity_path_destination_row_title">Tujuan</string>
     <string name="activity_path_learn_more_button_title">Selengkapnya</string>
     <string name="activity_create_private_chat_title">Session baru</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Masukkan Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Masukkan Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Pindai kode QR</string>
     <string name="activity_create_closed_group_group_name_missing_error">Masukkan nama grup</string>
     <string name="activity_create_closed_group_group_name_too_long_error">Masukkan nama grup yang lebih pendek</string>
@@ -459,7 +459,7 @@
     <string name="dialog_ui_mode_title">Tema</string>
     <string name="dialog_ui_mode_option_day">Day</string>
     <string name="dialog_ui_mode_option_night">Night</string>
-    <string name="activity_conversation_menu_copy_account_id">Salin Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Salin Account ID</string>
     <string name="attachment_type_voice_message">Pesan Suara</string>
     <string name="details">Detail</string>
     <string name="activity_backup_restore_select_file">Pilih file</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -528,9 +528,9 @@ scambia un altro messaggio!</string>
     <string name="copied_to_clipboard">Copiato negli appunti</string>
     <string name="next">Successivo</string>
     <string name="share">Condividi</string>
-    <string name="invalid_session_id">ID Sessione non valido</string>
+    <string name="invalid_account_id">ID Sessione non valido</string>
     <string name="cancel">Annulla</string>
-    <string name="your_session_id">Il tuo ID Sessione</string>
+    <string name="your_account_id">Il tuo ID Sessione</string>
     <string name="view_fake_chat_bubble_1">Cos\'è Session?</string>
     <string name="view_fake_chat_bubble_2">È un\'app di messaggistica decentralizzata e crittografata</string>
     <string name="view_fake_chat_bubble_3">Quindi non raccoglie informazioni personali o metadati di conversazione? Come funziona?</string>
@@ -566,7 +566,7 @@ scambia un altro messaggio!</string>
     <string name="activity_path_learn_more_button_title">Per saperne di più</string>
     <string name="activity_path_resolving_progress">In Risoluzione…</string>
     <string name="activity_create_private_chat_title">Nuova sessione</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Inserisci ID Sessione</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Inserisci ID Sessione</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Scansiona il codice QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scansiona il codice QR di un utente per avviare una sessione. Puoi trovare i codici QR toccando l\'icona Codice QR nelle impostazioni dell\'account.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Inserisci ID Sessione o nome ONS</string>

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

@@ -528,9 +528,9 @@ scambia un altro messaggio!</string>
     <string name="copied_to_clipboard">Copiato negli appunti</string>
     <string name="next">Successivo</string>
     <string name="share">Condividi</string>
-    <string name="invalid_session_id">ID Sessione non valido</string>
+    <string name="invalid_account_id">ID Sessione non valido</string>
     <string name="cancel">Annulla</string>
-    <string name="your_session_id">Il tuo ID Sessione</string>
+    <string name="your_account_id">Il tuo ID Sessione</string>
     <string name="view_fake_chat_bubble_1">Cos\'è Session?</string>
     <string name="view_fake_chat_bubble_2">È un\'app di messaggistica decentralizzata e crittografata</string>
     <string name="view_fake_chat_bubble_3">Quindi non raccoglie informazioni personali o metadati di conversazione? Come funziona?</string>
@@ -566,7 +566,7 @@ scambia un altro messaggio!</string>
     <string name="activity_path_learn_more_button_title">Per saperne di più</string>
     <string name="activity_path_resolving_progress">In Risoluzione…</string>
     <string name="activity_create_private_chat_title">Nuova sessione</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Inserisci ID Sessione</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Inserisci ID Sessione</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Scansiona il codice QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scansiona il codice QR di un utente per avviare una sessione. Puoi trovare i codici QR toccando l\'icona Codice QR nelle impostazioni dell\'account.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Inserisci ID Sessione o nome ONS</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -512,9 +512,9 @@
     <string name="copied_to_clipboard">クリップボードにコピーされました</string>
     <string name="next">次</string>
     <string name="share">共有する</string>
-    <string name="invalid_session_id">Session ID が無効です</string>
+    <string name="invalid_account_id">Account ID が無効です</string>
     <string name="cancel">取り消す</string>
-    <string name="your_session_id">あなたの Session ID</string>
+    <string name="your_account_id">あなたの Account ID</string>
     <string name="view_fake_chat_bubble_1">Session とは？</string>
     <string name="view_fake_chat_bubble_2">分散型の暗号化されたメッセージングアプリです</string>
     <string name="view_fake_chat_bubble_3">個人情報や会話のメタデータは収集されませんか？どのように機能しますか？</string>
@@ -539,7 +539,7 @@
     <string name="activity_home_delete_conversation_dialog_message">この会話を削除してもよろしいですか？</string>
     <string name="activity_home_conversation_deleted_message">会話を削除しました</string>
     <string name="view_seed_reminder_subtitle_1">リカバリーフレーズを保存してアカウントを保護する</string>
-    <string name="view_seed_reminder_subtitle_2">編集された単語をタップして長押ししてリカバリーフレーズを表示し、それを安全に保管して Session ID を保護します。</string>
+    <string name="view_seed_reminder_subtitle_2">編集された単語をタップして長押ししてリカバリーフレーズを表示し、それを安全に保管して Account ID を保護します。</string>
     <string name="view_seed_reminder_subtitle_3">リカバリーフレーズは安全な場所に保管してください</string>
     <string name="activity_path_title">パス</string>
     <string name="activity_path_explanation">Session は、Sessionの分散型ネットワークの複数のサービスノードを介してメッセージをバウンスすることにより、IP を隠します。これらは、接続が現在バウンスされている国です。</string>
@@ -550,11 +550,11 @@
     <string name="activity_path_learn_more_button_title">詳細</string>
     <string name="activity_path_resolving_progress">解決中...</string>
     <string name="activity_create_private_chat_title">新しい Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Session ID を入力してください</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Account ID を入力してください</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR コードをスキャンする</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">ユーザーの QR コードをスキャンして、Session を開始します。QR コードは、アカウント設定の QR コードアイコンをタップすると見つかります。</string>
     <string name="fragment_enter_public_key_edit_text_hint">セッションIDまたはONS名を入力してください</string>
-    <string name="fragment_enter_public_key_explanation">ユーザーは、アカウント設定に移動して [Session ID を共有] をタップするか、QR コードを共有することで、Session ID を共有できます。</string>
+    <string name="fragment_enter_public_key_explanation">ユーザーは、アカウント設定に移動して [Account ID を共有] をタップするか、QR コードを共有することで、Account ID を共有できます。</string>
     <string name="fragment_enter_public_key_error_message">セッションIDまたはONS名を確認して再度お試しください。</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session で QR コードをスキャンするにはカメラへのアクセスが必要です</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">カメラへのアクセスを許可する</string>
@@ -627,7 +627,7 @@
     <string name="dialog_ui_mode_option_day">デイ</string>
     <string name="dialog_ui_mode_option_night">ナイト</string>
     <string name="dialog_ui_mode_option_system_default">システムの既定値</string>
-    <string name="activity_conversation_menu_copy_account_id">Session ID をコピーする</string>
+    <string name="activity_conversation_menu_copy_account_id">Account ID をコピーする</string>
     <string name="attachment">添付ファイル</string>
     <string name="attachment_type_voice_message">音声メッセージ</string>
     <string name="details">詳細</string>

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

@@ -512,9 +512,9 @@
     <string name="copied_to_clipboard">クリップボードにコピーされました</string>
     <string name="next">次</string>
     <string name="share">共有する</string>
-    <string name="invalid_session_id">Session ID が無効です</string>
+    <string name="invalid_account_id">Account ID が無効です</string>
     <string name="cancel">取り消す</string>
-    <string name="your_session_id">あなたの Session ID</string>
+    <string name="your_account_id">あなたの Account ID</string>
     <string name="view_fake_chat_bubble_1">Session とは？</string>
     <string name="view_fake_chat_bubble_2">分散型の暗号化されたメッセージングアプリです</string>
     <string name="view_fake_chat_bubble_3">個人情報や会話のメタデータは収集されませんか？どのように機能しますか？</string>
@@ -539,7 +539,7 @@
     <string name="activity_home_delete_conversation_dialog_message">この会話を削除してもよろしいですか？</string>
     <string name="activity_home_conversation_deleted_message">会話を削除しました</string>
     <string name="view_seed_reminder_subtitle_1">リカバリーフレーズを保存してアカウントを保護する</string>
-    <string name="view_seed_reminder_subtitle_2">編集された単語をタップして長押ししてリカバリーフレーズを表示し、それを安全に保管して Session ID を保護します。</string>
+    <string name="view_seed_reminder_subtitle_2">編集された単語をタップして長押ししてリカバリーフレーズを表示し、それを安全に保管して Account ID を保護します。</string>
     <string name="view_seed_reminder_subtitle_3">リカバリーフレーズは安全な場所に保管してください</string>
     <string name="activity_path_title">パス</string>
     <string name="activity_path_explanation">Session は、Sessionの分散型ネットワークの複数のサービスノードを介してメッセージをバウンスすることにより、IP を隠します。これらは、接続が現在バウンスされている国です。</string>
@@ -550,11 +550,11 @@
     <string name="activity_path_learn_more_button_title">詳細</string>
     <string name="activity_path_resolving_progress">解決中...</string>
     <string name="activity_create_private_chat_title">新しい Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Session ID を入力してください</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Account ID を入力してください</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">QR コードをスキャンする</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">ユーザーの QR コードをスキャンして、Session を開始します。QR コードは、アカウント設定の QR コードアイコンをタップすると見つかります。</string>
     <string name="fragment_enter_public_key_edit_text_hint">セッションIDまたはONS名を入力してください</string>
-    <string name="fragment_enter_public_key_explanation">ユーザーは、アカウント設定に移動して [Session ID を共有] をタップするか、QR コードを共有することで、Session ID を共有できます。</string>
+    <string name="fragment_enter_public_key_explanation">ユーザーは、アカウント設定に移動して [Account ID を共有] をタップするか、QR コードを共有することで、Account ID を共有できます。</string>
     <string name="fragment_enter_public_key_error_message">セッションIDまたはONS名を確認して再度お試しください。</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session で QR コードをスキャンするにはカメラへのアクセスが必要です</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">カメラへのアクセスを許可する</string>
@@ -627,7 +627,7 @@
     <string name="dialog_ui_mode_option_day">デイ</string>
     <string name="dialog_ui_mode_option_night">ナイト</string>
     <string name="dialog_ui_mode_option_system_default">システムの既定値</string>
-    <string name="activity_conversation_menu_copy_account_id">Session ID をコピーする</string>
+    <string name="activity_conversation_menu_copy_account_id">Account ID をコピーする</string>
     <string name="attachment">添付ファイル</string>
     <string name="attachment_type_voice_message">音声メッセージ</string>
     <string name="details">詳細</string>

app/src/main/res/values-ko-rKR/strings.xml

@@ -406,7 +406,7 @@
     <string name="copied_to_clipboard">클립보드에 복사됨</string>
     <string name="share">공유</string>
     <string name="cancel">취소</string>
-    <string name="your_session_id">당신의 세션 ID</string>
+    <string name="your_account_id">당신의 세션 ID</string>
     <string name="activity_home_empty_state_message">아직 연락처가 없습니다</string>
     <string name="activity_home_empty_state_button_title">세션 시작하기</string>
     <string name="activity_path_explanation">Session 분산 네트워크의 여러 서비스 노드를 통해 메시지를 분산해 IP를 숨깁니다. 이들이 현재 연결을 분산하는 국가입니다:</string>

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

@@ -406,7 +406,7 @@
     <string name="copied_to_clipboard">클립보드에 복사됨</string>
     <string name="share">공유</string>
     <string name="cancel">취소</string>
-    <string name="your_session_id">당신의 세션 ID</string>
+    <string name="your_account_id">당신의 세션 ID</string>
     <string name="activity_home_empty_state_message">아직 연락처가 없습니다</string>
     <string name="activity_home_empty_state_button_title">세션 시작하기</string>
     <string name="activity_path_explanation">Session 분산 네트워크의 여러 서비스 노드를 통해 메시지를 분산해 IP를 숨깁니다. 이들이 현재 연결을 분산하는 국가입니다:</string>

app/src/main/res/values-lt-rLT/strings.xml

@@ -545,9 +545,9 @@
     <string name="copied_to_clipboard">Nukopijuota į iškarpinę</string>
     <string name="next">Kitas</string>
     <string name="share">Bendrinti</string>
-    <string name="invalid_session_id">Neteisingas Session ID</string>
+    <string name="invalid_account_id">Neteisingas Account ID</string>
     <string name="cancel">Atsisakyti</string>
-    <string name="your_session_id">Jūsų Session ID</string>
+    <string name="your_account_id">Jūsų Account ID</string>
     <string name="view_fake_chat_bubble_1">Kas yra Session?</string>
     <string name="view_fake_chat_bubble_2">Tai – decentralizuota, šifruota pokalbių programėlė</string>
     <string name="view_fake_chat_bubble_3">Ji nerenka mano asmeninės informacijos ar mano pokalbių metaduomenų? Kaip ji veikia?</string>
@@ -570,7 +570,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Ar tikrai norite ištrinti šį pokalbį?</string>
     <string name="activity_home_conversation_deleted_message">Pokalbis ištrintas</string>
     <string name="view_seed_reminder_subtitle_1">Apsaugokite savo paskyrą įsirašydami atkūrimo frazę</string>
-    <string name="view_seed_reminder_subtitle_2">Bakstelėkite ir laikykite ant redaguotų žodžių, kad būtų atskleista jūsų atkūrimo frazė. Tuomet, laikykite ją saugioje vietoje, kad apsaugotumėte savo Session ID.</string>
+    <string name="view_seed_reminder_subtitle_2">Bakstelėkite ir laikykite ant redaguotų žodžių, kad būtų atskleista jūsų atkūrimo frazė. Tuomet, laikykite ją saugioje vietoje, kad apsaugotumėte savo Account ID.</string>
     <string name="view_seed_reminder_subtitle_3">Užtikrinkite, kad laikytumėte savo atkūrimo frazę saugioje vietoje</string>
     <string name="activity_path_title">Kelias</string>
     <string name="activity_path_explanation">Programėlė Session slepia jūsų IP adresą, peradresuodama jūsų žinutes per kelis aptarnavimo mazgus Session decentralizuotame tinkle. Štai čia yra šalys, per kurias šiuo metu yra peradresuojamas jūsų ryšys:</string>
@@ -579,9 +579,9 @@
     <string name="activity_path_service_node_row_title">Aptarnavimo mazgas</string>
     <string name="activity_path_destination_row_title">Paskirties vieta</string>
     <string name="activity_path_learn_more_button_title">Sužinoti daugiau</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Įveskite Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Įveskite Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skenuoti QR kodą</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Įveskite Session ID arba ONS vardą</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Įveskite Account ID arba ONS vardą</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Suteikti prieigą prie kameros</string>
     <string name="activity_create_closed_group_title">Nauja uždara grupė</string>
     <string name="activity_create_closed_group_edit_text_hint">Įveskite grupės pavadinimą</string>
@@ -642,7 +642,7 @@
     <string name="dialog_ui_mode_option_day">Dieninis</string>
     <string name="dialog_ui_mode_option_night">Naktinis</string>
     <string name="dialog_ui_mode_option_system_default">Sistemos numatytasis</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopijuoti Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopijuoti Account ID</string>
     <string name="attachment">Priedas</string>
     <string name="attachment_type_voice_message">Balso žinutė</string>
     <string name="details">Išsamiau</string>

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

@@ -545,9 +545,9 @@
     <string name="copied_to_clipboard">Nukopijuota į iškarpinę</string>
     <string name="next">Kitas</string>
     <string name="share">Bendrinti</string>
-    <string name="invalid_session_id">Neteisingas Session ID</string>
+    <string name="invalid_account_id">Neteisingas Account ID</string>
     <string name="cancel">Atsisakyti</string>
-    <string name="your_session_id">Jūsų Session ID</string>
+    <string name="your_account_id">Jūsų Account ID</string>
     <string name="view_fake_chat_bubble_1">Kas yra Session?</string>
     <string name="view_fake_chat_bubble_2">Tai – decentralizuota, šifruota pokalbių programėlė</string>
     <string name="view_fake_chat_bubble_3">Ji nerenka mano asmeninės informacijos ar mano pokalbių metaduomenų? Kaip ji veikia?</string>
@@ -570,7 +570,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Ar tikrai norite ištrinti šį pokalbį?</string>
     <string name="activity_home_conversation_deleted_message">Pokalbis ištrintas</string>
     <string name="view_seed_reminder_subtitle_1">Apsaugokite savo paskyrą įsirašydami atkūrimo frazę</string>
-    <string name="view_seed_reminder_subtitle_2">Bakstelėkite ir laikykite ant redaguotų žodžių, kad būtų atskleista jūsų atkūrimo frazė. Tuomet, laikykite ją saugioje vietoje, kad apsaugotumėte savo Session ID.</string>
+    <string name="view_seed_reminder_subtitle_2">Bakstelėkite ir laikykite ant redaguotų žodžių, kad būtų atskleista jūsų atkūrimo frazė. Tuomet, laikykite ją saugioje vietoje, kad apsaugotumėte savo Account ID.</string>
     <string name="view_seed_reminder_subtitle_3">Užtikrinkite, kad laikytumėte savo atkūrimo frazę saugioje vietoje</string>
     <string name="activity_path_title">Kelias</string>
     <string name="activity_path_explanation">Programėlė Session slepia jūsų IP adresą, peradresuodama jūsų žinutes per kelis aptarnavimo mazgus Session decentralizuotame tinkle. Štai čia yra šalys, per kurias šiuo metu yra peradresuojamas jūsų ryšys:</string>
@@ -579,9 +579,9 @@
     <string name="activity_path_service_node_row_title">Aptarnavimo mazgas</string>
     <string name="activity_path_destination_row_title">Paskirties vieta</string>
     <string name="activity_path_learn_more_button_title">Sužinoti daugiau</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Įveskite Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Įveskite Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skenuoti QR kodą</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Įveskite Session ID arba ONS vardą</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Įveskite Account ID arba ONS vardą</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Suteikti prieigą prie kameros</string>
     <string name="activity_create_closed_group_title">Nauja uždara grupė</string>
     <string name="activity_create_closed_group_edit_text_hint">Įveskite grupės pavadinimą</string>
@@ -642,7 +642,7 @@
     <string name="dialog_ui_mode_option_day">Dieninis</string>
     <string name="dialog_ui_mode_option_night">Naktinis</string>
     <string name="dialog_ui_mode_option_system_default">Sistemos numatytasis</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopijuoti Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopijuoti Account ID</string>
     <string name="attachment">Priedas</string>
     <string name="attachment_type_voice_message">Balso žinutė</string>
     <string name="details">Išsamiau</string>

app/src/main/res/values-lv-rLV/strings.xml

@@ -216,7 +216,7 @@
     <string name="dialog_ui_mode_title">Izskats</string>
     <string name="dialog_ui_mode_option_day">Diena</string>
     <string name="dialog_ui_mode_option_night">Nakts</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopēt Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopēt Account ID</string>
     <string name="attachment">Pielikums</string>
     <string name="attachment_type_voice_message">Balss ziņojums</string>
     <string name="details">Papildu informācija</string>

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

@@ -216,7 +216,7 @@
     <string name="dialog_ui_mode_title">Izskats</string>
     <string name="dialog_ui_mode_option_day">Diena</string>
     <string name="dialog_ui_mode_option_night">Nakts</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopēt Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopēt Account ID</string>
     <string name="attachment">Pielikums</string>
     <string name="attachment_type_voice_message">Balss ziņojums</string>
     <string name="details">Papildu informācija</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -527,9 +527,9 @@ nøkkelutvekslingsmelding.</string>
     <string name="copied_to_clipboard">Kopiert til utklippstavle</string>
     <string name="next">Neste</string>
     <string name="share">Del</string>
-    <string name="invalid_session_id">Ugyldig Session ID</string>
+    <string name="invalid_account_id">Ugyldig Account ID</string>
     <string name="cancel">Avbryt</string>
-    <string name="your_session_id">Din Session ID</string>
+    <string name="your_account_id">Din Account ID</string>
     <string name="view_fake_chat_bubble_1">Hva er Session?</string>
     <string name="view_fake_chat_bubble_2">Det er en desentralisert, kryptert meldingsapp</string>
     <string name="view_fake_chat_bubble_3">Så den henter ikke min personlige informasjon eller samtaletadata? Hvordan virker det?</string>
@@ -565,7 +565,7 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_path_learn_more_button_title">Lær mer</string>
     <string name="activity_path_resolving_progress">Løser…</string>
     <string name="activity_create_private_chat_title">Ny Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Skriv inn Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Skriv inn Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skann QR-kode</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Skann en brukers QR-kode for å starte en økt. QR-koder finnes ved å trykke på QR-koden i kontoinnstillingene.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Angi Session-ID eller ONS-navn</string>

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

@@ -527,9 +527,9 @@ nøkkelutvekslingsmelding.</string>
     <string name="copied_to_clipboard">Kopiert til utklippstavle</string>
     <string name="next">Neste</string>
     <string name="share">Del</string>
-    <string name="invalid_session_id">Ugyldig Session ID</string>
+    <string name="invalid_account_id">Ugyldig Account ID</string>
     <string name="cancel">Avbryt</string>
-    <string name="your_session_id">Din Session ID</string>
+    <string name="your_account_id">Din Account ID</string>
     <string name="view_fake_chat_bubble_1">Hva er Session?</string>
     <string name="view_fake_chat_bubble_2">Det er en desentralisert, kryptert meldingsapp</string>
     <string name="view_fake_chat_bubble_3">Så den henter ikke min personlige informasjon eller samtaletadata? Hvordan virker det?</string>
@@ -565,7 +565,7 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_path_learn_more_button_title">Lær mer</string>
     <string name="activity_path_resolving_progress">Løser…</string>
     <string name="activity_create_private_chat_title">Ny Session</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Skriv inn Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Skriv inn Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skann QR-kode</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Skann en brukers QR-kode for å starte en økt. QR-koder finnes ved å trykke på QR-koden i kontoinnstillingene.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Angi Session-ID eller ONS-navn</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -528,9 +528,9 @@
     <string name="copied_to_clipboard">Gekopieerd naar klembord</string>
     <string name="next">Volgende</string>
     <string name="share">Delen</string>
-    <string name="invalid_session_id">Ongeldige Sessie-ID</string>
+    <string name="invalid_account_id">Ongeldige Sessie-ID</string>
     <string name="cancel">Annuleren</string>
-    <string name="your_session_id">Uw Sessie-ID</string>
+    <string name="your_account_id">Uw Sessie-ID</string>
     <string name="view_fake_chat_bubble_1">Wat is Sessie?</string>
     <string name="view_fake_chat_bubble_2">Het is een gedecentraliseerde, versleutelde berichten-app</string>
     <string name="view_fake_chat_bubble_3">Dus het verzamelt geen persoonlijke informatie of de metagegevens van mijn gesprek? Hoe werkt het?</string>
@@ -566,10 +566,10 @@
     <string name="activity_path_learn_more_button_title">Kom meer te weten</string>
     <string name="activity_path_resolving_progress">Bezig met verwerken...</string>
     <string name="activity_create_private_chat_title">Nieuwe sessie</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Uw Sessie-ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Uw Sessie-ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Scan QR-code</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scan de QR-code van een gebruiker om een sessie te starten. QR-codes kunnen worden gevonden door op het QR-icoon in de accountinstellingen te tikken.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Voer uw Session ID of ONS naam in</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Voer uw Account ID of ONS naam in</string>
     <string name="fragment_enter_public_key_explanation">Gebruikers kunnen hun Session-ID delen door naar hun accountinstellingen te gaan en op \"Deel Session-ID\" te tikken, of door hun QR-code te delen.</string>
     <string name="fragment_enter_public_key_error_message">Controleer de sessie-ID of ONS naam en probeer het opnieuw.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Sessie heeft cameratoegang nodig om QR-codes te scannen</string>

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

@@ -528,9 +528,9 @@
     <string name="copied_to_clipboard">Gekopieerd naar klembord</string>
     <string name="next">Volgende</string>
     <string name="share">Delen</string>
-    <string name="invalid_session_id">Ongeldige Sessie-ID</string>
+    <string name="invalid_account_id">Ongeldige Sessie-ID</string>
     <string name="cancel">Annuleren</string>
-    <string name="your_session_id">Uw Sessie-ID</string>
+    <string name="your_account_id">Uw Sessie-ID</string>
     <string name="view_fake_chat_bubble_1">Wat is Sessie?</string>
     <string name="view_fake_chat_bubble_2">Het is een gedecentraliseerde, versleutelde berichten-app</string>
     <string name="view_fake_chat_bubble_3">Dus het verzamelt geen persoonlijke informatie of de metagegevens van mijn gesprek? Hoe werkt het?</string>
@@ -566,10 +566,10 @@
     <string name="activity_path_learn_more_button_title">Kom meer te weten</string>
     <string name="activity_path_resolving_progress">Bezig met verwerken...</string>
     <string name="activity_create_private_chat_title">Nieuwe sessie</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Uw Sessie-ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Uw Sessie-ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Scan QR-code</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scan de QR-code van een gebruiker om een sessie te starten. QR-codes kunnen worden gevonden door op het QR-icoon in de accountinstellingen te tikken.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Voer uw Session ID of ONS naam in</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Voer uw Account ID of ONS naam in</string>
     <string name="fragment_enter_public_key_explanation">Gebruikers kunnen hun Session-ID delen door naar hun accountinstellingen te gaan en op \"Deel Session-ID\" te tikken, of door hun QR-code te delen.</string>
     <string name="fragment_enter_public_key_error_message">Controleer de sessie-ID of ONS naam en probeer het opnieuw.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Sessie heeft cameratoegang nodig om QR-codes te scannen</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -550,9 +550,9 @@
     <string name="copied_to_clipboard">Skopiowano do schowka</string>
     <string name="next">Dalej</string>
     <string name="share">Udostępnij</string>
-    <string name="invalid_session_id">Nieprawidłowy identyfikator Session</string>
+    <string name="invalid_account_id">Nieprawidłowy identyfikator Session</string>
     <string name="cancel">Anuluj</string>
-    <string name="your_session_id">Twój identyfikator Session</string>
+    <string name="your_account_id">Twój identyfikator Session</string>
     <string name="view_fake_chat_bubble_1">Czym jest Session?</string>
     <string name="view_fake_chat_bubble_2">To zdecentralizowana, szyfrowana aplikacja do przesyłania wiadomości</string>
     <string name="view_fake_chat_bubble_3">Więc nie zbiera moich danych osobowych ani metadanych z mojej rozmowy? Jak to działa?</string>
@@ -588,7 +588,7 @@
     <string name="activity_path_learn_more_button_title">Dowiedz się więcej</string>
     <string name="activity_path_resolving_progress">Ładowanie…</string>
     <string name="activity_create_private_chat_title">Nowa sesja</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Wpisz identyfikator Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Wpisz identyfikator Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skanowania QR code</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Zeskanuj kod QR użytkownika, aby rozpocząć sesję. Kody QR można znaleźć, dotykając ikony kodu QR w ustawieniach konta.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Wprowadź ID sesji lub nazwę ONS</string>

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

@@ -550,9 +550,9 @@
     <string name="copied_to_clipboard">Skopiowano do schowka</string>
     <string name="next">Dalej</string>
     <string name="share">Udostępnij</string>
-    <string name="invalid_session_id">Nieprawidłowy identyfikator Session</string>
+    <string name="invalid_account_id">Nieprawidłowy identyfikator Session</string>
     <string name="cancel">Anuluj</string>
-    <string name="your_session_id">Twój identyfikator Session</string>
+    <string name="your_account_id">Twój identyfikator Session</string>
     <string name="view_fake_chat_bubble_1">Czym jest Session?</string>
     <string name="view_fake_chat_bubble_2">To zdecentralizowana, szyfrowana aplikacja do przesyłania wiadomości</string>
     <string name="view_fake_chat_bubble_3">Więc nie zbiera moich danych osobowych ani metadanych z mojej rozmowy? Jak to działa?</string>
@@ -588,7 +588,7 @@
     <string name="activity_path_learn_more_button_title">Dowiedz się więcej</string>
     <string name="activity_path_resolving_progress">Ładowanie…</string>
     <string name="activity_create_private_chat_title">Nowa sesja</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Wpisz identyfikator Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Wpisz identyfikator Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skanowania QR code</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Zeskanuj kod QR użytkownika, aby rozpocząć sesję. Kody QR można znaleźć, dotykając ikony kodu QR w ustawieniach konta.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Wprowadź ID sesji lub nazwę ONS</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -528,9 +528,9 @@
     <string name="copied_to_clipboard">Copiado para clipboard</string>
     <string name="next">Próximo</string>
     <string name="share">Compartilhar</string>
-    <string name="invalid_session_id">Session ID inválida</string>
+    <string name="invalid_account_id">Account ID inválida</string>
     <string name="cancel">Cancelar</string>
-    <string name="your_session_id">Sua Session ID</string>
+    <string name="your_account_id">Sua Account ID</string>
     <string name="view_fake_chat_bubble_1">O que é Session?</string>
     <string name="view_fake_chat_bubble_2">É um app de mensageria encriptada, descentralizada</string>
     <string name="view_fake_chat_bubble_3">Então ele não coleta minha informação pessoal ou meus metadados de conversa? Como funciona?</string>
@@ -566,7 +566,7 @@
     <string name="activity_path_learn_more_button_title">Saber mais</string>
     <string name="activity_path_resolving_progress">Resolvendo…</string>
     <string name="activity_create_private_chat_title">Nova Sessão</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Digite o ID Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Digite o ID Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Escaneie o código QR de um usuário para iniciar uma sessão. Os códigos QR podem ser encontrados tocando no ícone de código QR nas configurações da conta.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Insira um ID Session ou nome ONS</string>
@@ -643,7 +643,7 @@
     <string name="dialog_ui_mode_option_day">Dia</string>
     <string name="dialog_ui_mode_option_night">Noite</string>
     <string name="dialog_ui_mode_option_system_default">Default de sistema</string>
-    <string name="activity_conversation_menu_copy_account_id">Copiar Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Copiar Account ID</string>
     <string name="attachment">Anexo</string>
     <string name="attachment_type_voice_message">Mensagem de Voz</string>
     <string name="details">Detalhes</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -523,9 +523,9 @@ foi recebida está corrompida!</string>
     <string name="copied_to_clipboard">Copiado para a área de transferência</string>
     <string name="next">Próximo</string>
     <string name="share">Compartilhar</string>
-    <string name="invalid_session_id">ID Session inválido</string>
+    <string name="invalid_account_id">ID Session inválido</string>
     <string name="cancel">Cancelar</string>
-    <string name="your_session_id">Seu ID Session</string>
+    <string name="your_account_id">Seu ID Session</string>
     <string name="view_fake_chat_bubble_1">O que é o Session?</string>
     <string name="view_fake_chat_bubble_2">É um aplicativo de mensagens criptografado e descentralizado</string>
     <string name="view_fake_chat_bubble_3">Então ele não coleta minhas informações pessoais ou meus metadados de conversa? Como funciona?</string>
@@ -561,12 +561,12 @@ foi recebida está corrompida!</string>
     <string name="activity_path_learn_more_button_title">Saber mais</string>
     <string name="activity_path_resolving_progress">A resolver…</string>
     <string name="activity_create_private_chat_title">Nova Sessão</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Digite o ID Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Digite o ID Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Escaneie o código QR de um usuário para iniciar uma sessão. Os códigos QR podem ser encontrados tocando no ícone de código QR nas configurações da conta.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Insira um Session ID ou um nome ONS</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Insira um Account ID ou um nome ONS</string>
     <string name="fragment_enter_public_key_explanation">Os usuários podem compartilhar seus IDs Session acessando as configurações da conta e tocando em Compartilhar ID Session, ou compartilhando o código QR.</string>
-    <string name="fragment_enter_public_key_error_message">Por favor, verifique o Session ID ou ONS e tente novamente.</string>
+    <string name="fragment_enter_public_key_error_message">Por favor, verifique o Account ID ou ONS e tente novamente.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">O Session precisa de acesso à câmera para escanear códigos QR</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Conceder acesso à câmera</string>
     <string name="activity_create_closed_group_title">Novo grupo fechado</string>

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

@@ -528,9 +528,9 @@
     <string name="copied_to_clipboard">Copiado para clipboard</string>
     <string name="next">Próximo</string>
     <string name="share">Compartilhar</string>
-    <string name="invalid_session_id">Session ID inválida</string>
+    <string name="invalid_account_id">Account ID inválida</string>
     <string name="cancel">Cancelar</string>
-    <string name="your_session_id">Sua Session ID</string>
+    <string name="your_account_id">Sua Account ID</string>
     <string name="view_fake_chat_bubble_1">O que é Session?</string>
     <string name="view_fake_chat_bubble_2">É um app de mensageria encriptada, descentralizada</string>
     <string name="view_fake_chat_bubble_3">Então ele não coleta minha informação pessoal ou meus metadados de conversa? Como funciona?</string>
@@ -566,7 +566,7 @@
     <string name="activity_path_learn_more_button_title">Saber mais</string>
     <string name="activity_path_resolving_progress">Resolvendo…</string>
     <string name="activity_create_private_chat_title">Nova Sessão</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Digite o ID Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Digite o ID Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Escanear código QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Escaneie o código QR de um usuário para iniciar uma sessão. Os códigos QR podem ser encontrados tocando no ícone de código QR nas configurações da conta.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Insira um ID Session ou nome ONS</string>
@@ -643,7 +643,7 @@
     <string name="dialog_ui_mode_option_day">Dia</string>
     <string name="dialog_ui_mode_option_night">Noite</string>
     <string name="dialog_ui_mode_option_system_default">Default de sistema</string>
-    <string name="activity_conversation_menu_copy_account_id">Copiar Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Copiar Account ID</string>
     <string name="attachment">Anexo</string>
     <string name="attachment_type_voice_message">Mensagem de Voz</string>
     <string name="details">Detalhes</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -542,9 +542,9 @@ schimbul de chei este corupt </string>
     <string name="copied_to_clipboard">Copiat în clipboard</string>
     <string name="next">Următorul</string>
     <string name="share">Distribuie</string>
-    <string name="invalid_session_id">ID sesiune nevalid</string>
+    <string name="invalid_account_id">ID sesiune nevalid</string>
     <string name="cancel">Anulare</string>
-    <string name="your_session_id">ID-ul sesiunii dvs</string>
+    <string name="your_account_id">ID-ul sesiunii dvs</string>
     <string name="view_fake_chat_bubble_1">Ce este Session?</string>
     <string name="view_fake_chat_bubble_2">Este o aplicație de mesagerie descentralizată, criptată</string>
     <string name="view_fake_chat_bubble_3">Deci nu colectează informaţii personale sau metadatele conversaţiei? Cum funcţionează?</string>
@@ -565,7 +565,7 @@ schimbul de chei este corupt </string>
     <string name="activity_path_learn_more_button_title">Aflați mai multe</string>
     <string name="activity_path_resolving_progress">Se rezolvă…</string>
     <string name="activity_create_private_chat_title">Sesiune Nouă</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Introduceți ID-ul Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Introduceți ID-ul Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Scanați codul QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scanați codul QR al unui utilizator pentru a începe o sesiune. Codurile QR pot fi găsite prin atingerea pictogramei de cod QR din setările contului.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Introduceți ID-ul Session sau numele ONS</string>

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

@@ -542,9 +542,9 @@ schimbul de chei este corupt </string>
     <string name="copied_to_clipboard">Copiat în clipboard</string>
     <string name="next">Următorul</string>
     <string name="share">Distribuie</string>
-    <string name="invalid_session_id">ID sesiune nevalid</string>
+    <string name="invalid_account_id">ID sesiune nevalid</string>
     <string name="cancel">Anulare</string>
-    <string name="your_session_id">ID-ul sesiunii dvs</string>
+    <string name="your_account_id">ID-ul sesiunii dvs</string>
     <string name="view_fake_chat_bubble_1">Ce este Session?</string>
     <string name="view_fake_chat_bubble_2">Este o aplicație de mesagerie descentralizată, criptată</string>
     <string name="view_fake_chat_bubble_3">Deci nu colectează informaţii personale sau metadatele conversaţiei? Cum funcţionează?</string>
@@ -565,7 +565,7 @@ schimbul de chei este corupt </string>
     <string name="activity_path_learn_more_button_title">Aflați mai multe</string>
     <string name="activity_path_resolving_progress">Se rezolvă…</string>
     <string name="activity_create_private_chat_title">Sesiune Nouă</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Introduceți ID-ul Session</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Introduceți ID-ul Session</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Scanați codul QR</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Scanați codul QR al unui utilizator pentru a începe o sesiune. Codurile QR pot fi găsite prin atingerea pictogramei de cod QR din setările contului.</string>
     <string name="fragment_enter_public_key_edit_text_hint">Introduceți ID-ul Session sau numele ONS</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -552,9 +552,9 @@
     <string name="copied_to_clipboard">Скопировано в буфер обмена</string>
     <string name="next">Далее</string>
     <string name="share">Поделиться</string>
-    <string name="invalid_session_id">Неверный Session ID</string>
+    <string name="invalid_account_id">Неверный Account ID</string>
     <string name="cancel">Отмена</string>
-    <string name="your_session_id">Ваш Session ID</string>
+    <string name="your_account_id">Ваш Account ID</string>
     <string name="view_fake_chat_bubble_1">Что такое Session?</string>
     <string name="view_fake_chat_bubble_2">Это децентрализованное, зашифрованное приложение для обмена сообщениями</string>
     <string name="view_fake_chat_bubble_3">Значит ли это, что оно не собирает мою личную информацию или метаданные моего разговора? Как оно работает?</string>
@@ -579,7 +579,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Вы уверены, что хотите удалить этот разговор?</string>
     <string name="activity_home_conversation_deleted_message">Разговор удален</string>
     <string name="view_seed_reminder_subtitle_1">Защитите свой аккаунт, сохранив секретную фразу</string>
-    <string name="view_seed_reminder_subtitle_2">Нажмите и удерживайте сокращенные слова, чтобы открыть секретную фразу, а затем сохраните ее в надежном месте, чтобы защитить свой Session ID.</string>
+    <string name="view_seed_reminder_subtitle_2">Нажмите и удерживайте сокращенные слова, чтобы открыть секретную фразу, а затем сохраните ее в надежном месте, чтобы защитить свой Account ID.</string>
     <string name="view_seed_reminder_subtitle_3">Обязательно сохраните секретную фразу в надежном месте</string>
     <string name="activity_path_title">Маршрут</string>
     <string name="activity_path_explanation">Session скрывает ваш IP, перенаправляя ваши сообщения через несколько сервисных узлов своей децентрализованной сети. Вот страны, через которые в данный момент проходит ваш сеанс связи:</string>
@@ -590,12 +590,12 @@
     <string name="activity_path_learn_more_button_title">Узнать больше</string>
     <string name="activity_path_resolving_progress">Идет определение…</string>
     <string name="activity_create_private_chat_title">Новый Диалог</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Введите Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Введите Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Сканировать QR-код</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Сканируйте QR-код пользователя, чтобы начать сессию. QR-коды можно найти, нажав значок QR-кода в настройках учетной записи.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Введите Session ID или ONS имя</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Введите Account ID или ONS имя</string>
-    <string name="fragment_enter_public_key_explanation">Пользователи могут поделиться своим Session ID, зайдя в настройки своей учетной записи и нажав «Отправить Session ID», или поделившись своим QR-кодом.</string>
+    <string name="fragment_enter_public_key_explanation">Пользователи могут поделиться своим Account ID, зайдя в настройки своей учетной записи и нажав «Отправить Account ID», или поделившись своим QR-кодом.</string>
-    <string name="fragment_enter_public_key_error_message">Пожалуйста, проверьте Session ID или ONS имя и попробуйте снова.</string>
+    <string name="fragment_enter_public_key_error_message">Пожалуйста, проверьте Account ID или ONS имя и попробуйте снова.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session нужен доступ к камере для сканирования QR-кодов</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Предоставить доступ к камере</string>
     <string name="activity_create_closed_group_title">Новая закрытая группа</string>
@@ -667,7 +667,7 @@
     <string name="dialog_ui_mode_option_day">День</string>
     <string name="dialog_ui_mode_option_night">Ночь</string>
     <string name="dialog_ui_mode_option_system_default">Системные настройки</string>
-    <string name="activity_conversation_menu_copy_account_id">Копировать Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Копировать Account ID</string>
     <string name="attachment">Вложение</string>
     <string name="attachment_type_voice_message">Голосовое сообщение</string>
     <string name="details">Подробности</string>

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

@@ -552,9 +552,9 @@
     <string name="copied_to_clipboard">Скопировано в буфер обмена</string>
     <string name="next">Далее</string>
     <string name="share">Поделиться</string>
-    <string name="invalid_session_id">Неверный Session ID</string>
+    <string name="invalid_account_id">Неверный Account ID</string>
     <string name="cancel">Отмена</string>
-    <string name="your_session_id">Ваш Session ID</string>
+    <string name="your_account_id">Ваш Account ID</string>
     <string name="view_fake_chat_bubble_1">Что такое Session?</string>
     <string name="view_fake_chat_bubble_2">Это децентрализованное, зашифрованное приложение для обмена сообщениями</string>
     <string name="view_fake_chat_bubble_3">Значит ли это, что оно не собирает мою личную информацию или метаданные моего разговора? Как оно работает?</string>
@@ -579,7 +579,7 @@
     <string name="activity_home_delete_conversation_dialog_message">Вы уверены, что хотите удалить этот разговор?</string>
     <string name="activity_home_conversation_deleted_message">Разговор удален</string>
     <string name="view_seed_reminder_subtitle_1">Защитите свой аккаунт, сохранив секретную фразу</string>
-    <string name="view_seed_reminder_subtitle_2">Нажмите и удерживайте сокращенные слова, чтобы открыть секретную фразу, а затем сохраните ее в надежном месте, чтобы защитить свой Session ID.</string>
+    <string name="view_seed_reminder_subtitle_2">Нажмите и удерживайте сокращенные слова, чтобы открыть секретную фразу, а затем сохраните ее в надежном месте, чтобы защитить свой Account ID.</string>
     <string name="view_seed_reminder_subtitle_3">Обязательно сохраните секретную фразу в надежном месте</string>
     <string name="activity_path_title">Маршрут</string>
     <string name="activity_path_explanation">Session скрывает ваш IP, перенаправляя ваши сообщения через несколько сервисных узлов своей децентрализованной сети. Вот страны, через которые в данный момент проходит ваш сеанс связи:</string>
@@ -590,12 +590,12 @@
     <string name="activity_path_learn_more_button_title">Узнать больше</string>
     <string name="activity_path_resolving_progress">Идет определение…</string>
     <string name="activity_create_private_chat_title">Новый Диалог</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Введите Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Введите Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Сканировать QR-код</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Сканируйте QR-код пользователя, чтобы начать сессию. QR-коды можно найти, нажав значок QR-кода в настройках учетной записи.</string>
-    <string name="fragment_enter_public_key_edit_text_hint">Введите Session ID или ONS имя</string>
+    <string name="fragment_enter_public_key_edit_text_hint">Введите Account ID или ONS имя</string>
-    <string name="fragment_enter_public_key_explanation">Пользователи могут поделиться своим Session ID, зайдя в настройки своей учетной записи и нажав «Отправить Session ID», или поделившись своим QR-кодом.</string>
+    <string name="fragment_enter_public_key_explanation">Пользователи могут поделиться своим Account ID, зайдя в настройки своей учетной записи и нажав «Отправить Account ID», или поделившись своим QR-кодом.</string>
-    <string name="fragment_enter_public_key_error_message">Пожалуйста, проверьте Session ID или ONS имя и попробуйте снова.</string>
+    <string name="fragment_enter_public_key_error_message">Пожалуйста, проверьте Account ID или ONS имя и попробуйте снова.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session нужен доступ к камере для сканирования QR-кодов</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Предоставить доступ к камере</string>
     <string name="activity_create_closed_group_title">Новая закрытая группа</string>
@@ -667,7 +667,7 @@
     <string name="dialog_ui_mode_option_day">День</string>
     <string name="dialog_ui_mode_option_night">Ночь</string>
     <string name="dialog_ui_mode_option_system_default">Системные настройки</string>
-    <string name="activity_conversation_menu_copy_account_id">Копировать Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Копировать Account ID</string>
     <string name="attachment">Вложение</string>
     <string name="attachment_type_voice_message">Голосовое сообщение</string>
     <string name="details">Подробности</string>

app/src/main/res/values-sk-rSK/strings.xml

@@ -542,9 +542,9 @@ výmeny kľúčov.</string>
     <string name="copied_to_clipboard">Skopírované do schránky</string>
     <string name="next">Ďalej</string>
     <string name="share">Zdieľať</string>
-    <string name="invalid_session_id">Neplatné Session ID</string>
+    <string name="invalid_account_id">Neplatné Account ID</string>
     <string name="cancel">Zrušiť</string>
-    <string name="your_session_id">Vaše Session ID</string>
+    <string name="your_account_id">Vaše Account ID</string>
     <string name="view_fake_chat_bubble_1">Čo je Session?</string>
     <string name="view_fake_chat_bubble_2">Je to decentralizovaná, šifrovaná aplikácia na posielanie správ</string>
     <string name="view_fake_chat_bubble_3">Takže nezbiera moje osobné informácie alebo metadáta mojich konverzácií? Ako to funguje?</string>
@@ -576,10 +576,10 @@ výmeny kľúčov.</string>
     <string name="activity_path_service_node_row_title">Servisný uzol</string>
     <string name="activity_path_destination_row_title">Cieľ</string>
     <string name="activity_path_learn_more_button_title">Viac informácií</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Zadajte Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Zadajte Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skenovať QR kód</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Začnite stretnutie naskenovaním QR kódu iného používateľa. QR kód nájdete ťuknutím na ikonu QR kódu v nastaveniach účtu.</string>
-    <string name="fragment_enter_public_key_explanation">Používatelia môžu zdieľať svoje Session ID tak, že prejdú do nastavení svojho účtu a klepnú na možnosť „Zdieľať Session ID“ alebo zdieľajú svoj QR kód.</string>
+    <string name="fragment_enter_public_key_explanation">Používatelia môžu zdieľať svoje Account ID tak, že prejdú do nastavení svojho účtu a klepnú na možnosť „Zdieľať Account ID“ alebo zdieľajú svoj QR kód.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session potrebuje prístup k fotoaparátu na skenovanie QR kódov</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Udeliť prístup k fotoaparátu</string>
     <string name="activity_create_closed_group_title">Nová uzatvorená skupina</string>
@@ -636,7 +636,7 @@ výmeny kľúčov.</string>
     <string name="dialog_ui_mode_option_day">Deň</string>
     <string name="dialog_ui_mode_option_night">Nočný režim</string>
     <string name="dialog_ui_mode_option_system_default">Predvolené systémom</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopírovať Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopírovať Account ID</string>
     <string name="attachment">Príloha</string>
     <string name="attachment_type_voice_message">Hlasová správa</string>
     <string name="details">Podrobnosti</string>

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

@@ -542,9 +542,9 @@ výmeny kľúčov.</string>
     <string name="copied_to_clipboard">Skopírované do schránky</string>
     <string name="next">Ďalej</string>
     <string name="share">Zdieľať</string>
-    <string name="invalid_session_id">Neplatné Session ID</string>
+    <string name="invalid_account_id">Neplatné Account ID</string>
     <string name="cancel">Zrušiť</string>
-    <string name="your_session_id">Vaše Session ID</string>
+    <string name="your_account_id">Vaše Account ID</string>
     <string name="view_fake_chat_bubble_1">Čo je Session?</string>
     <string name="view_fake_chat_bubble_2">Je to decentralizovaná, šifrovaná aplikácia na posielanie správ</string>
     <string name="view_fake_chat_bubble_3">Takže nezbiera moje osobné informácie alebo metadáta mojich konverzácií? Ako to funguje?</string>
@@ -576,10 +576,10 @@ výmeny kľúčov.</string>
     <string name="activity_path_service_node_row_title">Servisný uzol</string>
     <string name="activity_path_destination_row_title">Cieľ</string>
     <string name="activity_path_learn_more_button_title">Viac informácií</string>
-    <string name="activity_create_private_chat_enter_session_id_tab_title">Zadajte Session ID</string>
+    <string name="activity_create_private_chat_enter_account_id_tab_title">Zadajte Account ID</string>
     <string name="activity_create_private_chat_scan_qr_code_tab_title">Skenovať QR kód</string>
     <string name="activity_create_private_chat_scan_qr_code_explanation">Začnite stretnutie naskenovaním QR kódu iného používateľa. QR kód nájdete ťuknutím na ikonu QR kódu v nastaveniach účtu.</string>
-    <string name="fragment_enter_public_key_explanation">Používatelia môžu zdieľať svoje Session ID tak, že prejdú do nastavení svojho účtu a klepnú na možnosť „Zdieľať Session ID“ alebo zdieľajú svoj QR kód.</string>
+    <string name="fragment_enter_public_key_explanation">Používatelia môžu zdieľať svoje Account ID tak, že prejdú do nastavení svojho účtu a klepnú na možnosť „Zdieľať Account ID“ alebo zdieľajú svoj QR kód.</string>
     <string name="fragment_scan_qr_code_camera_access_explanation">Session potrebuje prístup k fotoaparátu na skenovanie QR kódov</string>
     <string name="fragment_scan_qr_code_grant_camera_access_button_title">Udeliť prístup k fotoaparátu</string>
     <string name="activity_create_closed_group_title">Nová uzatvorená skupina</string>
@@ -636,7 +636,7 @@ výmeny kľúčov.</string>
     <string name="dialog_ui_mode_option_day">Deň</string>
     <string name="dialog_ui_mode_option_night">Nočný režim</string>
     <string name="dialog_ui_mode_option_system_default">Predvolené systémom</string>
-    <string name="activity_conversation_menu_copy_account_id">Kopírovať Session ID</string>
+    <string name="activity_conversation_menu_copy_account_id">Kopírovať Account ID</string>
     <string name="attachment">Príloha</string>
     <string name="attachment_type_voice_message">Hlasová správa</string>
     <string name="details">Podrobnosti</string>

app/src/main/res/values-sq-rAL/strings.xml

@@ -526,9 +526,9 @@
     <string name="copied_to_clipboard">Kopjo në klipbord</string>
     <string name="next">Tutje</string>
     <string name="share">Shpërndaje</string>
-    <string name="invalid_session_id">Session ID e gabuar</string>
+    <string name="invalid_account_id">Account ID e gabuar</string>
     <string name="cancel">Anuloje</string>
-    <string name="your_session_id">Session ID e juaj</string>
+    <string name="your_account_id">Account ID e juaj</string>
     <string name="view_fake_chat_bubble_1">Si është Sessioni juaj?</string>
     <string name="view_fake_chat_bubble_2">Është një app për mesazhe të koduara dhe decentralizuara</string>
     <string name="view_fake_chat_bubble_3">I bije që të dhënat personale dhe informacionet e mesazheve nuk do të grumbullohen? Si funksionon kjo?</string>

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

@@ -526,9 +526,9 @@
     <string name="copied_to_clipboard">Kopjo në klipbord</string>
     <string name="next">Tutje</string>
     <string name="share">Shpërndaje</string>
-    <string name="invalid_session_id">Session ID e gabuar</string>
+    <string name="invalid_account_id">Account ID e gabuar</string>
     <string name="cancel">Anuloje</string>
-    <string name="your_session_id">Session ID e juaj</string>
+    <string name="your_account_id">Account ID e juaj</string>
     <string name="view_fake_chat_bubble_1">Si është Sessioni juaj?</string>
     <string name="view_fake_chat_bubble_2">Është një app për mesazhe të koduara dhe decentralizuara</string>
     <string name="view_fake_chat_bubble_3">I bije që të dhënat personale dhe informacionet e mesazheve nuk do të grumbullohen? Si funksionon kjo?</string>