From 9ac3fc6290cb5d8cbc593d1c3695b647ff2dfabc Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Mon, 6 May 2024 13:52:55 +1000 Subject: [PATCH 01/14] clean --- Session.xcodeproj/project.pbxproj | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 06efc5782..6b174a490 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -1307,7 +1307,6 @@ 7BAF54D227ACCF01003D12F8 /* SAEScreenLockViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SAEScreenLockViewController.swift; sourceTree = ""; }; 7BAF54D527ACD0E2003D12F8 /* ReusableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReusableView.swift; sourceTree = ""; }; 7BAFA7592AAEA281001DA43E /* LinkPreviewView_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreviewView_SwiftUI.swift; sourceTree = ""; }; - 7BB92B3E28C825FD0082762F /* NewConversationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewConversationViewModel.swift; sourceTree = ""; }; 7BBBDC43286EAD2D00747E59 /* TappableLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TappableLabel.swift; sourceTree = ""; }; 7BBBDC452875600700747E59 /* DocumentTitleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentTitleViewController.swift; sourceTree = ""; }; 7BC01A3B241F40AB00BC7C55 /* SessionNotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SessionNotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2537,14 +2536,6 @@ path = TurnServers; sourceTree = ""; }; - 94023B0C2BBBCD960044E021 /* Recovered References */ = { - isa = PBXGroup; - children = ( - 7BB92B3E28C825FD0082762F /* NewConversationViewModel.swift */, - ); - name = "Recovered References"; - sourceTree = ""; - }; 942C9CA02B67762400B5153A /* SwiftUI */ = { isa = PBXGroup; children = ( @@ -3582,7 +3573,6 @@ D221A08C169C9E5E00537ABF /* Frameworks */, D221A08A169C9E5E00537ABF /* Products */, 2BADBA206E0B8D297E313FBA /* Pods */, - 94023B0C2BBBCD960044E021 /* Recovered References */, ); sourceTree = ""; }; From 73193df2e177125cecc26c50d7b9ed07eff1f4b1 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Mon, 13 May 2024 16:47:15 +1000 Subject: [PATCH 02/14] Fixed error handling after merge --- .../Home/New Conversation/NewMessageScreen.swift | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Session/Home/New Conversation/NewMessageScreen.swift b/Session/Home/New Conversation/NewMessageScreen.swift index 3b1290ca2..72519040e 100644 --- a/Session/Home/New Conversation/NewMessageScreen.swift +++ b/Session/Home/New Conversation/NewMessageScreen.swift @@ -94,18 +94,13 @@ struct NewMessageScreen: View { case .finished: break case .failure(let error): modalActivityIndicator.dismiss { - var messageOrNil: String? - if let error = error as? SnodeAPIError { + let message: String = { switch error { - case .generic, .decryptionFailed, .hashingFailed, .validationFailed: - messageOrNil = "onsErrorUnableToSearch".localized() + case SnodeAPIError.onsDecryptionFailed, SnodeAPIError.onsHashingFailed, + SnodeAPIError.onsValidationFailed: + return "onsErrorUnableToSearch".localized() default: break } - } - let message: String = { - if let messageOrNil: String = messageOrNil { - return messageOrNil - } return (maybeSessionId?.prefix == .blinded15 || maybeSessionId?.prefix == .blinded25 ? "accountIdErrorInvalid".localized() : From e4d07fc510a6ceb868df6fc24cebd32652b5a946 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Thu, 16 May 2024 10:06:22 +1000 Subject: [PATCH 03/14] Tweaks to the build script and building instructions --- BUILDING.md | 18 +++++++++++++++++- Scripts/build_libSession_util.sh | 21 ++++++++++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index fbf425c00..2135475cd 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -46,7 +46,20 @@ To build and configure the libraries Session uses, just run: pod install ``` -## 4. Xcode +## 4. libSession build dependencies + +The iOS project has a share C++ library called `libSession` which is built as one of the project dependencies, in order for this to compile the following dependencies need to be installed: +- cmake +- m4 +- pkg-config + +These can be installed with Homebrew via `brew install cmake m4 pkg-config` + +Additionally `xcode-select` needs to be setup correctly (depending on the order of installation it can point to the wrong directory and result in a build error similar to `tool '{name}' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance`), this can be setup correctly by running: + +`sudo xcode-select -s /Applications/Xcode.app/Contents/Developer` + +## 5. Xcode Open the `Session.xcworkspace` in Xcode. @@ -67,6 +80,9 @@ Build and Run and you are ready to go! ## Known issues +### Third-party Installation +The database for the app is stored within an `App Group` directory which is based on the app identifier, unfortunately the identifier cannot be retrieved at runtime so it's currently hard-coded in the code. In order to be able to run session on a device you will need to update the `UserDefaults.applicationGroup` variable in `SessionUtilitiesKit/General/SNUserDefaults` to match the value provided (You may also need to create the `App Group` on your Apple Developer account). + ### Push Notifications Features related to push notifications are known to be not working for third-party contributors since Apple's Push Notification service pushes diff --git a/Scripts/build_libSession_util.sh b/Scripts/build_libSession_util.sh index d3d5e4a2c..d248a2ab5 100755 --- a/Scripts/build_libSession_util.sh +++ b/Scripts/build_libSession_util.sh @@ -27,6 +27,7 @@ # Need to set the path or we won't find cmake PATH=${PATH}:/usr/local/bin:/opt/local/bin:/opt/homebrew/bin:/opt/homebrew/opt/m4/bin:/sbin/md5 +required_packages=("cmake" "m4" "pkg-config") exec 3>&1 # Save original stdout @@ -34,15 +35,23 @@ exec 3>&1 # Save original stdout mkdir -p "${TARGET_BUILD_DIR}/libSessionUtil" echo "Validating build requirements" +missing_packages=() -# Ensure the build directory exists (in case we need it before XCode creates it) -mkdir -p "${TARGET_BUILD_DIR}" +for package in "${required_packages[@]}"; do + if ! which "$package" > /dev/null; then + missing_packages+=("$package") + fi +done -if ! which cmake > /dev/null; then - echo "error: cmake is required to build, please install (can install via homebrew with 'brew install cmake')." - exit 0 +if [ ${#missing_packages[@]} -ne 0 ]; then + packages=$(echo "${missing_packages[@]}") + echo "error: Some build dependencies are not installed, please install them ('brew install ${packages}'):" + exit 1 fi +# Ensure the build directory exists (in case we need it before XCode creates it) +mkdir -p "${TARGET_BUILD_DIR}" + # Check if we have the `LibSession-Util` submodule checked out and if not (depending on the 'SHOULD_AUTO_INIT_SUBMODULES' argument) perform the checkout if [ ! -d "${SRCROOT}/LibSession-Util" ] || [ ! -d "${SRCROOT}/LibSession-Util/src" ] || [ ! "$(ls -A "${SRCROOT}/LibSession-Util")" ]; then echo "error: Need to fetch LibSession-Util submodule (git submodule update --init --recursive)." @@ -188,6 +197,8 @@ if [ "$CONFIGURATION" == "Debug" ]; then submodule_check=OFF fi +echo "CMake build logs: ${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log" + # Build the individual architectures for i in "${!TARGET_ARCHS[@]}"; do build="${TARGET_BUILD_DIR}/libSessionUtil/${TARGET_ARCHS[$i]}" From c342deb94e7b01b8a0840e76fddc31d343a42fe2 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 16 May 2024 16:18:17 +1000 Subject: [PATCH 04/14] fix input colour after error occured --- SessionUIKit/Components/SwiftUI/SessionTextField.swift | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/SessionUIKit/Components/SwiftUI/SessionTextField.swift b/SessionUIKit/Components/SwiftUI/SessionTextField.swift index 31ffff55e..0a9356086 100644 --- a/SessionUIKit/Components/SwiftUI/SessionTextField.swift +++ b/SessionUIKit/Components/SwiftUI/SessionTextField.swift @@ -8,13 +8,11 @@ public struct SessionTextField: View where ExplanationView: Vie @Binding var text: String @Binding var error: String? @State var previousError: String = "" + @State var textThemeColor: ThemeValue = .textPrimary let explanationView: () -> ExplanationView let placeholder: String let accessibility: Accessibility - var textThemeColor: ThemeValue { - (error?.isEmpty == false) ? .danger : .textPrimary - } var isErrorMode: Bool { guard previousError.isEmpty else { return true } if error?.isEmpty == false { return true } @@ -46,6 +44,7 @@ public struct SessionTextField: View where ExplanationView: Vie alignment: .center, spacing: Values.smallSpacing ) { + // Text input ZStack(alignment: .leading) { if text.isEmpty { Text(placeholder) @@ -122,6 +121,11 @@ public struct SessionTextField: View where ExplanationView: Vie ) .stroke(themeColor: isErrorMode ? .danger : .borderSeparator) ) + .onReceive(Just(error)) { newValue in + textThemeColor = (newValue?.isEmpty == false) ? .danger : .textPrimary + } + + // Error message ZStack { if isErrorMode { Text(error ?? previousError) From 2301c75c08122bd179ea2ce1c899f26de06bfaa7 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 16 May 2024 16:21:19 +1000 Subject: [PATCH 05/14] fix toast error message for scanning recovery password qrcode --- .../Translations/ar.lproj/Localizable.strings | 1 + .../Translations/be.lproj/Localizable.strings | 1 + .../Translations/bg.lproj/Localizable.strings | 1 + .../Translations/bn.lproj/Localizable.strings | 1 + .../Translations/cs.lproj/Localizable.strings | 1 + .../Translations/da.lproj/Localizable.strings | 1 + .../Translations/de.lproj/Localizable.strings | 1 + .../Translations/el.lproj/Localizable.strings | 1 + .../Translations/en.lproj/Localizable.strings | 1 + .../Translations/eo.lproj/Localizable.strings | 1 + .../es-ES.lproj/Localizable.strings | 1 + .../Translations/fa.lproj/Localizable.strings | 1 + .../Translations/fi.lproj/Localizable.strings | 1 + .../Translations/fil.lproj/Localizable.strings | 1 + .../Translations/fr.lproj/Localizable.strings | 1 + .../Translations/hi.lproj/Localizable.strings | 1 + .../Translations/hr.lproj/Localizable.strings | 1 + .../Translations/hu.lproj/Localizable.strings | 1 + .../Translations/id.lproj/Localizable.strings | 1 + .../Translations/it.lproj/Localizable.strings | 1 + .../Translations/ja.lproj/Localizable.strings | 1 + .../Translations/ko.lproj/Localizable.strings | 1 + .../Translations/ku.lproj/Localizable.strings | 1 + .../Translations/lt.lproj/Localizable.strings | 1 + .../Translations/lv.lproj/Localizable.strings | 1 + .../ne-NP.lproj/Localizable.strings | 1 + .../Translations/nl.lproj/Localizable.strings | 1 + .../Translations/no.lproj/Localizable.strings | 1 + .../Translations/pl.lproj/Localizable.strings | 1 + .../pt-BR.lproj/Localizable.strings | 1 + .../pt-PT.lproj/Localizable.strings | 1 + .../Translations/ro.lproj/Localizable.strings | 1 + .../Translations/ru.lproj/Localizable.strings | 1 + .../si-LK.lproj/Localizable.strings | 1 + .../Translations/sk.lproj/Localizable.strings | 1 + .../Translations/sl.lproj/Localizable.strings | 1 + .../sv-SE.lproj/Localizable.strings | 1 + .../Translations/th.lproj/Localizable.strings | 1 + .../Translations/tr.lproj/Localizable.strings | 1 + .../Translations/uk.lproj/Localizable.strings | 1 + .../Translations/vi.lproj/Localizable.strings | 1 + .../zh-CN.lproj/Localizable.strings | 1 + .../zh-TW.lproj/Localizable.strings | 1 + Session/Onboarding/LoadAccountScreen.swift | 17 +++++------------ Session/Onboarding/Onboarding.swift | 14 ++++++++++++++ SessionUtilitiesKit/Crypto/Mnemonic.swift | 13 +++++++------ 46 files changed, 69 insertions(+), 18 deletions(-) diff --git a/Session/Meta/Translations/ar.lproj/Localizable.strings b/Session/Meta/Translations/ar.lproj/Localizable.strings index c507d041c..6989c4593 100644 --- a/Session/Meta/Translations/ar.lproj/Localizable.strings +++ b/Session/Meta/Translations/ar.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/be.lproj/Localizable.strings b/Session/Meta/Translations/be.lproj/Localizable.strings index de0535e43..83b01ceb4 100644 --- a/Session/Meta/Translations/be.lproj/Localizable.strings +++ b/Session/Meta/Translations/be.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/bg.lproj/Localizable.strings b/Session/Meta/Translations/bg.lproj/Localizable.strings index cf0f7f94a..f4586baac 100644 --- a/Session/Meta/Translations/bg.lproj/Localizable.strings +++ b/Session/Meta/Translations/bg.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/bn.lproj/Localizable.strings b/Session/Meta/Translations/bn.lproj/Localizable.strings index 09cc209eb..4324c2375 100644 --- a/Session/Meta/Translations/bn.lproj/Localizable.strings +++ b/Session/Meta/Translations/bn.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/cs.lproj/Localizable.strings b/Session/Meta/Translations/cs.lproj/Localizable.strings index 22dbae5a2..e481c4778 100644 --- a/Session/Meta/Translations/cs.lproj/Localizable.strings +++ b/Session/Meta/Translations/cs.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/da.lproj/Localizable.strings b/Session/Meta/Translations/da.lproj/Localizable.strings index 84363521d..4fa4cedc6 100644 --- a/Session/Meta/Translations/da.lproj/Localizable.strings +++ b/Session/Meta/Translations/da.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index b48bb9c26..3702beb2e 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -1100,6 +1100,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/el.lproj/Localizable.strings b/Session/Meta/Translations/el.lproj/Localizable.strings index 3517b8759..9e32149da 100644 --- a/Session/Meta/Translations/el.lproj/Localizable.strings +++ b/Session/Meta/Translations/el.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index 513c0d881..4452cd696 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/eo.lproj/Localizable.strings b/Session/Meta/Translations/eo.lproj/Localizable.strings index 76f1bb9b4..3c46be0df 100644 --- a/Session/Meta/Translations/eo.lproj/Localizable.strings +++ b/Session/Meta/Translations/eo.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/es-ES.lproj/Localizable.strings b/Session/Meta/Translations/es-ES.lproj/Localizable.strings index a3c76b172..d6a1152b4 100644 --- a/Session/Meta/Translations/es-ES.lproj/Localizable.strings +++ b/Session/Meta/Translations/es-ES.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index d5c530e12..3430a3f0a 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index 8d45051a0..659706fe3 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/fil.lproj/Localizable.strings b/Session/Meta/Translations/fil.lproj/Localizable.strings index 13ff25e71..dc789ced3 100644 --- a/Session/Meta/Translations/fil.lproj/Localizable.strings +++ b/Session/Meta/Translations/fil.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index c9be2726b..d7e007457 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index 83cff08a1..d5e027f69 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index ddf41089f..ddd4ba60e 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/hu.lproj/Localizable.strings b/Session/Meta/Translations/hu.lproj/Localizable.strings index 7ac433606..db883c4f6 100644 --- a/Session/Meta/Translations/hu.lproj/Localizable.strings +++ b/Session/Meta/Translations/hu.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/id.lproj/Localizable.strings b/Session/Meta/Translations/id.lproj/Localizable.strings index 1b961f37c..cfe1b6572 100644 --- a/Session/Meta/Translations/id.lproj/Localizable.strings +++ b/Session/Meta/Translations/id.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index 4d925e121..69410ce7b 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index bb84a1851..c05b4a34d 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/ko.lproj/Localizable.strings b/Session/Meta/Translations/ko.lproj/Localizable.strings index 660cbaa6b..7aac42b37 100644 --- a/Session/Meta/Translations/ko.lproj/Localizable.strings +++ b/Session/Meta/Translations/ko.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/ku.lproj/Localizable.strings b/Session/Meta/Translations/ku.lproj/Localizable.strings index d1a1c6a78..0ec81f7ce 100644 --- a/Session/Meta/Translations/ku.lproj/Localizable.strings +++ b/Session/Meta/Translations/ku.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/lt.lproj/Localizable.strings b/Session/Meta/Translations/lt.lproj/Localizable.strings index 6e9e7d97c..730f4deda 100644 --- a/Session/Meta/Translations/lt.lproj/Localizable.strings +++ b/Session/Meta/Translations/lt.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/lv.lproj/Localizable.strings b/Session/Meta/Translations/lv.lproj/Localizable.strings index 2abc8ddc3..e68be458f 100644 --- a/Session/Meta/Translations/lv.lproj/Localizable.strings +++ b/Session/Meta/Translations/lv.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings index 930a318f7..44e6e1d7f 100644 --- a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings +++ b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index dc9efc54d..38441e5fe 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/no.lproj/Localizable.strings b/Session/Meta/Translations/no.lproj/Localizable.strings index 91f60cb7f..b66529461 100644 --- a/Session/Meta/Translations/no.lproj/Localizable.strings +++ b/Session/Meta/Translations/no.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 0bb699b83..db2682ded 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -1100,6 +1100,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings index e1feda689..dd6a2ed04 100644 --- a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings index 1bb8d5184..4fa0d429e 100644 --- a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings @@ -1105,6 +1105,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/ro.lproj/Localizable.strings b/Session/Meta/Translations/ro.lproj/Localizable.strings index 813057bcf..bd92002b3 100644 --- a/Session/Meta/Translations/ro.lproj/Localizable.strings +++ b/Session/Meta/Translations/ro.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index 29998f69f..c2705035e 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/si-LK.lproj/Localizable.strings b/Session/Meta/Translations/si-LK.lproj/Localizable.strings index af9b27f14..a7a274ef9 100644 --- a/Session/Meta/Translations/si-LK.lproj/Localizable.strings +++ b/Session/Meta/Translations/si-LK.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index cd07efcaa..7fa70fdad 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/sl.lproj/Localizable.strings b/Session/Meta/Translations/sl.lproj/Localizable.strings index 0dcecf222..9323df3de 100644 --- a/Session/Meta/Translations/sl.lproj/Localizable.strings +++ b/Session/Meta/Translations/sl.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings index d3745a188..8491a0fb8 100644 --- a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index 54565ea70..d6b26738f 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/tr.lproj/Localizable.strings b/Session/Meta/Translations/tr.lproj/Localizable.strings index 09c533ff1..574234299 100644 --- a/Session/Meta/Translations/tr.lproj/Localizable.strings +++ b/Session/Meta/Translations/tr.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/uk.lproj/Localizable.strings b/Session/Meta/Translations/uk.lproj/Localizable.strings index 1452ce1d2..7427da0bc 100644 --- a/Session/Meta/Translations/uk.lproj/Localizable.strings +++ b/Session/Meta/Translations/uk.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/vi.lproj/Localizable.strings b/Session/Meta/Translations/vi.lproj/Localizable.strings index 58f272fe9..202785dfd 100644 --- a/Session/Meta/Translations/vi.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings index f667db3e0..072c303a5 100644 --- a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings index b3dd26b5e..c42c712a3 100644 --- a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings @@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message "qrView" = "View QR"; "recoveryPasswordView" = "View Password"; "yes" = "Yes"; +"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password"; //Settings "view" = "View"; diff --git a/Session/Onboarding/LoadAccountScreen.swift b/Session/Onboarding/LoadAccountScreen.swift index 2225bc360..d696e017d 100644 --- a/Session/Onboarding/LoadAccountScreen.swift +++ b/Session/Onboarding/LoadAccountScreen.swift @@ -50,9 +50,9 @@ struct LoadAccountScreen: View { } } - private func continueWithSeed(seed: Data, onError: (() -> ())?) { + private func continueWithSeed(seed: Data, from source: Onboarding.SeedSource, onError: (() -> ())?) { if (seed.count != 16) { - errorString = "recoveryPasswordErrorMessageGeneric".localized() + errorString = source.genericErrorMessage DispatchQueue.main.asyncAfter(deadline: .now() + 1) { onError?() } @@ -75,7 +75,7 @@ struct LoadAccountScreen: View { func continueWithhexEncodedSeed(onError: (() -> ())?) { let seed = Data(hex: hexEncodedSeed) - continueWithSeed(seed: seed, onError: onError) + continueWithSeed(seed: seed, from: .qrCode, onError: onError) } func continueWithMnemonic() { @@ -85,21 +85,14 @@ struct LoadAccountScreen: View { hexEncodedSeed = try Mnemonic.decode(mnemonic: mnemonic) } catch { if let decodingError = error as? Mnemonic.DecodingError { - switch decodingError { - case .inputTooShort: - errorString = "recoveryPasswordErrorMessageShort".localized() - case .invalidWord: - errorString = "recoveryPasswordErrorMessageIncorrect".localized() - default: - errorString = "recoveryPasswordErrorMessageGeneric".localized() - } + errorString = decodingError.errorDescription } else { errorString = "recoveryPasswordErrorMessageGeneric".localized() } return } let seed = Data(hex: hexEncodedSeed) - continueWithSeed(seed: seed, onError: nil) + continueWithSeed(seed: seed, from: .mnemonic, onError: nil) } } diff --git a/Session/Onboarding/Onboarding.swift b/Session/Onboarding/Onboarding.swift index 441ffb36b..b6c71363b 100644 --- a/Session/Onboarding/Onboarding.swift +++ b/Session/Onboarding/Onboarding.swift @@ -58,6 +58,20 @@ enum Onboarding { .eraseToAnyPublisher() } + enum SeedSource { + case qrCode + case mnemonic + + var genericErrorMessage: String { + switch self { + case .qrCode: + "qrNotRecoveryPassword".localized() + case .mnemonic: + "recoveryPasswordErrorMessageGeneric".localized() + } + } + } + enum State: CustomStringConvertible { case newUser case missingName diff --git a/SessionUtilitiesKit/Crypto/Mnemonic.swift b/SessionUtilitiesKit/Crypto/Mnemonic.swift index a9dbcfd0c..53bc31069 100644 --- a/SessionUtilitiesKit/Crypto/Mnemonic.swift +++ b/SessionUtilitiesKit/Crypto/Mnemonic.swift @@ -68,13 +68,14 @@ public enum Mnemonic { public enum DecodingError : LocalizedError { case generic, inputTooShort, missingLastWord, invalidWord, verificationFailed - public var errorDescription: String? { + public var errorDescription: String { switch self { - case .generic: return "RECOVERY_PHASE_ERROR_GENERIC".localized() - case .inputTooShort: return "RECOVERY_PHASE_ERROR_LENGTH".localized() - case .missingLastWord: return "RECOVERY_PHASE_ERROR_LAST_WORD".localized() - case .invalidWord: return "RECOVERY_PHASE_ERROR_INVALID_WORD".localized() - case .verificationFailed: return "RECOVERY_PHASE_ERROR_FAILED".localized() + case .inputTooShort: + return "recoveryPasswordErrorMessageShort".localized() + case .invalidWord: + return "recoveryPasswordErrorMessageIncorrect".localized() + default: + return "recoveryPasswordErrorMessageGeneric".localized() } } } From 98b46bc1422e6bb17f2ccde34336439671bf0ac4 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 16 May 2024 16:46:24 +1000 Subject: [PATCH 06/14] replace "Lock Session" with "Lock App" --- Session/Meta/Translations/ar.lproj/Localizable.strings | 1 + Session/Meta/Translations/be.lproj/Localizable.strings | 1 + Session/Meta/Translations/bg.lproj/Localizable.strings | 1 + Session/Meta/Translations/bn.lproj/Localizable.strings | 1 + Session/Meta/Translations/cs.lproj/Localizable.strings | 1 + Session/Meta/Translations/da.lproj/Localizable.strings | 1 + Session/Meta/Translations/de.lproj/Localizable.strings | 1 + Session/Meta/Translations/el.lproj/Localizable.strings | 1 + Session/Meta/Translations/en.lproj/Localizable.strings | 1 + Session/Meta/Translations/eo.lproj/Localizable.strings | 1 + Session/Meta/Translations/es-ES.lproj/Localizable.strings | 1 + Session/Meta/Translations/fa.lproj/Localizable.strings | 1 + Session/Meta/Translations/fi.lproj/Localizable.strings | 1 + Session/Meta/Translations/fil.lproj/Localizable.strings | 1 + Session/Meta/Translations/fr.lproj/Localizable.strings | 1 + Session/Meta/Translations/hi.lproj/Localizable.strings | 1 + Session/Meta/Translations/hr.lproj/Localizable.strings | 1 + Session/Meta/Translations/hu.lproj/Localizable.strings | 1 + Session/Meta/Translations/id.lproj/Localizable.strings | 1 + Session/Meta/Translations/it.lproj/Localizable.strings | 1 + Session/Meta/Translations/ja.lproj/Localizable.strings | 1 + Session/Meta/Translations/ko.lproj/Localizable.strings | 1 + Session/Meta/Translations/ku.lproj/Localizable.strings | 1 + Session/Meta/Translations/lt.lproj/Localizable.strings | 1 + Session/Meta/Translations/lv.lproj/Localizable.strings | 1 + Session/Meta/Translations/ne-NP.lproj/Localizable.strings | 1 + Session/Meta/Translations/nl.lproj/Localizable.strings | 1 + Session/Meta/Translations/no.lproj/Localizable.strings | 1 + Session/Meta/Translations/pl.lproj/Localizable.strings | 1 + Session/Meta/Translations/pt-BR.lproj/Localizable.strings | 1 + Session/Meta/Translations/pt-PT.lproj/Localizable.strings | 1 + Session/Meta/Translations/ro.lproj/Localizable.strings | 1 + Session/Meta/Translations/ru.lproj/Localizable.strings | 1 + Session/Meta/Translations/si-LK.lproj/Localizable.strings | 1 + Session/Meta/Translations/sk.lproj/Localizable.strings | 1 + Session/Meta/Translations/sl.lproj/Localizable.strings | 1 + Session/Meta/Translations/sv-SE.lproj/Localizable.strings | 1 + Session/Meta/Translations/th.lproj/Localizable.strings | 1 + Session/Meta/Translations/tr.lproj/Localizable.strings | 1 + Session/Meta/Translations/uk.lproj/Localizable.strings | 1 + Session/Meta/Translations/vi.lproj/Localizable.strings | 1 + Session/Meta/Translations/zh-CN.lproj/Localizable.strings | 1 + Session/Meta/Translations/zh-TW.lproj/Localizable.strings | 1 + Session/Settings/PrivacySettingsViewModel.swift | 2 +- 44 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Session/Meta/Translations/ar.lproj/Localizable.strings b/Session/Meta/Translations/ar.lproj/Localizable.strings index 6989c4593..b2d7118f2 100644 --- a/Session/Meta/Translations/ar.lproj/Localizable.strings +++ b/Session/Meta/Translations/ar.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/be.lproj/Localizable.strings b/Session/Meta/Translations/be.lproj/Localizable.strings index 83b01ceb4..11bbf7ef0 100644 --- a/Session/Meta/Translations/be.lproj/Localizable.strings +++ b/Session/Meta/Translations/be.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/bg.lproj/Localizable.strings b/Session/Meta/Translations/bg.lproj/Localizable.strings index f4586baac..5cc45dba2 100644 --- a/Session/Meta/Translations/bg.lproj/Localizable.strings +++ b/Session/Meta/Translations/bg.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/bn.lproj/Localizable.strings b/Session/Meta/Translations/bn.lproj/Localizable.strings index 4324c2375..cf0698fe0 100644 --- a/Session/Meta/Translations/bn.lproj/Localizable.strings +++ b/Session/Meta/Translations/bn.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/cs.lproj/Localizable.strings b/Session/Meta/Translations/cs.lproj/Localizable.strings index e481c4778..3d0fecf59 100644 --- a/Session/Meta/Translations/cs.lproj/Localizable.strings +++ b/Session/Meta/Translations/cs.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/da.lproj/Localizable.strings b/Session/Meta/Translations/da.lproj/Localizable.strings index 4fa4cedc6..3ca077be9 100644 --- a/Session/Meta/Translations/da.lproj/Localizable.strings +++ b/Session/Meta/Translations/da.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index 3702beb2e..9904652bb 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -1107,6 +1107,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/el.lproj/Localizable.strings b/Session/Meta/Translations/el.lproj/Localizable.strings index 9e32149da..e1b7664c0 100644 --- a/Session/Meta/Translations/el.lproj/Localizable.strings +++ b/Session/Meta/Translations/el.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index 4452cd696..e4ed6dfaf 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/eo.lproj/Localizable.strings b/Session/Meta/Translations/eo.lproj/Localizable.strings index 3c46be0df..c4aa09319 100644 --- a/Session/Meta/Translations/eo.lproj/Localizable.strings +++ b/Session/Meta/Translations/eo.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/es-ES.lproj/Localizable.strings b/Session/Meta/Translations/es-ES.lproj/Localizable.strings index d6a1152b4..bb8f800fc 100644 --- a/Session/Meta/Translations/es-ES.lproj/Localizable.strings +++ b/Session/Meta/Translations/es-ES.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index 3430a3f0a..742e8f667 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index 659706fe3..629b27af7 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/fil.lproj/Localizable.strings b/Session/Meta/Translations/fil.lproj/Localizable.strings index dc789ced3..1ac3122b4 100644 --- a/Session/Meta/Translations/fil.lproj/Localizable.strings +++ b/Session/Meta/Translations/fil.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index d7e007457..3cd6bd568 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index d5e027f69..34ee49bca 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index ddd4ba60e..eb6f10805 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/hu.lproj/Localizable.strings b/Session/Meta/Translations/hu.lproj/Localizable.strings index db883c4f6..ad4a9e3b6 100644 --- a/Session/Meta/Translations/hu.lproj/Localizable.strings +++ b/Session/Meta/Translations/hu.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/id.lproj/Localizable.strings b/Session/Meta/Translations/id.lproj/Localizable.strings index cfe1b6572..4ccb27a36 100644 --- a/Session/Meta/Translations/id.lproj/Localizable.strings +++ b/Session/Meta/Translations/id.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index 69410ce7b..ca829a3d3 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index c05b4a34d..2913761a5 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/ko.lproj/Localizable.strings b/Session/Meta/Translations/ko.lproj/Localizable.strings index 7aac42b37..a484c2ffd 100644 --- a/Session/Meta/Translations/ko.lproj/Localizable.strings +++ b/Session/Meta/Translations/ko.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/ku.lproj/Localizable.strings b/Session/Meta/Translations/ku.lproj/Localizable.strings index 0ec81f7ce..35a15b23a 100644 --- a/Session/Meta/Translations/ku.lproj/Localizable.strings +++ b/Session/Meta/Translations/ku.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/lt.lproj/Localizable.strings b/Session/Meta/Translations/lt.lproj/Localizable.strings index 730f4deda..b156fcbdf 100644 --- a/Session/Meta/Translations/lt.lproj/Localizable.strings +++ b/Session/Meta/Translations/lt.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/lv.lproj/Localizable.strings b/Session/Meta/Translations/lv.lproj/Localizable.strings index e68be458f..ef0a199f1 100644 --- a/Session/Meta/Translations/lv.lproj/Localizable.strings +++ b/Session/Meta/Translations/lv.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings index 44e6e1d7f..5d7cb06e9 100644 --- a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings +++ b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index 38441e5fe..e615e8a74 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/no.lproj/Localizable.strings b/Session/Meta/Translations/no.lproj/Localizable.strings index b66529461..a762b9715 100644 --- a/Session/Meta/Translations/no.lproj/Localizable.strings +++ b/Session/Meta/Translations/no.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index db2682ded..94397a897 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -1107,6 +1107,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings index dd6a2ed04..e00c8bd82 100644 --- a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings index 4fa0d429e..98accae8a 100644 --- a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings @@ -1112,6 +1112,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/ro.lproj/Localizable.strings b/Session/Meta/Translations/ro.lproj/Localizable.strings index bd92002b3..5f6c9c04e 100644 --- a/Session/Meta/Translations/ro.lproj/Localizable.strings +++ b/Session/Meta/Translations/ro.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index c2705035e..79ffa7505 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/si-LK.lproj/Localizable.strings b/Session/Meta/Translations/si-LK.lproj/Localizable.strings index a7a274ef9..59c41f1c8 100644 --- a/Session/Meta/Translations/si-LK.lproj/Localizable.strings +++ b/Session/Meta/Translations/si-LK.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 7fa70fdad..66d1d206d 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/sl.lproj/Localizable.strings b/Session/Meta/Translations/sl.lproj/Localizable.strings index 9323df3de..9be260300 100644 --- a/Session/Meta/Translations/sl.lproj/Localizable.strings +++ b/Session/Meta/Translations/sl.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings index 8491a0fb8..d58da891d 100644 --- a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index d6b26738f..9deefe558 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/tr.lproj/Localizable.strings b/Session/Meta/Translations/tr.lproj/Localizable.strings index 574234299..4555d4c18 100644 --- a/Session/Meta/Translations/tr.lproj/Localizable.strings +++ b/Session/Meta/Translations/tr.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/uk.lproj/Localizable.strings b/Session/Meta/Translations/uk.lproj/Localizable.strings index 7427da0bc..5a4f7e9d8 100644 --- a/Session/Meta/Translations/uk.lproj/Localizable.strings +++ b/Session/Meta/Translations/uk.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/vi.lproj/Localizable.strings b/Session/Meta/Translations/vi.lproj/Localizable.strings index 202785dfd..c016ef005 100644 --- a/Session/Meta/Translations/vi.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings index 072c303a5..a23e1487b 100644 --- a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings index c42c712a3..c4f8652f5 100644 --- a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings @@ -1106,6 +1106,7 @@ The point that a message will disappear in a disappearing message update message "settings_scan_qr_code_tab_title" = "Scan"; "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; +"lockApp" = "Lock App"; //Start Conversation "accountIdYours" = "Your Account ID"; diff --git a/Session/Settings/PrivacySettingsViewModel.swift b/Session/Settings/PrivacySettingsViewModel.swift index d5883ced2..de1bff06b 100644 --- a/Session/Settings/PrivacySettingsViewModel.swift +++ b/Session/Settings/PrivacySettingsViewModel.swift @@ -107,7 +107,7 @@ class PrivacySettingsViewModel: SessionTableViewModel, NavigationItemSource, Nav elements: [ SessionCell.Info( id: .screenLock, - title: "PRIVACY_SCREEN_SECURITY_LOCK_SESSION_TITLE".localized(), + title: "lockApp".localized(), subtitle: "PRIVACY_SCREEN_SECURITY_LOCK_SESSION_DESCRIPTION".localized(), rightAccessory: .toggle( .boolValue( From 27cfa40819e5014da44e07c73156e9f61f24c77f Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 16 May 2024 16:56:16 +1000 Subject: [PATCH 07/14] replace "Session ID" with "Account ID" --- Session/Conversations/Context Menu/ContextMenuVC+Action.swift | 2 +- Session/Conversations/Settings/ThreadSettingsViewModel.swift | 2 +- .../Views & Modals/MessageRequestFooterView.swift | 2 +- Session/Meta/Translations/ar.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/be.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/bg.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/bn.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/cs.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/da.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/de.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/el.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/en.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/eo.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/es-ES.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/fa.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/fi.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/fil.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/fr.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/hi.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/hr.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/hu.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/id.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/it.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/ja.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/ko.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/ku.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/lt.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/lv.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/ne-NP.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/nl.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/no.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/pl.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/pt-BR.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/pt-PT.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/ro.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/ru.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/si-LK.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/sk.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/sl.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/sv-SE.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/th.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/tr.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/uk.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/vi.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/zh-CN.lproj/Localizable.strings | 3 +++ Session/Meta/Translations/zh-TW.lproj/Localizable.strings | 3 +++ Session/Settings/SettingsViewModel.swift | 2 +- 47 files changed, 133 insertions(+), 4 deletions(-) diff --git a/Session/Conversations/Context Menu/ContextMenuVC+Action.swift b/Session/Conversations/Context Menu/ContextMenuVC+Action.swift index ea849b1b0..53df9b8c4 100644 --- a/Session/Conversations/Context Menu/ContextMenuVC+Action.swift +++ b/Session/Conversations/Context Menu/ContextMenuVC+Action.swift @@ -86,7 +86,7 @@ extension ContextMenuVC { static func copySessionID(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action { return Action( icon: UIImage(named: "ic_copy"), - title: "vc_conversation_settings_copy_session_id_button_title".localized(), + title: "accountIDCopy".localized(), accessibilityLabel: "Copy Session ID" ) { delegate?.copySessionID(cellViewModel) } diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift index 276575511..67a462747 100644 --- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift +++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift @@ -344,7 +344,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi ), title: (threadViewModel.threadVariant == .community ? "COPY_GROUP_URL".localized() : - "vc_conversation_settings_copy_session_id_button_title".localized() + "accountIDCopy".localized() ), accessibility: Accessibility( identifier: "\(ThreadSettingsViewModel.self).copy_thread_id", diff --git a/Session/Conversations/Views & Modals/MessageRequestFooterView.swift b/Session/Conversations/Views & Modals/MessageRequestFooterView.swift index 55742ce08..66a5a1f30 100644 --- a/Session/Conversations/Views & Modals/MessageRequestFooterView.swift +++ b/Session/Conversations/Views & Modals/MessageRequestFooterView.swift @@ -162,7 +162,7 @@ class MessageRequestFooterView: UIView { ) self.descriptionLabel.text = (threadRequiresApproval ? "MESSAGE_REQUEST_PENDING_APPROVAL_INFO".localized() : - "MESSAGE_REQUESTS_INFO".localized() + "messageRequestsAcceptDescription".localized() ) self.actionStackView.isHidden = threadRequiresApproval self.messageRequestDescriptionLabelBottomConstraint?.constant = (threadRequiresApproval ? -4 : -20) diff --git a/Session/Meta/Translations/ar.lproj/Localizable.strings b/Session/Meta/Translations/ar.lproj/Localizable.strings index b2d7118f2..71be2288d 100644 --- a/Session/Meta/Translations/ar.lproj/Localizable.strings +++ b/Session/Meta/Translations/ar.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/be.lproj/Localizable.strings b/Session/Meta/Translations/be.lproj/Localizable.strings index 11bbf7ef0..b434d965a 100644 --- a/Session/Meta/Translations/be.lproj/Localizable.strings +++ b/Session/Meta/Translations/be.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/bg.lproj/Localizable.strings b/Session/Meta/Translations/bg.lproj/Localizable.strings index 5cc45dba2..c1ef0f5c9 100644 --- a/Session/Meta/Translations/bg.lproj/Localizable.strings +++ b/Session/Meta/Translations/bg.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/bn.lproj/Localizable.strings b/Session/Meta/Translations/bn.lproj/Localizable.strings index cf0698fe0..336e3a605 100644 --- a/Session/Meta/Translations/bn.lproj/Localizable.strings +++ b/Session/Meta/Translations/bn.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/cs.lproj/Localizable.strings b/Session/Meta/Translations/cs.lproj/Localizable.strings index 3d0fecf59..30b40ca28 100644 --- a/Session/Meta/Translations/cs.lproj/Localizable.strings +++ b/Session/Meta/Translations/cs.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/da.lproj/Localizable.strings b/Session/Meta/Translations/da.lproj/Localizable.strings index 3ca077be9..d57f9bb43 100644 --- a/Session/Meta/Translations/da.lproj/Localizable.strings +++ b/Session/Meta/Translations/da.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index 9904652bb..ba88882a7 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -1108,6 +1108,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1124,3 +1126,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/el.lproj/Localizable.strings b/Session/Meta/Translations/el.lproj/Localizable.strings index e1b7664c0..e70107513 100644 --- a/Session/Meta/Translations/el.lproj/Localizable.strings +++ b/Session/Meta/Translations/el.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index e4ed6dfaf..964dd08ae 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/eo.lproj/Localizable.strings b/Session/Meta/Translations/eo.lproj/Localizable.strings index c4aa09319..f538ba0fd 100644 --- a/Session/Meta/Translations/eo.lproj/Localizable.strings +++ b/Session/Meta/Translations/eo.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/es-ES.lproj/Localizable.strings b/Session/Meta/Translations/es-ES.lproj/Localizable.strings index bb8f800fc..14d9e82be 100644 --- a/Session/Meta/Translations/es-ES.lproj/Localizable.strings +++ b/Session/Meta/Translations/es-ES.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index 742e8f667..f9bdb7235 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index 629b27af7..5701a0b11 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/fil.lproj/Localizable.strings b/Session/Meta/Translations/fil.lproj/Localizable.strings index 1ac3122b4..c017b4bbb 100644 --- a/Session/Meta/Translations/fil.lproj/Localizable.strings +++ b/Session/Meta/Translations/fil.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index 3cd6bd568..56bd73cdd 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index 34ee49bca..adaf068ba 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index eb6f10805..57fb29457 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/hu.lproj/Localizable.strings b/Session/Meta/Translations/hu.lproj/Localizable.strings index ad4a9e3b6..bdbb936d8 100644 --- a/Session/Meta/Translations/hu.lproj/Localizable.strings +++ b/Session/Meta/Translations/hu.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/id.lproj/Localizable.strings b/Session/Meta/Translations/id.lproj/Localizable.strings index 4ccb27a36..22a0cc295 100644 --- a/Session/Meta/Translations/id.lproj/Localizable.strings +++ b/Session/Meta/Translations/id.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index ca829a3d3..baba9fc68 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index 2913761a5..770cd4049 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/ko.lproj/Localizable.strings b/Session/Meta/Translations/ko.lproj/Localizable.strings index a484c2ffd..fb1534a9c 100644 --- a/Session/Meta/Translations/ko.lproj/Localizable.strings +++ b/Session/Meta/Translations/ko.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/ku.lproj/Localizable.strings b/Session/Meta/Translations/ku.lproj/Localizable.strings index 35a15b23a..2806bea76 100644 --- a/Session/Meta/Translations/ku.lproj/Localizable.strings +++ b/Session/Meta/Translations/ku.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/lt.lproj/Localizable.strings b/Session/Meta/Translations/lt.lproj/Localizable.strings index b156fcbdf..ea927043f 100644 --- a/Session/Meta/Translations/lt.lproj/Localizable.strings +++ b/Session/Meta/Translations/lt.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/lv.lproj/Localizable.strings b/Session/Meta/Translations/lv.lproj/Localizable.strings index ef0a199f1..a690f7745 100644 --- a/Session/Meta/Translations/lv.lproj/Localizable.strings +++ b/Session/Meta/Translations/lv.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings index 5d7cb06e9..e3e3de769 100644 --- a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings +++ b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index e615e8a74..f79bba3ce 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/no.lproj/Localizable.strings b/Session/Meta/Translations/no.lproj/Localizable.strings index a762b9715..6ff58c06b 100644 --- a/Session/Meta/Translations/no.lproj/Localizable.strings +++ b/Session/Meta/Translations/no.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 94397a897..426443241 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -1108,6 +1108,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1124,3 +1126,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings index e00c8bd82..3740127ee 100644 --- a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings index 98accae8a..23f4de76b 100644 --- a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings @@ -1113,6 +1113,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1129,3 +1131,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/ro.lproj/Localizable.strings b/Session/Meta/Translations/ro.lproj/Localizable.strings index 5f6c9c04e..b8f960e32 100644 --- a/Session/Meta/Translations/ro.lproj/Localizable.strings +++ b/Session/Meta/Translations/ro.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index 79ffa7505..34c6358ee 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/si-LK.lproj/Localizable.strings b/Session/Meta/Translations/si-LK.lproj/Localizable.strings index 59c41f1c8..47e57185f 100644 --- a/Session/Meta/Translations/si-LK.lproj/Localizable.strings +++ b/Session/Meta/Translations/si-LK.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 66d1d206d..37c07e451 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/sl.lproj/Localizable.strings b/Session/Meta/Translations/sl.lproj/Localizable.strings index 9be260300..1f4ecdf4d 100644 --- a/Session/Meta/Translations/sl.lproj/Localizable.strings +++ b/Session/Meta/Translations/sl.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings index d58da891d..a2281fa42 100644 --- a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index 9deefe558..72e0934d1 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/tr.lproj/Localizable.strings b/Session/Meta/Translations/tr.lproj/Localizable.strings index 4555d4c18..9c5760419 100644 --- a/Session/Meta/Translations/tr.lproj/Localizable.strings +++ b/Session/Meta/Translations/tr.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/uk.lproj/Localizable.strings b/Session/Meta/Translations/uk.lproj/Localizable.strings index 5a4f7e9d8..2ffa9e98d 100644 --- a/Session/Meta/Translations/uk.lproj/Localizable.strings +++ b/Session/Meta/Translations/uk.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/vi.lproj/Localizable.strings b/Session/Meta/Translations/vi.lproj/Localizable.strings index c016ef005..dd159c25a 100644 --- a/Session/Meta/Translations/vi.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings index a23e1487b..a704b626a 100644 --- a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings index c4f8652f5..776dcd942 100644 --- a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings @@ -1107,6 +1107,8 @@ The point that a message will disappear in a disappearing message update message "settings_view_my_qr_code_explanation" = "This is your Account ID. Other users can scan it to start a conversation with you."; "qrNotAccountId" = "This QR code does not contain an Account ID."; "lockApp" = "Lock App"; +"accountIdYours" = "Your Account ID"; +"accountIDCopy" = "Copy Account ID"; //Start Conversation "accountIdYours" = "Your Account ID"; @@ -1123,3 +1125,4 @@ The point that a message will disappear in a disappearing message update message //General "attachmentsNa" = "N/A"; "search" = "Search"; +"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID."; diff --git a/Session/Settings/SettingsViewModel.swift b/Session/Settings/SettingsViewModel.swift index 52728d63e..d1cc0548a 100644 --- a/Session/Settings/SettingsViewModel.swift +++ b/Session/Settings/SettingsViewModel.swift @@ -64,7 +64,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl var title: String? { switch self { - case .sessionId: return "your_session_id".localized() + case .sessionId: return "accountIdYours".localized() default: return nil } } From 0a9fa9de5199b7c0d09e877e723f97d938411023 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 16 May 2024 17:02:14 +1000 Subject: [PATCH 08/14] clean --- Session/Meta/Translations/ar.lproj/Localizable.strings | 1 - Session/Meta/Translations/be.lproj/Localizable.strings | 1 - Session/Meta/Translations/bg.lproj/Localizable.strings | 1 - Session/Meta/Translations/bn.lproj/Localizable.strings | 1 - Session/Meta/Translations/cs.lproj/Localizable.strings | 1 - Session/Meta/Translations/da.lproj/Localizable.strings | 1 - Session/Meta/Translations/de.lproj/Localizable.strings | 1 - Session/Meta/Translations/el.lproj/Localizable.strings | 1 - Session/Meta/Translations/en.lproj/Localizable.strings | 1 - Session/Meta/Translations/eo.lproj/Localizable.strings | 1 - Session/Meta/Translations/es-ES.lproj/Localizable.strings | 1 - Session/Meta/Translations/fa.lproj/Localizable.strings | 1 - Session/Meta/Translations/fi.lproj/Localizable.strings | 1 - Session/Meta/Translations/fil.lproj/Localizable.strings | 1 - Session/Meta/Translations/fr.lproj/Localizable.strings | 1 - Session/Meta/Translations/hi.lproj/Localizable.strings | 1 - Session/Meta/Translations/hr.lproj/Localizable.strings | 1 - Session/Meta/Translations/hu.lproj/Localizable.strings | 1 - Session/Meta/Translations/id.lproj/Localizable.strings | 1 - Session/Meta/Translations/it.lproj/Localizable.strings | 1 - Session/Meta/Translations/ja.lproj/Localizable.strings | 1 - Session/Meta/Translations/ko.lproj/Localizable.strings | 1 - Session/Meta/Translations/ku.lproj/Localizable.strings | 1 - Session/Meta/Translations/lt.lproj/Localizable.strings | 1 - Session/Meta/Translations/lv.lproj/Localizable.strings | 1 - Session/Meta/Translations/ne-NP.lproj/Localizable.strings | 1 - Session/Meta/Translations/nl.lproj/Localizable.strings | 1 - Session/Meta/Translations/no.lproj/Localizable.strings | 1 - Session/Meta/Translations/pl.lproj/Localizable.strings | 1 - Session/Meta/Translations/pt-BR.lproj/Localizable.strings | 1 - Session/Meta/Translations/pt-PT.lproj/Localizable.strings | 1 - Session/Meta/Translations/ro.lproj/Localizable.strings | 1 - Session/Meta/Translations/ru.lproj/Localizable.strings | 1 - Session/Meta/Translations/si-LK.lproj/Localizable.strings | 1 - Session/Meta/Translations/sk.lproj/Localizable.strings | 1 - Session/Meta/Translations/sl.lproj/Localizable.strings | 1 - Session/Meta/Translations/sv-SE.lproj/Localizable.strings | 1 - Session/Meta/Translations/th.lproj/Localizable.strings | 1 - Session/Meta/Translations/tr.lproj/Localizable.strings | 1 - Session/Meta/Translations/uk.lproj/Localizable.strings | 1 - Session/Meta/Translations/vi.lproj/Localizable.strings | 1 - Session/Meta/Translations/zh-CN.lproj/Localizable.strings | 1 - Session/Meta/Translations/zh-TW.lproj/Localizable.strings | 1 - 43 files changed, 43 deletions(-) diff --git a/Session/Meta/Translations/ar.lproj/Localizable.strings b/Session/Meta/Translations/ar.lproj/Localizable.strings index 71be2288d..6fa516ebe 100644 --- a/Session/Meta/Translations/ar.lproj/Localizable.strings +++ b/Session/Meta/Translations/ar.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/be.lproj/Localizable.strings b/Session/Meta/Translations/be.lproj/Localizable.strings index b434d965a..239672ece 100644 --- a/Session/Meta/Translations/be.lproj/Localizable.strings +++ b/Session/Meta/Translations/be.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/bg.lproj/Localizable.strings b/Session/Meta/Translations/bg.lproj/Localizable.strings index c1ef0f5c9..e4fd2f067 100644 --- a/Session/Meta/Translations/bg.lproj/Localizable.strings +++ b/Session/Meta/Translations/bg.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/bn.lproj/Localizable.strings b/Session/Meta/Translations/bn.lproj/Localizable.strings index 336e3a605..a53d497e9 100644 --- a/Session/Meta/Translations/bn.lproj/Localizable.strings +++ b/Session/Meta/Translations/bn.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/cs.lproj/Localizable.strings b/Session/Meta/Translations/cs.lproj/Localizable.strings index 30b40ca28..52462e552 100644 --- a/Session/Meta/Translations/cs.lproj/Localizable.strings +++ b/Session/Meta/Translations/cs.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/da.lproj/Localizable.strings b/Session/Meta/Translations/da.lproj/Localizable.strings index d57f9bb43..eea271fcb 100644 --- a/Session/Meta/Translations/da.lproj/Localizable.strings +++ b/Session/Meta/Translations/da.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index ba88882a7..3a7fad2fa 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -1112,7 +1112,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/el.lproj/Localizable.strings b/Session/Meta/Translations/el.lproj/Localizable.strings index e70107513..832e79d3f 100644 --- a/Session/Meta/Translations/el.lproj/Localizable.strings +++ b/Session/Meta/Translations/el.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index 964dd08ae..09e893f4b 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/eo.lproj/Localizable.strings b/Session/Meta/Translations/eo.lproj/Localizable.strings index f538ba0fd..11c4533c8 100644 --- a/Session/Meta/Translations/eo.lproj/Localizable.strings +++ b/Session/Meta/Translations/eo.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/es-ES.lproj/Localizable.strings b/Session/Meta/Translations/es-ES.lproj/Localizable.strings index 14d9e82be..f108ee85f 100644 --- a/Session/Meta/Translations/es-ES.lproj/Localizable.strings +++ b/Session/Meta/Translations/es-ES.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index f9bdb7235..c6f8aec4f 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index 5701a0b11..cfe3a85d8 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/fil.lproj/Localizable.strings b/Session/Meta/Translations/fil.lproj/Localizable.strings index c017b4bbb..009f320c8 100644 --- a/Session/Meta/Translations/fil.lproj/Localizable.strings +++ b/Session/Meta/Translations/fil.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index 56bd73cdd..040747ab0 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index adaf068ba..3d0209467 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index 57fb29457..fcd5c2b5d 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/hu.lproj/Localizable.strings b/Session/Meta/Translations/hu.lproj/Localizable.strings index bdbb936d8..ae258ffde 100644 --- a/Session/Meta/Translations/hu.lproj/Localizable.strings +++ b/Session/Meta/Translations/hu.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/id.lproj/Localizable.strings b/Session/Meta/Translations/id.lproj/Localizable.strings index 22a0cc295..40f6330d4 100644 --- a/Session/Meta/Translations/id.lproj/Localizable.strings +++ b/Session/Meta/Translations/id.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index baba9fc68..aa9dedeea 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index 770cd4049..0201bece6 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/ko.lproj/Localizable.strings b/Session/Meta/Translations/ko.lproj/Localizable.strings index fb1534a9c..65e81fdcd 100644 --- a/Session/Meta/Translations/ko.lproj/Localizable.strings +++ b/Session/Meta/Translations/ko.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/ku.lproj/Localizable.strings b/Session/Meta/Translations/ku.lproj/Localizable.strings index 2806bea76..0131f00ad 100644 --- a/Session/Meta/Translations/ku.lproj/Localizable.strings +++ b/Session/Meta/Translations/ku.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/lt.lproj/Localizable.strings b/Session/Meta/Translations/lt.lproj/Localizable.strings index ea927043f..7a1cdc555 100644 --- a/Session/Meta/Translations/lt.lproj/Localizable.strings +++ b/Session/Meta/Translations/lt.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/lv.lproj/Localizable.strings b/Session/Meta/Translations/lv.lproj/Localizable.strings index a690f7745..e3f2e7e0c 100644 --- a/Session/Meta/Translations/lv.lproj/Localizable.strings +++ b/Session/Meta/Translations/lv.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings index e3e3de769..8b7850806 100644 --- a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings +++ b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index f79bba3ce..cf854ccb3 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/no.lproj/Localizable.strings b/Session/Meta/Translations/no.lproj/Localizable.strings index 6ff58c06b..52a0e745b 100644 --- a/Session/Meta/Translations/no.lproj/Localizable.strings +++ b/Session/Meta/Translations/no.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 426443241..60f6b6a19 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -1112,7 +1112,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings index 3740127ee..a7fdeff48 100644 --- a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings index 23f4de76b..568876765 100644 --- a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings @@ -1117,7 +1117,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/ro.lproj/Localizable.strings b/Session/Meta/Translations/ro.lproj/Localizable.strings index b8f960e32..5b3f6123d 100644 --- a/Session/Meta/Translations/ro.lproj/Localizable.strings +++ b/Session/Meta/Translations/ro.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index 34c6358ee..544e468d9 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/si-LK.lproj/Localizable.strings b/Session/Meta/Translations/si-LK.lproj/Localizable.strings index 47e57185f..e49577e53 100644 --- a/Session/Meta/Translations/si-LK.lproj/Localizable.strings +++ b/Session/Meta/Translations/si-LK.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 37c07e451..1c8259c82 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/sl.lproj/Localizable.strings b/Session/Meta/Translations/sl.lproj/Localizable.strings index 1f4ecdf4d..b822669f6 100644 --- a/Session/Meta/Translations/sl.lproj/Localizable.strings +++ b/Session/Meta/Translations/sl.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings index a2281fa42..6e4c97e80 100644 --- a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index 72e0934d1..ed5e8b623 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/tr.lproj/Localizable.strings b/Session/Meta/Translations/tr.lproj/Localizable.strings index 9c5760419..ef72e6022 100644 --- a/Session/Meta/Translations/tr.lproj/Localizable.strings +++ b/Session/Meta/Translations/tr.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/uk.lproj/Localizable.strings b/Session/Meta/Translations/uk.lproj/Localizable.strings index 2ffa9e98d..9d0e61ff0 100644 --- a/Session/Meta/Translations/uk.lproj/Localizable.strings +++ b/Session/Meta/Translations/uk.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/vi.lproj/Localizable.strings b/Session/Meta/Translations/vi.lproj/Localizable.strings index dd159c25a..0039b141c 100644 --- a/Session/Meta/Translations/vi.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings index a704b626a..7ac49fc12 100644 --- a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; diff --git a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings index 776dcd942..3ebec3f50 100644 --- a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings @@ -1111,7 +1111,6 @@ The point that a message will disappear in a disappearing message update message "accountIDCopy" = "Copy Account ID"; //Start Conversation -"accountIdYours" = "Your Account ID"; "qrYoursDescription" = "Friends can message you by scanning your QR code."; "start_conversation_screen_title" = "Start Conversation"; "invite_a_friend_explanation" = "Invite your friend to chat with you on Session by sharing your Account ID with them"; From d8c6692fbc1a2a862d5e78b4e66f1c3539d963a3 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 16 May 2024 17:02:40 +1000 Subject: [PATCH 09/14] add closed button for Open URL Modal --- Session/Onboarding/LandingScreen.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Session/Onboarding/LandingScreen.swift b/Session/Onboarding/LandingScreen.swift index d61da0c7b..c7cb71b6b 100644 --- a/Session/Onboarding/LandingScreen.swift +++ b/Session/Onboarding/LandingScreen.swift @@ -157,6 +157,7 @@ struct LandingScreen: View { label: "Privacy policy button" ), cancelStyle: .textPrimary, + hasCloseButton: true, onConfirm: { _ in if let url: URL = URL(string: "https://getsession.org/terms-of-service") { UIApplication.shared.open(url) From aa5d7f14d3992916d88d0e30ef362e43d1599390 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Fri, 17 May 2024 09:45:19 +1000 Subject: [PATCH 10/14] fix home screen in light mode --- Session/Home/HomeVC.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index 392b5f808..cc3f24166 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -215,7 +215,11 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS sessionLogoImage.contentMode = .scaleAspectFit sessionLogoImage.set(.height, to: 103) - let sessionTitleImage: UIImageView = UIImageView(image: UIImage(named: "SessionHeading")) + let sessionTitleImage: UIImageView = UIImageView( + image: UIImage(named: "SessionHeading")? + .withRenderingMode(.alwaysTemplate) + ) + sessionTitleImage.themeTintColor = .textPrimary sessionTitleImage.contentMode = .scaleAspectFit sessionTitleImage.set(.height, to: 22) @@ -247,7 +251,7 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS let welcomeLabel = UILabel() welcomeLabel.font = .systemFont(ofSize: Values.smallFontSize) welcomeLabel.text = "onboardingBubbleWelcomeToSession".localized() - welcomeLabel.themeTextColor = .primary + welcomeLabel.themeTextColor = .sessionButton_text welcomeLabel.textAlignment = .center let result = UIStackView(arrangedSubviews: [ From 648c3e658e5cfd925bfc0595eed76ed350475912 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Fri, 17 May 2024 10:11:31 +1000 Subject: [PATCH 11/14] fix incorrectly displayed empty state in home screen --- Session/Home/HomeVC.swift | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index cc3f24166..22e1850df 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -497,19 +497,18 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS // Show the empty state if there is no data if self.flow == .register { - accountCreatedView.isHidden = ( - !updatedData.isEmpty && - updatedData.contains(where: { !$0.elements.isEmpty }) - ) + accountCreatedView.isHidden = false emptyStateLogoView.isHidden = true } else { + accountCreatedView.isHidden = true emptyStateLogoView.isHidden = false - emptyStateView.isHidden = ( - !updatedData.isEmpty && - updatedData.contains(where: { !$0.elements.isEmpty }) - ) } + emptyStateStackView.isHidden = ( + !updatedData.isEmpty && + updatedData.contains(where: { !$0.elements.isEmpty }) + ) + CATransaction.begin() CATransaction.setCompletionBlock { [weak self] in // Complete page loading From ae4c87a5b01880a2292cce3e054743250190615d Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Fri, 17 May 2024 11:21:54 +1000 Subject: [PATCH 12/14] minor refactor on how to show error messages when the mnemonic is incorrect --- Session/Onboarding/LoadAccountScreen.swift | 9 ++++++++- SessionUtilitiesKit/Crypto/Mnemonic.swift | 11 ----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Session/Onboarding/LoadAccountScreen.swift b/Session/Onboarding/LoadAccountScreen.swift index d696e017d..fe971035f 100644 --- a/Session/Onboarding/LoadAccountScreen.swift +++ b/Session/Onboarding/LoadAccountScreen.swift @@ -85,7 +85,14 @@ struct LoadAccountScreen: View { hexEncodedSeed = try Mnemonic.decode(mnemonic: mnemonic) } catch { if let decodingError = error as? Mnemonic.DecodingError { - errorString = decodingError.errorDescription + switch decodingError { + case .inputTooShort, .missingLastWord: + errorString = "recoveryPasswordErrorMessageShort".localized() + case .invalidWord, .verificationFailed: + errorString = "recoveryPasswordErrorMessageIncorrect".localized() + default: + errorString = "recoveryPasswordErrorMessageGeneric".localized() + } } else { errorString = "recoveryPasswordErrorMessageGeneric".localized() } diff --git a/SessionUtilitiesKit/Crypto/Mnemonic.swift b/SessionUtilitiesKit/Crypto/Mnemonic.swift index 53bc31069..93260931a 100644 --- a/SessionUtilitiesKit/Crypto/Mnemonic.swift +++ b/SessionUtilitiesKit/Crypto/Mnemonic.swift @@ -67,17 +67,6 @@ public enum Mnemonic { public enum DecodingError : LocalizedError { case generic, inputTooShort, missingLastWord, invalidWord, verificationFailed - - public var errorDescription: String { - switch self { - case .inputTooShort: - return "recoveryPasswordErrorMessageShort".localized() - case .invalidWord: - return "recoveryPasswordErrorMessageIncorrect".localized() - default: - return "recoveryPasswordErrorMessageGeneric".localized() - } - } } public static func hash(hexEncodedString string: String, language: Language = .english) -> String { From 431c0243540b67645e703c25f011ffdbc097bd48 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Fri, 17 May 2024 11:33:07 +1000 Subject: [PATCH 13/14] update accessibility ids --- Session/Onboarding/LandingScreen.swift | 5 +++++ Session/Onboarding/LoadAccountScreen.swift | 5 +---- Session/Onboarding/PNModeScreen.swift | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Session/Onboarding/LandingScreen.swift b/Session/Onboarding/LandingScreen.swift index c7cb71b6b..840ff0a36 100644 --- a/Session/Onboarding/LandingScreen.swift +++ b/Session/Onboarding/LandingScreen.swift @@ -112,6 +112,11 @@ struct LandingScreen: View { AttributedText(attributedText) .foregroundColor(themeColor: .textPrimary) } + .accessibility( + Accessibility( + identifier: "Open URL" + ) + ) .padding(.horizontal, Values.massiveSpacing) } } diff --git a/Session/Onboarding/LoadAccountScreen.swift b/Session/Onboarding/LoadAccountScreen.swift index fe971035f..8698548e9 100644 --- a/Session/Onboarding/LoadAccountScreen.swift +++ b/Session/Onboarding/LoadAccountScreen.swift @@ -163,10 +163,7 @@ struct EnterRecoveryPasswordScreen: View{ $recoveryPassword, placeholder: "recoveryPasswordEnter".localized(), error: $error, - accessibility: Accessibility( - identifier: "Recovery password input", - label: "Recovery password input" - ) + accessibility: Accessibility(identifier: "Recovery password input") ) Spacer(minLength: 0) diff --git a/Session/Onboarding/PNModeScreen.swift b/Session/Onboarding/PNModeScreen.swift index 2b71792cd..bc62b13e1 100644 --- a/Session/Onboarding/PNModeScreen.swift +++ b/Session/Onboarding/PNModeScreen.swift @@ -243,6 +243,7 @@ struct PNOptionView: View { ) } } + .accessibility(info.accessibility) } .frame( maxWidth: .infinity From de4a367374f7750a712190e71ffde373de226133 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Fri, 17 May 2024 13:48:56 +1000 Subject: [PATCH 14/14] fix an issue that the navigation bar won't change as the appearance settings changes --- Session/Shared/SessionHostingViewController.swift | 2 +- SessionUIKit/Style Guide/Themes/Theme.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Session/Shared/SessionHostingViewController.swift b/Session/Shared/SessionHostingViewController.swift index f80f39545..198490eb8 100644 --- a/Session/Shared/SessionHostingViewController.swift +++ b/Session/Shared/SessionHostingViewController.swift @@ -17,7 +17,7 @@ public class SessionHostingViewController: UIHostingController