From 73742408f2c12e00ecf781963f6621b70f958e2a Mon Sep 17 00:00:00 2001
From: Mauro Romito <mauro.romito@element.io>
Date: Tue, 15 Oct 2024 17:27:08 +0200
Subject: [PATCH 01/59] Prepare for new sprint

---
 Config/AppVersion.xcconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 7cc43ca49..29905a7a2 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.11.19
-CURRENT_PROJECT_VERSION = 1.11.19
+MARKETING_VERSION = 1.11.20
+CURRENT_PROJECT_VERSION = 1.11.20

From 42905e2f9079ebb9db1b87fe2ba5232a0e11a6be Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Mon, 4 Nov 2024 14:58:25 +0100
Subject: [PATCH 02/59] Allow Video calls for Education and Agents

(cherry picked from commit 75c58fa758466f612ea573a07b29595eb1547d45)
---
 Tchap/Config/BuildSettings.swift | 3 ++-
 changelog.d/1109.change          | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1109.change

diff --git a/Tchap/Config/BuildSettings.swift b/Tchap/Config/BuildSettings.swift
index 392f5b92d..78409b552 100644
--- a/Tchap/Config/BuildSettings.swift
+++ b/Tchap/Config/BuildSettings.swift
@@ -294,7 +294,8 @@ final class BuildSettings: NSObject {
         ],
         tchapFeatureVideoOverIP: [
             "agent.dinum.tchap.gouv.fr",
-            "agent.education.tchap.gouv.fr"
+            "agent.education.tchap.gouv.fr",
+            "agent.tchap.gouv.fr",
         ],
         tchapFeatureGeolocationSharing: [
             tchapFeatureAnyHomeServer
diff --git a/changelog.d/1109.change b/changelog.d/1109.change
new file mode 100644
index 000000000..be87637d5
--- /dev/null
+++ b/changelog.d/1109.change
@@ -0,0 +1 @@
+Permettre les appels vidéos sur Education et Agent.
\ No newline at end of file

From c0532d4a1a01a3dfc45910baa6005ebe5033bac4 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Mon, 11 Nov 2024 09:22:45 +0000
Subject: [PATCH 03/59] Show Matrix RTC calls as unsupported. (#7862)

---
 Podfile.lock                                  | 12 ++++----
 Riot/Assets/en.lproj/Localizable.strings      |  2 ++
 Riot/Assets/en.lproj/Vector.strings           |  1 +
 Riot/Generated/Strings.swift                  |  4 +++
 .../Modules/MatrixKit/Models/MXKAppSettings.m |  2 ++
 .../Room/CellData/RoomBubbleCellData.h        |  1 +
 .../Room/CellData/RoomBubbleCellData.m        | 19 ++++++++++++
 Riot/Modules/Room/RoomViewController.m        |  4 +++
 .../Call/CallCellContentView.xib              |  8 ++---
 .../MatrixRTC/RoomMatrixRTCCallCell.swift     | 29 +++++++++++++++++++
 .../RoomTimelineCellIdentifier.h              |  1 +
 .../Plain/PlainRoomTimelineCellProvider.m     |  2 ++
 RiotNSE/NotificationService.swift             |  9 ++++++
 matrix-ios-sdk                                |  2 +-
 14 files changed, 85 insertions(+), 11 deletions(-)
 create mode 100644 Riot/Modules/Room/TimelineCells/Call/MatrixRTC/RoomMatrixRTCCallCell.swift

diff --git a/Podfile.lock b/Podfile.lock
index 672f3250b..63e9f57b5 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -39,16 +39,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.13):
-    - MatrixSDK/Core (= 0.27.13)
-  - MatrixSDK/Core (0.27.13):
+  - MatrixSDK (0.27.15):
+    - MatrixSDK/Core (= 0.27.15)
+  - MatrixSDK/Core (0.27.15):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDKCrypto (= 0.4.3)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.13):
+  - MatrixSDK/JingleCallStack (0.27.15):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.4.3)
@@ -179,7 +179,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: b5756a518af19296b94e3ad9b6f16648f9eb17c3
+  MatrixSDK: 12b379749b84ab5b3662042acb1914b9f9bb692b
   MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
@@ -200,4 +200,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 484a1cdf04951cc82156f29de196efd76d3ad893
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3
diff --git a/Riot/Assets/en.lproj/Localizable.strings b/Riot/Assets/en.lproj/Localizable.strings
index 965fcfd4a..53a8b63bf 100644
--- a/Riot/Assets/en.lproj/Localizable.strings
+++ b/Riot/Assets/en.lproj/Localizable.strings
@@ -182,6 +182,8 @@
 /* Group call from user, CallKit caller name */
 "GROUP_CALL_FROM_USER" = "%@ (Group call)";
 
+"UNSUPPORTED_CALL" = "Unsupported call";
+
 /** Key verification **/
 
 "KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ wants to verify";
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 00fc9a6d1..d0030805d 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -1253,6 +1253,7 @@ Tap the + to start adding people.";
 "call_no_stun_server_error_use_fallback_button" = "Try using %@";
 
 "call_actions_unhold" = "Resume";
+"call_unsupported_matrix_rtc_call" = "Unsupported call. The new Element X app is needed to join this call.";
 
 // No VoIP support
 "no_voip_title" = "Incoming call";
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 7826653b2..5b168bcee 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -1187,6 +1187,10 @@ public class VectorL10n: NSObject {
   public static var callTransferUsers: String { 
     return VectorL10n.tr("Vector", "call_transfer_users") 
   }
+  /// Unsupported call. The new Element X app is needed to join this call.
+  public static var callUnsupportedMatrixRtcCall: String { 
+    return VectorL10n.tr("Vector", "call_unsupported_matrix_rtc_call") 
+  }
   /// Video call with %@
   public static func callVideoWithUser(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "call_video_with_user", p1)
diff --git a/Riot/Modules/MatrixKit/Models/MXKAppSettings.m b/Riot/Modules/MatrixKit/Models/MXKAppSettings.m
index aae9ddc4f..870d9f36e 100644
--- a/Riot/Modules/MatrixKit/Models/MXKAppSettings.m
+++ b/Riot/Modules/MatrixKit/Models/MXKAppSettings.m
@@ -169,6 +169,8 @@ -(instancetype)init
             kMXEventTypeStringCallHangup,
             kMXEventTypeStringCallReject,
             kMXEventTypeStringCallNegotiate,
+            kMXEventTypeStringCallNotify,
+            kMXEventTypeStringCallNotifyUnstable,
             kMXEventTypeStringSticker,
             kMXEventTypeStringKeyVerificationCancel,
             kMXEventTypeStringKeyVerificationDone,
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.h b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
index e3e331610..b7e97a4d6 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.h
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.h
@@ -25,6 +25,7 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
     RoomBubbleCellDataTagKeyVerificationConclusion,
     RoomBubbleCellDataTagCall,
     RoomBubbleCellDataTagGroupCall,
+    RoomBubbleCellDataTagRTCCallNotify,
     RoomBubbleCellDataTagRoomCreationIntro,
     RoomBubbleCellDataTagPoll,
     RoomBubbleCellDataTagLocation,
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index 1277d97d3..6e7001ad2 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -142,6 +142,14 @@ - (instancetype)initWithEvent:(MXEvent *)event andRoomState:(MXRoomState *)roomS
                 self.displayTimestampForSelectedComponentOnLeftWhenPossible = NO;
                 break;
             }
