keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'onboarding' into standardised-strings

Browse Source
pull/1023/head
Ryan ZHAO 11 months ago
parent 1c46faa500 de4a367374
commit 1d01eb91ae
55 changed files with 1051 additions and 87 deletions
Show Stats Download Patch File Download Diff File

18
BUILDING.md
Unescape Escape View File

@ -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

21
Scripts/build_libSession_util.sh
Unescape Escape View File

@ -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]}"

4
Session/Conversations/Views & Modals/MessageRequestFooterView.swift
Unescape Escape View File

@ -163,9 +163,7 @@ class MessageRequestFooterView: UIView {
)
self.descriptionLabel.text = (threadRequiresApproval ?
"messageRequestPendingDescription".localized() :
"messageRequestsAcceptDescription"
.put(key: "app_name", value: Singleton.appName)
.localized()
"messageRequestsAcceptDescription".localized()
)
self.actionStackView.isHidden = threadRequiresApproval
self.messageRequestDescriptionLabelBottomConstraint?.constant = (threadRequiresApproval ? -4 : -20)

23
Session/Home/HomeVC.swift
Unescape Escape View File

@ -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: [
@ -493,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

24
Session/Meta/Translations/ar.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/be.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/bg.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/bn.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/cs.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/da.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/de.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/el.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

2
Session/Meta/Translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -434,7 +434,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/eo.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/es-ES.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/fa.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/fi.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/fil.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/fr.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/hi.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/hr.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/hu.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/id.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/it.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/ja.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/ko.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/ku.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/lt.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/lv.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/ne-NP.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/nl.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/no.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/pl.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/pt-BR.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/pt-PT.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/ro.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/ru.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/si-LK.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/sk.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/sl.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/sv-SE.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/th.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/tr.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/uk.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/vi.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/zh-CN.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

24
Session/Meta/Translations/zh-TW.lproj/Localizable.strings
Unescape Escape View File

@ -86,6 +86,7 @@
"groupLeaveDescriptionAdmin" = "Are you sure you want to leave {group_name}? This will deactivate the group for all members.";
"urlOpenDescription" = "Are you sure you want to open this URL in your browser?<br/><br/>{url}";
"recoveryPasswordHidePermanentlyDescription2" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
<<<<<<< HEAD
"blockUnblockDescription" = "Are you sure you want to unblock {name}?";
"attachment" = "Attachment";
"attachmentsExpired" = "Attachment expired";
@ -196,6 +197,26 @@
"callsVoiceAndVideoToggleDescription" = "Enables voice and video calls to and from other users";
"displayNameEnter" = "Enter your display name";
"groupDescriptionEnter" = "Enter a group description";
=======
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";
"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";
"accountIdYours" = "Your Account ID";
"accountIDCopy" = "Copy Account ID";
//Start Conversation
"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";
>>>>>>> onboarding
"accountIdEnter" = "Enter Account ID";
"accountIdOrOnsEnter" = "Enter Account ID or ONS";
"communityEnterUrl" = "Enter Community URL";
@ -420,6 +441,7 @@
"screenSecurity" = "Screen Security";
"screenshotNotifications" = "Screenshot Notifications";
"search" = "Search";
<<<<<<< HEAD
"searchContacts" = "Search Contacts";
"searchConversation" = "Search Conversation";
"searchMembers" = "Search Members";
@ -434,7 +456,7 @@
"conversationsSendWithEnterKey" = "Send with Enter Key";
"sending" = "Sending";
"messageRequestGroupInviteDescription" = "Sending a message to this group will automatically accept the group invite.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your {app_name} ID.";
"messageRequestsAcceptDescription" = "Sending a message to this user will automatically accept their message request and reveal your Account ID.";
"adminSendingPromotion" = "Sending admin promotion";
"groupInviteSending" = "Sending invite";
"disappearingMessagesSent" = "Sent";

6
Session/Onboarding/LandingScreen.swift
Unescape Escape View File

@ -112,6 +112,11 @@ struct LandingScreen: View {
AttributedText(attributedText)
.foregroundColor(themeColor: .textPrimary)
}
.accessibility(
Accessibility(
identifier: "Open URL"
)
)
.padding(.horizontal, Values.massiveSpacing)
}
}
@ -157,6 +162,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)

17
Session/Onboarding/LoadAccountScreen.swift
Unescape Escape View File

@ -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() {
@ -86,9 +86,9 @@ struct LoadAccountScreen: View {
} catch {
if let decodingError = error as? Mnemonic.DecodingError {
switch decodingError {
case .inputTooShort:
case .inputTooShort, .missingLastWord:
errorString = "recoveryPasswordErrorMessageShort".localized()
case .invalidWord:
case .invalidWord, .verificationFailed:
errorString = "recoveryPasswordErrorMessageIncorrect".localized()
default:
errorString = "recoveryPasswordErrorMessageGeneric".localized()
@ -99,7 +99,7 @@ struct LoadAccountScreen: View {
return
}
let seed = Data(hex: hexEncodedSeed)
continueWithSeed(seed: seed, onError: nil)
continueWithSeed(seed: seed, from: .mnemonic, onError: nil)
}
}
@ -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)

14
Session/Onboarding/Onboarding.swift
Unescape Escape View File

@ -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

1
Session/Onboarding/PNModeScreen.swift
Unescape Escape View File

@ -249,6 +249,7 @@ struct PNOptionView: View {
)
}
}
.accessibility(info.accessibility)
}
.frame(
maxWidth: .infinity

2
Session/Shared/SessionHostingViewController.swift
Unescape Escape View File

@ -17,7 +17,7 @@ public class SessionHostingViewController<Content>: UIHostingController<Modified
return ThemeManager.currentTheme.statusBarStyle
}
public var navigationBackground: ThemeValue { customizedNavigationBackground ?? .backgroundPrimary }
public var navigationBackground: ThemeValue? { customizedNavigationBackground }
private let customizedNavigationBackground: ThemeValue?
private let shouldHideNavigationBar: Bool

10
SessionUIKit/Components/SwiftUI/SessionTextField.swift
Unescape Escape View File

@ -8,13 +8,11 @@ public struct SessionTextField<ExplanationView>: 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<ExplanationView>: 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<ExplanationView>: 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)

2
SessionUIKit/Style Guide/Themes/Theme.swift
Unescape Escape View File

@ -101,7 +101,7 @@ public protocol ThemeColors {
// MARK: - ThemedNavigation
public protocol ThemedNavigation {
var navigationBackground: ThemeValue { get }
var navigationBackground: ThemeValue? { get }
}
// MARK: - ThemeValue

10
SessionUtilitiesKit/Crypto/Mnemonic.swift
Unescape Escape View File

@ -67,16 +67,6 @@ public enum Mnemonic {
public enum DecodingError : LocalizedError {
case generic, inputTooShort, missingLastWord, invalidWord, verificationFailed
public var errorDescription: String? {
switch self {
case .generic: return "recoveryPasswordErrorMessageGeneric".localized()
case .inputTooShort: return "recoveryPasswordErrorMessageShort".localized()
case .missingLastWord: return "recoveryPasswordErrorMessageShort".localized()
case .invalidWord: return "recoveryPasswordErrorMessageIncorrect".localized()
case .verificationFailed: return "recoveryPasswordErrorMessageGeneric".localized()
}
}
}
public static func hash(hexEncodedString string: String, language: Language = .english) -> String {

Write Preview
Loading…
Cancel
Save