+            case MXEventTypeCallNotify:
+            {
+                self.tag = RoomBubbleCellDataTagRTCCallNotify;
+                self.collapsable = NO;
+                self.collapsed = NO;
+                self.displayTimestampForSelectedComponentOnLeftWhenPossible = NO;
+                break;
+            }
             case MXEventTypePollStart:
             case MXEventTypePollEnd:
             {
@@ -374,6 +382,11 @@ - (BOOL)hasNoDisplay
             break;
         case RoomBubbleCellDataTagVoiceBroadcastNoDisplay:
             break;
+        case RoomBubbleCellDataTagRTCCallNotify:
+        {
+            hasNoDisplay = NO;
+            break;
+        }
         default:
             hasNoDisplay = [super hasNoDisplay];
             break;
@@ -1119,6 +1132,9 @@ - (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
         case RoomBubbleCellDataTagGroupCall:
             shouldAddEvent = NO;
             break;
+        case RoomBubbleCellDataTagRTCCallNotify:
+            shouldAddEvent = NO;
+            break;
         case RoomBubbleCellDataTagRoomCreateConfiguration:
             shouldAddEvent = NO;
             break;
@@ -1193,6 +1209,9 @@ - (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
             case MXEventTypeCallReject:
                 shouldAddEvent = NO;
                 break;
+            case MXEventTypeCallNotify:
+                shouldAddEvent = NO;
+                break;
             case MXEventTypePollStart:
             case MXEventTypePollEnd:
                 shouldAddEvent = NO;
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index f0aa55491..656a41399 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -3220,6 +3220,10 @@ - (RoomTimelineCellIdentifier)cellIdentifierForCellData:(MXKCellData*)cellData a
     {
         cellIdentifier = RoomTimelineCellIdentifierGroupCallStatus;
     }
+    else if (bubbleData.tag == RoomBubbleCellDataTagRTCCallNotify)
+    {
+        cellIdentifier = RoomTimelineCellIdentifierMatrixRTCCall;
+    }
     else if (bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage || bubbleData.attachment.type == MXKAttachmentTypeAudio)
     {
         if (bubbleData.isIncoming)
diff --git a/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib b/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
index 4f838a8ef..99aad1824 100644
--- a/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
+++ b/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="CallCellContentView" customModule="Riot" customModuleProvider="target">
+        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="CallCellContentView" customModule="Element" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="414" height="220"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="pdr-Jo-LHQ">
@@ -87,7 +87,7 @@
                                                         <constraint firstAttribute="height" constant="16" id="OdD-1h-kkV"/>
                                                     </constraints>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Active call" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Active call" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
                                                     <rect key="frame" x="22" y="2" width="62" height="16"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <nil key="textColor"/>
diff --git a/Riot/Modules/Room/TimelineCells/Call/MatrixRTC/RoomMatrixRTCCallCell.swift b/Riot/Modules/Room/TimelineCells/Call/MatrixRTC/RoomMatrixRTCCallCell.swift
new file mode 100644
index 000000000..12921f8be
--- /dev/null
+++ b/Riot/Modules/Room/TimelineCells/Call/MatrixRTC/RoomMatrixRTCCallCell.swift
@@ -0,0 +1,29 @@
+// 
+// Copyright 2021-2024 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only
+// Please see LICENSE in the repository root for full details.
+//
+
+import UIKit
+
+@objcMembers
+class RoomMatrixRTCCallCell: RoomCallBaseCell {
+    private static var className: String { String(describing: self) }
+    
+    //  MARK: - MXKCellRendering
+    
+    override func render(_ cellData: MXKCellData!) {
+        super.render(cellData)
+        
+        guard let bubbleCellData = cellData as? RoomBubbleCellData else { return }
+        let roomID = bubbleCellData.roomId
+        guard let room = bubbleCellData.mxSession.room(withRoomId: roomID) else { return }
+        
+        room.summary.setRoomAvatarImageIn(innerContentView.avatarImageView)
+        innerContentView.avatarImageView.defaultBackgroundColor = .clear
+        innerContentView.callerNameLabel.text = room.summary.displayName
+        statusText = VectorL10n.callUnsupportedMatrixRtcCall
+        bottomContentView = nil // Expands the size of the status stack.
+    }
+}
diff --git a/Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h b/Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
index 955bfb2ef..3a4e512bd 100644
--- a/Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
+++ b/Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
@@ -128,6 +128,7 @@ typedef NS_ENUM(NSUInteger, RoomTimelineCellIdentifier) {
     // - Call
     RoomTimelineCellIdentifierDirectCallStatus,
     RoomTimelineCellIdentifierGroupCallStatus,
+    RoomTimelineCellIdentifierMatrixRTCCall,
     
     // - Voice message
     // -- Incoming
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
index dd5526b58..b6529d9a6 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
+++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
@@ -235,6 +235,7 @@ - (void)registerCallCellsForTableView:(UITableView*)tableView
 {
     [tableView registerClass:RoomDirectCallStatusCell.class forCellReuseIdentifier:RoomDirectCallStatusCell.defaultReuseIdentifier];
     [tableView registerClass:RoomGroupCallStatusCell.class forCellReuseIdentifier:RoomGroupCallStatusCell.defaultReuseIdentifier];
+    [tableView registerClass:RoomMatrixRTCCallCell.class forCellReuseIdentifier:RoomMatrixRTCCallCell.defaultReuseIdentifier];
 }
 
 - (void)registerVoiceMessageCellsForTableView:(UITableView*)tableView
@@ -520,6 +521,7 @@ - (void)registerVoiceBroadcastRecorderCellsForTableView:(UITableView*)tableView
     return @{
         @(RoomTimelineCellIdentifierDirectCallStatus) : RoomDirectCallStatusCell.class,
         @(RoomTimelineCellIdentifierGroupCallStatus) : RoomGroupCallStatusCell.class,
+        @(RoomTimelineCellIdentifierMatrixRTCCall) : RoomMatrixRTCCallCell.class,
     };
 }
 
diff --git a/RiotNSE/NotificationService.swift b/RiotNSE/NotificationService.swift
index 16fbc6314..21b05588b 100644
--- a/RiotNSE/NotificationService.swift
+++ b/RiotNSE/NotificationService.swift
@@ -577,6 +577,15 @@ class NotificationService: UNNotificationServiceExtension {
                             notificationTitle = self.messageTitle(for: eventSenderName, in: roomDisplayName)
                             notificationBody = VectorL10n.pollTimelineEndedText
                         
+                        case .callNotify:
+                            if let callNotify = MXCallNotify(fromJSON: event.content) {
+                                let userIDs = callNotify.mentions.userIDs as? [String]
+                                if currentUserId.flatMap({ userIDs?.contains($0) }) ?? callNotify.mentions.room {
+                                    notificationTitle = self.messageTitle(for: eventSenderName, in: roomDisplayName)
+                                    notificationBody = NotificationService.localizedString(forKey: "UNSUPPORTED_CALL")
+                                }
+                            }
+                        
                         default:
                             break
                     }
diff --git a/matrix-ios-sdk b/matrix-ios-sdk
index bae77831f..07aa62ed1 160000
--- a/matrix-ios-sdk
+++ b/matrix-ios-sdk
@@ -1 +1 @@
-Subproject commit bae77831f2da7834303613c2ccbb75570e856291
+Subproject commit 07aa62ed1acc9f91507c709471f0e1656de0b4fd

From 6fcf57c950a65bd3d6f7b70243d4d5abff2072f1 Mon Sep 17 00:00:00 2001
From: Frank Paul Silye <frankps@gmail.com>
Date: Fri, 8 Nov 2024 11:43:10 +0000
Subject: [PATCH 04/59] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l=20(nb))?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 52.0% (26 of 50 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/nb/
---
 Riot/Assets/nb.lproj/Localizable.strings | 26 ++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Riot/Assets/nb.lproj/Localizable.strings b/Riot/Assets/nb.lproj/Localizable.strings
index b74076feb..516c32909 100644
--- a/Riot/Assets/nb.lproj/Localizable.strings
+++ b/Riot/Assets/nb.lproj/Localizable.strings
@@ -64,3 +64,29 @@
 
 /* New message from a specific person, not referencing a room */
 "MSG_FROM_USER" = "%@ sendte en melding";
+
+/* A single unread message */
+"SINGLE_UNREAD" = "Du har mottatt en melding";
+
+/* New file message from a specific person, not referencing a room. */
+"LOCATION_FROM_USER" = "%@ delte posisjonen sin";
+
+/** Media Messages **/
+
+/* New image message from a specific person, not referencing a room. */
+"PICTURE_FROM_USER" = "%@ sendte et bilde";
+
+/* New video message from a specific person, not referencing a room. */
+"VIDEO_FROM_USER" = "%@ sendte en video";
+
+/* New audio message from a specific person, not referencing a room. */
+"AUDIO_FROM_USER" = "%@ sendte en lydfil %@";
+
+/* New voice message from a specific person, not referencing a room. */
+"VOICE_MESSAGE_FROM_USER" = "%@ sendte en talemelding";
+
+/* New file message from a specific person, not referencing a room. */
+"FILE_FROM_USER" = "%@ sendte en fil %@";
+
+/* New image message from a specific person in a named room. */
+"IMAGE_FROM_USER_IN_ROOM" = "%@ postet et bilde %@ i %@";

From 4af471390495e02fed110f49123dc0d44a1e4a5e Mon Sep 17 00:00:00 2001
From: Frank Paul Silye <frankps@gmail.com>
Date: Sat, 9 Nov 2024 12:07:46 +0000
Subject: [PATCH 05/59] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l=20(nb))?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 96.0% (48 of 50 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/nb/
---
 Riot/Assets/nb.lproj/Localizable.strings | 75 ++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/Riot/Assets/nb.lproj/Localizable.strings b/Riot/Assets/nb.lproj/Localizable.strings
index 516c32909..6003bc452 100644
--- a/Riot/Assets/nb.lproj/Localizable.strings
+++ b/Riot/Assets/nb.lproj/Localizable.strings
@@ -90,3 +90,78 @@
 
 /* New image message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ postet et bilde %@ i %@";
+
+/* A user has change their name to a new name which we don't know */
+"GENERIC_USER_UPDATED_DISPLAYNAME" = "%@ har endret navn";
+
+/* A user's membership has updated in an unknown way */
+"USER_MEMBERSHIP_UPDATED" = "%@ har oppdatert profilen";
+
+/* A single unread message in a room */
+"SINGLE_UNREAD_IN_ROOM" = "Du mottok en melding i %@";
+
+/** Invites **/
+
+/* A user has invited you to a chat */
+"USER_INVITE_TO_CHAT" = "%@ har invitert deg til en chat";
+
+/* A user has invited you to an (unamed) group chat */
+"USER_INVITE_TO_CHAT_GROUP_CHAT" = "%@ har invitert deg til en gruppechat";
+
+/* A user has invited you to a named room */
+"USER_INVITE_TO_NAMED_ROOM" = "%@ har invitert deg til %@";
+
+/* Incoming one-to-one video call */
+"VIDEO_CALL_FROM_USER" = "Videoanrop fra %@";
+
+/* Incoming unnamed voice conference invite from a specific person */
+"VOICE_CONF_FROM_USER" = "Gruppeanrop fra %@";
+
+/* Incoming unnamed video conference invite from a specific person */
+"VIDEO_CONF_FROM_USER" = "Videogruppeanrop fra %@";
+
+/* Incoming named video conference invite from a specific person */
+"VIDEO_CONF_NAMED_FROM_USER" = "Videogruppeanrop fra %@: '%@'";
+
+/** Reactions **/
+
+/* A user has reacted to a message, including the reaction e.g. "Alice reacted 👍". */
+"REACTION_FROM_USER" = "%@ reagerte %@";
+
+/* A user has reacted to a message, but the reaction content is unknown */
+"GENERIC_REACTION_FROM_USER" = "%@ sendte en reaksjon";
+
+/* A user has change their avatar */
+"USER_UPDATED_AVATAR" = "%@ har endret avatar";
+
+/* A user added a Jitsi call to a room */
+"GROUP_CALL_STARTED" = "Gruppeanrop startet";
+
+/* Group call from user, CallKit caller name */
+"GROUP_CALL_FROM_USER" = "%@ (Gruppeanrop)";
+
+/** Key verification **/
+
+"KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ ønsker å bekrefte";
+
+/* New message reply from a specific person, not referencing a room. */
+"REPLY_FROM_USER_TITLE" = "%@ svarte";
+
+/* New message reply from a specific person in a named room. */
+"REPLY_FROM_USER_IN_ROOM_TITLE" = "%@ svarte i %@";
+
+/** Membership Updates **/
+
+/* A user has change their name to a new name */
+"USER_UPDATED_DISPLAYNAME" = "%@ har endret navn til %@";
+
+/* Incoming named voice conference invite from a specific person */
+"VOICE_CONF_NAMED_FROM_USER" = "Gruppeanrop fra %@: '%@'";
+
+/* New message from a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM" = "%@ postet i %@";
+
+/** Calls **/
+
+/* Incoming one-to-one voice call */
+"VOICE_CALL_FROM_USER" = "Anrop fra %@";

From e9f7e258c5f51359d81cb4964dee49f72b11a4f9 Mon Sep 17 00:00:00 2001
From: Piotr Strebski <strebski@gmail.com>
Date: Tue, 29 Oct 2024 11:34:54 +0000
Subject: [PATCH 06/59] Translated using Weblate (Polish)

Currently translated at 100.0% (2420 of 2420 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/pl/
---
 Riot/Assets/pl.lproj/Vector.strings | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Riot/Assets/pl.lproj/Vector.strings b/Riot/Assets/pl.lproj/Vector.strings
index ba5a2bc09..900783a86 100644
--- a/Riot/Assets/pl.lproj/Vector.strings
+++ b/Riot/Assets/pl.lproj/Vector.strings
@@ -2861,3 +2861,10 @@
 "settings_manage_account_title" = "Konto";
 "settings_manage_account_action" = "Zarządzaj kontem";
 "settings_manage_account_description" = "Zarządzaj swoim kontem w %@";
+
+
+// MARK: - WYSIWYG Composer
+"wysiwyg_composer_action_minimise_action" = "Zmniejsz edytora treści";
+"wysiwyg_composer_action_maximise_action" = "Powiększ edytora treści";
+"room_action_report_prompt_reason" = "Powód zgłoszenia tego pokoju";
+"room_action_report" = "Zgłoś pokój";

From 4dfee69934a28ecc635ebc9ba7592654d0cfc246 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 11 Nov 2024 09:30:46 +0000
Subject: [PATCH 07/59] Translated using Weblate (Albanian)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/sq/
---
 Riot/Assets/sq.lproj/Localizable.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/sq.lproj/Localizable.strings b/Riot/Assets/sq.lproj/Localizable.strings
index 8036083e0..8f51f92d9 100644
--- a/Riot/Assets/sq.lproj/Localizable.strings
+++ b/Riot/Assets/sq.lproj/Localizable.strings
@@ -121,3 +121,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ nisi një transmetim zanor";
+"UNSUPPORTED_CALL" = "Thirrje që s’mbulohet";

From d6dd476704118391de9db0c4944a62c919487d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Mon, 11 Nov 2024 13:03:12 +0000
Subject: [PATCH 08/59] Translated using Weblate (Estonian)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/et/
---
 Riot/Assets/et.lproj/Localizable.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/et.lproj/Localizable.strings b/Riot/Assets/et.lproj/Localizable.strings
index b3a015217..a1919b441 100644
--- a/Riot/Assets/et.lproj/Localizable.strings
+++ b/Riot/Assets/et.lproj/Localizable.strings
@@ -121,3 +121,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ alustas ringhäälingukõnet";
+"UNSUPPORTED_CALL" = "See kõne pole toetatud";

From cc462b7e5b08538746587c0877cbd62f4b240dbe Mon Sep 17 00:00:00 2001
From: Linerly <linerly@proton.me>
Date: Tue, 12 Nov 2024 00:24:22 +0000
Subject: [PATCH 09/59] Translated using Weblate (Indonesian)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/id/
---
 Riot/Assets/id.lproj/Localizable.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/id.lproj/Localizable.strings b/Riot/Assets/id.lproj/Localizable.strings
index da5e860c5..529a4f884 100644
--- a/Riot/Assets/id.lproj/Localizable.strings
+++ b/Riot/Assets/id.lproj/Localizable.strings
@@ -175,3 +175,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ memulai sebuah siaran suara";
+"UNSUPPORTED_CALL" = "Panggilan tidak didukung";

From ed1b24414f44bb357fd3a6fbca99d04805c68bdb Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 11 Nov 2024 09:32:19 +0000
Subject: [PATCH 10/59] Translated using Weblate (Albanian)

Currently translated at 99.6% (2412 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
---
 Riot/Assets/sq.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings
index b1158c152..d9392197f 100644
--- a/Riot/Assets/sq.lproj/Vector.strings
+++ b/Riot/Assets/sq.lproj/Vector.strings
@@ -2764,3 +2764,4 @@
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Tkurre hartuesin";
 "wysiwyg_composer_action_maximise_action" = "Zgjeroje hartuesin";
+"call_unsupported_matrix_rtc_call" = "Thirrje që s’mbulohet. Për të marrë pjesë në këtë thirrje, lypset aplikacioni i ri Element X.";

From 1ff398fa228f500d27b1f25e1a0e542e1f78e50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Mon, 11 Nov 2024 13:02:45 +0000
Subject: [PATCH 11/59] Translated using Weblate (Estonian)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/
---
 Riot/Assets/et.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings
index c21f0ba26..bf3c3d463 100644
--- a/Riot/Assets/et.lproj/Vector.strings
+++ b/Riot/Assets/et.lproj/Vector.strings
@@ -2726,3 +2726,4 @@
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Peida tekstitoimeti";
 "wysiwyg_composer_action_maximise_action" = "Ava tekstitoimeti";
+"call_unsupported_matrix_rtc_call" = "See kõne pole toetatud. Kõnega liitumiseks palun kasuta uut Element X rakendust.";

From 9e3f341eee41c30bc23f6dbdec950b5180c4669e Mon Sep 17 00:00:00 2001
From: Linerly <linerly@proton.me>
Date: Tue, 12 Nov 2024 00:22:34 +0000
Subject: [PATCH 12/59] Translated using Weblate (Indonesian)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/
---
 Riot/Assets/id.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/id.lproj/Vector.strings b/Riot/Assets/id.lproj/Vector.strings
index a27d04098..fc9836607 100644
--- a/Riot/Assets/id.lproj/Vector.strings
+++ b/Riot/Assets/id.lproj/Vector.strings
@@ -2981,3 +2981,4 @@
 "wysiwyg_composer_action_minimise_action" = "Kecilkan komposer";
 "wysiwyg_composer_action_maximise_action" = "Luaskan komposer";
 "room_action_report" = "Laporkan ruangan";
+"call_unsupported_matrix_rtc_call" = "Panggilan tidak didukung. Aplikasi Element X diperlukan untuk bergabung ke panggilan ini.";

From 5667086c924de879166737883ccdef708746b188 Mon Sep 17 00:00:00 2001
From: Mauro Romito <mauro.romito@element.io>
Date: Tue, 12 Nov 2024 12:29:10 +0100
Subject: [PATCH 13/59] version++

---
 CHANGES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 906148afd..4668b1004 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+## Changes in 1.11.20 (2024-11-12)
+
+No significant changes.
+
+
 ## Changes in 1.11.19 (2024-10-15)
 
 No significant changes.

From 8ffed9fcce2e26f38cff1785e3e95d3402de5b59 Mon Sep 17 00:00:00 2001
From: Mauro Romito <mauro.romito@element.io>
Date: Tue, 12 Nov 2024 13:43:11 +0100
Subject: [PATCH 14/59] finish version++


From 34ddefaac01f49e01ee8e69d31db4378c1ae1e13 Mon Sep 17 00:00:00 2001
From: Mauro Romito <mauro.romito@element.io>
Date: Tue, 12 Nov 2024 13:43:18 +0100
Subject: [PATCH 15/59] Prepare for new sprint

---
 Config/AppVersion.xcconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 29905a7a2..16b10d8d8 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.11.20
-CURRENT_PROJECT_VERSION = 1.11.20
+MARKETING_VERSION = 1.11.21
+CURRENT_PROJECT_VERSION = 1.11.21

From 7e509fbbcd0a40ba4232bad3b0dea52c27c41844 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Thu, 14 Nov 2024 08:37:35 +0000
Subject: [PATCH 16/59] Fix a bug where Matrix RTC call notifications are
 removed immediately after display. (#7870)

---
 RiotNSE/NotificationService.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RiotNSE/NotificationService.swift b/RiotNSE/NotificationService.swift
index 21b05588b..5c8a4e05f 100644
--- a/RiotNSE/NotificationService.swift
+++ b/RiotNSE/NotificationService.swift
@@ -795,7 +795,7 @@ class NotificationService: UNNotificationServiceExtension {
             return Constants.callInviteNotificationCategoryIdentifier
         }
         
-        guard event.eventType == .roomMessage || event.eventType == .roomEncrypted else {
+        guard event.eventType == .roomMessage || event.eventType == .roomEncrypted || event.eventType == .callNotify else {
             return Constants.toBeRemovedNotificationCategoryIdentifier
         }
         

From e7567f6b621bce67df590356d3257a48583723f6 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 14 Nov 2024 14:47:06 +0000
Subject: [PATCH 17/59] version++

---
 CHANGES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 4668b1004..698e941e6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+## Changes in 1.11.21 (2024-11-14)
+
+No significant changes.
+
+
 ## Changes in 1.11.20 (2024-11-12)
 
 No significant changes.

From a21546e7489063c5f191033d494cf038f1faadc1 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 14 Nov 2024 15:27:59 +0000
Subject: [PATCH 18/59] finish version++


From 91b2c846ad4bd0f6ddf740324be40f6a057af961 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 14 Nov 2024 15:28:05 +0000
Subject: [PATCH 19/59] Prepare for new sprint

---
 Config/AppVersion.xcconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 16b10d8d8..1f553c96a 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.11.21
-CURRENT_PROJECT_VERSION = 1.11.21
+MARKETING_VERSION = 1.11.22
+CURRENT_PROJECT_VERSION = 1.11.22

From 31db49d137f8324f641da02c9cf47f935e4e8f94 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Thu, 21 Nov 2024 11:32:47 +0100
Subject: [PATCH 20/59] =?UTF-8?q?Afficher=20une=20information=20plus=20pr?=
 =?UTF-8?q?=C3=A9cise=20si=20un=20keyBackup=20existe=20mais=20n'est=20pas?=
 =?UTF-8?q?=20de=20confiance?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SettingsSecureBackupTableViewSection.swift | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift
index 95066ef0b..3ec494faa 100644
--- a/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift
+++ b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift
@@ -150,10 +150,22 @@ private enum BackupRows {
                     ]
                 }
             case .keyBackupNotTrusted(let keyBackupVersion, _):
+                // Tchap: if backup is not trusted, treats it as if no backup is present (like on Android)
+//                backupRows = [
+//                    .info(text: VectorL10n.securitySettingsSecureBackupInfoValid, icon: UIImage(systemName: "checkmark.circle.fill"), tint: .systemGreen),
+//                    .restoreFromKeyBackupAction(keyBackupVersion: keyBackupVersion, title: VectorL10n.securitySettingsSecureBackupRestore),
+//                    .deleteKeyBackupAction(keyBackupVersion: keyBackupVersion)
+//                ]
+                let noBackup = VectorL10n.settingsKeyBackupInfoNotValid
+//                let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning
+                // Tchap
+//                let infoText = [noBackup, signoutWarning].joined(separator: "\n")
+                let infoText = noBackup
+                
+                let backupInfoText = noBackup
                 backupRows = [
-                    .info(text: VectorL10n.securitySettingsSecureBackupInfoValid, icon: UIImage(systemName: "checkmark.circle.fill"), tint: .systemGreen),
-                    .restoreFromKeyBackupAction(keyBackupVersion: keyBackupVersion, title: VectorL10n.securitySettingsSecureBackupRestore),
-//                    .deleteKeyBackupAction(keyBackupVersion: keyBackupVersion) // Tchap : no more "Delete backup" button
+                    .info(text: infoText, icon: UIImage(systemName: "xmark.circle.fill"), tint: .systemGray),
+                    .createSecureBackupAction
                 ]
             }
         case .secureBackup(let keyBackupState):

From 909cdf60380456ff1f806d6a5481972f905c6242 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Thu, 21 Nov 2024 11:33:35 +0100
Subject: [PATCH 21/59] =?UTF-8?q?Afficher=20une=20info=20plus=20pr=C3=A9ci?=
 =?UTF-8?q?se=20si=20la=20signature=20crois=C3=A9e=20existe=20mais=20n'est?=
 =?UTF-8?q?=20pas=20de=20confiance=20et=20ajouter=20un=20bouton=20Reset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Riot/Modules/Settings/Security/SecurityViewController.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Riot/Modules/Settings/Security/SecurityViewController.m b/Riot/Modules/Settings/Security/SecurityViewController.m
index 5b5673a5b..784e29817 100644
--- a/Riot/Modules/Settings/Security/SecurityViewController.m
+++ b/Riot/Modules/Settings/Security/SecurityViewController.m
@@ -688,6 +688,8 @@ - (NSInteger)numberOfRowsInCrossSigningSection
             numberOfRowsInCrossSigningSection = CROSSSIGNING_FIRST_ACTION + 1;
             break;
         case MXCrossSigningStateCrossSigningExists:             // Actions: Verify this session, Reset
+            numberOfRowsInCrossSigningSection = CROSSSIGNING_FIRST_ACTION + 2;
+            break;
         case MXCrossSigningStateTrustCrossSigning:              // Actions: Request keys, Reset
             numberOfRowsInCrossSigningSection = CROSSSIGNING_FIRST_ACTION + 1;
             break;
@@ -707,7 +709,7 @@ - (NSAttributedString*)crossSigningInformation
             crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoNotBootstrapped];
             break;
         case MXCrossSigningStateCrossSigningExists:
-            crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoNotBootstrapped]; // Tchap : simply tell user cross-signing is not configured.
+            crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoExists]; // Tchap : tell user cross-signing exists on the account but is not trusted.
             break;
         case MXCrossSigningStateTrustCrossSigning:
             crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoTrusted];

From 97c48d614b345555f0795c238c08363518e631cb Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Mon, 25 Nov 2024 11:15:22 +0100
Subject: [PATCH 22/59] Remove unused intermediate variables

---
 .../SettingsSecureBackupTableViewSection.swift           | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift
index 3ec494faa..64c48ee1a 100644
--- a/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift
+++ b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift
@@ -157,14 +157,9 @@ private enum BackupRows {
 //                    .deleteKeyBackupAction(keyBackupVersion: keyBackupVersion)
 //                ]
                 let noBackup = VectorL10n.settingsKeyBackupInfoNotValid
-//                let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning
-                // Tchap
-//                let infoText = [noBackup, signoutWarning].joined(separator: "\n")
-                let infoText = noBackup
                 
-                let backupInfoText = noBackup
                 backupRows = [
-                    .info(text: infoText, icon: UIImage(systemName: "xmark.circle.fill"), tint: .systemGray),
+                    .info(text: noBackup, icon: UIImage(systemName: "xmark.circle.fill"), tint: .systemGray),
                     .createSecureBackupAction
                 ]
             }
@@ -172,8 +167,8 @@ private enum BackupRows {
             switch keyBackupState {
             case .noKeyBackup:
                 let noBackup = VectorL10n.settingsKeyBackupInfoNone
-                let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning
                 // Tchap
+//                let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning
 //                let infoText = [noBackup, signoutWarning].joined(separator: "\n")
                 let infoText = noBackup
                                 

From 1e264ceeb796d893f4fc5246cfce1a6fad554a1a Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Mon, 25 Nov 2024 11:15:44 +0100
Subject: [PATCH 23/59] Add Changelog file

---
 changelog.d/1125.change | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1125.change

diff --git a/changelog.d/1125.change b/changelog.d/1125.change
new file mode 100644
index 000000000..4ff59dbfb
--- /dev/null
+++ b/changelog.d/1125.change
@@ -0,0 +1 @@
+Amélioration de la description de l'état de la signature croisée et des actions possibles (pour être au même niveau que le client Tchap Android).
\ No newline at end of file

From 2610af6da55d1982810cc68f7e42cbe861ff7843 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Mon, 25 Nov 2024 11:29:28 +0100
Subject: [PATCH 24/59] =?UTF-8?q?Activation=20des=20appels=20vid=C3=A9o=20?=
 =?UTF-8?q?pour=20toutes=20les=20instances=20en=20Production?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tchap/Config/BuildSettings.swift | 21 ++++++++++++++++++---
 changelog.d/1126.change          |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/1126.change

diff --git a/Tchap/Config/BuildSettings.swift b/Tchap/Config/BuildSettings.swift
index 2283dbb5b..6b12e99f4 100644
--- a/Tchap/Config/BuildSettings.swift
+++ b/Tchap/Config/BuildSettings.swift
@@ -272,7 +272,7 @@ final class BuildSettings: NSObject {
         tchapFeatureNotificationByEmail: [
             tchapFeatureAnyHomeServer
         ],
-        // Audio calls for all in Tchap Production.
+        // Audio calls for all instances in Tchap Production.
         tchapFeatureVoiceOverIP: [
             "agent.externe.tchap.gouv.fr",
             "agent.collectivites.tchap.gouv.fr",
@@ -292,10 +292,25 @@ final class BuildSettings: NSObject {
             "agent.dev-durable.tchap.gouv.fr",
             "agent.education.tchap.gouv.fr"
         ],
+        // Video calls for all instances in Tchap Production.
         tchapFeatureVideoOverIP: [
+            "agent.externe.tchap.gouv.fr",
+            "agent.collectivites.tchap.gouv.fr",
+            "agent.tchap.gouv.fr",
+            "agent.elysee.tchap.gouv.fr",
+            "agent.pm.tchap.gouv.fr",
+            "agent.ssi.tchap.gouv.fr",
+            "agent.finances.tchap.gouv.fr",
+            "agent.social.tchap.gouv.fr",
+            "agent.interieur.tchap.gouv.fr",
+            "agent.agriculture.tchap.gouv.fr",
+            "agent.justice.tchap.gouv.fr",
+            "agent.diplomatie.tchap.gouv.fr",
+            "agent.intradef.tchap.gouv.fr",
             "agent.dinum.tchap.gouv.fr",
-            "agent.education.tchap.gouv.fr",
-            "agent.tchap.gouv.fr"
+            "agent.culture.tchap.gouv.fr",
+            "agent.dev-durable.tchap.gouv.fr",
+            "agent.education.tchap.gouv.fr"
         ],
         tchapFeatureGeolocationSharing: [
             tchapFeatureAnyHomeServer
diff --git a/changelog.d/1126.change b/changelog.d/1126.change
new file mode 100644
index 000000000..051c2e432
--- /dev/null
+++ b/changelog.d/1126.change
@@ -0,0 +1 @@
+Activation des appels vidéo pour toutes les instances en Production.
\ No newline at end of file

From 4b924b06dbea8cf4feba15dedc5cddb6c4ebf223 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 26 Nov 2024 16:08:39 +0100
Subject: [PATCH 25/59] Execute towncrier

---
 TCHAP_CHANGES.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index b1a58dfd2..2c4981931 100644
--- a/TCHAP_CHANGES.md
+++ b/TCHAP_CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 2.8.2 (2024-11-26)
+
+🙌 Improvements
+
+- Permettre les appels vidéos sur Education et Agent. ([#1109](https://github.com/tchapgouv/tchap-ios/issues/1109))
+
+
 ## Changes in 2.8.2 (2024-11-06)
 
 ✨ Features

From 7361073fc97da722a3cd9caedb1a1e6af45795b4 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 26 Nov 2024 16:10:43 +0100
Subject: [PATCH 26/59] Execute towncrier

---
 TCHAP_CHANGES.md        | 11 +++++++++++
 changelog.d/1109.change |  1 -
 changelog.d/1118.change |  1 -
 changelog.d/1120.change |  1 -
 changelog.d/1125.change |  1 -
 changelog.d/1126.change |  1 -
 6 files changed, 11 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/1109.change
 delete mode 100644 changelog.d/1118.change
 delete mode 100644 changelog.d/1120.change
 delete mode 100644 changelog.d/1125.change
 delete mode 100644 changelog.d/1126.change

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index b1a58dfd2..b1ce709b7 100644
--- a/TCHAP_CHANGES.md
+++ b/TCHAP_CHANGES.md
@@ -1,3 +1,14 @@
+## Changes in 2.8.4 (2024-11-26)
+
+🙌 Improvements
+
+- Permettre les appels vidéos sur Education et Agent. ([#1109](https://github.com/tchapgouv/tchap-ios/issues/1109))
+- Update Sentry pod dependency to compile with Xcode 16.1 ([#1118](https://github.com/tchapgouv/tchap-ios/issues/1118))
+- Modifier le commentaire lorsqu'on active l'accès à un salon par lien ([#1120](https://github.com/tchapgouv/tchap-ios/issues/1120))
+- Amélioration de la description de l'état de la signature croisée et des actions possibles (pour être au même niveau que le client Tchap Android). ([#1125](https://github.com/tchapgouv/tchap-ios/issues/1125))
+- Activation des appels vidéo pour toutes les instances en Production. ([#1126](https://github.com/tchapgouv/tchap-ios/issues/1126))
+
+
 ## Changes in 2.8.2 (2024-11-06)
 
 ✨ Features
diff --git a/changelog.d/1109.change b/changelog.d/1109.change
deleted file mode 100644
index be87637d5..000000000
--- a/changelog.d/1109.change
+++ /dev/null
@@ -1 +0,0 @@
-Permettre les appels vidéos sur Education et Agent.
\ No newline at end of file
diff --git a/changelog.d/1118.change b/changelog.d/1118.change
deleted file mode 100644
index 69824d161..000000000
--- a/changelog.d/1118.change
+++ /dev/null
@@ -1 +0,0 @@
-Update Sentry pod dependency to compile with Xcode 16.1
\ No newline at end of file
diff --git a/changelog.d/1120.change b/changelog.d/1120.change
deleted file mode 100644
index 312f369a9..000000000
--- a/changelog.d/1120.change
+++ /dev/null
@@ -1 +0,0 @@
-Modifier le commentaire lorsqu'on active l'accès à un salon par lien
\ No newline at end of file
diff --git a/changelog.d/1125.change b/changelog.d/1125.change
deleted file mode 100644
index 4ff59dbfb..000000000
--- a/changelog.d/1125.change
+++ /dev/null
@@ -1 +0,0 @@
-Amélioration de la description de l'état de la signature croisée et des actions possibles (pour être au même niveau que le client Tchap Android).
\ No newline at end of file
diff --git a/changelog.d/1126.change b/changelog.d/1126.change
deleted file mode 100644
index 051c2e432..000000000
--- a/changelog.d/1126.change
+++ /dev/null
@@ -1 +0,0 @@
-Activation des appels vidéo pour toutes les instances en Production.
\ No newline at end of file

From 3b57e4eea328c0e6ccdb06ac129ad1a71483472a Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Wed, 27 Nov 2024 08:57:00 +0000
Subject: [PATCH 27/59] Fix a bug where UIA for cross signing wasn't needed
 until after checking for it. (#7874)

* Update the SDK.

* Fix a bug where UIA for cross signing wasn't needed until after checking for it.

This was due to the parameters not being present in the check, so we no longer check and instead do UIA on failure.
---
 Podfile.lock                                  | 12 +++---
 .../Setup/CrossSigningSetupCoordinator.swift  | 43 +++++++++----------
 matrix-ios-sdk                                |  2 +-
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index 63e9f57b5..34baf860f 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -39,16 +39,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.15):
-    - MatrixSDK/Core (= 0.27.15)
-  - MatrixSDK/Core (0.27.15):
+  - MatrixSDK (0.27.16):
+    - MatrixSDK/Core (= 0.27.16)
+  - MatrixSDK/Core (0.27.16):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDKCrypto (= 0.4.3)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.15):
+  - MatrixSDK/JingleCallStack (0.27.16):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.4.3)
@@ -179,7 +179,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 12b379749b84ab5b3662042acb1914b9f9bb692b
+  MatrixSDK: ce8f2cec670c2212144a129cc617d4144c89b97f
   MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
@@ -198,6 +198,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: 484a1cdf04951cc82156f29de196efd76d3ad893
+PODFILE CHECKSUM: 9148246fffa2c32e3c9b29a51cae4bb037497056
 
 COCOAPODS: 1.14.3
diff --git a/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift b/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift
index 2877de09d..74b7f967e 100644
--- a/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift
+++ b/Riot/Modules/CrossSigning/Setup/CrossSigningSetupCoordinator.swift
@@ -45,7 +45,7 @@ final class CrossSigningSetupCoordinator: CrossSigningSetupCoordinatorType {
     // MARK: - Public methods
     
     func start() {
-        self.showReauthentication()
+        setupCrossSigning()
     }
     
     func toPresentable() -> UIViewController {
@@ -53,16 +53,33 @@ final class CrossSigningSetupCoordinator: CrossSigningSetupCoordinatorType {
     }
     
     // MARK: - Private methods
-
-    private func showReauthentication() {
+    
+    private func setupCrossSigning(with authenticationParameters: [String: Any] = [:]) {
+        guard let crossSigning = parameters.session.crypto?.crossSigning else { return }
         
+        crossSigning.setup(withAuthParams: authenticationParameters) { [weak self] in
+            guard let self else { return }
+            delegate?.crossSigningSetupCoordinatorDidComplete(self)
+        } failure: { [weak self] error in
+            guard let self else { return }
+            
+            if let responseData = (error as NSError).userInfo[MXHTTPClientErrorResponseDataKey] as? [AnyHashable: Any],
+               let authenticationSession = MXAuthenticationSession(fromJSON: responseData) {
+                showReauthentication(authenticationSession: authenticationSession)
+            } else {
+                delegate?.crossSigningSetupCoordinator(self, didFailWithError: error)
+            }
+        }
+    }
+
+    private func showReauthentication(authenticationSession: MXAuthenticationSession) {
         let setupCrossSigningRequest = self.crossSigningService.setupCrossSigningRequest()
         
         let reauthenticationParameters = ReauthenticationCoordinatorParameters(session: parameters.session,
                                                                                presenter: parameters.presenter,
                                                                                title: parameters.title,
                                                                                message: parameters.message,
-                                                                               authenticatedEndpointRequest: setupCrossSigningRequest)
+                                                                               authenticationSession: authenticationSession)
         
         let coordinator = ReauthenticationCoordinator(parameters: reauthenticationParameters)
         coordinator.delegate = self
@@ -70,24 +87,6 @@ final class CrossSigningSetupCoordinator: CrossSigningSetupCoordinatorType {
         
         coordinator.start()
     }
-    
-    private func setupCrossSigning(with authenticationParameters: [String: Any]) {
-        guard let crossSigning = self.parameters.session.crypto?.crossSigning else {
-            return
-        }
-        
-        crossSigning.setup(withAuthParams: authenticationParameters) { [weak self] in
-            guard let self = self else {
-                return
-            }
-            self.delegate?.crossSigningSetupCoordinatorDidComplete(self)
-        } failure: { [weak self] error in
-            guard let self = self else {
-                return
-            }
-            self.delegate?.crossSigningSetupCoordinator(self, didFailWithError: error)
-        }
-    }
 }
 
 // MARK: - ReauthenticationCoordinatorDelegate
diff --git a/matrix-ios-sdk b/matrix-ios-sdk
index 07aa62ed1..07e8d577e 160000
--- a/matrix-ios-sdk
+++ b/matrix-ios-sdk
@@ -1 +1 @@
-Subproject commit 07aa62ed1acc9f91507c709471f0e1656de0b4fd
+Subproject commit 07e8d577e063015ecc3408591d15298c1bfcdff7

From bd1b8707af4e997e7486cbb5abc3677bac327d21 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Dec 2024 11:59:15 +0100
Subject: [PATCH 28/59] Activer ProConnect sur la Preprod

---
 Btchap/Config/BuildSettings.swift | 2 +-
 changelog.d/1129.change           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1129.change

diff --git a/Btchap/Config/BuildSettings.swift b/Btchap/Config/BuildSettings.swift
index d873f79d1..36b88209f 100644
--- a/Btchap/Config/BuildSettings.swift
+++ b/Btchap/Config/BuildSettings.swift
@@ -244,7 +244,7 @@ final class BuildSettings: NSObject {
     ]
     
     // Tchap: handle SSO feature flag. Presents SSO button on Onboarding screen and give priority to SSO on UIA.
-    static let tchapFeatureHandleSSO = false
+    static let tchapFeatureHandleSSO = true
     
     // MARK: - Side Menu
     static let enableSideMenu: Bool = true && !newAppLayoutEnabled
diff --git a/changelog.d/1129.change b/changelog.d/1129.change
new file mode 100644
index 000000000..a9dacc930
--- /dev/null
+++ b/changelog.d/1129.change
@@ -0,0 +1 @@
+Activer ProConnect sur la Preprod
\ No newline at end of file

From 26ab362f64afb9315bc99b1e0f2991f3d9a50dc7 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Dec 2024 16:27:55 +0100
Subject: [PATCH 29/59] Update to last Matrix iOS SDK

---
 matrix-ios-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-ios-sdk b/matrix-ios-sdk
index 07e8d577e..cfd20629f 160000
--- a/matrix-ios-sdk
+++ b/matrix-ios-sdk
@@ -1 +1 @@
-Subproject commit 07e8d577e063015ecc3408591d15298c1bfcdff7
+Subproject commit cfd20629fa805e9684eae2a4679563517e362819

From d18c440f0fcb932dca51f9e4095ebc906bf8b552 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Dec 2024 16:44:24 +0100
Subject: [PATCH 30/59] Resolve conflicts on Rebase/Element-v1.11.21 into Tchap

---
 Config/AppVersion.xcconfig                    |  5 ----
 Podfile.lock                                  | 24 +++++++++----------
 Riot/Assets/en.lproj/Vector.strings           |  2 +-
 Riot/Assets/fr.lproj/Vector.strings           |  1 +
 Riot/Modules/Room/RoomViewController.m        |  7 ------
 .../Call/CallCellContentView.xib              | 17 -------------
 RiotNSE/BuildSettings.swift                   | 18 +++++++++++++-
 RiotShareExtension/BuildSettings.swift        | 18 +++++++++++++-
 Tchap/Generated/Strings.swift                 |  2 +-
 9 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index b3e6300c1..be6ad511d 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,10 +15,5 @@
 //
 
 // Version
-<<<<<<< HEAD
 MARKETING_VERSION = 2.8.4
 CURRENT_PROJECT_VERSION = 1
-=======
-MARKETING_VERSION = 1.11.21
-CURRENT_PROJECT_VERSION = 1.11.21
->>>>>>> v1.11.21
diff --git a/Podfile.lock b/Podfile.lock
index 06af3d6de..c2bf30eb3 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -39,16 +39,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.15):
-    - MatrixSDK/Core (= 0.27.15)
-  - MatrixSDK/Core (0.27.15):
+  - MatrixSDK (0.27.16):
+    - MatrixSDK/Core (= 0.27.16)
+  - MatrixSDK/Core (0.27.16):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDKCrypto (= 0.4.3)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.15):
+  - MatrixSDK/JingleCallStack (0.27.16):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.4.3)
@@ -68,9 +68,9 @@ PODS:
   - Reusable/Storyboard (4.1.2)
   - Reusable/View (4.1.2)
   - RxSwift (5.1.3)
-  - Sentry (7.15.0):
-    - Sentry/Core (= 7.15.0)
-  - Sentry/Core (7.15.0)
+  - Sentry (8.40.1):
+    - Sentry/Core (= 8.40.1)
+  - Sentry/Core (8.40.1)
   - SideMenu (6.5.0)
   - SwiftBase32 (0.9.0)
   - SwiftFormat/CLI (0.54.5)
@@ -109,7 +109,7 @@ DEPENDENCIES:
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
   - RxSwift (~> 5.1.1)
-  - Sentry (~> 7.15.0)
+  - Sentry (~> 8.40.1)
   - SideMenu (~> 6.5)
   - SwiftBase32 (~> 0.9.0)
   - SwiftFormat/CLI
@@ -192,7 +192,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 12b379749b84ab5b3662042acb1914b9f9bb692b
+  MatrixSDK: ce8f2cec670c2212144a129cc617d4144c89b97f
   MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: f9e5c13ceea86bb5314218c85d16125b797eb332
@@ -200,7 +200,7 @@ SPEC CHECKSUMS:
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
   RxSwift: 915abbdfb62214aa89ccd0b194d44fb478019b27
-  Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7
+  Sentry: e9215d7b17f7902692b4f8700e061e4f853e3521
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
   SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c
@@ -214,6 +214,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: 71717d585bff57965402647a1ac31c47351d3cc7
+PODFILE CHECKSUM: a4732b13f538318a3f022f2debaeb134099493e7
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index dd113093e..415d7bfae 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -1255,7 +1255,7 @@ Tap the + to start adding people.";
 "call_no_stun_server_error_use_fallback_button" = "Try using %@";
 
 "call_actions_unhold" = "Resume";
-"call_unsupported_matrix_rtc_call" = "Unsupported call. The new Element X app is needed to join this call.";
+"call_unsupported_matrix_rtc_call" = "This type of call is currently unsupported."; // Tchap
 
 // No VoIP support
 "no_voip_title" = "Incoming call";
diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings
index 056297ce6..32e2f0f27 100644
--- a/Riot/Assets/fr.lproj/Vector.strings
+++ b/Riot/Assets/fr.lproj/Vector.strings
@@ -1331,6 +1331,7 @@
 "secrets_recovery_reset_action_part_1" = "Vous avez perdu votre Code de Récupération ? "; // Tchap
 "bug_report_background_mode" = "Poursuivre en arrière-plan";
 "call_actions_unhold" = "Reprendre";
+"call_unsupported_matrix_rtc_call" = "Type d'appel non supporté actuellement."; // Tchap
 "event_formatter_call_back" = "Rappeler";
 "event_formatter_call_you_declined" = "Appel rejeté";
 "event_formatter_call_has_ended" = "Appel terminé";
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index f6005d7e6..303008cdc 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -3254,21 +3254,14 @@ - (RoomTimelineCellIdentifier)cellIdentifierForCellData:(MXKCellData*)cellData a
     {
         cellIdentifier = RoomTimelineCellIdentifierDirectCallStatus;
     }
-<<<<<<< HEAD
 //    else if (bubbleData.tag == RoomBubbleCellDataTagGroupCall)
 //    {
 //        cellIdentifier = RoomTimelineCellIdentifierGroupCallStatus;
 //    }
-=======
-    else if (bubbleData.tag == RoomBubbleCellDataTagGroupCall)
-    {
-        cellIdentifier = RoomTimelineCellIdentifierGroupCallStatus;
-    }
     else if (bubbleData.tag == RoomBubbleCellDataTagRTCCallNotify)
     {
         cellIdentifier = RoomTimelineCellIdentifierMatrixRTCCall;
     }
->>>>>>> v1.11.21
     else if (bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage || bubbleData.attachment.type == MXKAttachmentTypeAudio)
     {
         if (bubbleData.isIncoming)
diff --git a/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib b/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
index 553bec329..f9e35d0ec 100644
--- a/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
+++ b/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
@@ -1,27 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<< HEAD
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
-=======
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
->>>>>>> v1.11.21
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-<<<<<<< HEAD
         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="CallCellContentView" customModule="Btchap" customModuleProvider="target">
-=======
-        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="CallCellContentView" customModule="Element" customModuleProvider="target">
->>>>>>> v1.11.21
             <rect key="frame" x="0.0" y="0.0" width="414" height="220"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="pdr-Jo-LHQ">
@@ -99,13 +87,8 @@
                                                         <constraint firstAttribute="height" constant="16" id="OdD-1h-kkV"/>
                                                     </constraints>
                                                 </imageView>
-<<<<<<< HEAD
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Active call" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
                                                     <rect key="frame" x="22" y="0.0" width="62" height="16"/>
-=======
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Active call" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
-                                                    <rect key="frame" x="22" y="2" width="62" height="16"/>
->>>>>>> v1.11.21
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
diff --git a/RiotNSE/BuildSettings.swift b/RiotNSE/BuildSettings.swift
index 4acd6065d..6b12e99f4 100644
--- a/RiotNSE/BuildSettings.swift
+++ b/RiotNSE/BuildSettings.swift
@@ -272,7 +272,7 @@ final class BuildSettings: NSObject {
         tchapFeatureNotificationByEmail: [
             tchapFeatureAnyHomeServer
         ],
-        // Audio calls for all in Tchap Production.
+        // Audio calls for all instances in Tchap Production.
         tchapFeatureVoiceOverIP: [
             "agent.externe.tchap.gouv.fr",
             "agent.collectivites.tchap.gouv.fr",
@@ -292,8 +292,24 @@ final class BuildSettings: NSObject {
             "agent.dev-durable.tchap.gouv.fr",
             "agent.education.tchap.gouv.fr"
         ],
+        // Video calls for all instances in Tchap Production.
         tchapFeatureVideoOverIP: [
+            "agent.externe.tchap.gouv.fr",
+            "agent.collectivites.tchap.gouv.fr",
+            "agent.tchap.gouv.fr",
+            "agent.elysee.tchap.gouv.fr",
+            "agent.pm.tchap.gouv.fr",
+            "agent.ssi.tchap.gouv.fr",
+            "agent.finances.tchap.gouv.fr",
+            "agent.social.tchap.gouv.fr",
+            "agent.interieur.tchap.gouv.fr",
+            "agent.agriculture.tchap.gouv.fr",
+            "agent.justice.tchap.gouv.fr",
+            "agent.diplomatie.tchap.gouv.fr",
+            "agent.intradef.tchap.gouv.fr",
             "agent.dinum.tchap.gouv.fr",
+            "agent.culture.tchap.gouv.fr",
+            "agent.dev-durable.tchap.gouv.fr",
             "agent.education.tchap.gouv.fr"
         ],
         tchapFeatureGeolocationSharing: [
diff --git a/RiotShareExtension/BuildSettings.swift b/RiotShareExtension/BuildSettings.swift
index 4acd6065d..6b12e99f4 100644
--- a/RiotShareExtension/BuildSettings.swift
+++ b/RiotShareExtension/BuildSettings.swift
@@ -272,7 +272,7 @@ final class BuildSettings: NSObject {
         tchapFeatureNotificationByEmail: [
             tchapFeatureAnyHomeServer
         ],
-        // Audio calls for all in Tchap Production.
+        // Audio calls for all instances in Tchap Production.
         tchapFeatureVoiceOverIP: [
             "agent.externe.tchap.gouv.fr",
             "agent.collectivites.tchap.gouv.fr",
@@ -292,8 +292,24 @@ final class BuildSettings: NSObject {
             "agent.dev-durable.tchap.gouv.fr",
             "agent.education.tchap.gouv.fr"
         ],
+        // Video calls for all instances in Tchap Production.
         tchapFeatureVideoOverIP: [
+            "agent.externe.tchap.gouv.fr",
+            "agent.collectivites.tchap.gouv.fr",
+            "agent.tchap.gouv.fr",
+            "agent.elysee.tchap.gouv.fr",
+            "agent.pm.tchap.gouv.fr",
+            "agent.ssi.tchap.gouv.fr",
+            "agent.finances.tchap.gouv.fr",
+            "agent.social.tchap.gouv.fr",
+            "agent.interieur.tchap.gouv.fr",
+            "agent.agriculture.tchap.gouv.fr",
+            "agent.justice.tchap.gouv.fr",
+            "agent.diplomatie.tchap.gouv.fr",
+            "agent.intradef.tchap.gouv.fr",
             "agent.dinum.tchap.gouv.fr",
+            "agent.culture.tchap.gouv.fr",
+            "agent.dev-durable.tchap.gouv.fr",
             "agent.education.tchap.gouv.fr"
         ],
         tchapFeatureGeolocationSharing: [
diff --git a/Tchap/Generated/Strings.swift b/Tchap/Generated/Strings.swift
index 8b38a694a..d17cc9454 100644
--- a/Tchap/Generated/Strings.swift
+++ b/Tchap/Generated/Strings.swift
@@ -663,7 +663,7 @@ public class TchapL10n: NSObject {
   public static var roomSettingsEnableRoomAccessByLink: String { 
     return TchapL10n.tr("Tchap", "room_settings_enable_room_access_by_link") 
   }
-  /// Les utilisateurs pourront rejoindre ce salon à partir d'un lien puis le partager à d'autres utilisateurs.
+  /// Tous les agents disposant du lien peuvent rejoindre ce salon et inviter d'autres agents
   public static var roomSettingsEnableRoomAccessByLinkInfoOff: String { 
     return TchapL10n.tr("Tchap", "room_settings_enable_room_access_by_link_info_off") 
   }

From 75ea5415e42dd2108b417e698f584ba77d6375d0 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Dec 2024 16:51:58 +0100
Subject: [PATCH 31/59] Add changelog

---
 changelog.d/1131.change | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1131.change

diff --git a/changelog.d/1131.change b/changelog.d/1131.change
new file mode 100644
index 000000000..757a76e9a
--- /dev/null
+++ b/changelog.d/1131.change
@@ -0,0 +1 @@
+Rebase sur Element 1.11.21
\ No newline at end of file

From 65f53a9649062a9482cd12620a1ace5da78381a0 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Dec 2024 17:33:08 +0100
Subject: [PATCH 32/59] Update version to 2.8.6

---
 Config/AppVersion.xcconfig | 2 +-
 towncrier.toml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index be6ad511d..9b33ca86f 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 2.8.4
+MARKETING_VERSION = 2.8.6
 CURRENT_PROJECT_VERSION = 1
diff --git a/towncrier.toml b/towncrier.toml
index 946c92f59..7c12f6a4d 100644
--- a/towncrier.toml
+++ b/towncrier.toml
@@ -1,6 +1,6 @@
 [tool.towncrier]
 name = "Changes in"
-version = "2.8.4"
+version = "2.8.6"
 filename = "TCHAP_CHANGES.md"
 directory = "changelog.d"
 template = "changelog.d/_template.md.jinja"

From 328af0c5eac3ebfe729016f2e2f3dac7dbf86a7d Mon Sep 17 00:00:00 2001
From: Viktor Kumanenkov <hek4ek@gmail.com>
Date: Wed, 4 Dec 2024 21:36:28 +0300
Subject: [PATCH 33/59] =?UTF-8?q?Fix=20display=20of=20incoming=20call=20fo?=
 =?UTF-8?q?r=20group=20calls=20when=20receiving=20VOIP=20noti=E2=80=A6=20(?=
 =?UTF-8?q?#7875)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix display of incoming call for group calls when receiving VOIP notification

Author reset

* Update Riot/Managers/Call/CallPresenter.swift

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>

---------

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
---
 Riot/Managers/Call/CallPresenter.swift | 7 +++++--
 changelog.d/7858.bugfix                | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/7858.bugfix

diff --git a/Riot/Managers/Call/CallPresenter.swift b/Riot/Managers/Call/CallPresenter.swift
index cdec8328b..42626cb16 100644
--- a/Riot/Managers/Call/CallPresenter.swift
+++ b/Riot/Managers/Call/CallPresenter.swift
@@ -309,8 +309,11 @@ class CallPresenter: NSObject {
                     return
                 }
                 let user = session.user(withUserId: event.sender)
-                let displayName = NSString.localizedUserNotificationString(forKey: "GROUP_CALL_FROM_USER",
-                                                                           arguments: [user?.displayname as Any])
+                let displayNameUNLocalizedString = NSString.localizedUserNotificationString(forKey: "GROUP_CALL_FROM_USER",
+                                                                                            arguments: [user?.displayname as Any])
+
+                // will fix app crash when CXCallUpdate accesses the localizedCallerName property because list of allowed classes for com.apple.callkit.callsourcehost service contains only NSString
+                let displayName = NSString(string: displayNameUNLocalizedString) as String
                 
                 MXLog.debug("[CallPresenter] processWidgetEvent: Report new incoming call with id: \(newUUID.uuidString)")
                 
diff --git a/changelog.d/7858.bugfix b/changelog.d/7858.bugfix
new file mode 100644
index 000000000..1dbe051b8
--- /dev/null
+++ b/changelog.d/7858.bugfix
@@ -0,0 +1 @@
+Fix display of incoming call for group calls when receiving VOIP notification.
\ No newline at end of file

From 05ffa666737827ade9f1e3ee56d2aa5df7822bc8 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 14 Nov 2024 21:10:18 +0000
Subject: [PATCH 34/59] Translated using Weblate (Swedish)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/sv/
---
 Riot/Assets/sv.lproj/Localizable.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/sv.lproj/Localizable.strings b/Riot/Assets/sv.lproj/Localizable.strings
index fc7c18b9e..1dd69bcd0 100644
--- a/Riot/Assets/sv.lproj/Localizable.strings
+++ b/Riot/Assets/sv.lproj/Localizable.strings
@@ -121,3 +121,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ påbörjade en röstsändning";
+"UNSUPPORTED_CALL" = "Samtal stöds inte";

From a3874cdf951cae77bf0d3adaa185d9578b5ef023 Mon Sep 17 00:00:00 2001
From: Jozef Gaal <preklady@mayday.sk>
Date: Tue, 19 Nov 2024 23:43:03 +0000
Subject: [PATCH 35/59] Translated using Weblate (Slovak)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/sk/
---
 Riot/Assets/sk.lproj/Localizable.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/sk.lproj/Localizable.strings b/Riot/Assets/sk.lproj/Localizable.strings
index 02c086065..284ddc77c 100644
--- a/Riot/Assets/sk.lproj/Localizable.strings
+++ b/Riot/Assets/sk.lproj/Localizable.strings
@@ -171,3 +171,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ začal/a hlasové vysielanie";
+"UNSUPPORTED_CALL" = "Nepodporovaný hovor";

From b9403215e546678f019ce63d7fceca7b34707688 Mon Sep 17 00:00:00 2001
From: zarooba01 <zawistowskihubert01@gmail.com>
Date: Mon, 25 Nov 2024 12:54:44 +0000
Subject: [PATCH 36/59] Added translation using Weblate (Georgian)

---
 Riot/Assets/ka.lproj/InfoPlist.strings | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Riot/Assets/ka.lproj/InfoPlist.strings

diff --git a/Riot/Assets/ka.lproj/InfoPlist.strings b/Riot/Assets/ka.lproj/InfoPlist.strings
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/Riot/Assets/ka.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+

From b502ff9d6e9f3be8b9122cdfeac2a9b7e7c3f8d4 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 26 Nov 2024 01:10:15 +0000
Subject: [PATCH 37/59] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (51 of 51 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/uk/
---
 Riot/Assets/uk.lproj/Localizable.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/uk.lproj/Localizable.strings b/Riot/Assets/uk.lproj/Localizable.strings
index 90e0de28e..9c092e349 100644
--- a/Riot/Assets/uk.lproj/Localizable.strings
+++ b/Riot/Assets/uk.lproj/Localizable.strings
@@ -121,3 +121,4 @@
 
 /* New voice broadcast from a specific person, not referencing a room. */
 "VOICE_BROADCAST_FROM_USER" = "%@ розпочинає голосову трансляцію";
+"UNSUPPORTED_CALL" = "Непідтримуваний виклик";

From f58365c77f346597623befe96cfb7cccf8ff10e0 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 14 Nov 2024 21:10:14 +0000
Subject: [PATCH 38/59] Translated using Weblate (Swedish)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/
---
 Riot/Assets/sv.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/sv.lproj/Vector.strings b/Riot/Assets/sv.lproj/Vector.strings
index 4ba032603..5254ec736 100644
--- a/Riot/Assets/sv.lproj/Vector.strings
+++ b/Riot/Assets/sv.lproj/Vector.strings
@@ -2721,3 +2721,4 @@
 
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Krymp redigerare";
+"call_unsupported_matrix_rtc_call" = "Samtal stöds inte. Nya Element X-appen behövs för att gå med i det här samtalet.";

From 439042c679a3370226db5969f8288e17ebe5515b Mon Sep 17 00:00:00 2001
From: Percy <perrsig@gmail.com>
Date: Mon, 18 Nov 2024 14:49:52 +0000
Subject: [PATCH 39/59] Translated using Weblate (Chinese (Simplified))

Currently translated at 86.4% (2092 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/
---
 Riot/Assets/zh_Hans.lproj/Vector.strings | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings
index 50d43aed9..89bd82d8b 100644
--- a/Riot/Assets/zh_Hans.lproj/Vector.strings
+++ b/Riot/Assets/zh_Hans.lproj/Vector.strings
@@ -2227,7 +2227,7 @@
 "authentication_qr_login_start_subtitle" = "用此设备的相机扫描显示在你的其他设备上的QR码：";
 "authentication_qr_login_start_title" = "扫描QR码";
 "authentication_choose_password_signout_all_devices" = "登出全部设备";
-"authentication_login_with_qr" = "用QR码登录";
+"authentication_login_with_qr" = "使用二维码登录";
 "onboarding_congratulations_home_button" = "带我到主页";
 "onboarding_use_case_message" = "我们将帮助你连接";
 "invite_to" = "邀请到%@";
@@ -2426,3 +2426,5 @@
 "network_offline_message" = "您已离线，请检查您的网络链接。";
 "key_verification_alert_body" = "重新检查以确保您的账户安全。";
 "key_verification_scan_qr_code_title" = "扫描 QR Code";
+"room_action_report" = "举报房间";
+"pill_message_from" = "来自 %@ 的消息";

From 2af826f8bb805fa6f95eebefd1515ac4d0e402ef Mon Sep 17 00:00:00 2001
From: Jozef Gaal <preklady@mayday.sk>
Date: Tue, 19 Nov 2024 23:42:54 +0000
Subject: [PATCH 40/59] Translated using Weblate (Slovak)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/
---
 Riot/Assets/sk.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/sk.lproj/Vector.strings b/Riot/Assets/sk.lproj/Vector.strings
index 5ad14f43f..86f3d5bc1 100644
--- a/Riot/Assets/sk.lproj/Vector.strings
+++ b/Riot/Assets/sk.lproj/Vector.strings
@@ -2977,3 +2977,4 @@
 
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Zmenšiť editor";
+"call_unsupported_matrix_rtc_call" = "Nepodporovaný hovor. Na pripojenie k tomuto hovoru je potrebná nová aplikácia Element X.";

From 6b275a97a65319e7c3aa33fe44063bf3e0c27448 Mon Sep 17 00:00:00 2001
From: zarooba01 <zawistowskihubert01@gmail.com>
Date: Mon, 25 Nov 2024 12:39:02 +0000
Subject: [PATCH 41/59] Translated using Weblate (Georgian)

Currently translated at 14.4% (350 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ka/
---
 Riot/Assets/ka.lproj/Vector.strings | 333 ++++++++++++++++++++++++++++
 1 file changed, 333 insertions(+)

diff --git a/Riot/Assets/ka.lproj/Vector.strings b/Riot/Assets/ka.lproj/Vector.strings
index 8c20e5dc3..6b0810158 100644
--- a/Riot/Assets/ka.lproj/Vector.strings
+++ b/Riot/Assets/ka.lproj/Vector.strings
@@ -75,3 +75,336 @@
 // Call Bar
 "callbar_only_single_active" = "შეეხეთ, რომ დაბრუნდეთ ზარში (%@)";
 "callbar_only_multiple_paused" = "%@ შეჩერებული ზარები";
+
+// Accessibility
+"accessibility_checkbox_label" = "ღილაკი";
+"accessibility_button_label" = "ღილაკი";
+"accessibility_selected" = "შერჩეული";
+"onboarding_splash_login_button_title" = "მე უკვე მაქვს ანგარიში";
+"onboarding_splash_page_1_title" = "დაეუფლეთ თქვენს საუბრებს.";
+"onboarding_splash_page_2_title" = "თქვენ აკონტროლებთ.";
+"onboarding_splash_page_3_title" = "უსაფრთხო შეტყობინებები.";
+"onboarding_splash_page_3_message" = "ბოლოს ბოლომდე დაშიფრული და ტელეფონის ნომერი არ არის საჭირო. რეკლამები და მონაცემთა მოპოვება არ ხდება.";
+"onboarding_splash_page_4_title_no_pun" = "შეტყობინებები თქვენი გუნდისთვის.";
+"onboarding_use_case_title" = "ვის ესაუბრებით ყველაზე მეტად?";
+"onboarding_use_case_message" = "ჩვენ დაგეხმარებით დაკავშირებაში";
+"onboarding_use_case_personal_messaging" = "მეგობრები და ოჯახი";
+"onboarding_use_case_work_messaging" = "გუნდები";
+"onboarding_use_case_community_messaging" = "თემები";
+"onboarding_use_case_skip_button" = "გამოტოვეთ ეს კითხვა";
+"onboarding_use_case_existing_server_message" = "გსურთ შეუერთდეთ არსებულ სერვერს?";
+"onboarding_use_case_existing_server_button" = "სერვერთან დაკავშირება";
+"onboarding_congratulations_title" = "გილოცავ!";
+"onboarding_congratulations_personalize_button" = "პროფილის პერსონალიზაცია";
+"onboarding_congratulations_home_button" = "სახლში წამიყვანე";
+"onboarding_personalization_save" = "შეინახეთ და გააგრძელეთ";
+"onboarding_personalization_skip" = "გამოტოვეთ ეს ნაბიჯი";
+"onboarding_display_name_message" = "ეს გამოჩნდება შეტყობინებების გაგზავნისას.";
+"onboarding_display_name_placeholder" = "საჩვენებელი სახელი";
+"onboarding_avatar_title" = "დაამატეთ პროფილის სურათი";
+"onboarding_avatar_message" = "დროა სახელის დახატვა";
+"onboarding_avatar_accessibility_label" = "პროფილის სურათი";
+"onboarding_celebration_button" = "მოდით წავიდეთ";
+
+// MARK: Authentication
+"authentication_registration_title" = "შექმენით თქვენი ანგარიში";
+"authentication_registration_username" = "მომხმარებლის სახელი";
+"authentication_registration_username_footer" = "თქვენ არ შეგიძლიათ შეცვალოთ ეს მოგვიანებით";
+"authentication_registration_password_footer" = "უნდა იყოს 8 ან მეტი სიმბოლო";
+"authentication_server_info_title" = "სადაც თქვენი საუბრები იცხოვრებს";
+"authentication_login_title" = "კეთილი იყოს თქვენი მობრძანება!";
+"authentication_login_forgot_password" = "დაგავიწყდათ პაროლი";
+"authentication_server_info_title_login" = "სადაც თქვენი საუბრები ცხოვრობს";
+"authentication_login_with_qr" = "შედით QR კოდით";
+"authentication_server_selection_login_message" = "რა არის თქვენი სერვერის მისამართი?";
+"authentication_server_selection_server_url" = "სახლის სერვერის URL";
+"authentication_server_selection_generic_error" = "ამ URL-ზე სერვერის პოვნა ვერ ხერხდება, გთხოვთ, შეამოწმოთ, რომ ეს სწორია.";
+"authentication_verify_email_input_title" = "შეიყვანეთ თქვენი ელფოსტა";
+/* The placeholder will show the homeserver's domain */
+"authentication_verify_email_input_message" = "%@ საჭიროებს თქვენი ანგარიშის დადასტურებას";
+"authentication_verify_email_text_field_placeholder" = "ელფოსტა";
+"authentication_verify_email_waiting_title" = "დაადასტურეთ თქვენი ელფოსტა.";
+"authentication_verify_email_waiting_hint" = "ელ.წერილი არ მიგიღიათ?";
+"authentication_verify_email_waiting_button" = "ელფოსტის ხელახლა გაგზავნა";
+"authentication_forgot_password_input_title" = "შეიყვანეთ თქვენი ელფოსტა";
+"authentication_forgot_password_text_field_placeholder" = "ელფოსტა";
+"authentication_forgot_password_waiting_title" = "შეამოწმეთ თქვენი ელ.წერილი.";
+/* The placeholder will show the email address that was entered. */
+"authentication_forgot_password_waiting_message" = "მიჰყევით %@-ზე გაგზავნილ ინსტრუქციას";
+"authentication_forgot_password_waiting_button" = "ელფოსტის ხელახლა გაგზავნა";
+"authentication_choose_password_input_title" = "აირჩიეთ ახალი პაროლი";
+"authentication_choose_password_signout_all_devices" = "გადით ყველა მოწყობილობიდან";
+"authentication_choose_password_submit_button" = "პაროლის აღდგენა";
+"authentication_choose_password_not_verified_message" = "შეამოწმეთ თქვენი შემომავალი";
+"authentication_verify_msisdn_input_title" = "შეიყვანეთ თქვენი ტელეფონის ნომერი";
+"authentication_verify_msisdn_text_field_placeholder" = "ტელეფონის ნომერი";
+"authentication_verify_msisdn_otp_text_field_placeholder" = "დადასტურების კოდი";
+"authentication_verify_msisdn_waiting_title" = "დაადასტურეთ თქვენი ტელეფონის ნომერი";
+/* The placeholder will show the phone number that was entered. */
+"authentication_verify_msisdn_waiting_message" = "კოდი გაიგზავნა %@-ზე";
+"authentication_verify_msisdn_waiting_button" = "კოდის ხელახლა გაგზავნა";
+"authentication_terms_title" = "კონფიდენციალურობის პოლიტიკა";
+"authentication_terms_policy_url_error" = "არჩეული წესების პოვნა შეუძლებელია. გთხოვთ, სცადოთ მოგვიანებით.";
+"authentication_qr_login_start_title" = "QR კოდის სკანირება";
+"authentication_qr_login_start_step1" = "გახსენით ელემენტი თქვენს სხვა მოწყობილობაზე";
+"authentication_qr_login_start_step3" = "აირჩიეთ \"მოწყობილობის დაკავშირება\"";
+"authentication_qr_login_start_step4" = "აირჩიეთ „ამ მოწყობილობაზე QR კოდის ჩვენება“";
+"authentication_qr_login_start_display_qr" = "QR კოდის ჩვენება ამ მოწყობილობაზე";
+"authentication_qr_login_display_title" = "მოწყობილობის მიბმა";
+"authentication_qr_login_display_step1" = "გახსენით ელემენტი თქვენს სხვა მოწყობილობაზე";
+"authentication_qr_login_display_step2" = "აირჩიეთ „შესვლა QR კოდით“";
+"authentication_qr_login_scan_title" = "QR კოდის სკანირება";
+"authentication_qr_login_confirm_title" = "დამყარდა უსაფრთხო კავშირი";
+"authentication_qr_login_loading_connecting_device" = "მოწყობილობასთან დაკავშირება";
+"authentication_qr_login_loading_waiting_signin" = "ელოდება მოწყობილობის შესვლას.";
+"authentication_qr_login_loading_signed_in" = "ახლა შესული ხართ თქვენი სხვა მოწყობილობიდან.";
+"authentication_qr_login_failure_title" = "დაკავშირება ვერ მოხერხდა";
+"authentication_qr_login_failure_device_not_supported" = "ამ მოწყობილობასთან დაკავშირება მხარდაჭერილი არ არის.";
+"authentication_qr_login_failure_invalid_qr" = "QR კოდი არასწორია.";
+"authentication_qr_login_failure_request_timed_out" = "დაკავშირება არ დასრულებულა საჭირო დროში.";
+"authentication_qr_login_failure_retry" = "სცადეთ ხელახლა";
+"password_validation_error_header" = "მითითებული პაროლი არ აკმაყოფილებს ქვემოთ მოცემულ კრიტერიუმებს:";
+/* The placeholder will show a number */
+"password_validation_error_min_length" = "მინიმუმ %d სიმბოლო.";
+"password_validation_error_contain_lowercase_letter" = "შეიცავდეს პატარა ასოს.";
+"password_validation_error_contain_uppercase_letter" = "შეიტანეთ დიდი ასო.";
+"password_validation_error_contain_number" = "შეიცავდეს რიცხვს.";
+"password_validation_error_contain_symbol" = "შეიცავს სიმბოლოს.";
+"password_policy_pwd_in_dict_error" = "ეს პაროლი ნაპოვნია ლექსიკონში და დაუშვებელია.";
+
+// MARK: Legacy Authentication
+"auth_login" = "შესვლა";
+"auth_submit" = "გაგზავნა";
+"auth_skip" = "გამოტოვება";
+"auth_send_reset_email" = "გადატვირთვის ელფოსტის გაგზავნა";
+"auth_user_id_placeholder" = "ელ. ფოსტა ან მომხმარებლის სახელი";
+"auth_password_placeholder" = "პაროლი";
+"auth_new_password_placeholder" = "ახალი პაროლი";
+"auth_optional_email_placeholder" = "ელფოსტის მისამართი (არასავალდებულო)";
+"auth_email_placeholder" = "ელფოსტის მისამართი";
+"auth_phone_placeholder" = "ტელეფონის ნომერი";
+"auth_repeat_password_placeholder" = "გაიმეორეთ პაროლი";
+"auth_home_server_placeholder" = "URL (მაგ. https://matrix.org)";
+"auth_identity_server_placeholder" = "URL (მაგ. https://vector.im)";
+"auth_invalid_login_param" = "არასწორი მომხმარებლის სახელი და/ან პაროლი";
+"auth_invalid_password" = "პაროლი ძალიან მოკლეა (მინ. 6)";
+"auth_invalid_email" = "ეს არ ჰგავს მოქმედ ელფოსტის მისამართს";
+"auth_missing_password" = "პაროლი აკლია";
+"auth_add_phone_message_2" = "დააყენეთ ტელეფონი და მოგვიანებით იქნება სურვილისამებრ აღმოაჩინოს ადამიანები, რომლებიც გიცნობენ.";
+"auth_missing_email" = "ელფოსტის მისამართი აკლია";
+"auth_missing_phone" = "დაკარგული ტელეფონის ნომერი";
+"auth_missing_email_or_phone" = "აკლია ელფოსტის მისამართი ან ტელეფონის ნომერი";
+"auth_phone_in_use" = "ეს ტელეფონის ნომერი უკვე გამოიყენება";
+"auth_untrusted_id_server" = "პირადობის სერვერი არ არის სანდო";
+"auth_username_in_use" = "მომხმარებლის სახელი გამოიყენება";
+"auth_forgot_password" = "დაგავიწყდათ Matrix ანგარიშის პაროლი?";
+"auth_email_not_found" = "ელფოსტის გაგზავნა ვერ მოხერხდა: ელფოსტის ეს მისამართი ვერ მოიძებნა";
+"auth_email_validation_message" = "გთხოვთ, შეამოწმოთ თქვენი ელ.წერილი რეგისტრაციის გასაგრძელებლად";
+"auth_msisdn_validation_error" = "ტელეფონის ნომრის დადასტურება შეუძლებელია.";
+"auth_recaptcha_message" = "ამ სახლის სერვერს სურს დარწმუნდეს, რომ თქვენ არ ხართ რობოტი";
+"auth_reset_password_missing_email" = "თქვენს ანგარიშთან დაკავშირებული ელ.ფოსტის მისამართი უნდა შეიყვანოთ.";
+"auth_reset_password_missing_password" = "ახალი პაროლი უნდა შეიყვანოთ.";
+"auth_reset_password_next_step_button" = "მე დავადასტურე ჩემი ელფოსტის მისამართი";
+"auth_reset_password_error_not_found" = "როგორც ჩანს, თქვენი ელფოსტის მისამართი არ ასოცირდება Matrix ID-თან ამ სახლის სერვერზე.";
+"auth_accept_policies" = "გთხოვთ, გადახედოთ და დაეთანხმოთ ამ სახლის სერვერის პოლიტიკას:";
+"auth_autodiscover_invalid_response" = "სახლის სერვერის აღმოჩენის არასწორი პასუხი";
+"auth_softlogout_signed_out" = "თქვენ გასული ხართ";
+"auth_softlogout_clear_data" = "პირადი მონაცემების გასუფთავება";
+"auth_softlogout_clear_data_message_1" = "გაფრთხილება: თქვენი პერსონალური მონაცემები (მათ შორის დაშიფვრის გასაღებები) კვლავ ინახება ამ მოწყობილობაზე.";
+"auth_softlogout_clear_data_button" = "ყველა მონაცემის გასუფთავება";
+"auth_softlogout_clear_data_sign_out_title" = "დარწმუნებული ხარ?";
+"auth_softlogout_clear_data_sign_out" = "გასვლა";
+
+// Social login
+
+"social_login_list_title_continue" = "გააგრძელე";
+"social_login_list_title_sign_in" = "ან";
+"social_login_list_title_sign_up" = "ან";
+"social_login_button_title_continue" = "განაგრძეთ %@-ით";
+"social_login_button_title_sign_in" = "შედით %@-ით";
+"social_login_button_title_sign_up" = "დარეგისტრირდით %@-ით";
+
+// Errors
+"error_user_already_logged_in" = "როგორც ჩანს, თქვენ ცდილობთ სხვა სახლის სერვერთან დაკავშირებას. გსურთ გასვლა?";
+
+// Chat creation
+"room_creation_title" = "ახალი ჩატი";
+"room_creation_account" = "ანგარიში";
+"room_creation_appearance" = "გარეგნობა";
+"room_creation_appearance_name" = "სახელი";
+"room_creation_privacy" = "კონფიდენციალურობა";
+"room_creation_private_room" = "ეს ჩატი პირადია";
+"room_creation_public_room" = "ეს ჩატი საჯაროა";
+"room_creation_make_public_prompt_title" = "გახადოს ეს ჩატი საჯარო?";
+"room_creation_keep_private" = "შეინახეთ პირადი";
+"room_creation_make_private" = "პირადი";
+"room_creation_dm_error" = "ჩვენ ვერ შევქმენით თქვენი DM. გთხოვთ, შეამოწმოთ მომხმარებლები, რომელთა მოწვევაც გსურთ და ხელახლა სცადოთ.";
+"room_creation_only_one_email_invite" = "თქვენ შეგიძლიათ მოიწვიოთ მხოლოდ ერთი ელ.წერილი ერთდროულად";
+"room_creation_user_not_found_prompt_title" = "დადასტურება";
+"room_creation_user_not_found_prompt_invite_action" = "მაინც დაიწყე DM";
+
+// Room recents
+"room_recents_directory_section" = "ოთახის დირექტორია";
+"room_recents_favourites_section" = "რჩეულები";
+"room_recents_people_section" = "ხალხი";
+"room_recents_conversations_section" = "ოთახები";
+"room_recents_no_conversation" = "ოთახები არ არის";
+"room_recents_server_notice_section" = "სისტემის გაფრთხილებები";
+"room_recents_invites_section" = "იწვევს";
+"room_recents_suggested_rooms_section" = "შემოთავაზებული ოთახები";
+"room_recents_create_empty_room" = "შექმენით ოთახი";
+"room_recents_join_room" = "შეუერთდი ოთახს";
+"room_recents_join_room_title" = "შეუერთდი ოთახს";
+"room_recents_unknown_room_error_message" = "ამ ოთახს ვერ ვპოულობ. დარწმუნდით, რომ ის არსებობს";
+
+// People tab
+"people_invites_section" = "იწვევს";
+"people_conversation_section" = "საუბრები";
+"people_empty_view_title" = "ხალხი";
+
+// Rooms tab
+"room_directory_no_public_room" = "არ არის ხელმისაწვდომი საჯარო ოთახები";
+"rooms_empty_view_title" = "ოთახები";
+
+// Groups tab
+"group_invite_section" = "იწვევს";
+"group_section" = "თემები";
+
+// Search
+"search_rooms" = "ოთახები";
+"search_messages" = "შეტყობინებები";
+"search_people" = "ხალხი";
+"search_files" = "ფაილები";
+"search_default_placeholder" = "ძიება";
+"search_no_result" = "არანაირი შედეგი";
+"search_in_progress" = "ძიება…";
+
+// Directory
+"directory_cell_title" = "დაათვალიერეთ დირექტორია";
+"directory_cell_description" = "%tu ოთახი";
+"directory_search_results_title" = "დაათვალიერეთ დირექტორია შედეგები";
+/* The placeholder %1$tu will be replaced with a number and %2$@ with the user's search terms. Note the > at the start indicates "more than 20 results". */
+"directory_search_results_more_than" = ">%1$tu შედეგი მოიძებნა %2$@-ისთვის";
+"directory_searching_title" = "დირექტორიაში ძიება…";
+"directory_search_fail" = "მონაცემების მიღება ვერ მოხერხდა";
+"contacts_address_book_matrix_users_toggle" = "მხოლოდ მატრიქსის მომხმარებლები";
+"contacts_address_book_no_contact" = "ადგილობრივი კონტაქტები არ არის";
+"contacts_address_book_permission_required" = "ადგილობრივ კონტაქტებზე წვდომისთვის საჭიროა ნებართვა";
+"contacts_address_book_permission_denied_alert_title" = "კონტაქტები გამორთულია";
+"contacts_user_directory_section" = "მომხმარებლის დირექტორია";
+"contacts_user_directory_offline_section" = "მომხმარებლის დირექტორია (ხაზგარეშე)";
+"find_your_contacts_title" = "დაიწყეთ თქვენი კონტაქტების ჩამოთვლით";
+"find_your_contacts_button_title" = "იპოვეთ თქვენი კონტაქტები";
+"find_your_contacts_footer" = "ეს შეიძლება ნებისმიერ დროს გამორთოთ პარამეტრებიდან.";
+
+// Chat participants
+"room_participants_title" = "მონაწილეები";
+"room_participants_add_participant" = "დაამატეთ მონაწილე";
+"store_full_description" = "ელემენტი ახალი ტიპის მესენჯერი და თანამშრომლობის აპლიკაციაა, რომელიც:\n\nგაძლევთ კონტროლს თქვენი კონფიდენციალურობის დასაცავად.\nგაძლევთ შესაძლებლობას, იურთიერთოთ Matrix ქსელში მყოფ ნებისმიერ ადამიანთან და სხვა აპლიკაციებთან, როგორიცაა Slack.\nგიცავთ რეკლამისგან, მონაცემების მოპოვებისგან, უკანა კარიებიდან და დახურული ეკოსისტემებისგან.\nუზრუნველყოფს თქვენს უსაფრთხოებას ბოლოს ბოლომდე დაშიფვრით და მოწყობილობების დადასტურების მექანიზმით (cross-signing).\nელემენტი სრულიად განსხვავდება სხვა მესენჯერებისა და თანამშრომლობის აპლიკაციებისგან, რადგან არის დეცენტრალიზებული და ღია კოდის.\n\nრატომ ელემენტი?\nმონაცემების მფლობელობა\nთქვენ წყვეტთ, სად შეინახოთ თქვენი მონაცემები და შეტყობინებები. თქვენ ხართ მათი მფლობელი და მართავთ, არანაირი მეგაკორპორაცია ან მესამე მხარე.\n\nღია შეტყობინებები და თანამშრომლობა\nშეგიძლიათ საუბარი Matrix ქსელში ნებისმიერ მომხმარებელთან, მიუხედავად იმისა, იყენებენ ისინი ელემენტს, სხვა Matrix აპლიკაციას თუ სხვა მესენჯერს (Slack, IRC, XMPP).\n\nსუპერ უსაფრთხოება\nბოლოს ბოლომდე დაშიფვრა, სადაც მხოლოდ საუბრის მონაწილეებს შეუძლიათ შეტყობინებების გაშიფვრა, და მოწყობილობების დადასტურება მონაწილეების უსაფრთხოებისთვის.\n\nსრული კომუნიკაცია\nშეტყობინებები, ხმის და ვიდეო ზარები, ფაილების გაზიარება, ეკრანის გაზიარება, ინტეგრაციები, ბოტები და ვიჯეტები. შექმენით ოთახები და საზოგადოებები, შეინარჩუნეთ კავშირი და მიაღწიეთ მიზნებს.\n\nთქვენ ყველგან\nიყავით კავშირზე ნებისმიერი მოწყობილობიდან და იხილეთ შეტყობინებების ისტორია სინქრონიზაციის გზით. ვებზე: https://element.io/app";
+"callbar_only_single_active_group" = "დაკლიკეთ ჯგუფურ ზარში შესასვლელად (%@)";
+
+// MARK: Onboarding
+"onboarding_splash_register_button_title" = "ანგარიშის შექმნა";
+"onboarding_splash_page_1_message" = "უსაფრთხო და დამოუკიდებელი კომუნიკაცია, რომელიც გთავაზობთ იმავე კონფიდენციალურობის დონეს, როგორიც სახლში პირისპირ საუბრისას გაქვთ.";
+"onboarding_splash_page_2_message" = "აირჩიეთ, სად ინახება თქვენი საუბრები, რათა მიიღოთ კონტროლი და დამოუკიდებლობა. დაკავშირებულია Matrix-ის მეშვეობით.";
+"onboarding_splash_page_4_message" = "Element ასევე შესანიშნავია სამუშაო გარემოსთვის. მას ენდობიან მსოფლიოს ყველაზე უსაფრთხო ორგანიზაციები.";
+/* The placeholder string contains onboarding_use_case_skip_button as a tappable action */
+"onboarding_use_case_not_sure_yet" = "ჯერ არ ხართ დარწმუნებული? %@";
+/* The placeholder string contains the user's matrix ID */
+"onboarding_congratulations_message" = "თქვენი ანგარიში %@ შეიქმნა";
+"onboarding_display_name_title" = "აირჩიეთ საჩვენებელი სახელი";
+"onboarding_display_name_hint" = "თქვენ შეგიძლიათ შეცვალოთ ეს მოგვიანებით";
+"onboarding_display_name_max_length" = "თქვენი საჩვენებელი სახელი უნდა იყოს 256 სიმბოლოზე ნაკლები";
+"onboarding_celebration_title" = "კარგად გამოიყურება!";
+"onboarding_celebration_message" = "გადადით პარამეტრებში ნებისმიერ დროს, რათა განაახლოთ თქვენი პროფილი";
+/* The placeholder will show the full Matrix ID that has been entered. */
+"authentication_registration_username_footer_available" = "სხვებს შეუძლიათ შენი აღმოჩენა %@";
+"authentication_login_username" = "მომხმარებლის სახელი / ელ.ფოსტა / ტელეფონი";
+"authentication_server_selection_login_title" = "დაუკავშირდით სახლის სერვერს";
+"authentication_server_selection_register_title" = "აირჩიეთ თქვენი სახლის სერვერი";
+"authentication_server_selection_register_message" = "როგორია თქვენი სერვერის მისამართი? ეს არის თქვენი მონაცემების საცავი";
+"authentication_cancel_flow_confirmation_message" = "თქვენი ანგარიში ჯერ არ არის შექმნილი. შეწყვიტოთ რეგისტრაციის პროცესი?";
+/* The placeholder will show the email address that was entered. */
+"authentication_verify_email_waiting_message" = "მიჰყევით %@-ზე გაგზავნილ ინსტრუქციას";
+/* The placeholder will show the homeserver's domain */
+"authentication_forgot_password_input_message" = "%@ გამოგიგზავნით დამადასტურებელ ბმულს";
+"authentication_choose_password_input_message" = "დარწმუნდით, რომ ეს არის 8 ან მეტი სიმბოლო";
+"authentication_choose_password_text_field_placeholder" = "ახალი პაროლი";
+"authentication_choose_password_not_verified_title" = "ელფოსტა არ არის დადასტურებული";
+/* The placeholder will show the homeserver's domain */
+"authentication_verify_msisdn_input_message" = "%@ საჭიროებს თქვენი ანგარიშის დადასტურებას";
+"authentication_verify_msisdn_invalid_phone_number" = "ტელეფონის ნომერი არასწორია";
+/* The placeholder will show the homeserver's domain */
+"authentication_terms_message" = "გთხოვთ, წაიკითხოთ %@-ის პირობები და წესები";
+"authentication_recaptcha_title" = "ადამიანი ხარ?";
+"authentication_qr_login_start_subtitle" = "გამოიყენეთ ამ მოწყობილობის კამერა, რომ დაასკანეროთ QR კოდი, რომელიც ნაჩვენებია თქვენს სხვა მოწყობილობაზე:";
+"authentication_qr_login_start_step2" = "გადადით პარამეტრები -> უსაფრთხოება და კონფიდენციალურობა";
+"authentication_qr_login_start_need_alternative" = "გჭირდებათ ალტერნატიული მეთოდი?";
+"authentication_qr_login_display_subtitle" = "დაასკანერეთ ქვემოთ მოცემული QR კოდი თქვენი მოწყობილობით, რომელიც გამოუსვლელია.";
+"authentication_qr_login_scan_subtitle" = "განათავსეთ QR კოდი ქვემოთ მოცემულ კვადრატში";
+"authentication_qr_login_confirm_subtitle" = "დაადასტურეთ, რომ ქვემოთ მოცემული კოდი ემთხვევა თქვენს სხვა მოწყობილობას:";
+"authentication_qr_login_confirm_alert" = "გთხოვთ, დარწმუნდით, რომ იცით ამ კოდის წარმოშობა. მოწყობილობების მიბმით, თქვენ მიაწვდით ვინმეს სრულ წვდომას თქვენს ანგარიშზე.";
+"authentication_qr_login_failure_request_denied" = "მოთხოვნა უარყოფილი იქნა სხვა მოწყობილობაზე.";
+
+// MARK: Password Validation
+"password_validation_info_header" = "თქვენი პაროლი უნდა აკმაყოფილებდეს ქვემოთ მოცემულ კრიტერიუმებს:";
+/* The placeholder will show a number */
+"password_validation_error_max_length" = "არ აღემატებოდეს %d სიმბოლოს.";
+
+// MARK: Password policy errors
+"password_policy_too_short_pwd_error" = "ძალიან მოკლე პაროლი";
+"password_policy_weak_pwd_error" = "ეს პაროლი ძალიან სუსტია. იგი უნდა შეიცავდეს მინიმუმ 8 სიმბოლოს, მათ შორის თითოეულ ტიპს: დიდი ასო, პატარა ასო, ციფრი და სპეციალური სიმბოლო.";
+"auth_register" = "რეგისტრაცია";
+"auth_login_single_sign_on" = "შესვლა";
+"auth_return_to_login" = "დაბრუნება შესვლის ეკრანზე";
+"auth_user_name_placeholder" = "მომხმარებლის სახელი";
+"auth_optional_phone_placeholder" = "ტელეფონის ნომერი (სურვილისამებრ)";
+"auth_repeat_new_password_placeholder" = "დაადასტურეთ თქვენი ახალი Matrix ანგარიშის პაროლი";
+"auth_invalid_user_name" = "მომხმარებლის სახელები შეიძლება შეიცავდეს მხოლოდ ასოებს, რიცხვებს, წერტილებს, დეფისებს და ქვედა ხაზებს";
+"auth_invalid_phone" = "ეს არ ჰგავს მოქმედ ტელეფონის ნომერს";
+"auth_add_email_message_2" = "დააყენეთ ელფოსტა ანგარიშის აღსადგენად და მოგვიანებით, რათა სურვილისამებრ აღმოაჩინონ ის ადამიანები, ვინც გიცნობთ.";
+"auth_add_email_phone_message_2" = "დააყენეთ ელფოსტა ანგარიშის აღდგენისთვის. გამოიყენეთ მოგვიანებით ელფოსტა ან ტელეფონი, რათა სურვილისამებრ აღმოჩნდეთ თქვენი ნაცნობი ადამიანების მიერ.";
+"auth_email_in_use" = "ეს ელფოსტის მისამართი უკვე გამოიყენება";
+"auth_email_is_required" = "საიდენტიფიკაციო სერვერი არ არის კონფიგურირებული, ასე რომ თქვენ არ შეგიძლიათ დაამატოთ ელფოსტის მისამართი, რათა მომავალში განაახლოთ თქვენი Matrix ანგარიშის პაროლი.";
+"auth_phone_is_required" = "არ არის კონფიგურირებული საიდენტიფიკაციო სერვერი, ასე რომ თქვენ არ შეგიძლიათ ტელეფონის ნომრის დამატება მომავალში თქვენი Matrix ანგარიშის პაროლის გადატვირთვისთვის.";
+"auth_password_dont_match" = "პაროლები არ ემთხვევა";
+"auth_forgot_password_error_no_configured_identity_server" = "საიდენტიფიკაციო სერვერი არ არის კონფიგურირებული: დაამატეთ ერთი თქვენი Matrix ანგარიშის პაროლის აღსადგენად.";
+"auth_use_server_options" = "გამოიყენეთ მორგებული სერვერის პარამეტრები (მოწინავე)";
+"auth_msisdn_validation_title" = "დადასტურება მოლოდინშია";
+"auth_msisdn_validation_message" = "ჩვენ გავგზავნეთ SMS აქტივაციის კოდით. გთხოვთ, შეიყვანოთ ეს კოდი ქვემოთ.";
+"auth_reset_password_message" = "თქვენი Matrix ანგარიშის პაროლის აღსადგენად, შეიყვანეთ თქვენს ანგარიშთან მიბმული ელ.ფოსტის მისამართი:";
+"auth_reset_password_email_validation_message" = "ელფოსტა გაიგზავნა %@-ზე. მას შემდეგ რაც მიჰყვებით მასში არსებულ ბმულს, დააწკაპუნეთ ქვემოთ.";
+"auth_reset_password_error_unauthorized" = "ელფოსტის მისამართის დადასტურება ვერ მოხერხდა: დარწმუნდით, რომ დააწკაპუნეთ ბმულზე ელფოსტაში";
+"auth_reset_password_error_is_required" = "საიდენტიფიკაციო სერვერი არ არის კონფიგურირებული: დაამატეთ ერთი სერვერის ვარიანტებში თქვენი Matrix ანგარიშის პაროლის აღსადგენად.";
+"auth_reset_password_success_message" = "თქვენი Matrix ანგარიშის პაროლი გადაყენებულია.\n\nთქვენ გამოხვედით ყველა სესიიდან და აღარ მიიღებთ push-შეტყობინებებს. შეტყობინებების ხელახლა ჩასართავად, ხელახლა შედით თითოეულ მოწყობილობაზე.";
+"auth_add_email_and_phone_warning" = "რეგისტრაცია ერთდროულად ელფოსტისა და ტელეფონის ნომრით ჯერ არ არის მხარდაჭერილი, სანამ API არ შეიქმნება. მხოლოდ ტელეფონის ნომერი იქნება გათვალისწინებული. შეგიძლიათ დაამატოთ თქვენი ელფოსტა პროფილში პარამეტრებიდან.";
+"auth_softlogout_sign_in" = "შესვლა";
+"auth_softlogout_reason" = "თქვენმა სახლის სერვერის (%1$@) ადმინისტრატორმა გამოხვედით თქვენი ანგარიშიდან %2$@ (%3$@).";
+"auth_softlogout_recover_encryption_keys" = "შედით, რომ აღადგინოთ დაშიფვრის გასაღებები, რომლებიც ინახება ექსკლუზიურად ამ მოწყობილობაზე. თქვენ გჭირდებათ ისინი, რომ წაიკითხოთ ყველა თქვენი უსაფრთხო შეტყობინება ნებისმიერ მოწყობილობაზე.";
+"auth_softlogout_clear_data_message_2" = "გაასუფთავეთ, თუ დაასრულეთ ამ მოწყობილობის გამოყენება ან გსურთ სხვა ანგარიშში შესვლა.";
+"auth_softlogout_clear_data_sign_out_msg" = "დარწმუნებული ხართ, რომ გსურთ ამ მოწყობილობაზე ამჟამად შენახული ყველა მონაცემის გასუფთავება? ხელახლა შედით თქვენი ანგარიშის მონაცემებსა და შეტყობინებებზე წვდომისთვის.";
+"room_creation_appearance_picture" = "ჩეთის სურათი (სურვილისამებრ)";
+"room_creation_make_public" = "გახადეთ საჯარო";
+"room_creation_make_public_prompt_msg" = "დარწმუნებული ხართ, რომ გსურთ ეს ჩატი საჯარო გახადოთ? ნებისმიერს შეუძლია წაიკითხოს თქვენი შეტყობინებები და შეუერთდეს ჩატში.";
+"room_creation_wait_for_creation" = "ოთახი უკვე იქმნება. გთხოვთ დაელოდოთ.";
+"room_creation_invite_another_user" = "მომხმარებლის ID, სახელი ან ელფოსტა";
+"room_creation_error_invite_user_by_email_without_identity_server" = "არ არის კონფიგურირებული საიდენტიფიკაციო სერვერი, ასე რომ თქვენ არ შეგიძლიათ დაამატოთ მონაწილე ელფოსტით.";
+"room_creation_user_not_found_prompt_message" = "ამ Matrix ID-ის პროფილების პოვნა შეუძლებელია. მაინც გსურთ DM-ის დაწყება?";
+"room_recents_low_priority_section" = "დაბალი პრიორიტეტი";
+"room_recents_start_chat_with" = "დაიწყეთ ჩატი";
+"room_recents_join_room_prompt" = "აკრიფეთ ოთახის ID ან ოთახის მეტსახელი";
+"people_no_conversation" = "არანაირი საუბრები";
+"people_empty_view_information" = "უსაფრთხოდ ესაუბრეთ ნებისმიერს. შეეხეთ +-ს ხალხის დამატების დასაწყებად.";
+"rooms_empty_view_information" = "ოთახები შესანიშნავია ნებისმიერი ჯგუფური ჩეთისთვის, კერძო თუ საჯარო. შეეხეთ +-ს არსებული ოთახების საპოვნელად ან ახლის შესაქმნელად.";
+"search_filter_placeholder" = "ფილტრი";
+"search_people_placeholder" = "მოძებნეთ მომხმარებლის ID, სახელი ან ელექტრონული ფოსტით";
+/* The placeholder %1$tu will be replaced with a number and %2$@ with the user's search terms. */
+"directory_search_results" = "ნაპოვნია %1$tu შედეგი %2$@-ისთვის";
+
+// Contacts
+"contacts_address_book_section" = "ლოკალური კონტაქტები";
+"contacts_address_book_no_identity_server" = "პირადობის სერვერი არ არის კონფიგურირებული";
+"contacts_address_book_permission_denied" = "თქვენ არ მისცემდით %@-ს თქვენს ადგილობრივ კონტაქტებზე წვდომის უფლებას";
+"contacts_address_book_permission_denied_alert_message" = "კონტაქტების ჩასართავად გადადით თქვენი მოწყობილობის პარამეტრებში.";
+"find_your_contacts_message" = "მიეცით საშუალება %@-ს აჩვენოს თქვენი კონტაქტები, რათა სწრაფად დაიწყოთ საუბარი მათთან, ვინც უკეთ იცნობთ.";
+"find_your_contacts_identity_service_error" = "პირადობის სერვერთან დაკავშირება შეუძლებელია.";

From cd8d422de3edde778c6e9b1f893ebdac039294a0 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 26 Nov 2024 01:11:17 +0000
Subject: [PATCH 42/59] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
---
 Riot/Assets/uk.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings
index 0119a6575..eec0e81d6 100644
--- a/Riot/Assets/uk.lproj/Vector.strings
+++ b/Riot/Assets/uk.lproj/Vector.strings
@@ -2979,3 +2979,4 @@
 
 // MARK: - WYSIWYG Composer
 "wysiwyg_composer_action_minimise_action" = "Зменшити редактор";
+"call_unsupported_matrix_rtc_call" = "Непідтримуваний виклик. Потрібен застосунок Element X, щоб приєднатися до цього виклику.";

From 3113578e27f986734d99a69e2fefec8ca48c0429 Mon Sep 17 00:00:00 2001
From: Maros Dumitru <dimamaros@gmail.com>
Date: Tue, 3 Dec 2024 18:32:35 +0000
Subject: [PATCH 43/59] Translated using Weblate (Romanian)

Currently translated at 0.4% (10 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ro/
---
 Riot/Assets/ro.lproj/Vector.strings | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Riot/Assets/ro.lproj/Vector.strings b/Riot/Assets/ro.lproj/Vector.strings
index 8d9ff4221..293d1e333 100644
--- a/Riot/Assets/ro.lproj/Vector.strings
+++ b/Riot/Assets/ro.lproj/Vector.strings
@@ -9,3 +9,6 @@
 "view" = "Văzut";
 "next" = "Următorul";
 "back" = "Înapoi";
+
+// Titles
+"title_home" = "Acasă";

From 6f89894e680c0ef62cd9e2e4b32c368a79baa24a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Tue, 3 Dec 2024 18:32:16 +0000
Subject: [PATCH 44/59] Translated using Weblate (Romanian)

Currently translated at 0.4% (10 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ro/
---
 Riot/Assets/ro.lproj/Vector.strings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Assets/ro.lproj/Vector.strings b/Riot/Assets/ro.lproj/Vector.strings
index 293d1e333..39d2aba8e 100644
--- a/Riot/Assets/ro.lproj/Vector.strings
+++ b/Riot/Assets/ro.lproj/Vector.strings
@@ -1,7 +1,7 @@
 // String for App Store
 "store_short_description" = "// String pe App Store";
 "title_favourites" = "Favorite";
-"title_people" = "Oamei";
+"title_people" = "Oameni";
 "title_rooms" = "Camere";
 "title_groups" = "Comunități";
 "warning" = "Greșeală";

From 74ad55253ad2ee19970172f65718f8061bdf100c Mon Sep 17 00:00:00 2001
From: Victor Golovanenko <drygdryg2014@yandex.com>
Date: Thu, 5 Dec 2024 13:18:54 +0000
Subject: [PATCH 45/59] Translated using Weblate (Russian)

Currently translated at 87.8% (2126 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
---
 Riot/Assets/ru.lproj/Vector.strings | 79 +++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index 3e96f0ad3..f03f9a17e 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -1319,7 +1319,7 @@
 // Call Bar
 "callbar_only_single_active" = "Нажмите для возврата к вызову (%@)";
 "room_details_integrations" = "Интеграции";
-"room_details_search" = "Искать комнату";
+"room_details_search" = "Поиск в комнате";
 "room_multiple_typing_notification" = "%@ и другие";
 "room_accessibility_video_call" = "Видео вызов";
 "room_message_replying_to" = "В ответ %@";
@@ -2053,7 +2053,7 @@
 "room_event_copy_link_info" = "Ссылка скопирована в буфер обмена.";
 "room_event_action_reply_in_thread" = "Нить";
 "room_event_action_view_in_room" = "Посмотреть в комнате";
-"room_event_action_end_poll" = "Закончить опрос";
+"room_event_action_end_poll" = "Завершить опрос";
 "room_event_action_remove_poll" = "Удалить опрос";
 "room_participants_invite_prompt_to_msg" = "Вы уверены что хотите пригласить %@ в %@?";
 "room_participants_leave_success" = "Левая комната";
@@ -2157,7 +2157,7 @@
 "user_other_session_verified_additional_info" = "Эта сессия готова к безопасному обмену сообщениями.";
 "user_other_session_current_session_details" = "Текущая сессия";
 "user_other_session_filter_menu_all" = "Все сессии";
-"wysiwyg_composer_start_action_stickers" = "Наклейки";
+"wysiwyg_composer_start_action_stickers" = "Наклейка";
 "authentication_login_with_qr" = "Войти при помощи QR-кода";
 "onboarding_avatar_message" = "Время добавить лицо к имени";
 "onboarding_congratulations_home_button" = "На главную";
@@ -2204,7 +2204,7 @@
 "notice_voice_broadcast_ended_by_you" = "Вы закончили голосовую трансляцию.";
 "room_displayname_more_than_two_members" = "%@ и %@ другие";
 "room_details_access_row_title" = "Доступ";
-"room_details_polls" = "История опроса";
+"room_details_polls" = "Опросы";
 // User sessions management
 "user_sessions_settings" = "Управление сеансами";
 "manage_session_sign_out_other_sessions" = "Выйти из всех остальных сеансов";
@@ -2353,3 +2353,74 @@
 "key_verification_scan_qr_code_information_new_session" = "Наведите камеру на QR-код, отображенном на другом вашем устройстве для подтверждения вашей новой сессии";
 "create_room_section_footer_type_restricted" = "Все в пространстве могут искать и вступать.";
 "launch_loading_delay_warning" = "Это может занимать больше времени.\nСпасибо за терпение.";
+"poll_history_no_past_poll_text" = "В комнате нет завершённых опросов";
+"poll_history_past_segment_title" = "Завершённые опросы";
+"all_chats_edit_layout_show_filters" = "Фильтры";
+"poll_timeline_total_votes_not_voted" = "%lu проголосовал(о). Проголосуйте, чтобы увидеть результаты";
+"all_chats_user_menu_accessibility_label" = "Меню пользователя";
+"poll_history_no_active_poll_period_text" = "Нет активных опросов за прошедшие %@ дней. Подгрузите ещё, чтобы просмотреть опросы за предыдущие месяцы";
+"poll_edit_form_poll_type" = "Тип опроса";
+"poll_edit_form_poll_type_closed_description" = "Результаты отобразятся только после завершения опроса";
+"all_chats_edit_layout_recents" = "Недавние";
+"poll_timeline_total_no_votes" = "Нет голосов";
+"poll_timeline_loading" = "Загрузка…";
+"wysiwyg_composer_start_action_location" = "Местоположение";
+"all_chats_edit_layout_alphabetical_order" = "Сортировать по алфавиту";
+"poll_history_no_past_poll_period_text" = "Нет завершённых опросов за прошедшие %@ дней. Подгрузите ещё, чтобы просмотреть опросы за предыдущие месяцы";
+"poll_history_load_more" = "Загрузить ещё";
+
+// MARK: - Polls
+
+"poll_edit_form_create_poll" = "Создать опрос";
+"poll_timeline_decryption_error" = "Из-за ошибок расшифровки некоторые голоса могут быть не учтены";
+"wysiwyg_composer_start_action_text_formatting" = "Форматирование текста";
+"all_chats_edit_layout_unreads" = "Непрочитанные";
+"poll_timeline_total_final_results_one_vote" = "Окончательный результат на основании 1 голоса";
+"all_chats_nothing_found_placeholder_message" = "Попробуйте скорректировать ваш поисковый запрос.";
+"poll_edit_form_poll_type_open_description" = "Проголосовавшие увидят результаты сразу после голосования";
+"poll_edit_form_poll_type_closed" = "Закрытый опрос";
+"poll_timeline_total_votes" = "%lu проголосовало";
+"poll_timeline_vote_not_registered_subtitle" = "Извините, ваш голос не был учтён, пожалуйста, попробуйте ещё раз";
+"poll_history_fetching_error" = "Ошибка при загрузке опросов.";
+"poll_timeline_total_final_results" = "Окончательный результат на основании %lu голосa(ов)";
+"poll_timeline_vote_not_registered_title" = "Голос не учтён";
+"poll_timeline_total_one_vote_not_voted" = "1 проголосовал. Проголосуйте, чтобы увидеть результаты";
+"poll_history_detail_view_in_timeline" = "Просмотреть в чате";
+"all_chats_edit_menu_space_settings" = "Настройки пространства";
+"poll_timeline_reply_ended_poll" = "Опрос завершён";
+"wysiwyg_composer_start_action_attachments" = "Вложение";
+"all_chats_section_title" = "Беседы";
+"all_chats_edit_layout" = "Настройки вида";
+"room_recents_recently_viewed_section" = "Недавно просмотренные";
+"wysiwyg_composer_start_action_voice_broadcast" = "Голосовая трансляция";
+"poll_timeline_total_one_vote" = "1 проголосовал";
+
+// MARK: - All Chats
+
+"all_chats_title" = "Все беседы";
+"all_chats_edit_layout_show_recents" = "Недавние";
+"all_chats_edit_layout_activity_order" = "Сортировать по активности";
+"all_chats_empty_list_placeholder_title" = "Нечего отображать.";
+"all_chats_empty_unreads_placeholder_message" = "Здесь будут отображаться непрочитанные сообщения, когда таковые появятся.";
+
+// MARK: - Polls history
+
+"poll_history_title" = "История опросов";
+"poll_history_loading_text" = "Опросы загружаются";
+"poll_edit_form_poll_type_open" = "Открытый опрос";
+"poll_timeline_ended_text" = "Опрос завершён";
+"all_chats_edit_layout_sorting_options_title" = "Сортировать сообщения по";
+"all_chats_nothing_found_placeholder_title" = "Ничего не найдено.";
+"all_chats_user_menu_settings" = "Настройки пользователя";
+"all_chats_edit_menu_leave_space" = "Покинуть %@";
+"poll_history_active_segment_title" = "Активные опросы";
+"poll_history_no_active_poll_text" = "В комнате нет активных опросов";
+"poll_timeline_one_vote" = "1 голос";
+"poll_timeline_votes_count" = "%lu голоса(ов)";
+"poll_timeline_not_closed_title" = "Не получается завершить опрос";
+"poll_timeline_not_closed_subtitle" = "Попробуйте ещё раз";
+
+// Send Media Actions
+"wysiwyg_composer_start_action_media_picker" = "Фото";
+"wysiwyg_composer_start_action_camera" = "Снимок с камеры";
+"wysiwyg_composer_start_action_polls" = "Опрос";

From 65b2c6ef8cb87b371069857f802e1b237bab2632 Mon Sep 17 00:00:00 2001
From: Victor Golovanenko <drygdryg2014@yandex.com>
Date: Fri, 6 Dec 2024 09:50:29 +0000
Subject: [PATCH 46/59] Translated using Weblate (Russian)

Currently translated at 90.0% (2179 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
---
 Riot/Assets/ru.lproj/Vector.strings | 67 ++++++++++++++++++++++++++---
 1 file changed, 62 insertions(+), 5 deletions(-)

diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index f03f9a17e..0383fdae5 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -1999,7 +1999,7 @@
 "settings_analytics_and_crash_data" = "Отправлять данные о сбоях и аналитике";
 "settings_labs_enable_live_location_sharing" = "Трансляция геопозиции - делиться текущей геопозицией (активная разработка и, временно, сохраняющиеся в истории комнаты локации)";
 "settings_labs_use_only_latest_user_avatar_and_name" = "Показывать последний аватар и имя пользователей в истории сообщений";
-"settings_labs_enable_threads" = "Потоковый обмен сообщениями";
+"settings_labs_enable_threads" = "Обсуждения сообщений";
 "settings_labs_enabled_polls" = "Опросы";
 "settings_ui_show_redactions_in_room_history" = "Показать место хранения удалённых сообщений";
 "settings_about" = "О";
@@ -2212,11 +2212,11 @@
 "settings_presence_offline_mode_description" = "Если включено, вы будете всегда оффлайн для остальных пользователей, даже при использовании приложения.";
 "settings_presence" = "Присутствие";
 "settings_discovery_accept_terms" = "Примите Правила Идентификации Сервера";
-"settings_labs_enable_voice_broadcast" = "Голосовая трансляция";
-"settings_labs_enable_wysiwyg_composer" = "Попробуйте редактор текста";
+"settings_labs_enable_voice_broadcast" = "Голосовые трансляции";
+"settings_labs_enable_wysiwyg_composer" = "Наглядный текстовый редактор";
 "settings_labs_enable_new_app_layout" = "Новый Слой Приложения";
-"settings_labs_enable_new_session_manager" = "Новый менеджер сессии";
-"settings_labs_enable_auto_report_decryption_errors" = "Авто Отчет Ошибок Расшифровки";
+"settings_labs_enable_new_session_manager" = "Новый менеджер сеансов";
+"settings_labs_enable_auto_report_decryption_errors" = "Автоматически сообщать об ошибках расшифровки";
 "settings_push_rules_error" = "Произошла ошибка при обновлении настроек уведомлений. Пожалуйста, попробуйте переключить свой вариант еще раз.";
 "threads_beta_information" = "Держите обсуждения организованными с помощью потоков.\n\nПотоки помогают вести ваши разговоры по теме и их легко отслеживать. ";
 "room_creation_only_one_email_invite" = "Вы можете пригласить только один адрес email за раз";
@@ -2424,3 +2424,60 @@
 "wysiwyg_composer_start_action_media_picker" = "Фото";
 "wysiwyg_composer_start_action_camera" = "Снимок с камеры";
 "wysiwyg_composer_start_action_polls" = "Опрос";
+"call_unsupported_matrix_rtc_call" = "Вызов не поддерживается. Для подключения к этому вызову требуется новое приложение Element X.";
+"room_action_report" = "Сообщить о комнате";
+"room_action_report_prompt_reason" = "Причина сообщения/жалобы на комнату";
+"spaces_creation_new_rooms_general" = "Общая";
+"spaces_creation_new_rooms_random" = "Случайная";
+"spaces_creation_address_already_exists" = "%@\nуже существует";
+"side_menu_coach_message" = "Чтобы увидеть все комнаты, смахните вправо или коснитесь экрана";
+"spaces_add_space" = "Добавить пространство";
+"leave_space_and_one_room" = "Выйти из пространства и 1 комнаты";
+"spaces_subspace_creation_visibility_title" = "Какой вид подпространства вы хотите создать?";
+"spaces_creation_address" = "Адрес";
+"voice_broadcast_playback_loading_error" = "Не удается воспроизвести эту голосовую трансляцию.";
+"spaces_creation_private_space_title" = "Ваше приватное пространство";
+"spaces_add_subspace_title" = "Создать пространство внутри %@";
+"space_settings_access_section" = "Кто может получать доступ к этому пространству?";
+"space_settings_update_failed_message" = "Не удалось обновить настройки пространства. Повторить попытку?";
+"voice_broadcast_permission_denied_message" = "У вас нет необходимых разрешений для запуска голосовой трансляции в этой комнате. Обратитесь к администратору комнаты, чтобы он выдал вам разрешение.";
+"spaces_create_subspace_title" = "Создать подпространство";
+"spaces_subspace_creation_visibility_message" = "Созданное пространство будет добавлено в %@.";
+"spaces_creation_address_invalid_characters" = "%@\nсодержит недопустимые символы";
+"leave_space_selection_title" = "ВЫБЕРИТЕ КОМНАТЫ";
+"spaces_creation_empty_room_name_error" = "Необходимо указать имя";
+"spaces_creation_new_rooms_support" = "Поддержка";
+
+// MARK: Leave space
+
+"leave_space_action" = "Выйти из пространства";
+"spaces_explore_rooms_format" = "Просмотреть %@";
+
+// MARK: - Voice Broadcast
+"voice_broadcast_unauthorized_title" = "Не удается запустить голосовую трансляцию";
+"voice_broadcast_tile" = "Голосовая трансляция";
+"spaces_creation_footer" = "Вы сможете изменить это в будущем";
+"spaces_creation_cancel_message" = "Введённые вами данные будут утеряны.";
+"leave_space_and_more_rooms" = "Выйти из пространства и %@ комнат(ы)";
+"voice_broadcast_already_in_progress_message" = "Вы уже ведёте голосовую трансляцию. Пожалуйста, завершите текущую голосовую трансляцию и начните новую.";
+"spaces_create_space_title" = "Создать пространство";
+"spaces_creation_visibility_title" = "Какой вид пространства вы хотите создать?";
+"room_creation_user_not_found_prompt_message" = "Не удается найти профили по этому Matrix ID. Всё равно начать личную переписку?";
+"room_creation_user_not_found_prompt_invite_action" = "Всё равно начать переписку";
+"room_participants_invite_unknown_participant_prompt_to_msg" = "Не удается найти профили по этому Matrix ID. Вы уверены, что хотите пригласить %@ в %@?";
+"room_participants_invite_anyway" = "Всё равно пригласить";
+"voice_message_broadcast_in_progress_message" = "Вы не можете записывать голосовые сообщения во время прямой трансляции. Пожалуйста, завершите прямую трансляцию, чтобы начать запись голосового сообщения";
+"spaces_creation_cancel_title" = "Отменить создание пространства?";
+"settings_manage_account_title" = "Учётная запись";
+"spaces_creation_settings_message" = "Добавьте детали, которые помогут ему выделиться. Вы сможете изменить их в любой момент.";
+"voice_broadcast_playback_lock_screen_placeholder" = "Голосовая трансляция";
+"space_settings_current_address_message" = "Ваше пространство доступно для просмотра по адресу\n%@";
+"spaces_creation_visibility_message" = "Чтобы присоединиться к существующему пространству, вам нужно приглашение.";
+"spaces_creation_address_default_message" = "Ваше пространство будет доступно для просмотра по адресу\n%@";
+"spaces_creation_public_space_title" = "Ваше публичное пространство";
+"spaces_creation_new_rooms_room_name_title" = "Имя комнаты";
+"leave_space_selection_all_rooms" = "Выбрать все комнаты";
+"leave_space_selection_no_rooms" = "Не выбирать комнаты";
+"voice_message_broadcast_in_progress_title" = "Невозможно начать запись голосового сообщения";
+"voice_broadcast_blocked_by_someone_else_message" = "Кто-то другой уже ведёт голосовую трансляцию. Дождитесь окончания текущей голосовой трансляции, чтобы начать свою.";
+"voice_broadcast_live" = "В эфире";

From af97a750ab79d979b98c9c453ae213b4bde8cf68 Mon Sep 17 00:00:00 2001
From: Victor Golovanenko <drygdryg2014@yandex.com>
Date: Fri, 6 Dec 2024 14:03:45 +0000
Subject: [PATCH 47/59] Translated using Weblate (Russian)

Currently translated at 90.6% (2194 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
---
 Riot/Assets/ru.lproj/Vector.strings | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index 0383fdae5..f67ebb9c5 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -2481,3 +2481,18 @@
 "voice_message_broadcast_in_progress_title" = "Невозможно начать запись голосового сообщения";
 "voice_broadcast_blocked_by_someone_else_message" = "Кто-то другой уже ведёт голосовую трансляцию. Дождитесь окончания текущей голосовой трансляции, чтобы начать свою.";
 "voice_broadcast_live" = "В эфире";
+"voice_broadcast_voip_cannot_start_description" = "Невозможно позвонить, так как в данный момент ведется прямая трансляция. Пожалуйста, завершите прямую трансляцию, чтобы позвонить.";
+"voice_broadcast_stop_alert_agree_button" = "Да, остановить";
+"voice_broadcast_connection_error_title" = "Ошибка соединения";
+"voice_broadcast_buffering" = "Буферизация…";
+"voice_broadcast_stop_alert_description" = "Вы уверены, что хотите остановить прямую трансляцию? После этого в комнате будет доступна полная запись трансляции.";
+"all_chats_edit_layout_add_section_title" = "Добавить раздел на главную";
+"voice_broadcast_recorder_connection_error" = "Ошибка соединения — запись приостановлена";
+"all_chats_empty_view_title" = "%@\nвыглядит несколько пустым.";
+"all_chats_empty_space_information" = "Пространства — это новый способ группировать комнаты и людей. Добавьте существующую комнату или создайте новую, используя кнопку снизу справа.";
+"voice_broadcast_time_left" = "%@ осталось";
+"voice_broadcast_playback_unable_to_decrypt" = "Не удается расшифровать эту голосовую трансляцию.";
+"voice_broadcast_voip_cannot_start_title" = "Не удается начать вызов";
+"all_chats_empty_view_information" = "Универсальное приложение для безопасного общения команд, друзей и организаций. Для начала создайте чат или присоединитесь к уже созданной комнате.";
+"voice_broadcast_stop_alert_title" = "Остановить прямую трансляцию?";
+"voice_broadcast_connection_error_message" = "К сожалению, сейчас не удаётся запустить трансляцию. Пожалуйста, повторите попытку позже.";

From 5b28178cee5ac845ae9e637abdcd1cbcc61799c0 Mon Sep 17 00:00:00 2001
From: Victor Golovanenko <drygdryg2014@yandex.com>
Date: Fri, 6 Dec 2024 14:47:11 +0000
Subject: [PATCH 48/59] Translated using Weblate (Russian)

Currently translated at 92.4% (2239 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
---
 Riot/Assets/ru.lproj/Vector.strings | 89 +++++++++++++++++++++++------
 1 file changed, 70 insertions(+), 19 deletions(-)

diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index f67ebb9c5..585b8f17a 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -1997,29 +1997,29 @@
 "authentication_registration_title" = "Создать аккаунт";
 "settings_presence_offline_mode" = "Режим офлайн";
 "settings_analytics_and_crash_data" = "Отправлять данные о сбоях и аналитике";
-"settings_labs_enable_live_location_sharing" = "Трансляция геопозиции - делиться текущей геопозицией (активная разработка и, временно, сохраняющиеся в истории комнаты локации)";
+"settings_labs_enable_live_location_sharing" = "Трансляция геопозиции в реальном времени - поделиться текущей геопозицией (функция находится в разработке, геопозиции временно сохраняются в истории комнаты)";
 "settings_labs_use_only_latest_user_avatar_and_name" = "Показывать последний аватар и имя пользователей в истории сообщений";
 "settings_labs_enable_threads" = "Обсуждения сообщений";
 "settings_labs_enabled_polls" = "Опросы";
 "settings_ui_show_redactions_in_room_history" = "Показать место хранения удалённых сообщений";
 "settings_about" = "О";
 "room_preview_decline_invitation_options" = "Вы хотите отклонить приглашение или проигнорировать пользователя?";
-"threads_discourage_information_2" = "\n\nХотите всё равно включить потоки?";
-"threads_discourage_information_1" = "Ваш домашний сервер в настоящее время не поддерживает потоки, поэтому эта функция может быть ненадежной. Некоторые потоковые сообщения могут быть недоступны. ";
+"threads_discourage_information_2" = "\n\nВсё равно хотите включить обсуждения?";
+"threads_discourage_information_1" = "Ваш домашний сервер в настоящее время не поддерживает обсуждения, поэтому эта функция может работать ненадёжно. Некоторые сообщения в обсуждениях могут быть недоступны. ";
 "threads_beta_cancel" = "Не сейчас";
-"threads_beta_enable" = "Попробуйте";
-"threads_beta_information_link" = "Больше информации";
-"threads_beta_title" = "Потоки";
+"threads_beta_enable" = "Попробовать";
+"threads_beta_information_link" = "Подробнее";
+"threads_beta_title" = "Обсуждения";
 "message_from_a_thread" = "Из потока";
-"threads_empty_show_all_threads" = "Показать все потоки";
-"threads_action_my_threads" = "Мои потоки";
-"threads_action_all_threads" = "Все потоки";
-"threads_title" = "Потоки";
+"threads_empty_show_all_threads" = "Показать все обсуждения";
+"threads_action_my_threads" = "Мои обсуждения";
+"threads_action_all_threads" = "Все обсуждения";
+"threads_title" = "Обсуждения";
 "thread_copy_link_to_thread" = "Скопировать ссылку потока";
 
 // MARK: Threads
 "room_thread_title" = "Поток";
-"room_accessibility_threads" = "Потоки";
+"room_accessibility_threads" = "Обсуждения";
 "message_reply_to_sender_sent_their_live_location" = "Трансляция геопозиции в реальном времени.";
 
 // Mark: - Space Creation
@@ -2170,7 +2170,7 @@
 "authentication_terms_policy_url_error" = "Не получилось найти выбранные правила. Пожалуйста, попробуйте снова позже.";
 "threads_empty_tip" = "Подсказка: Нажмите на сообщение и используйте «Поток», чтобы начать переписку.";
 "threads_empty_info_my" = "Ответьте в действующий поток, или нажмите на «Поток», чтобы начать новый.";
-"threads_empty_info_all" = "Потоки помогают придерживаться темы разговора и легко отслеживаются.";
+"threads_empty_info_all" = "Обсуждения помогают придерживаться темы разговора и легко отслеживаются.";
 "threads_empty_title" = "Организуйте свои обсуждения при помощи потоков";
 "room_first_message_placeholder" = "Отправьте своё первое сообщение…";
 "room_participants_leave_processing" = "Выход";
@@ -2218,10 +2218,10 @@
 "settings_labs_enable_new_session_manager" = "Новый менеджер сеансов";
 "settings_labs_enable_auto_report_decryption_errors" = "Автоматически сообщать об ошибках расшифровки";
 "settings_push_rules_error" = "Произошла ошибка при обновлении настроек уведомлений. Пожалуйста, попробуйте переключить свой вариант еще раз.";
-"threads_beta_information" = "Держите обсуждения организованными с помощью потоков.\n\nПотоки помогают вести ваши разговоры по теме и их легко отслеживать. ";
+"threads_beta_information" = "Поддерживайте ваши чаты упорядоченными благодаря обсуждениям.\n\nОбсуждения помогают вести разговоры по теме и легко их отслеживать. ";
 "room_creation_only_one_email_invite" = "Вы можете пригласить только один адрес email за раз";
-"threads_notice_title" = "Потоки больше не экспериментальная функция 🎉";
-"threads_notice_information" = "Все потоки созданные во время экспериментального периода теперь <b>отображаются как обычные ответы</b>.<br/><br/>Это разовый переход, так как потоки теперь часть спецификации Matrix.";
+"threads_notice_title" = "Обсуждения — это теперь не экспериментальная функция 🎉";
+"threads_notice_information" = "Все обсуждения, созданные во время экспериментального периода, теперь <b>отображаются как обычные ответы</b>.<br/><br/>Это разовый переход, так как обсуждения — теперь часть спецификации Matrix.";
 "authentication_qr_login_failure_device_not_supported" = "Связь с этим устройством не поддерживается.";
 "accessibility_selected" = "выбранный";
 "room_access_settings_screen_message" = "Решите, кто может найти и присоединиться к %@.";
@@ -2427,8 +2427,8 @@
 "call_unsupported_matrix_rtc_call" = "Вызов не поддерживается. Для подключения к этому вызову требуется новое приложение Element X.";
 "room_action_report" = "Сообщить о комнате";
 "room_action_report_prompt_reason" = "Причина сообщения/жалобы на комнату";
-"spaces_creation_new_rooms_general" = "Общая";
-"spaces_creation_new_rooms_random" = "Случайная";
+"spaces_creation_new_rooms_general" = "Главная";
+"spaces_creation_new_rooms_random" = "Разное";
 "spaces_creation_address_already_exists" = "%@\nуже существует";
 "side_menu_coach_message" = "Чтобы увидеть все комнаты, смахните вправо или коснитесь экрана";
 "spaces_add_space" = "Добавить пространство";
@@ -2446,7 +2446,7 @@
 "spaces_creation_address_invalid_characters" = "%@\nсодержит недопустимые символы";
 "leave_space_selection_title" = "ВЫБЕРИТЕ КОМНАТЫ";
 "spaces_creation_empty_room_name_error" = "Необходимо указать имя";
-"spaces_creation_new_rooms_support" = "Поддержка";
+"spaces_creation_new_rooms_support" = "Помощь";
 
 // MARK: Leave space
 
@@ -2488,7 +2488,7 @@
 "voice_broadcast_stop_alert_description" = "Вы уверены, что хотите остановить прямую трансляцию? После этого в комнате будет доступна полная запись трансляции.";
 "all_chats_edit_layout_add_section_title" = "Добавить раздел на главную";
 "voice_broadcast_recorder_connection_error" = "Ошибка соединения — запись приостановлена";
-"all_chats_empty_view_title" = "%@\nвыглядит несколько пустым.";
+"all_chats_empty_view_title" = "В пространстве %@\nпусто.";
 "all_chats_empty_space_information" = "Пространства — это новый способ группировать комнаты и людей. Добавьте существующую комнату или создайте новую, используя кнопку снизу справа.";
 "voice_broadcast_time_left" = "%@ осталось";
 "voice_broadcast_playback_unable_to_decrypt" = "Не удается расшифровать эту голосовую трансляцию.";
@@ -2496,3 +2496,54 @@
 "all_chats_empty_view_information" = "Универсальное приложение для безопасного общения команд, друзей и организаций. Для начала создайте чат или присоединитесь к уже созданной комнате.";
 "voice_broadcast_stop_alert_title" = "Остановить прямую трансляцию?";
 "voice_broadcast_connection_error_message" = "К сожалению, сейчас не удаётся запустить трансляцию. Пожалуйста, повторите попытку позже.";
+"spaces_creation_in_many_spaces" = "в %@ пространствах";
+"spaces_creation_email_invites_title" = "Пригласите людей из вашей команды";
+"spaces_creation_post_process_inviting_users" = "Приглашение %@ пользователей(я)";
+"spaces_add_room_missing_permission_message" = "У вас нет прав на добавление комнат в это пространство.";
+"location_sharing_allow_background_location_message" = "Если вы хотите поделиться своей геопозицией в режиме реального времени, приложению необходим доступ к местоположению, когда оно работает в фоновом режиме. Чтобы разрешить доступ, зайдите в Настройки > Местоположение и выберите \"Разрешать всегда\"";
+"spaces_creation_email_invites_message" = "Также вы можете пригласить их позже.";
+"location_sharing_static_share_title" = "Отправить текущее местоположение";
+"spaces_creation_in_spacename" = "в %@";
+
+// MARK: - Space Selector
+
+"space_selector_title" = "Мои пространства";
+"spaces_creation_in_spacename_plus_one" = "в %@ + 1 пространстве";
+"spaces_creation_sharing_type_me_and_teammates_title" = "Я и товарищи по команде";
+"live_location_sharing_banner_stop" = "Завершить";
+"spaces_creation_sharing_type_me_and_teammates_detail" = "Личное пространство для вас и ваших товарищей по команде";
+"spaces_creation_post_process_adding_rooms" = "Добавление %@ комнат(ы)";
+"spaces_creation_new_rooms_message" = "Мы создадим для каждой из них отдельную комнату.";
+"location_sharing_live_list_item_last_update_invalid" = "Время последнего обновления неизвестно";
+"live_location_sharing_banner_title" = "Трансляция геопозиции включена";
+"location_sharing_live_list_item_last_update" = "Обновлена %@ назад";
+"location_sharing_live_list_item_current_user_display_name" = "Вы";
+"location_sharing_live_lab_promotion_text" = "Обратите внимание: это экспериментальная функция, опирающаяся на временную реализацию, которая позволяет пользователям из комнаты постоянно видеть историю вашего местоположения.";
+"spaces_creation_new_rooms_title" = "Какие беседы у вас будут?";
+"spaces_creation_invite_by_username_title" = "Пригласите людей из вашей команды";
+"spaces_creation_invite_by_username_message" = "Также вы можете пригласить их позже.";
+"spaces_creation_post_process_creating_room" = "Создание %@";
+"spaces_creation_in_spacename_plus_many" = "в %@ + %@ пространствах";
+"location_sharing_live_list_item_time_left" = "%@ осталось";
+"location_sharing_live_list_item_sharing_expired" = "Срок действия общего доступа истек";
+"location_sharing_live_viewer_title" = "Местоположение";
+"spaces_creation_post_process_creating_space_task" = "Создание %@";
+"location_sharing_live_map_callout_title" = "Поделиться геопозицией";
+"spaces_creation_invite_by_username" = "Пригласить по имени пользователя";
+
+// MARK: Live location sharing
+
+"location_sharing_live_share_title" = "Делиться геопозицией в реальном времени";
+"location_sharing_live_list_item_stop_sharing_action" = "Завершить";
+"spaces_creation_sharing_type_just_me_detail" = "Личное пространство для обустройства ваших комнат";
+"location_sharing_invalid_power_level_message" = "У вас должны быть соответствующие разрешения, чтобы делиться своей геопозицией в реальном времени в этой комнате.";
+"live_location_sharing_ended" = "Трансляция геопозиции завершена";
+"spaces_creation_sharing_type_title" = "С кем вы работаете?";
+"spaces_creation_sharing_type_message" = "Убедитесь, что у нужных людей есть доступ %@. Вы можете изменить это позже.";
+"spaces_creation_sharing_type_just_me_title" = "Только я";
+"spaces_creation_add_rooms_message" = "Поскольку это место предназначено только для вас, никто об этом не узнает. В будущем вы сможете добавить больше комнат.";
+"spaces_creation_post_process_creating_space" = "Пространство создаётся";
+"location_sharing_invalid_power_level_title" = "У вас нет разрешения делиться геопозицией";
+"spaces_creation_add_rooms_title" = "Какие комнаты вы хотите добавить в пространство?";
+"spaces_creation_post_process_uploading_avatar" = "Загрузка аватара";
+"spaces_creation_in_one_space" = "в 1 пространстве";

From 55a511db0dd1c3e3452f4c9249a22cc1766892f8 Mon Sep 17 00:00:00 2001
From: Victor Golovanenko <drygdryg2014@yandex.com>
Date: Fri, 6 Dec 2024 15:28:03 +0000
Subject: [PATCH 49/59] Translated using Weblate (Russian)

Currently translated at 97.8% (2368 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
---
 Riot/Assets/ru.lproj/Vector.strings | 146 +++++++++++++++++++++++++++-
 1 file changed, 142 insertions(+), 4 deletions(-)

diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index 585b8f17a..3477eef18 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -228,7 +228,7 @@
 // Settings
 "settings_title" = "Настройки";
 "account_logout_all" = "Выйти из всех аккаунтов";
-"settings_mark_all_as_read" = "Пометить все сообщения как прочитанные";
+"settings_mark_all_as_read" = "Пометить все сообщения прочитанными";
 "settings_report_bug" = "Сообщить об ошибке";
 "settings_config_home_server" = "Домашний сервер: %@";
 "settings_config_identity_server" = "Сервер идентификации: %@";
@@ -391,7 +391,7 @@
 "contacts_user_directory_section" = "КАТАЛОГ ПОЛЬЗОВАТЕЛЕЙ";
 "contacts_user_directory_offline_section" = "КАТАЛОГ ПОЛЬЗОВАТЕЛЕЙ (offline)";
 "room_participants_unknown" = "Неизвестно";
-"room_participants_idle" = "Свободен";
+"room_participants_idle" = "Неактивен";
 "room_participants_action_ban" = "Забанить в этой комнате";
 "room_participants_action_unban" = "Разбанить";
 "room_warning_about_encryption" = "Сквозное шифрование является экспериментальным и может быть ненадежным.\n\nПока еще не стоит доверять ему для защиты важных данных.\n\nУстройства не смогут расшифровать историю чатов которые велись до их входа в комнату.\n\nЗашифрованные сообщения не будут видны на клиентах, которые еще не применяют шифрование.";
@@ -832,7 +832,7 @@
 "media_type_accessibility_image" = "Изображение";
 "media_type_accessibility_audio" = "Аудио";
 "media_type_accessibility_video" = "Видео";
-"media_type_accessibility_location" = "Местонахождение";
+"media_type_accessibility_location" = "Местоположение";
 "media_type_accessibility_file" = "Файл";
 "media_type_accessibility_sticker" = "Стикер";
 "settings_discovery_settings" = "ПОИСК";
@@ -2516,7 +2516,7 @@
 "spaces_creation_new_rooms_message" = "Мы создадим для каждой из них отдельную комнату.";
 "location_sharing_live_list_item_last_update_invalid" = "Время последнего обновления неизвестно";
 "live_location_sharing_banner_title" = "Трансляция геопозиции включена";
-"location_sharing_live_list_item_last_update" = "Обновлена %@ назад";
+"location_sharing_live_list_item_last_update" = "Обновлено %@ назад";
 "location_sharing_live_list_item_current_user_display_name" = "Вы";
 "location_sharing_live_lab_promotion_text" = "Обратите внимание: это экспериментальная функция, опирающаяся на временную реализацию, которая позволяет пользователям из комнаты постоянно видеть историю вашего местоположения.";
 "spaces_creation_new_rooms_title" = "Какие беседы у вас будут?";
@@ -2547,3 +2547,141 @@
 "spaces_creation_add_rooms_title" = "Какие комнаты вы хотите добавить в пространство?";
 "spaces_creation_post_process_uploading_avatar" = "Загрузка аватара";
 "spaces_creation_in_one_space" = "в 1 пространстве";
+"location_sharing_live_loading" = "Загрузка местоположения в реальном времени…";
+"location_sharing_live_timer_selector_long" = "8 часов";
+"user_sessions_hide_location_info" = "Скрыть IP-адрес";
+"user_session_verify_action" = "Заверить сеанс";
+"user_session_push_notifications" = "Push-уведомления";
+// First item is client name and second item is session display name
+"user_session_name" = "%@: %@";
+"user_inactive_session_item" = "Неактивен более 90 дней";
+"user_session_details_device_ip_location" = "Местоположение (по IP)";
+"user_session_got_it" = "Понятно";
+"poll_edit_form_post_failure_title" = "Не удалось опубликовать опрос";
+"location_sharing_post_failure_title" = "Не удалось отправить ваше местоположение";
+"user_sessions_show_location_info" = "Показать IP-адрес";
+"manage_session_redirect_error" = "Эта функциональность в настоящее время недоступна. Пожалуйста, свяжитесь с администратором вашего домашнего сервера";
+"user_session_verified_session_description" = "Заверенный сеанс — это когда вы используете Element и ввели парольную фразу или подтвердили вашу личность с использованием другого заверенного сеанса.\n\nЭтот значит, что у клиента есть все ключи, необходимые для расшифровки ваших зашифрованных сообщений, а также он свидетельствует другим пользователям о том, что вы доверяете этому сеансу.";
+"user_inactive_session_item_with_date" = "Неактивен более 90 дней (%@)";
+"user_session_details_title" = "Информация о сеансе";
+"location_sharing_live_timer_selector_short" = "15 минут";
+"user_session_verified_session_title" = "Заверенные сеансы";
+"user_other_session_filter_menu_verified" = "Заверенные";
+"poll_edit_form_create_options" = "Варианты ответа";
+"poll_edit_form_update_failure_subtitle" = "Попробуйте ещё раз";
+"device_name_desktop" = "%@ Desktop";
+"location_sharing_settings_toggle_title" = "Включить трансляцию геопозиции";
+"location_sharing_live_lab_promotion_activation" = "Включить трансляцию геопозиции в реальном времени";
+"user_other_session_filter" = "Фильтр";
+"location_sharing_loading_map_error_title" = "%@ не удалось загрузить карту. Пожалуйста, повторите попытку позже.";
+"location_sharing_settings_header" = "Трансляция геопозиции";
+"location_sharing_pin_drop_share_title" = "Отправить эту точку";
+"location_sharing_map_loading_error" = "Не удается загрузить карту\nЭтот домашний сервер не настроен для отображения карт";
+"user_other_session_unverified_additional_info" = "Заверьте или выйдите из этого сеанса для обеспечения максимальной безопасности и надежности.";
+"poll_edit_form_input_placeholder" = "Напишите что-нибудь";
+"location_sharing_post_failure_subtitle" = "%@ не удалось отправить ваше местоположение. Пожалуйста, повторите попытку позже.";
+"location_sharing_locating_user_error_title" = "%@ не удалось получить доступ к вашему местоположению. Пожалуйста, повторите попытку позже.";
+"location_sharing_live_no_user_locations_error_title" = "Нет доступных геопозиций пользователей";
+"location_sharing_live_stop_sharing_progress" = "Завершить трансляцию геопозиции";
+"user_session_verified" = "Заверенный сеанс";
+"user_session_unverified_short" = "Не заверено";
+"user_other_session_clear_filter" = "Сбросить фильтр";
+"user_session_details_device_ip_address" = "IP-адрес";
+"poll_edit_form_post_failure_subtitle" = "Попробуйте ещё раз";
+"location_sharing_allow_background_location_cancel_action" = "Не сейчас";
+"user_session_verified_short" = "Заверено";
+"user_session_inactive_session_description" = "Неактивные сеансы — это сеансы, не используемые вами в течение некоторого времени, но при этом которые продолжают получать ключи шифрования.\n\nУдаление неактивных сеансов улучшает безопасность и производительность, а также облегчает выявление подозрительных сеансов.";
+"user_session_details_session_section_header" = "Сеанс";
+"user_session_details_session_section_footer" = "Скопировать любые данные можно путём нажатия на них и удержания.";
+"room_access_space_chooser_known_spaces_section" = "Известные вам пространства, в которых есть %@";
+"location_sharing_close_action" = "Закрыть";
+"user_session_verified_additional_info" = "Ваш текущий сеанс готов к безопасному обмену сообщениями.";
+"poll_edit_form_question_or_topic" = "Вопрос или тема";
+"location_sharing_live_error" = "Ошибка трансляции местоположения";
+"user_session_item_details_last_activity" = "Был активен %@";
+"user_session_details_device_model" = "Модель устройства";
+"poll_edit_form_add_option" = "Добавить вариант";
+"user_sessions_overview_current_session_section_title" = "Текущий сеанс";
+"user_sessions_overview_link_device" = "Подключить устройство";
+"user_session_verification_unknown" = "Состояние заверенности неизвестно";
+"space_selector_empty_view_information" = "Пространства — это способ сгруппировать комнаты и людей. Для начала создайте пространство.";
+"user_other_session_filter_menu_unverified" = "Незаверенные";
+"user_other_session_no_verified_sessions" = "Нет заверенных сеансов.";
+"location_sharing_allow_background_location_title" = "Разрешить доступ";
+"location_sharing_live_lab_promotion_title" = "Трансляция геопозиции в реальном времени";
+"user_session_view_details" = "Подробности";
+"user_other_session_no_inactive_sessions" = "Нет неактивных сеансов.";
+"device_type_name_desktop" = "Desktop";
+"device_type_name_unknown" = "Неизвестный";
+"user_session_details_application_section_header" = "Приложение";
+"spaces_creation_email_invites_email_title" = "E-Mail";
+"location_sharing_live_stop_sharing_error" = "Не удается остановить трансляцию геопозиции";
+"device_type_name_mobile" = "Mobile";
+"user_session_details_session_id" = "ID сеанса";
+"user_session_details_device_os" = "Операционная система";
+"location_sharing_map_credits_title" = "© Copyright";
+"user_session_unverified_session_title" = "Незаверенный сеанс";
+"user_other_session_filter_menu_inactive" = "Неактивные";
+"user_sessions_view_all_action" = "Просмотреть все (%d)";
+"room_invites_empty_view_information" = "Здесь появятся ваши приглашения";
+"location_sharing_open_open_street_maps" = "Открыть в OpenStreetMap";
+"user_other_session_security_recommendation_title" = "Другие сеансы";
+"device_name_unknown" = "Неизвестный клиент";
+"user_session_details_application_name" = "Название приложения";
+"user_session_details_application_version" = "Версия";
+"user_session_overview_session_title" = "Сеанс";
+"location_sharing_live_timer_selector_title" = "Выберите, как долго другие пользователи будут видеть ваше точное местоположение.";
+"device_type_name_web" = "Web";
+"user_session_details_last_activity" = "Последняя активность";
+"user_session_unverified" = "Незаверенный сеанс";
+"user_session_details_device_browser" = "Браузер";
+"user_session_push_notifications_message" = "При включении этот сеанс будет получать push-уведомления.";
+"device_name_mobile" = "%@ Mobile";
+
+// MARK: - Location sharing
+
+"location_sharing_title" = "Местоположение";
+"location_sharing_open_apple_maps" = "Открыть в Apple Maps";
+"user_session_details_application_url" = "URL-адрес";
+"user_session_overview_session_details_button_title" = "Информация о сеансе";
+"space_selector_create_space" = "Создать пространство";
+"location_sharing_live_timer_selector_medium" = "1 час";
+"user_other_session_menu_select_sessions" = "Выбрать сеансы";
+"room_creation_user_not_found_prompt_title" = "Подтверждение";
+"user_session_verification_unknown_additional_info" = "Заверьте свой текущий сеанс, чтобы узнать состояние заверенности этого сеанса.";
+
+/* %1$@ will be the verification state and %2$@ will be user_session_item_details_verification_unknown or user_other_session_current_session_details */
+"user_session_item_details" = "%1$@ · %2$@";
+"user_session_rename_session_title" = "Переименование сеансов";
+"device_name_web" = "%@ Web";
+"space_selector_empty_view_title" = "Пространств пока нет.";
+"poll_edit_form_option_number" = "Вариант %lu";
+"poll_edit_form_update_failure_title" = "Не удалось обновить опрос";
+"location_sharing_invalid_authorization_settings" = "Настройки";
+"location_sharing_open_google_maps" = "Открыть в Google Картах";
+"user_session_unverified_session_description" = "Незаверенные сеансы — это сеансы, при входе в которые использовались ваши учетные данные, но не была проведена перекрестная проверка.\n\nВам следует особенно убедиться, что вы узнаёте эти сеансы, поскольку они могут являться следствием несанкционированных входов в вашу учетную запись.";
+"user_session_rename_session_description" = "Другие пользователи в личных сообщениях и комнатах, к которым вы присоединились, могут просматривать полный список ваших сеансов.\n\nЭто дает им уверенность в том, что они действительно разговаривают с вами, но при этом они могут видеть введенное вами название сеанса.";
+"user_session_details_device_section_header" = "Устройство";
+"user_session_details_session_name" = "Имя сеанса";
+
+// MARK: - Room invites
+
+"room_invites_empty_view_title" = "Ничего нового";
+"room_waiting_other_participants_title" = "Ожидание присоединения пользователей к %@";
+"room_waiting_other_participants_message" = "Как только приглашенные пользователи присоединятся к %@, вы сможете общаться; комната будет зашифрована сквозным шифрованием";
+"poll_edit_form_poll_question_or_topic" = "Вопрос или тема опроса";
+"location_sharing_invalid_authorization_error_title" = "У %@ нет разрешения на доступ к вашему местоположению. Вы можете дать доступ в разделе Настройки > Местоположение";
+"location_sharing_invalid_authorization_not_now" = "Не сейчас";
+"location_sharing_allow_background_location_validate_action" = "Настройки";
+"user_session_verification_unknown_short" = "Неизвестно";
+"user_session_learn_more" = "Подробнее";
+"user_session_unverified_additional_info" = "Заверьте свой текущий сеанс для обеспечения лучшей защищённости сообщений.";
+"user_other_session_permanently_unverified_additional_info" = "Этот сеанс не поддерживает шифрование и, следовательно, не может быть заверен.";
+"user_session_permanently_unverified_session_description" = "Этот сеанс не поддерживает шифрование, поэтому его невозможно заверить.\n\nЧерез него вы не сможете общаться в комнатах, где включено сквозное шифрование.\n\nДля обеспечения максимальной безопасности и конфиденциальности рекомендуется использовать клиенты Matrix, поддерживающие шифрование.";
+"user_session_inactive_session_title" = "Неактивные сеансы";
+"user_other_session_unverified_sessions_header_subtitle" = "Заверьте свои сеансы для обеспечения лучшей защиты сообщений или выйдите из тех, которые вы не узнаете или не пользуетесь.";
+"user_other_session_verified_sessions_header_subtitle" = "Для обеспечения максимальной безопасности выйдите из любого сеанса, который вы не узнаёте или не пользуетесь.";
+"user_other_session_no_unverified_sessions" = "Нет незаверенных сеансов.";
+"user_other_session_selected_count" = "%@ выбрано";
+"user_other_session_menu_sign_out_sessions" = "Выйти из %@ сеансов";
+"user_session_overview_current_session_title" = "Текущий сеанс";

From baed39384c30d4d259ef7b73bb3df6576586038c Mon Sep 17 00:00:00 2001
From: Victor Golovanenko <drygdryg2014@yandex.com>
Date: Fri, 6 Dec 2024 16:29:56 +0000
Subject: [PATCH 50/59] Translated using Weblate (Russian)

Currently translated at 97.7% (2367 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
---
 Riot/Assets/ru.lproj/Vector.strings | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index 3477eef18..bee75e991 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -1983,7 +1983,7 @@
 "stop" = "Остановить";
 "joining" = "Соединение";
 "enable" = "Включить";
-"authentication_verify_email_waiting_title" = "Подтвердите свою электронную почту";
+"authentication_verify_email_waiting_title" = "Подтвердите свою электронную почту.";
 "authentication_verify_email_text_field_placeholder" = "Электронная почта";
 "authentication_verify_email_input_title" = "Введите электронную почту";
 "authentication_login_forgot_password" = "Забыл(а) пароль";
@@ -2002,7 +2002,7 @@
 "settings_labs_enable_threads" = "Обсуждения сообщений";
 "settings_labs_enabled_polls" = "Опросы";
 "settings_ui_show_redactions_in_room_history" = "Показать место хранения удалённых сообщений";
-"settings_about" = "О";
+"settings_about" = "О приложении";
 "room_preview_decline_invitation_options" = "Вы хотите отклонить приглашение или проигнорировать пользователя?";
 "threads_discourage_information_2" = "\n\nВсё равно хотите включить обсуждения?";
 "threads_discourage_information_1" = "Ваш домашний сервер в настоящее время не поддерживает обсуждения, поэтому эта функция может работать ненадёжно. Некоторые сообщения в обсуждениях могут быть недоступны. ";
@@ -2616,14 +2616,14 @@
 "user_session_details_application_section_header" = "Приложение";
 "spaces_creation_email_invites_email_title" = "E-Mail";
 "location_sharing_live_stop_sharing_error" = "Не удается остановить трансляцию геопозиции";
-"device_type_name_mobile" = "Mobile";
+"device_type_name_mobile" = "";
 "user_session_details_session_id" = "ID сеанса";
 "user_session_details_device_os" = "Операционная система";
 "location_sharing_map_credits_title" = "© Copyright";
 "user_session_unverified_session_title" = "Незаверенный сеанс";
 "user_other_session_filter_menu_inactive" = "Неактивные";
 "user_sessions_view_all_action" = "Просмотреть все (%d)";
-"room_invites_empty_view_information" = "Здесь появятся ваши приглашения";
+"room_invites_empty_view_information" = "Здесь появятся ваши приглашения.";
 "location_sharing_open_open_street_maps" = "Открыть в OpenStreetMap";
 "user_other_session_security_recommendation_title" = "Другие сеансы";
 "device_name_unknown" = "Неизвестный клиент";
@@ -2666,7 +2666,7 @@
 
 // MARK: - Room invites
 
-"room_invites_empty_view_title" = "Ничего нового";
+"room_invites_empty_view_title" = "Ничего нового.";
 "room_waiting_other_participants_title" = "Ожидание присоединения пользователей к %@";
 "room_waiting_other_participants_message" = "Как только приглашенные пользователи присоединятся к %@, вы сможете общаться; комната будет зашифрована сквозным шифрованием";
 "poll_edit_form_poll_question_or_topic" = "Вопрос или тема опроса";

From bfb11b80b7f1c2a22c8677c67b3f2739adec9ac7 Mon Sep 17 00:00:00 2001
From: Victor Golovanenko <drygdryg2014@yandex.com>
Date: Fri, 6 Dec 2024 16:33:46 +0000
Subject: [PATCH 51/59] Translated using Weblate (Russian)

Currently translated at 97.8% (2368 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
---
 Riot/Assets/ru.lproj/Vector.strings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index bee75e991..744d91454 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -2685,3 +2685,4 @@
 "user_other_session_selected_count" = "%@ выбрано";
 "user_other_session_menu_sign_out_sessions" = "Выйти из %@ сеансов";
 "user_session_overview_current_session_title" = "Текущий сеанс";
+"notice_voice_broadcast_live" = "Прямая трансляция";

From d8bcc18ce9a8201b1b7f959b83ad7624a723e14f Mon Sep 17 00:00:00 2001
From: Victor Golovanenko <drygdryg2014@yandex.com>
Date: Mon, 9 Dec 2024 15:37:45 +0000
Subject: [PATCH 52/59] Translated using Weblate (Russian)

Currently translated at 99.2% (2404 of 2421 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
---
 Riot/Assets/ru.lproj/Vector.strings | 42 ++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings
index 744d91454..d8ff3cf4b 100644
--- a/Riot/Assets/ru.lproj/Vector.strings
+++ b/Riot/Assets/ru.lproj/Vector.strings
@@ -233,7 +233,7 @@
 "settings_config_home_server" = "Домашний сервер: %@";
 "settings_config_identity_server" = "Сервер идентификации: %@";
 "settings_config_user_id" = "Идентификатор пользователя: %@";
-"settings_user_settings" = "ПОЛЬЗОВАТЕЛЬСКИЕ НАСТРОЙКИ";
+"settings_user_settings" = "ПАРАМЕТРЫ ПОЛЬЗОВАТЕЛЯ";
 "settings_notifications_settings" = "НАСТРОЙКИ УВЕДОМЛЕНИЙ";
 "settings_user_interface" = "ПОЛЬЗОВАТЕЛЬСКИЙ ИНТЕРФЕЙС";
 "settings_ignored_users" = "ИГНОРИРУЕМЫЕ ПОЛЬЗОВАТЕЛИ";
@@ -2686,3 +2686,43 @@
 "user_other_session_menu_sign_out_sessions" = "Выйти из %@ сеансов";
 "user_session_overview_current_session_title" = "Текущий сеанс";
 "notice_voice_broadcast_live" = "Прямая трансляция";
+"user_sessions_overview_security_recommendations_unverified_title" = "Незаверенные сеансы";
+"manage_session_redirect" = "Вы будете перенаправлены к поставщику услуг аутентификации вашего сервера для совершения выхода.";
+"user_sessions_overview_other_sessions_section_title" = "Другие сеансы";
+"all_chats_edit_layout_add_filters_title" = "Фильтруйте свои сообщения";
+"user_sessions_overview_title" = "Сеансы";
+"notice_display_name_changed_to" = "%@ изменил(а) своё имя на %@";
+"user_sessions_overview_security_recommendations_inactive_title" = "Неактивные сеансы";
+"wysiwyg_composer_format_action_inline_code" = "Код";
+"wysiwyg_composer_format_action_italic" = "Курсив";
+"wysiwyg_composer_format_action_un_indent" = "Убрать отступ";
+"wysiwyg_composer_format_action_quote" = "Цитировать";
+"wysiwyg_composer_format_action_indent" = "Вставить отступ";
+"user_sessions_overview_other_sessions_section_info" = "Для обеспечения максимальной безопасности заверьте свои сеансы, а также выйдите из каждого сеанса, который вы не узнаёте или не пользуетесь им.";
+"wysiwyg_composer_link_action_link" = "Ссылка";
+"deselect_all" = "Отменить все";
+"notice_error_unformattable_event" = "* Не удается отобразить сообщение. Пожалуйста, создайте отчёт об ошибке";
+"user_sessions_overview_security_recommendations_section_title" = "Рекомендации по обеспечению безопасности";
+"all_chats_edit_layout_add_filters_message" = "Автоматически фильтруйте свои сообщения по выбранным категориям";
+"room_event_encryption_info_key_authenticity_not_guaranteed" = "Подлинность этого зашифрованного сообщения не может быть гарантирована на данном устройстве.";
+"user_sessions_overview_security_recommendations_unverified_info" = "Заверьте или выйдите из незаверенных сеансов.";
+"user_sessions_overview_security_recommendations_section_info" = "Повысьте безопасность своей учетной записи, следуя этим рекомендациям.";
+"wysiwyg_composer_format_action_strikethrough" = "Перечёркнутый";
+"wysiwyg_composer_link_action_edit_title" = "Изменить ссылку";
+"user_sessions_overview_security_recommendations_inactive_info" = "Рассмотрите возможность выхода из старых сеансов (90 дней или старше), которыми вы больше не пользуетесь.";
+"all_chats_all_filter" = "Все";
+"settings_manage_account_action" = "Управлять учётной записью";
+"settings_manage_account_description" = "Управляйте вашей учётной записью на %@";
+"wysiwyg_composer_format_action_link" = "Вставить ссылку";
+"wysiwyg_composer_format_action_underline" = "Подчёркнутый";
+
+// Links
+"wysiwyg_composer_link_action_text" = "Текст";
+"wysiwyg_composer_link_action_create_title" = "Создать ссылку";
+"ignore_user" = "Игнорировать пользователя";
+
+// Formatting Actions
+"wysiwyg_composer_format_action_bold" = "Жирный";
+"wysiwyg_composer_format_action_unordered_list" = "Маркированный список";
+"wysiwyg_composer_format_action_ordered_list" = "Нумерованный список";
+"wysiwyg_composer_format_action_code_block" = "Блок кода";

From 342b701dc937f4d95f74a56e767e2d7f42d4eb55 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:40:38 +0000
Subject: [PATCH 53/59] Update the SDK. (#7883)

---
 changelog.d/pr-7883.bugfix | 1 +
 matrix-ios-sdk             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/pr-7883.bugfix

diff --git a/changelog.d/pr-7883.bugfix b/changelog.d/pr-7883.bugfix
new file mode 100644
index 000000000..2cba8066d
--- /dev/null
+++ b/changelog.d/pr-7883.bugfix
@@ -0,0 +1 @@
+Fix a crash when restoring from a backup and a bug where you couldn't reset cross-signing.  
\ No newline at end of file
diff --git a/matrix-ios-sdk b/matrix-ios-sdk
index 07e8d577e..2529e7feb 160000
--- a/matrix-ios-sdk
+++ b/matrix-ios-sdk
@@ -1 +1 @@
-Subproject commit 07e8d577e063015ecc3408591d15298c1bfcdff7
+Subproject commit 2529e7feb9ef4b76c5b7cfdc0a3aa617197762b0

From d26f577b9f954d7b938de9ef4452ea633a5db07f Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Tue, 10 Dec 2024 10:44:41 +0000
Subject: [PATCH 54/59] version++

---
 CHANGES.md                 | 8 ++++++++
 changelog.d/7858.bugfix    | 1 -
 changelog.d/pr-7883.bugfix | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/7858.bugfix
 delete mode 100644 changelog.d/pr-7883.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 698e941e6..90e191141 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+## Changes in 1.11.22 (2024-12-10)
+
+🐛 Bugfixes
+
+- Fix a crash when restoring from a backup and a bug where you couldn't reset cross-signing. ([#7883](https://github.com/element-hq/element-ios/pull/7883))
+- Fix display of incoming call for group calls when receiving VOIP notification. ([#7858](https://github.com/element-hq/element-ios/issues/7858))
+
+
 ## Changes in 1.11.21 (2024-11-14)
 
 No significant changes.
diff --git a/changelog.d/7858.bugfix b/changelog.d/7858.bugfix
deleted file mode 100644
index 1dbe051b8..000000000
--- a/changelog.d/7858.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix display of incoming call for group calls when receiving VOIP notification.
\ No newline at end of file
diff --git a/changelog.d/pr-7883.bugfix b/changelog.d/pr-7883.bugfix
deleted file mode 100644
index 2cba8066d..000000000
--- a/changelog.d/pr-7883.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a crash when restoring from a backup and a bug where you couldn't reset cross-signing.  
\ No newline at end of file

From 61e32d099d2da5038e3bcaea7e19c59a3a3a5687 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Tue, 10 Dec 2024 11:10:31 +0000
Subject: [PATCH 55/59] finish version++


From d194d334ff4e95d69b6d01fd1cd631932ab1e71a Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 11 Dec 2024 16:02:42 +0100
Subject: [PATCH 56/59] =?UTF-8?q?Ajouter=20la=20configuration=20posthog=20?=
 =?UTF-8?q?pour=20v=C3=A9rifier=20la=20charge=20en=20production?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Riot/Modules/Room/RoomDisplayConfiguration.swift |  2 +-
 Tchap/Config/BuildSettings.swift                 | 10 +++++-----
 changelog.d/1135.change                          |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/1135.change

diff --git a/Riot/Modules/Room/RoomDisplayConfiguration.swift b/Riot/Modules/Room/RoomDisplayConfiguration.swift
index 2031dc35b..349e49f83 100644
--- a/Riot/Modules/Room/RoomDisplayConfiguration.swift
+++ b/Riot/Modules/Room/RoomDisplayConfiguration.swift
@@ -18,7 +18,7 @@ class RoomDisplayConfiguration: NSObject {
         guard _tchapCallsEnabled,
               let account = MXKAccountManager.shared().activeAccounts.first
         else { return false }
-        // Tchap: actually, only allow VoIP for DINUM homeServer.
+        // Tchap: actually, only allow VoIP by homeServer.
         if (account.isFeatureActivated(BuildSettings.tchapFeatureVoiceOverIP) || account.isFeatureActivated(BuildSettings.tchapFeatureVideoOverIP)) {
             return true
         }
diff --git a/Tchap/Config/BuildSettings.swift b/Tchap/Config/BuildSettings.swift
index 6b12e99f4..90ff8ec65 100644
--- a/Tchap/Config/BuildSettings.swift
+++ b/Tchap/Config/BuildSettings.swift
@@ -209,12 +209,12 @@ final class BuildSettings: NSObject {
                                                                termsURL: URL(string: "https://tchap.beta.gouv.fr/politique-de-confidentialite")!) // Tchap: dev posthog,
     #else
     /// The configuration to use for analytics. Set `isEnabled` to false to disable analytics.
-    static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: false,
-                                                               host: "",
-                                                               apiKey: "",
-                                                               termsURL: URL(string: "https://")!)
+    static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: true, // Tchap: enable PostHog analytics on production
+                                                               host: "https://posthogdev.tchap.incubateur.net", // Tchap: prod posthog,
+                                                               apiKey: "phc_FFa4pkvmuWjF9nZOMmYJWUXMibuYnCnPyf3DqPGZs4L", // Tchap: prod posthog,
+                                                               termsURL: URL(string: "https://tchap.beta.gouv.fr/politique-de-confidentialite")!)
     #endif
-    
+
     // MARK: - Bug report
     static let bugReportEndpointUrlString = ""
     static let bugReportDefaultHost = "agent.tchap.gouv.fr"
diff --git a/changelog.d/1135.change b/changelog.d/1135.change
new file mode 100644
index 000000000..4fb1c097d
--- /dev/null
+++ b/changelog.d/1135.change
@@ -0,0 +1 @@
+Ajouter la configuration posthog pour vérifier la charge en production
\ No newline at end of file

From 28d820748f4930b783bbc751929c5cabd0a94468 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Thu, 12 Dec 2024 12:14:18 +0100
Subject: [PATCH 57/59] Update Matrix SDK to 0.27.17

---
 matrix-ios-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-ios-sdk b/matrix-ios-sdk
index cfd20629f..75fe51781 160000
--- a/matrix-ios-sdk
+++ b/matrix-ios-sdk
@@ -1 +1 @@
-Subproject commit cfd20629fa805e9684eae2a4679563517e362819
+Subproject commit 75fe517811ebfd6ce90d3287997a6c09e89eabee

From a3d00563a95a4609e731fe4a57d3ef7d3bb7e01e Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Thu, 12 Dec 2024 12:14:31 +0100
Subject: [PATCH 58/59] Execute Towncrier

---
 TCHAP_CHANGES.md        | 9 +++++++++
 changelog.d/1129.change | 1 -
 changelog.d/1131.change | 1 -
 changelog.d/1135.change | 1 -
 4 files changed, 9 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1129.change
 delete mode 100644 changelog.d/1131.change
 delete mode 100644 changelog.d/1135.change

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index b1ce709b7..6c792004a 100644
--- a/TCHAP_CHANGES.md
+++ b/TCHAP_CHANGES.md
@@ -1,3 +1,12 @@
+## Changes in 2.8.6 (2024-12-12)
+
+🙌 Improvements
+
+- Activer ProConnect sur la Preprod ([#1129](https://github.com/tchapgouv/tchap-ios/issues/1129))
+- Rebase sur Element 1.11.21 ([#1131](https://github.com/tchapgouv/tchap-ios/issues/1131))
+- Ajouter la configuration posthog pour vérifier la charge en production ([#1135](https://github.com/tchapgouv/tchap-ios/issues/1135))
+
+
 ## Changes in 2.8.4 (2024-11-26)
 
 🙌 Improvements
diff --git a/changelog.d/1129.change b/changelog.d/1129.change
deleted file mode 100644
index a9dacc930..000000000
--- a/changelog.d/1129.change
+++ /dev/null
@@ -1 +0,0 @@
-Activer ProConnect sur la Preprod
\ No newline at end of file
diff --git a/changelog.d/1131.change b/changelog.d/1131.change
deleted file mode 100644
index 757a76e9a..000000000
--- a/changelog.d/1131.change
+++ /dev/null
@@ -1 +0,0 @@
-Rebase sur Element 1.11.21
\ No newline at end of file
diff --git a/changelog.d/1135.change b/changelog.d/1135.change
deleted file mode 100644
index 4fb1c097d..000000000
--- a/changelog.d/1135.change
+++ /dev/null
@@ -1 +0,0 @@
-Ajouter la configuration posthog pour vérifier la charge en production
\ No newline at end of file

From 505b8b3f6e2d583ddb56047e5111b59b8dd204f1 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Mon, 16 Dec 2024 11:55:19 +0100
Subject: [PATCH 59/59] =?UTF-8?q?Am=C3=A9liorer=20l'UI=20de=20succ=C3=A8s?=
 =?UTF-8?q?=20de=20cr=C3=A9ation=20de=20compte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Congratulations/View/OnboardingCongratulationsScreen.swift  | 2 ++
 changelog.d/1139.change                                         | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/1139.change

diff --git a/RiotSwiftUI/Modules/Onboarding/Congratulations/View/OnboardingCongratulationsScreen.swift b/RiotSwiftUI/Modules/Onboarding/Congratulations/View/OnboardingCongratulationsScreen.swift
index 987cb98f4..01ba74435 100644
--- a/RiotSwiftUI/Modules/Onboarding/Congratulations/View/OnboardingCongratulationsScreen.swift
+++ b/RiotSwiftUI/Modules/Onboarding/Congratulations/View/OnboardingCongratulationsScreen.swift
@@ -70,7 +70,9 @@ struct OnboardingCongratulationsScreen: View {
                     .font(theme.fonts.title2B)
                     .foregroundColor(.white)
                 
+                // Tchap: replace deprecated `StyleText` with `Text(AttributedString)`
                 StyledText(viewModel.viewState.messageString)
+//                Text(AttributedString(viewModel.viewState.messageString))
                     .font(theme.fonts.body)
                     .foregroundColor(.white)
                     .multilineTextAlignment(.center)
diff --git a/changelog.d/1139.change b/changelog.d/1139.change
new file mode 100644
index 000000000..5c32659d5
--- /dev/null
+++ b/changelog.d/1139.change
@@ -0,0 +1 @@
+Améliorer l'UI de succès de création de compte
\ No newline at end of file