Merge pull request #4200 from vector-im/release/1.3.0/release

Release 1.3.0

CHANGES.rst

@@ -1,3 +1,44 @@
+Changes in 1.3.0 (2021-04-09)
+=================================================
+
+✨ Features
+ * Composer Update - Typing and sending a message (#4085)
+ * Switching composer between text mode & action mode (#4087)
+ * Explore typing notifications inspired by web (#4134)
+
+🙌 Improvements
+ * Make the application settings more configurable (#4171)
+ * Possibility to lock some room creation parameters from settings (#4181)
+ * Enable / disable external friends invite (#4173)
+ * Composer update - UI enhancements (#4133)
+ * Increase grow/shrink animation speed in new composer (#4187)
+ * Limit typing notifications timeline jumps (#4176)
+ * Consider displaying names in typing notifications (#4175)
+
+🐛 Bugfix
+ * If you start typing while the new attachment sending mode is on, the send button appears (#4155)
+ * The final frames of the appearance animation of the new composer buttons are missing (#4160)
+ * Crash in [RoomViewController setupActions] (#4162)
+ * Too much vertical whitespace when replying (#4164)
+ * Black theme uses dark background for composer (#4192)
+ * Vertical layout of typing notifs can go wonky (#4159)
+ * Crash in [RoomViewController refreshTypingNotification] (#4161)
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+    
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+ * Upgrade MatrixKit version ([v0.14.7](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.7)).
+
 Changes in 1.2.8 (2021-03-26)
 =================================================
 
@@ -61,6 +102,7 @@ Changes in 1.2.6 (2021-03-11)
 ✨ Features
  * Improve the status of send messages (sending, sent, received, failed) (#4014)
  * Retrying & deleting failed messages (#4013)
+ * Composer Update - Typing and sending a message (#4085)
 
 🙌 Improvements
  * 

Config/AppIdentifiers.xcconfig

@@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
 APPLICATION_SCHEME = element
 
 // Version
-MARKETING_VERSION = 1.2.8
-CURRENT_PROJECT_VERSION = 1.2.8
+MARKETING_VERSION = 1.3.0
+CURRENT_PROJECT_VERSION = 1.3.0
 
 
 // Team

Config/BuildSettings.swift

@@ -109,6 +109,8 @@ final class BuildSettings: NSObject {
     
     
     // MARK: - Legal URLs
+    
+    // Note: Set empty strings to hide the related entry in application settings
     static let applicationCopyrightUrlString = "https://element.io/copyright"
     static let applicationPrivacyPolicyUrlString = "https://element.io/privacy"
     static let applicationTermsConditionsUrlString = "https://element.io/terms-of-service"
@@ -193,6 +195,8 @@ final class BuildSettings: NSObject {
     
     static let allowLocalContactsAccess: Bool = true
     
+    static let allowInviteExernalUsers: Bool = true
+    
     // MARK: - Feature Specifics
     
     /// Not allowed pin codes. User won't be able to select one of the pin in the list.
@@ -225,10 +229,27 @@ final class BuildSettings: NSObject {
     static let settingsScreenAllowChangingCrashUsageDataSettings: Bool = true
     static let settingsScreenAllowBugReportingManually: Bool = true
     static let settingsScreenAllowDeactivatingAccount: Bool = true
-    
+    static let settingsScreenShowChangePassword:Bool = true
+    static let settingsScreenShowInviteFriends:Bool = true
+    static let settingsScreenShowEnableStunServerFallback: Bool = true
+    static let settingsSecurityScreenShowSessions:Bool = true
+    static let settingsSecurityScreenShowSetupBackup:Bool = true
+    static let settingsSecurityScreenShowRestoreBackup:Bool = true
+    static let settingsSecurityScreenShowDeleteBackup:Bool = true
+    static let settingsSecurityScreenShowCryptographyInfo:Bool = true
+    static let settingsSecurityScreenShowCryptographyExport:Bool = true
+    static let settingsSecurityScreenShowAdvancedUnverifiedDevices:Bool = true
+
     // MARK: - Timeline settings
     static let roomInputToolbarCompressionMode = MXKRoomInputToolbarCompressionModePrompt
     
+    // MARK: - Room Creation Screen
+    
+    static let roomCreationScreenAllowEncryptionConfiguration: Bool = true
+    static let roomCreationScreenRoomIsEncrypted: Bool = true
+    static let roomCreationScreenAllowRoomTypeConfiguration: Bool = true
+    static let roomCreationScreenRoomIsPublic: Bool = false
+
     // MARK: - Room Settings Screen
     
     static let roomSettingsScreenShowLowPriorityOption: Bool = true

Podfile

@@ -11,7 +11,7 @@ use_frameworks!
 # - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixKitVersion = '= 0.14.6'
+$matrixKitVersion = '= 0.14.7'
 # $matrixKitVersion = :local
 # $matrixKitVersion = {'develop' => 'develop'}
 

Riot/Assets/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -34,14 +34,6 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
-                        <rightBarButtonItems>
-                            <barButtonItem image="search_icon" id="wyR-qv-IxC" userLabel="Menu Bar Button Item">
-                                <inset key="imageInsets" minX="-5" minY="0.0" maxX="5" maxY="0.0"/>
-                            </barButtonItem>
-                            <barButtonItem image="integrations_icon" id="cal-D0-6Fw">
-                                <inset key="imageInsets" minX="10" minY="0.0" maxX="-10" maxY="0.0"/>
-                            </barButtonItem>
-                        </rightBarButtonItems>
                     </navigationItem>
                     <connections>
                         <outlet property="roomTitleViewContainer" destination="aas-th-FW1" id="SFz-1s-ywg"/>
@@ -96,7 +88,7 @@
         <!--Room Search View Controller-->
         <scene sceneID="rUg-1s-vHX">
             <objects>
-                <viewController id="KDg-aD-xlK" customClass="RoomSearchViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="RoomSearch" id="KDg-aD-xlK" customClass="RoomSearchViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="F5n-wr-hGG"/>
                         <viewControllerLayoutGuide type="bottom" id="BxE-Q4-YjP"/>
@@ -320,7 +312,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="egL-pK-Xhr">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <connections>
                             <outlet property="dataSource" destination="taU-5Q-sdv" id="Ipf-IM-E39"/>
                             <outlet property="delegate" destination="taU-5Q-sdv" id="kIU-uT-h9Y"/>
@@ -589,11 +581,10 @@
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="mhb-l9-pM3"/>
-        <segue reference="ziz-Xl-QVg"/>
+        <segue reference="Tfl-tq-LQp"/>
+        <segue reference="f5u-Y1-7nt"/>
     </inferredMetricsTieBreakers>
     <resources>
-        <image name="integrations_icon" width="24" height="24"/>
         <image name="launch_screen_logo" width="240" height="240"/>
         <image name="search_icon" width="24" height="24"/>
         <image name="settings_icon" width="24" height="24"/>
@@ -602,5 +593,8 @@
         <image name="tab_home" width="20" height="23.5"/>
         <image name="tab_people" width="24" height="24"/>
         <image name="tab_rooms" width="24" height="24"/>
+        <systemColor name="groupTableViewBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>

Riot/Assets/Images.xcassets/Encryption/encryption_normal.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "encryption_normal.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "encryption_normal@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "encryption_normal@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Riot/Assets/Images.xcassets/Encryption/encryption_trusted.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "encryption_trusted.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "encryption_trusted@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "encryption_trusted@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Riot/Assets/Images.xcassets/Encryption/encryption_warning.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "encryption_warning.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "encryption_warning@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "encryption_warning@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Riot/Assets/Images.xcassets/Room/Actions/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Room/Actions/action_camera.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "action_camera.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_camera@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_camera@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/Actions/action_file.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "action_file.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_file@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_file@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/Actions/action_media_library.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "action_media_library.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_media_library@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_media_library@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/Actions/action_sticker.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "action_sticker.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "action_sticker@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "action_sticker@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/Activities/scrolldown.imageset/Contents.json

@@ -19,8 +19,5 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
   }
 }

Riot/Assets/Images.xcassets/Room/Activities/scrolldown_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "scrolldown_dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "scrolldown_dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "scrolldown_dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Room/Input/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Riot/Assets/Images.xcassets/Room/Input/input_close_icon.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "input_close_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "input_close_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "input_close_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/Input/input_edit_icon.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "input_edit_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "input_edit_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "input_edit_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/Input/input_reply_icon.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "input_reply_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "input_reply_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "input_reply_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/Input/input_text_background.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "input_text_background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "input_text_background@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "input_text_background@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/Input/save_icon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "save_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "save_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "save_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Room/Input/send_icon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "send_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "send_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "send_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Room/Input/upload_icon.imageset/Contents.json

@@ -19,8 +19,5 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
   }
 }

Riot/Assets/Images.xcassets/Room/Input/upload_icon_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "upload_icon_dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "upload_icon_dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "upload_icon_dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Room/Input/video_call.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "video_call.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "video_call@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "video_call@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/ar.lproj/Vector.strings

@@ -118,3 +118,14 @@
 "store_full_description" = "Element هُوَ نَوعٌ جَديدٌ مِن تَطبيقاتِ المُراسَلَة وَالتَّعَاوُن الَّذي:\n\n1. يَمنَحُكَ التَّحَكُّم فِي لِلحِفاظِ عَلَى خُصُوصِيَّتِك\n2. يُتيحُ لَكَ التَّواصُلُ مَعَ أيّ شَخص عَلَى شَبَكَةِ Matrix ، وَحَتَّى خارِجَهَا مِن خِلال التَّكامُل مَعَ التَّطبيقات مِثل Slack\n3. يَحميكَ مِنَ الإعلانات، التَّنقيبُ عَنِ البَيانات، الأبوابُ الخَلفِيَّة وَعَمَلِيَّاتُ الحَدائِقِ المُسَوَّرَة\n4. يُؤمِنُكَ مِن خِلاِل تَعمِيَةِ النِّهايَة-إلى-النِّهايَة، مَعَ التَّوقيعِ المُتَبادَلِ لِلتَحَقُّقِ مِنَ الآخَرَين\n\nيَختَلِفُ Element تَمامًا عَن تَطبيقاتِ المُراسَلَةِ وَالتَّعاوُن الأُخرَى لأنَّهُ لا مَركَزي وَمَفتُوح المَصدَر.\n\nيُتيحُ لَكَ Element إمكانيةُ الاِستِضافَة الذّاتيَّة -أو اِختيارُ مُضيف- بِحَيث تَتَمَتَّع بِالخُصُوصِيَّة وَالمُلكيَّة وَالتَّحَكُّم فِي بَيانَاتك وَمُحَادَثاتك. يُتيحُ لَكَ الوُصُول إلى شَبَكَة مَفتُوحَة؛ لِذَلِكَ لا يَقتَصِرُ الأمر عَلَى التَّحدُث إلى مُستَخدِمي Element الآخَرين فَقَط. كَما اَنهُ آمِنٌ لِلغايَة.\n\nإنَّ Element قادِرٌ عَلَى إتاحَةِ كُلِ ذَلِك لِأنَهُ يَعمَلُ عَلَى Matrix -مِعيار التَّواصُل المَفتُوح اللَّامَركَزي.\n\nإنَّ Element يَمنَحُكَ زِمَامَ التَّحَكُم مِن خِلال السَّماح لَك بِاختيار مَن يَستَضيفُ المُحادَثاتِ الخَاصَّةِ بِك. مِن تَطبيقِ Element يُمكِنُكَ اِختيار الاِستِضافَة بِطُرُقٍ مُختَلِفَة:\n\n1. الحُصُول عَلَى حِساب مَجانيّ عَلَى الخادِم العَامّ matrix.org\n2. اِستِضافَة حِسابك بِنَفسِك عَن طَريق تَشغيل خادِم عَلَى أجهِزَتِكَ الخَاصَّة\n3. التَّسجيل لِلحُصُولِ عَلَى حِساب عَلَى خادِم مُخصص بمُجرد الاِشتِراك فِي مِنَصَّة اِستِضافَة Element Matrix Services\n\nلِمَاذَا تَختارُ Element؟\n\nتَملَّك بَياناتَك: أنتَ مَن تُقرر أين تَحتَفِظ ببياناتك ورسائلك. أنت تمتلكها وتتحكم فيها، وليس بعض الشركات الكُبرى الإحتكارية التي تُنقِّب عن بياناتك أو تُتيح الوصول إلى أطراف ثالثة.\n\n\nتَراسُل وَتَعَاوُن مَفتُوح يُمكِنُكَ مُحادَثَة أي شَخص آخَر عَلَى شَبَكَة Matrix، سَواءً كانُوا يَستَخدِمُونَ Element أو تَطبيقُ Matrix آخَر، وَحَتّى إذا كانُوا يَستَخدِمُونَ نِظامَ مُراسلةٍ مُختَلِف مِثل Slack أو IRC أو XMPP.\n\nالأمان-الخارِق: تَعميَة حَقيقيَة مِنَ النِّهايَة إلى النِّهايَة (فَقَط أطراف المُحادَثَة مَن يُمكِنَهُم فَكّ تَعميَة الرَّسائِل)، وَالتَّوقِيع المُتَبادَل لِلتحقق من أجهزة المُشاركين في المُحادثة.\n\nالتواصل الكامل: المُراسلة، المُكالمات الصوتية والمرئية، مُشاركة الملفات، مُشاركة الشاشة، مجموعة كاملة وكبيرة من عمليات التكامُل، الروبوتات والأدوات. بناء الغُرف، المُجتمعات، ابق على اتصال وأنجز المهام.\n\nأين ما كُنت: ابق على اتصال أينما كنت مع سجل الرسائل المتزامن بالكامل عبر جميع أجهزتك وفي الويب على https://app.element.io.";
 // String for App Store
 "store_short_description" = "مُحادَثَةٌ/VoIP آمنةٌ لَا مَركَزِيَّة";
+"auth_missing_email" = "عُنوان بَريد إلِكتُرونيّ مَفقُود";
+"auth_add_email_phone_message_2" = "عَيِّن بَريدً إلِكتُرونيًّ لِاِستِردَادِ الحِساب. لاحِقًا استخدم رَقم الهَاتِف أو البَريد الإلِكتُرونيّ لِتَكُونَ قابِلاً لِلاِكتِشاف اِختِيَاريًّا مِن قِبَلِ الأشخاصِ الَّذينَ يَعرِفُنَك.";
+"auth_add_phone_message_2" = "عَيِّن رَقم هَاتِف لِاِستِردَادِ الحِساب، وَلاحِقًا لِتَكُونَ قابِلاً لِلاِكتِشاف اِختِيَاريًّا مِن قِبَلِ الأشخاصِ الَّذينَ يَعرِفُونَك.";
+
+// Accessibility
+"accessibility_checkbox_label" = "مُرَبَعُ اِختِيارات";
+"callbar_return" = "الرُّجوع";
+"callbar_active_and_multiple_paused" = "مُكالَمَةٌ واحدةٌ نَشِطة (%@) · عَدَد %@ مُكالَمَة مُعلَّقة";
+"callbar_only_multiple_paused" = "عَدَد %@ مُكالَمَة مُعلَّقة";
+"callbar_active_and_single_paused" = "مُكالَمَةٌ واحدةٌ نَشِطة (%@) · مُكالَمَةٌ واحدةٌ مُعلَّقة";
+"callbar_only_single_paused" = "مُكالَمَة مُعلَّقة";

Riot/Assets/de.lproj/Vector.strings

@@ -755,7 +755,7 @@
 "widget_integrations_server_failed_to_connect" = "Verbindung zum Integrationsserver fehlgeschlagen";
 "device_verification_security_advice" = "Für maximale Sicherheit empfehlen wir, dies persönlich zu tun oder ein anderes vertrauenswürdiges Kommunikationsmittel zu verwenden";
 "device_verification_incoming_description_1" = "Überprüfe diese Sitzung, um sie als vertrauenswürdig zu markieren. Sitzungen von Partnern zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende verschlüsselten Nachrichten.";
-"device_verification_incoming_description_2" = "Wenn du diese Sitzung verifizierst, wird es sie vertrauenswürdig und für dein Gegenüber als vertrauenswürdig gekennzeichnet.";
+"device_verification_incoming_description_2" = "Wenn du diese Sitzung verifizierst, wird sie für dich und für dein Gegenüber als vertrauenswürdig gekennzeichnet.";
 // MARK: Start
 "device_verification_start_title" = "Verifizieren durch Vergleichen eines kurzen Textes";
 "device_verification_start_wait_partner" = "Warten auf Annahme durch Partner…";
@@ -1058,7 +1058,7 @@
 "key_verification_other_session_title" = "Sitzung verifizieren";
 "key_verification_new_session_title" = "Neue Sitzung verifizieren";
 "key_verification_this_session_title" = "Verifiziere diese Sitzung";
-"device_verification_security_advice_emoji" = "Vergleiche die einzigartigen Emoji und stell sicher, dass sie in derselben Reihenfolge angezeigt werden.";
+"device_verification_security_advice_emoji" = "Vergleiche die einzigartigen Emojis und kontrolliere, dass sie in derselben Reihenfolge angezeigt werden.";
 "device_verification_security_advice_number" = "Vergleiche die Zahlen und stell sicher, dass sie in derselben Reihenfolge angezeigt werden.";
 "key_verification_self_verify_current_session_alert_title" = "Verifiziere diese Sitzung";
 "key_verification_self_verify_current_session_alert_message" = "Andere Benutzer vertrauen ihr vielleicht nicht.";

Riot/Assets/en.lproj/Vector.strings

@@ -322,6 +322,8 @@ Tap the + to start adding people.";
 "room_message_placeholder" = "Send a message (unencrypted)…";
 "room_message_reply_to_placeholder" = "Send a reply (unencrypted)…";
 "room_message_unable_open_link_error_message" = "Unable to open the link.";
+"room_message_editing" = "Editing";
+"room_message_replying_to" = "Replying to %@";
 "room_do_not_have_permission_to_post" = "You do not have permission to post to this room";
 "encrypted_room_message_placeholder" = "Send an encrypted message…";
 "encrypted_room_message_reply_to_placeholder" = "Send an encrypted reply…";
@@ -389,6 +391,7 @@ Tap the + to start adding people.";
 "room_accessibility_integrations" = "Integrations";
 "room_accessibility_upload" = "Upload";
 "room_accessibility_call" = "Call";
+"room_accessibility_video_call" = "Video Call";
 "room_accessibility_hangup" = "Hang up";
 "room_place_voice_call" = "Voice call";
 "room_open_dialpad" = "Dial pad";
@@ -403,6 +406,8 @@ Tap the + to start adding people.";
 "external_link_confirmation_title" = "Double-check this link";
 "external_link_confirmation_message" = "The link %@ is taking you to another site: %@\n\nAre you sure you want to continue?";
 
+"room_multiple_typing_notification" = "%@ and others";
+
 // Unknown devices
 "unknown_devices_alert_title" = "Room contains unknown sessions";
 "unknown_devices_alert" = "This room contains unknown sessions which have not been verified.\nThis means there is no guarantee that the sessions belong to the users they claim to.\nWe recommend you go through the verification process for each session before continuing, but you can resend the message without verifying if you prefer.";
@@ -684,6 +689,8 @@ Tap the + to start adding people.";
 "room_details_title_for_dm" = "Details";
 "room_details_people" = "Members";
 "room_details_files" = "Uploads";
+"room_details_search" = "Search room";
+"room_details_integrations" = "Integrations";
 "room_details_settings" = "Settings";
 "room_details_photo" = "Room Photo";
 "room_details_photo_for_dm" = "Photo";

Riot/Assets/eo.lproj/Vector.strings

@@ -128,8 +128,8 @@
 "room_conference_call_no_power" = "Vi bezonas permeson administri grupvokojn en ĉi tiu ĉambro";
 "room_ongoing_conference_call_close" = "Fermi";
 "room_ongoing_conference_call" = "Daŭranta grupa voko. Aliĝi kiel %@ aŭ %@.";
-"room_unsent_messages_unknown_devices_notification" = "Mesaĝoj ne sendiĝis pro ĉeesto de nekonataj salutaĵoj. Ĉu %@ aŭ %@ nun?";
-"room_unsent_messages_notification" = "Mesaĝoj ne sendiĝis. Ĉu %@ aŭ %@ nun?";
+"room_unsent_messages_unknown_devices_notification" = "Mesaĝoj ne sendiĝis pro ĉeesto de nekonataj salutaĵoj.";
+"room_unsent_messages_notification" = "Mesaĝoj ne sendiĝis.";
 "room_offline_notification" = "Konekto al la servilo perdiĝis.";
 "room_accessiblity_scroll_to_bottom" = "Moviĝi ĝis planko";
 "encrypted_room_message_placeholder" = "Sendi mesaĝon ĉifritan…";
@@ -305,7 +305,7 @@
 "auth_untrusted_id_server" = "La identiga servilo ne estas fidata";
 "auth_phone_is_required" = "Neniu identiga servilo estas agordita, do vi ne povas agordi telefonnumeron por laŭbezona rehavo de konto.";
 "auth_email_is_required" = "Neniu identiga servilo estas agordita, do vi ne povas agordi retpoŝtadreson por laŭbezona rehavo de konto.";
-"auth_phone_in_use" = "Ĉi tiu telefonnumero jam estas uzata.";
+"auth_phone_in_use" = "Ĉi tiu telefonnumero jam estas uzata";
 "auth_email_in_use" = "Ĉi tiu retpoŝtadreso jam estas uzata";
 "auth_add_email_phone_message_2" = "Agordu retpoŝtadreson por rehavo de konto. Uzu poste retpoŝtadreson aŭ telefonon por esti laŭplaĉe trovebla de personoj, kiuj vin konas.";
 "auth_add_phone_message_2" = "Agordu telefonon, por via (laŭplaĉa) trovebleco de personoj, kiuj vin konas.";
@@ -313,7 +313,7 @@
 "joined" = "Aliĝita";
 "device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Uzi rehavajn pasfrazon aŭ ŝlosilon";
 "device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Uzi rehavan ŝlosilon";
-"device_verification_self_verify_wait_additional_information" = "Ĉi tio funkcias por Element kaj aliaj klientoj kapablaj je delegaj subskriboj";
+"device_verification_self_verify_wait_additional_information" = "Ĉi tio funkcias por Element kaj aliaj klientoj kapablaj je delegaj subskriboj.";
 "device_verification_self_verify_wait_information" = "Kontrolu ĉi tiun saluton per unu el viaj aliaj salutaĵoj, dononte al ĝi aliron al ĉifritaj mesaĝoj.\n\nUzu la plej freŝan version de Element per viaj aliaj aparatoj:";
 "device_verification_self_verify_wait_new_sign_in_title" = "Kontrolu ĉi tiun saluton";
 
@@ -964,7 +964,7 @@
 //"settings_join_leave_rooms" = "When people join or leave rooms";
 //"settings_call_invitations" = "Call invitations";
 
-"settings_enable_callkit" = "";
+"settings_enable_callkit" = "Integraj vokoj";
 "settings_ui_theme_picker_title" = "Elektu haŭton";
 "settings_ui_theme_black" = "Nigra";
 "settings_ui_theme_dark" = "Malluma";
@@ -1075,3 +1075,411 @@
 "room_resource_limit_exceeded_message_contact_3" = " por ke vi daŭre uzu la servilon.";
 "room_resource_limit_exceeded_message_contact_2_link" = "kontaktu vian serviladministranton";
 "room_resource_limit_exceeded_message_contact_1" = " Bonvole ";
+"room_intro_cell_information_dm_sentence1_part3" = ". ";
+"room_intro_cell_information_dm_sentence2" = "Sole la paro de vi ĉeestas ĉi tiu ĉambro, neniu alia povas eniri.";
+"room_intro_cell_information_multiple_dm_sentence2" = "Sole vi ĉeestas ĉi tiun ĉambron, krom se oni invitas aliulon.";
+"device_verification_security_advice_emoji" = "Komparu la unikajn bildosignojn, certigante, ke ili aperas samorde.";
+"key_verification_user_title" = "Kontrolu ĝin";
+"key_verification_this_session_title" = "Kontrolu ĉi tiun salutaĵon";
+"key_verification_new_session_title" = "Kontrolu vian novan salutaĵon";
+
+// MARK: - Device Verification
+"key_verification_other_session_title" = "Kontrolu salutaĵon";
+"sign_out_key_backup_in_progress_alert_cancel_action" = "Mi atendos";
+"sign_out_key_backup_in_progress_alert_discard_key_backup_action" = "Mi ne volas miajn ĉifritajn mesaĝojn";
+"sign_out_key_backup_in_progress_alert_title" = "Savkopiado progresas. Se vi adiaŭos nun, vi perdos aliron al viaj ĉifritaj mesaĝoj.";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_backup_action" = "Savkopii";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_sign_out_action" = "Adiaŭi";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_message" = "Vi perdos aliron al viaj ĉifritaj mesaĝoj, se vi ne savkopios viajn ŝlosilojn antaŭ adiaŭo.";
+"sign_out_non_existing_key_backup_sign_out_confirmation_alert_title" = "Vi perdos viajn ĉifritajn mesaĝojn";
+"sign_out_non_existing_key_backup_alert_discard_key_backup_action" = "Mi ne volas miajn ĉifritajn mesaĝojn";
+"sign_out_non_existing_key_backup_alert_setup_secure_backup_action" = "Ekuzi sekuran savkopiadon";
+"sign_out_non_existing_key_backup_alert_title" = "Vi perdos aliron al viaj ĉifritaj mesaĝoj se vi nun adiaŭos";
+"sign_out_existing_key_backup_alert_sign_out_action" = "Adiaŭi";
+
+// MARK: Sign out warning
+
+"sign_out_existing_key_backup_alert_title" = "Ĉu vi certe volas adiaŭi?";
+"key_backup_recover_done_action" = "Finite";
+
+// Success
+
+"key_backup_recover_success_info" = "Savkopio rehaviĝis!";
+"key_backup_recover_from_recovery_key_lost_recovery_key_action" = "Ĉu vi perdis vian rehavan ŝlosilon? Vi povas agordi novan per la Agordoj.";
+"key_backup_recover_from_recovery_key_recover_action" = "Malŝlosi historion";
+"key_backup_recover_from_recovery_key_recovery_key_placeholder" = "Enigu rehavan ŝlosilon";
+"key_backup_recover_from_recovery_key_recovery_key_title" = "Enigu";
+
+// Recover from recovery key
+
+"key_backup_recover_from_recovery_key_info" = "Uzu vian rehavan ŝlosilon por malŝlosi vian historion de sekuraj mesaĝoj";
+"large_badge_value_k_format" = "%.1fK";
+"image_picker_action_library" = "Elekti el vidaŭdaĵujo";
+"media_picker_library" = "Vidaŭdaĵujo";
+"room_details_advanced_section" = "Altnivelaj";
+"room_details_banned_users_section" = "Forbaritaj uzantoj";
+"room_details_flair_invalid_id_prompt_msg" = "%@ ne estas valida identigilo por komunumo";
+"room_details_flair_invalid_id_prompt_title" = "Nevalida formo";
+"room_details_new_flair_placeholder" = "Aldoni novan identigilon de komunumo (ekz. +io%@)";
+"room_details_flair_section" = "Montri insignon por komunumoj";
+"room_details_addresses_disable_main_address_prompt_msg" = "Vi havos neniun specifitan ĉefan adreson. La implicita ĉefadreso por ĉi tiu ĉambro elektiĝos hazarde";
+"room_details_access_section_for_dm" = "Kiu rajtas aliri ĉi tion?";
+"room_details_access_section" = "Kiu rajtas aliri ĉi tiun ĉambron?";
+"room_details_direct_chat" = "Rekta babilo";
+"room_details_mute_notifs" = "Silentigi sciigojn";
+"room_details_low_priority_tag" = "Malalta prioritato";
+"room_details_favourite_tag" = "Elstarigita";
+"room_details_topic" = "Temo";
+"room_details_room_name_for_dm" = "Nomo";
+"room_details_room_name" = "Nomo de ĉambro";
+"room_details_photo_for_dm" = "Bildo";
+"room_details_photo" = "Bildo de ĉambro";
+"room_details_settings" = "Agordoj";
+"room_details_files" = "Alŝutoj";
+"room_details_people" = "Ĉambranoj";
+"room_details_title_for_dm" = "Detaloj";
+
+
+// Room Details
+"room_details_title" = "Detaloj pri ĉambro";
+"identity_server_settings_alert_error_invalid_identity_server" = "%@ ne estas valida identiga servilo.";
+"identity_server_settings_alert_error_terms_not_accepted" = "Vi devas akcepti la uzokondiĉojn de %@, por uzi ĝin kiel identiga servilo.";
+"identity_server_settings_alert_disconnect" = "Ĉu malkonektu de la identiga servilo %@?";
+"identity_server_settings_alert_disconnect_title" = "Malkonektu identigan servilon";
+"identity_server_settings_alert_change" = "Ĉu malkonektu de identiga servilo %1$@ kaj anstataŭe konektu al %@$A?";
+"identity_server_settings_alert_change_title" = "Ŝanĝu identigan servilon";
+"identity_server_settings_alert_no_terms" = "Via elektita identiga servilo ne havas uzokondiĉojn. Daŭrigu nur se vi fidas la posedanton de tiu servilo.";
+"identity_server_settings_alert_no_terms_title" = "Identiga servilo ne havas uzokondiĉojn";
+"identity_server_settings_disconnect" = "Malkonekti";
+"identity_server_settings_disconnect_info" = "Malkonektinte de via identiga servilo, vi ne troviĝus al aliaj uzantoj per, nek povos inviti uzantojn per, retpoŝtadresoj aŭ telefonnumeroj.";
+"identity_server_settings_change" = "Ŝanĝi";
+"identity_server_settings_add" = "Aldoni";
+"identity_server_settings_place_holder" = "Enigu identigan servilon";
+"identity_server_settings_no_is_description" = "Vi nun ne uzas identigan servilon. Por troviĝi de kaj trovi jamajn kontaktojn, aldonu tian servilon ĉi-supre.";
+"identity_server_settings_description" = "Vi uzas %@ por trovi kaj troviĝi de jamaj kontaktoj, kiujn vi konas.";
+
+// Identity server settings
+"identity_server_settings_title" = "Identiga Servilo";
+
+// AuthenticatedSessionViewControllerFactory
+"authenticated_session_flow_not_supported" = "Ĉi tiu programo ne subtenas la identigan metodon de via hejmservilo.";
+"manage_session_sign_out" = "Adiaŭi al ĉi tiu salutaĵo";
+"manage_session_not_trusted" = "Nefidataj";
+"manage_session_trusted" = "Fidataj de vi";
+"manage_session_name" = "Nomo de salutaĵo";
+"manage_session_info" = "INFORMOJ DE SALUTAĴO";
+
+// Manage session
+"manage_session_title" = "Administru salutaĵon";
+"security_settings_user_password_description" = "Konfirmi vian identon per enigo de via pasvorto";
+"security_settings_coming_soon" = "Bedaŭron. Ĉi tiu funkcio ne jam estas subtenata por Element iOS. Bonvolu uzi alian Matrix klienton por agordi ĝin. Element iOS sekvos ĝin.";
+"security_settings_complete_security_alert_message" = "Vi kompletigu sekurigon je ĉi tiu salutaĵo unue.";
+"security_settings_complete_security_alert_title" = "Kompletigi sekurigon";
+"security_settings_blacklist_unverified_devices_description" = "Kontroli ĉiujn salutaĵojn de uzanto, por marki ilin fidata kaj sendi mesaĝojn al ĝi.";
+"security_settings_blacklist_unverified_devices" = "Neniam sendi mesaĝojn al nefidatajn salutaĵojn";
+"security_settings_advanced" = "ALTNIVELAJ";
+"security_settings_export_keys_manually" = "Elporti ŝlosilojn permane";
+"security_settings_cryptography" = "KRIPTOGRAFIO";
+"security_settings_crosssigning_complete_security" = "Kompletigi sekurigon";
+"security_settings_crosssigning_reset" = "Restarigi delegan subskribadon";
+"security_settings_crosssigning_bootstrap" = "Praŝargi delegan subskribadon";
+"security_settings_crosssigning_info_ok" = "Delega subskribado estas ŝaltita.";
+"security_settings_crosssigning_info_trusted" = "Delega subskribado estas ŝaltita. Vi povas fidi aliajn uzantojn kaj viajn salutaĵojn per delegaj subskriboj, sed vi ne povas delege subskribi de ĉi tiu salutaĵo, ĉar mankas al ĝi ŝlosiloj privataj por delegaj subskriboj.";
+"security_settings_crosssigning_info_exists" = "Via konto havas identon de delega subskribado, sed ne jam estas fidata de ĉi tiu salutaĵo. Kompletigu la sekurigon de ĉi tiu salutaĵo.";
+"security_settings_crosssigning_info_not_bootstrapped" = "Delega subskribado ne jam agordiĝis.";
+"security_settings_crosssigning" = "DELEGAJ SUBSKRIBOJ";
+"security_settings_backup" = "SAVKOPIADO DE MESAĜOJ";
+"security_settings_secure_backup_delete" = "Forigi";
+"security_settings_secure_backup_synchronise" = "Speguli";
+"security_settings_secure_backup_setup" = "Agordi";
+"security_settings_secure_backup_description" = "Malhelpu perdon de aliro al ĉifritaj mesaĝoj kaj datumoj per savkopiado de ĉifraj ŝlosiloj al via servilo.";
+"security_settings_secure_backup" = "SAVKOPIADO";
+"security_settings_crypto_sessions_description_2" = "Se vi ne konas salutaĵojn, ŝanĝu vian pasvorton kaj restarigu savkopiadon.";
+"security_settings_crypto_sessions_loading" = "Enlegante salutaĵojn…";
+"security_settings_crypto_sessions" = "MIAJ SALUTAĴOJ";
+
+// Security settings
+"security_settings_title" = "Sekureco";
+"settings_show_NSFW_public_rooms" = "Montru publikajn ĉambrojn konsternajn";
+"settings_identity_server_no_is_description" = "Vi uzas neniun identigan servilon. Por trovi kaj troviĝi de jamaj kontaktoj, kiujn vi konas, aldonu servilon supre.";
+"settings_identity_server_no_is" = "Neniu identiga servilo estas agordita";
+"settings_identity_server_description" = "Uzante la identigan servilon supre agorditan, vi povas trovi kaj troviĝi de jamaj kontaktoj, kiujn vi konas.";
+"settings_discovery_three_pid_details_enter_sms_code_action" = "Enigu SMS aktivigan kodon";
+"settings_discovery_three_pid_details_cancel_email_validation_action" = "Nuligi retpoŝtan kontrolon";
+"settings_discovery_three_pid_details_revoke_action" = "Senvalidigi";
+"settings_discovery_three_pid_details_share_action" = "Kunhavigi";
+"settings_discovery_three_pid_details_information_phone_number" = "Agordu ĉi tiun telefonnumeron, per kiu aliaj uzantoj povas trovi kaj inviti vin al ĉambroj. Aldonu aŭ forigu telefonnumerojn ĉe Kontoj.";
+"settings_discovery_three_pid_details_title_phone_number" = "Agordu telefonnumeron";
+"settings_discovery_three_pid_details_information_email" = "Agordu ĉi tiun retpoŝtadreson, per kiu aliaj uzantoj povas trovi kaj inviti vin al ĉambroj. Aldonu aŭ forigu retpoŝtadresojn ĉe Kontoj.";
+"settings_discovery_three_pid_details_title_email" = "Agordu retpoŝtadreson";
+"settings_discovery_error_message" = "Eraris iel. Bonvolu reprovi.";
+"settings_discovery_three_pids_management_information_part3" = ".";
+"settings_discovery_three_pids_management_information_part2" = "Agordoj de uzanto";
+"settings_discovery_three_pids_management_information_part1" = "Agordu la retpoŝtadresojn kaj telefonnumerojn per kiuj aliaj uzantoj povas trovi kaj inviti vin al ĉambroj. Aldonu aŭ forigu retpoŝtadresojn aŭ telefonnumerojn de ĉi tiu listo en ";
+"settings_discovery_terms_not_signed" = "Konsentu la uzokondiĉojn de la identiga servilo (%@) por trovebligi vin per retpoŝtadreso aŭ telefonnumero.";
+"settings_discovery_no_identity_server" = "Vi nun ne uzas identigan servilon. Por trovi kaj troviĝi de jamaj kontaktoj, kiujn vi konas, aldonu servilon.";
+"settings_devices_description" = "Prezenta nomo de salutaĵo videblas al personoj kunbabilataj";
+"settings_key_backup_delete_confirmation_prompt_msg" = "Ĉu vi certas? Vi perdos aliron al viaj ĉifritaj mesaĝoj, se vi ne savkopios viajn ŝlosilojn.";
+"settings_key_backup_delete_confirmation_prompt_title" = "Forigi savkopion";
+"settings_key_backup_button_connect" = "Konekti ĉi tiu salutaĵo savkopionte";
+"settings_key_backup_button_delete" = "Forigi savkopion";
+"settings_key_backup_button_restore" = "Rehavigi per savkopio";
+"settings_key_backup_button_create" = "Komenci savkopiojn";
+"settings_key_backup_info_trust_signature_invalid_device_unverified" = "Savkopio havas nevalidan subskribon de %@";
+"settings_key_backup_info_trust_signature_invalid_device_verified" = "Savkopio havas nevalidan subskribon de %@";
+"settings_key_backup_info_trust_signature_valid_device_unverified" = "Savkopio havas subskribon de %@";
+"settings_key_backup_info_trust_signature_valid_device_verified" = "Savkopio havas validan subskribon de %@";
+"settings_key_backup_info_trust_signature_valid" = "Savkopio havas validan subskribon de ĉi salutaĵo";
+"settings_key_backup_info_trust_signature_unknown" = "Savkopio havas subskribon de salutaĵo kun la identigilo: %@";
+"settings_key_backup_info_progress_done" = "Ĉiuj ŝlosiloj estas savkopiitaj";
+"settings_key_backup_info_progress" = "Savkopiante %@ ŝlosilojn…";
+"settings_key_backup_info_not_valid" = "Ĉi tiu salutaĵo ne savkopias viajn ŝlosilojn, sed vi havas restantan kopion kiun vi povas alreveni kaj uzi ekde nun.";
+"settings_key_backup_info_valid" = "Ĉi tiu salutaĵo savkopias viajn ŝlosilojn.";
+"settings_key_backup_info_algorithm" = "Algoritmo: %@";
+"settings_key_backup_info_version" = "Savkopia Versio: %@";
+"settings_key_backup_info_signout_warning" = "Konektu ĉi tiun salutaĵon savkopie antaŭ ol vi adiaŭas, por eviti la perdiĝon de ŝlosiloj nurlokaj.";
+"settings_key_backup_info_none" = "Viaj ŝlosiloj estas nesavkopiataj por ĉi tiu salutaĵo.";
+"settings_key_backup_info_checking" = "Kontrolante…";
+"settings_key_backup_info" = "Mesaĝoj en ĉifritaj ĉambroj estas sekurigitaj per tutvoja ĉifrado. Nur vi kaj la adresato(j) havas la ŝlosilojn por malĉifri tiujn ĉi mesaĝojn.";
+"settings_deactivate_my_account" = "Malŝalti mian konton";
+"settings_crypto_blacklist_unverified_devices" = "Ĉifri nur al kontrolitaj salutaĵoj";
+"settings_crypto_export" = "Elporti ŝlosilojn";
+"settings_crypto_device_key" = "\nŜlosilo de salutaĵo:\n";
+"settings_crypto_device_id" = "\nIdentigilo de salutaĵo: ";
+"settings_crypto_device_name" = "Nomo de salutaĵo: ";
+"settings_add_3pid_invalid_password_message" = "Nevalida pasvorto";
+"settings_add_3pid_password_message" = "Por daŭrigi, bonvolu enigi vian pasvorton";
+"settings_add_3pid_password_title_msidsn" = "Aldoni telefonnumeron";
+"settings_add_3pid_password_title_email" = "Aldoni retpoŝtadreson";
+"settings_password_updated" = "Via pasvorto ĝisdatiĝis";
+"settings_fail_to_update_password" = "Eraris ĝisdatigante pasvorton";
+"settings_confirm_password" = "Konfirmu pasvorton";
+"settings_global_settings_info" = "Ĉieaj sciigoj uzeblas per via retkliento %@";
+"settings_fail_to_update_profile" = "Eraris ĝisdatigante profilon";
+"room_open_dialpad" = "Ciferilo";
+"room_place_voice_call" = "Voĉvoko";
+"room_event_action_delete_confirmation_message" = "Ĉu vi certas, ke vi volas forigi ĉi tiun nesenditan mesaĝon?";
+"room_event_action_delete_confirmation_title" = "Forigi nesenditan mesaĝon";
+"room_ongoing_conference_call_with_close" = "Daŭranta grupa voko. Aliĝi kiel %@ aŭ %@. %@.";
+"room_unsent_messages_cancel_message" = "Ĉu vi certas, ke vi volas forigi ĉiujn nesenditajn mesaĝojn en ĉi tiu ĉambro?";
+"room_unsent_messages_cancel_title" = "Forigi nesenditajn mesaĝojn";
+"room_member_power_level_short_moderator" = "Reg";
+"room_participants_security_loading" = "Enlegante…";
+"room_participants_action_security_status_loading" = "Enlegante…";
+"room_participants_filter_room_members_for_dm" = "Filtri ĉambranojn";
+"room_participants_add_participant" = "Aldoni partoprenanton";
+"contacts_user_directory_offline_section" = "KATALOGO DE UZANTOJ (nefunkcia)";
+"contacts_address_book_permission_denied" = "Vi ne permesis al Element aliri viajn lokajn kontaktojn";
+"rooms_empty_view_information" = "Ĉambroj taŭgas por ajna grupbabilo, privata aŭ publika. Premu la + por trovi ekzistantaj ĉambroj, aŭ fari novajn.";
+"rooms_empty_view_title" = "Ĉambroj";
+"people_empty_view_information" = "Sekure babili kun iu ajn.Premu la + por inviti personojn.";
+"people_empty_view_title" = "Homoj";
+"social_login_button_title_sign_up" = "Registriĝi per %@";
+"social_login_button_title_sign_in" = "Saluti per %@";
+"social_login_button_title_continue" = "Saluti per %@";
+"social_login_list_title_sign_up" = "Aŭ registriĝi per";
+"social_login_list_title_sign_in" = "Aŭ saluti per";
+
+// Social login
+
+"social_login_list_title_continue" = "Saluti per";
+"callbar_return" = "Reveni";
+"callbar_only_multiple_paused" = "%@ paŭzigitaj vokoj";
+"callbar_only_single_paused" = "Paŭzigita voko";
+"callbar_active_and_multiple_paused" = "1 aktiva voko (%@) · %@ paŭzigitaj vokoj";
+"callbar_active_and_single_paused" = "1 aktiva voko (%@) · 1 paŭzigita voko";
+
+// Call Bar
+"callbar_only_single_active" = "Aktiva voko (%@)";
+"less" = "Malpli";
+"more" = "Pli";
+"switch" = "Baskuli";
+"store_promotional_text" = "Privatecgardanta babila kaj kunlabora programo, uzanta malferman reton. Ĝi estas malcentra, do vi estas la stiranto. Neniu datumamasanto nek kaŝenirejo.";
+"room_intro_cell_information_room_with_topic_sentence2" = "Temo: %@";
+"room_intro_cell_information_room_sentence1_part3" = ". ";
+"room_intro_cell_information_room_sentence1_part1" = "Ĉi tio estas la komenco de ";
+
+// Mark: - Room creation introduction cell
+
+"room_intro_cell_add_participants_action" = "Aldoni personojn";
+"room_avatar_view_accessibility_hint" = "Ŝanĝi bildon de ĉambro";
+
+// Mark: - Room avatar view
+
+"room_avatar_view_accessibility_label" = "bildo de ĉambro";
+"invite_friends_share_text" = "Saluton! Parolu kun mi per %@: %@";
+
+// MARK: - Invite friends
+
+"invite_friends_action" = "Inviti amikojn al %@";
+"favourites_empty_view_information" = "Vi povas elstarigi kelkmaniere – plej rapide estas simple premi kaj teni. Tuŝetu la stelon por aperigi la elstarigaton ĉi tie.";
+
+// MARK: - Favourites
+
+"favourites_empty_view_title" = "Elstarigitaj ĉambroj kaj personoj";
+"home_empty_view_information" = "La ĉionhava sekura babililo por skipoj, amikoj, kaj organizaĵoj. Tuŝetu la ĉi-suban butonon + por aldoni personojn kaj ĉambrojn.";
+
+// MARK: - Home
+
+"home_empty_view_title" = "bonvenu al %@,\n%@";
+"call_transfer_error_title" = "Eraro";
+"call_transfer_contacts_all" = "Ĉiuj";
+"call_transfer_contacts_recent" = "Freŝdataj";
+"call_transfer_users" = "Uzantoj";
+"pin_protection_settings_change_pin" = "Ŝanĝi personan identigan numeron";
+"pin_protection_confirm_pin_to_change" = "Konfirmu personan identigan numeron por ĝin ŝanĝi";
+"key_verification_bootstrap_not_setup_message" = "Vi devas praŝargi delegan subskribadon unue.";
+"error_not_supported_on_mobile" = "Vi ne povas tion fari per %@ je portebla aparato.";
+
+// Unverified sessions
+
+"key_verification_self_verify_unverified_sessions_alert_title" = "Kontrolu, kie vi salutis";
+"device_verification_incoming_description_1" = "Kontrolu ĉi tiun salutaĵon por marki ĝin fidata. Fidi salutaĵojn de kunuloj helpos vin resti pli trankvila kiam vi sendas tutvoje ĉifritajn mesaĝojn.";
+
+// Mark: Incoming
+"device_verification_incoming_title" = "Envena kontrolpeto";
+"device_verification_error_cannot_load_device" = "Ne povas enlegi informojn pri salutaĵo.";
+"device_verification_cancelled_by_me" = "La kontrolo nuliĝis. Kialo: %@";
+"device_verification_cancelled" = "La aliulo nuligis la kontrolon.";
+"device_verification_security_advice_number" = "Komparu la numerojn, certigante, ke ili aperas samorde.";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part3" = ".";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part2" = "uzi vian rehavan ŝlosilon";
+"key_backup_recover_from_passphrase_lost_passphrase_action_part1" = "Ĉu vi ne konas vian rehavan pasfrazon? Vi povas ";
+"key_backup_recover_from_passphrase_recover_action" = "Malŝlosi historion";
+"key_backup_recover_from_passphrase_passphrase_placeholder" = "Enigu pasfrazon";
+"key_backup_recover_from_passphrase_passphrase_title" = "Enigu";
+
+// Recover from passphrase
+
+"key_backup_recover_from_passphrase_info" = "Uzu vian rehavan pasfrazon por malŝlosi vian historion de sekuraj mesaĝoj";
+
+// Recover from private key
+"key_backup_recover_from_private_key_info" = "Rehavante savkopion…";
+"key_backup_recover_invalid_recovery_key" = "Ne povis malĉifri savkopion per tiu ĉi ŝlosilo: bonvolu kontroli, ke vi enigis la ĝustan rehavan ŝlosilon.";
+"key_backup_recover_invalid_recovery_key_title" = "Malakordo de rehava ŝlosilo";
+"key_backup_recover_invalid_passphrase" = "Ne povis malĉifri savkopion per ĉi tiu pasfrazo: bonvolu kontroli, ĉu vi ĝuste enigis la rehavan pasfrazon.";
+"key_backup_recover_invalid_passphrase_title" = "Malĝusta rehava pasfrazo";
+
+// MARK: Key backup recover
+
+"key_backup_recover_title" = "Sekuraj mesaĝoj";
+"key_backup_setup_success_from_recovery_key_made_copy_action" = "Mi faris kopion";
+"key_backup_setup_success_from_recovery_key_make_copy_action" = "Fari kopion";
+"key_backup_setup_success_from_recovery_key_recovery_key_title" = "Rehava ŝlosilo";
+
+// Success from recovery key
+"key_backup_setup_success_from_recovery_key_info" = "Viaj ŝlosiloj estas savkopiataj.\n\nFaru kopion de tiu ĉi rehava ŝlosilo kaj bone ĝin sekurigu.";
+"key_backup_setup_success_from_passphrase_done_action" = "Finite";
+"key_backup_setup_success_from_passphrase_save_recovery_key_action" = "Konservi rehavan ŝlosilon";
+
+// Success from passphrase
+"key_backup_setup_success_from_passphrase_info" = "Viaj ŝlosiloj estas savkopiataj.\n\nVia rehava ŝlosilo estas formo de asekuro – vi povas ĝin uzi por rehavi aliron al viaj ĉifritaj mesaĝoj, se vi forgesos vian pasfrazon.\n\nTenu vian rehavan ŝlosilon en loko tre sekura, kiel ekzemple administrilo de pasvortoj (aŭ sekurkesto).";
+
+// Success
+
+"key_backup_setup_success_title" = "Sukceso!";
+"key_backup_setup_passphrase_setup_recovery_key_action" = "(Altnivele) Agordi per rehava ŝlosilo";
+"key_backup_setup_passphrase_setup_recovery_key_info" = "Aŭ sekurigu vian savkopion per rehava ŝlosilo, konservante ĝin en sekura loko.";
+"key_backup_setup_passphrase_set_passphrase_action" = "Agordi pasfrazon";
+"key_backup_setup_passphrase_confirm_passphrase_invalid" = "Pasfrazoj ne akordas";
+"key_backup_setup_passphrase_confirm_passphrase_valid" = "Bonege!";
+"key_backup_setup_passphrase_confirm_passphrase_placeholder" = "Konfirmu pasfrazon";
+"key_backup_setup_passphrase_confirm_passphrase_title" = "Konfirmi";
+"key_backup_setup_passphrase_passphrase_invalid" = "Provu aldoni vorton";
+"key_backup_setup_passphrase_passphrase_title" = "Enigi";
+
+// Passphrase
+
+"key_backup_setup_passphrase_title" = "Sekurigu vian savkopion per pasfrazo";
+"key_backup_setup_intro_manual_export_info" = "(Altnivele)";
+"key_backup_setup_intro_setup_connect_action_with_existing_backup" = "Konektu ĉi tiun aparaton al savkopio de ŝlosiloj";
+"key_backup_setup_intro_setup_action_without_existing_backup" = "Ekuzu savkopiadon de ŝlosiloj";
+
+
+// MARK: Key backup setup
+
+"key_backup_setup_title" = "Savkopiado de ŝlosiloj";
+
+// MARK: Secure backup setup
+
+// Intro
+
+"secure_key_backup_setup_intro_title" = "Sekura savkopiado";
+"room_widget_permission_information_title" = "Uzado povas havigi datumojn al %@:\n";
+"room_widget_permission_webview_information_title" = "Uzado povas meti kuketojn kaj havigi datumojn al %@:\n";
+"bug_report_background_mode" = "Daŭrigi fone";
+"e2e_key_backup_wrong_version" = "Nova savkopio de ŝlosiloj de sekuraj mesaĝoj troviĝis.\n\nSe vi ne faris ĝin, agordu novan pasfrazon per la Agordoj.";
+
+// Key backup wrong version
+"e2e_key_backup_wrong_version_title" = "Nova savkopio de ŝlosiloj";
+"call_actions_unhold" = "Daŭrigi";
+"photo_library_access_not_granted" = "%@ ne havas permeson aliri la fotujon; bonvolu ŝanĝi agordojn de privateco";
+"event_formatter_call_back" = "Revoki";
+"event_formatter_call_you_declined" = "Vi rifuzis ĉi tiun vokon";
+"event_formatter_call_you_currently_in" = "Vi nun partoprenas ĉi tiun vokon";
+"event_formatter_call_has_ended" = "Ĉi tiu voko finiĝis";
+"event_formatter_call_video" = "Vidvoko";
+"event_formatter_call_voice" = "Voĉvoko";
+
+// Media picker
+"media_picker_title" = "Vidaŭdaĵoj";
+"room_details_set_main_address" = "Agordi kiel ĉefadreson";
+"room_details_save_changes_prompt" = "Ĉu vi volas konservi ŝanĝojn?";
+"room_details_fail_to_enable_encryption" = "Malsukcesis ŝalti ĉifradon en ĉi tiu ĉambro";
+"room_details_fail_to_update_room_direct" = "Malsukcesis ĝisdatigi la rektan markon de ĉi tiu ĉambro";
+"room_details_fail_to_update_room_communities" = "Malsukcesis ĝisdatigi la ritalajn komunumojn";
+"room_details_fail_to_update_room_canonical_alias" = "Malsukcesis ĝisdatigi la ĉefadreson";
+"room_details_fail_to_remove_room_aliases" = "Malsukcesis forigi la adresojn de ĉambro";
+"room_details_fail_to_add_room_aliases" = "Malsukcesis aldoni novajn adresojn de ĉambro";
+"room_details_fail_to_update_history_visibility" = "Malsukcesis ĝisdatigi videblecon de la historio";
+"room_details_fail_to_update_room_directory_visibility" = "Malsukcesis ĝisdatigi videblecon en la katalogo de ĉambroj";
+"room_details_fail_to_update_room_join_rule" = "Malsukcesis ĝisdatigi la regulon pri aliĝoj";
+"room_details_fail_to_update_room_guest_access" = "Malsukcesis ĝisdatigi aliron de gastoj al la ĉambro";
+"room_details_fail_to_update_topic" = "Malsukcesis ĝisdatigi la temon";
+"room_details_fail_to_update_room_name" = "Malsukcesis ĝisdatigi la nomon de ĉambro";
+"room_details_fail_to_update_avatar" = "Malsukcesis ĝisdatigi la bildon de ĉambro";
+"room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "Ĉifri nur por kontrolitaj salutaĵoj";
+"room_details_advanced_e2e_encryption_disabled_for_dm" = "Ĉifrado ne estas ŝaltita ĉi tie.";
+"room_details_advanced_e2e_encryption_disabled" = "Ĉifrado ne estas ŝaltita en ĉi tiu ĉambro.";
+"room_details_advanced_e2e_encryption_enabled_for_dm" = "Ĉifrado estas ŝaltita ĉi tie";
+"room_details_advanced_e2e_encryption_enabled" = "Ĉifrado estas ŝaltita en ĉi tiu ĉambro";
+"room_details_advanced_enable_e2e_encryption" = "Ŝalti ĉifradon (averto: ne eblas malŝalti!)";
+"room_details_advanced_room_id_for_dm" = "Identigilo:";
+"room_details_advanced_room_id" = "Identigilo de ĉambro:";
+"identity_server_settings_alert_disconnect_still_sharing_3pid" = "Vi ankoraŭ kunhavigas personajn informojn per la identiga servilo %@.\n\nNi rekomendas, ke vi forigu viajn retpoŝtadresojn kaj telefonnumerojn de la identiga servilo, antaŭ malkonekto.";
+"identity_server_settings_alert_disconnect_still_sharing_3pid_button" = "Malkonekti malgraŭe";
+"identity_server_settings_alert_disconnect_button" = "Malkonekti";
+"room_details_addresses_disable_main_address_prompt_title" = "Averto je la ĉefadreso";
+"room_details_addresses_invalid_address_prompt_msg" = "%@ ne estas valida formo por kromnomo";
+"room_details_addresses_invalid_address_prompt_title" = "Nevalido formo de kromnomo";
+"room_details_new_address_placeholder" = "Aldoni novan adreson (ekz. #io%@)";
+"room_details_new_address" = "Aldoni novan adreson";
+"room_details_no_local_addresses_for_dm" = "Ĉi tio ne havas lokajn adresojn";
+"room_details_no_local_addresses" = "Ĉi tiu ĉambro ne havas lokajn adresojn";
+"room_details_addresses_section" = "Adresoj";
+"room_details_history_section_prompt_msg" = "Ŝanĝoj al legebleco de historio nur aplikiĝos al venontaj mesaĝoj en ĉi tiu ĉambro. La videbleco de jama historio restos senŝanĝe.";
+"room_details_history_section_prompt_title" = "Averto de privateco";
+"room_details_history_section_members_only_since_joined" = "Nur ĉambranoj (ekde sia aliĝo)";
+"room_details_history_section_members_only_since_invited" = "Nur ĉambranoj (ekde sia invitiĝo)";
+"room_details_history_section_members_only" = "Nur ĉambranoj (ekde ĉi tiu elekto)";
+"room_details_history_section_anyone" = "Ĉiu ajn";
+"room_details_history_section" = "Kiu rajtas legi historion?";
+"room_details_access_section_directory_toggle_for_dm" = "Listigi en katalogo de ĉambroj";
+"room_details_access_section_directory_toggle" = "Listigi ĉi tiun ĉambron en la katalogo de ĉambroj";
+"room_details_access_section_no_address_warning" = "Por ligi al ĉambro, ĝi bezonas adreson";
+"room_details_access_section_anyone_for_dm" = "Ĉiu, kiu konas la ligilon, inkluzive gastojn";
+"room_details_access_section_anyone" = "Ĉiu, kiu konas la ligilon de la ĉambro, inkluzive gastojn";
+"room_details_access_section_anyone_apart_from_guest_for_dm" = "Ĉiu, kiu konas la ligilon, krom gastoj";
+"room_details_access_section_anyone_apart_from_guest" = "Ĉiu, kiu konas la ligilon de la ĉambro, krom gastoj";
+"room_details_access_section_invited_only" = "Nur personoj, kiuj invitiĝis";
+"store_full_description" = "Element estas nova speco de mesaĝilo kaj kunlabora aplikaĵo, kiu:\n\n1. Stirigas vin por konservi vian privatecon\n2. Lasas vin komuniki kun ĉiu en la reto de Matrix, kaj eĉ ekstere, per kuniĝo kun aliaj aplikaĵoj, kiel ekzemple Slack\n3. Protektas vin de reklamoj, datumkolektado, kaŝenirejoj, kaj muritaj ĝardenoj\n4. Sekurigas vin per tutvoja ĉifrado, kun delegaj subskriboj por kontroli aliulojn\n\nElement tute malsamas de aliaj mesaĝiloj kaj kunlaboriloj, ĉar ĝi estas federa kaj malfermitkoda.\n\nElement lasas vin gastigi vin mem – aŭ elekti alian gastiganton – por ke vi havu privatecon, regon kaj kontrolon de viaj datumoj kaj interparoloj. Ĝi donas al vi aliron al malfermita reto, por ke via komunikado ne limiĝu al nur aliaj uzantoj de Element. Kaj ĝi estas tre sekura.\n\nElement povas fari ĉi ĉion, ĉar ĝi funkcias per Matrix – publika normo por malfermita, sencentra komunikado. \n\n\nElement lasas vi elekti, kiu gastigos viajn interparolojn. Per la aplikaĵo Element, vi povas elekti diversajn specojn de gastigado:\n\n1. Akiri senpagan konton ĉe la publika servilo matrix.org\n2. Memgastiĝi per via propra servilo ĉe via propra aparato\n3. Registriĝi ĉe propra servilo per simpla pagaliĝo al la gastiga platformo «Element Matrix Services»\n\nKial Element?\n\nPOSEDU VIAJN DATUMOJN: Vi decidu, kie vi tenu viajn datumojn kaj mesaĝojn. Vi posedas kaj regas ilin, ne iu granda komerca firmao, kiu kolektas viajn datumojn aŭ donas aliron al aliuloj.\n\nMALFERMAJ MESAĜADO KAJ KUNLABORADO: Vi povas babili kun ĉiu alia en la reto de Matrix, ĉu ĝi uzas Elementon aŭ alian aplikaĵon de Matrix, kaj eĉ se ĝi uzas tute alian mesaĝilon, kiel ekzemple Slack, IRC, aŭ XMPP.\n\nTRE SEKURA: Vera tutvoja ĉifrado (nur la interparolantoj povas malĉifri siajn mesaĝojn), kaj delegaj subskriboj por kontroli la aparatojn de partoprenantoj.\n\nSENMANKA KOMUNIKADO: Mesaĝoj, voĉvokoj kaj vidvokoj, havigado de dosieroj, ekrano, kaj multaj diversaj kunigoj, robotoj kaj fenestraĵoj. Kreu ĉambrojn, komunumojn, komuniku kaj kunlaboru.\n\nĈIE KUN VI: Tenu vin ĝisdata per historio de mesaĝoj plene spegulita trans ĉiuj viaj aparatoj, kaj sur la reto per https://app.element.io.";
+"directory_server_all_native_rooms" = "Ĉiuj ĉambroj, propraj al Matrix";
+"call_transfer_error_message" = "Malsukcesis transdono de voko";
+
+// MARK: - Call Transfer
+"call_transfer_title" = "Transdono";
+"room_intro_cell_information_dm_sentence1_part1" = "Ĉi tie komencas historio de viaj rektaj mesaĝoj kun ";
+"call_transfer_dialpad" = "Ciferplato";
+
+// MARK: - Dial Pad
+"dialpad_title" = "Ciferplato";

Riot/Assets/et.lproj/Vector.strings

@@ -559,7 +559,7 @@
 "identity_server_settings_place_holder" = "Sisesta isikutuvastusserver";
 "identity_server_settings_add" = "Lisa";
 "identity_server_settings_change" = "Muuda";
-"identity_server_settings_disconnect_info" = "Isikutuvastusserveri kasutamise lõpetamine tähendab, et sa ei ole leitav teiste kasutajate poolt ega sulle ei saa telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab kutset saata Matrix'i kasutajatunnuse alusel.";
+"identity_server_settings_disconnect_info" = "Isikutuvastusserveri kasutamise lõpetamine tähendab, et sa ei ole leitav nende kasutajate poolt, kes tahavad sulle telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab alati kutset saata Matrix'i kasutajatunnuse alusel.";
 "room_details_history_section_prompt_msg" = "Kui muudad seda, kes saavad selle jututoa ajalugu lugeda, siis kehtib see vaid tulevaste sõnumite kohta. Senise ajaloo nähtavus sellega ei muutu.";
 // Read Receipts
 "read_receipts_list" = "Lugemisteatiste loend";

Riot/Assets/fa.lproj/Vector.strings

@@ -0,0 +1 @@
+

Riot/Assets/nl.lproj/Vector.strings

@@ -1184,7 +1184,7 @@
 "device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Herstelsleutel gebruiken";
 "device_verification_self_verify_wait_additional_information" = "Dit werkt met Element en andere Matrix-apps die kruislings ondertekenen ondersteunen.";
 "device_verification_self_verify_wait_information" = "Verifieer deze sessie vanaf een van uw andere sessies, om toegang te krijgen tot de versleutelde berichten.\n\nGebruik de laatste versie van Element op uw andere apparaten:";
-"device_verification_self_verify_wait_new_sign_in_title" = "Verifieer deze aanmelding";
+"device_verification_self_verify_wait_new_sign_in_title" = "Verifieer deze login";
 
 // MARK: Self verification wait
 
@@ -1312,7 +1312,7 @@
 "identity_server_settings_alert_no_terms" = "De door u gekozen identiteitsserver heeft geen dienstvoorwaarden. Ga alleen door, wanneer u de eigenaar van de server vertrouwd.";
 "identity_server_settings_alert_no_terms_title" = "De identiteitsserver heeft geen dienstvoorwaarden";
 "identity_server_settings_disconnect" = "Verbinding verbreken";
-"identity_server_settings_disconnect_info" = "De verbinding met uw identiteitsserver verbreken zal ertoe leiden dat u niet door andere gebruikers gevonden zal kunnen worden, en dat u anderen niet via e-mail of telefoon zal kunnen uitnodigen.";
+"identity_server_settings_disconnect_info" = "De verbinding met uw identiteitsserver verbreken zal ertoe leiden dat u niet door andere mensen gevonden zal kunnen worden, en dat u anderen niet via e-mail of telefoon zal kunnen uitnodigen.";
 "identity_server_settings_change" = "Wijzigen";
 "identity_server_settings_add" = "Toevoegen";
 "identity_server_settings_place_holder" = "Voer een identiteitsserver in";

Riot/Assets/ru.lproj/Vector.strings

@@ -1280,3 +1280,55 @@
 "social_login_button_title_continue" = "Продолжить с %@";
 "social_login_list_title_sign_up" = "Или зарегистрируйтесь через";
 "social_login_list_title_sign_in" = "Или войдите через";
+"room_intro_cell_information_multiple_dm_sentence2" = "Только вы находитесь в этом разговоре, если только кто-то из вас не пригласит кого-то присоединиться.";
+"room_intro_cell_information_dm_sentence2" = "Только двое из вас в этом разговоре, никто другой не может присоединиться.";
+"room_intro_cell_information_dm_sentence1_part3" = ". ";
+"room_intro_cell_information_dm_sentence1_part1" = "Это начало ваших личных сообщений с ";
+"room_intro_cell_information_room_without_topic_sentence2_part2" = " чтобы люди знали, о чём эта комната.";
+"room_intro_cell_information_room_without_topic_sentence2_part1" = "Добавьте тему";
+"room_intro_cell_information_room_with_topic_sentence2" = "Тема: %@";
+"room_intro_cell_information_room_sentence1_part3" = ". ";
+"room_intro_cell_information_room_sentence1_part1" = "Это начало ";
+
+// Mark: - Room creation introduction cell
+
+"room_intro_cell_add_participants_action" = "Добавить людей";
+"room_avatar_view_accessibility_hint" = "Изменить аватар комнаты";
+
+// Mark: - Room avatar view
+
+"room_avatar_view_accessibility_label" = "аватар";
+"call_transfer_error_message" = "Передача вызова не удалась";
+"call_transfer_error_title" = "Ошибка";
+"call_transfer_contacts_all" = "Все";
+"call_transfer_contacts_recent" = "Недавние";
+"call_transfer_dialpad" = "Панель набора номера";
+"call_transfer_users" = "Пользователи";
+
+// MARK: - Call Transfer
+"call_transfer_title" = "Перевод";
+
+// MARK: - Dial Pad
+"dialpad_title" = "Панель набора номера";
+"callbar_return" = "Вернуться";
+"call_actions_unhold" = "Возобновить";
+"event_formatter_call_back" = "Перезвонить";
+"event_formatter_call_you_declined" = "Вы отклонили этот вызов";
+"event_formatter_call_you_currently_in" = "Вы в этом вызове";
+"event_formatter_call_has_ended" = "Этот вызов закончился";
+"event_formatter_call_video" = "Видео вызов";
+"event_formatter_call_voice" = "Голосовой вызов";
+"settings_show_NSFW_public_rooms" = "Показать публичные комнаты с чувствительным контентом";
+"room_open_dialpad" = "Панель набора номера";
+"room_place_voice_call" = "Голосовой вызов";
+"room_event_action_delete_confirmation_message" = "Вы уверены, что хотите удалить это неотправленное сообщение?";
+"room_event_action_delete_confirmation_title" = "Удалить неотправленное сообщение";
+"room_unsent_messages_cancel_message" = "Вы уверены, что хотите удалить все неотправленные сообщения в этой комнате?";
+"room_unsent_messages_cancel_title" = "Удалить неотправленные сообщения";
+"callbar_only_multiple_paused" = "%@ приостановленных вызовов";
+"callbar_only_single_paused" = "Приостановленный вызов";
+"callbar_active_and_multiple_paused" = "1 активный вызов (%@) · %@ приостановленных вызовов";
+"callbar_active_and_single_paused" = "1 активный вызов (%@) · 1 приостановленный вызов";
+
+// Call Bar
+"callbar_only_single_active" = "Активный вызов (%@)";

Riot/Assets/sq.lproj/Vector.strings

@@ -476,7 +476,7 @@
 "room_participants_remove_third_party_invite_msg" = "Heqja e ftesave nga palë të treta nuk mbulohet ende, derisa të kihet API";
 "room_participants_invite_malformed_id" = "ID e keqformuar. Duhet të jetë një adresë email ose ID Matrix, si '@localpart:domain'";
 "room_participants_action_ban" = "Dëboje nga kjo dhomë";
-"room_unsent_messages_unknown_devices_notification" = "Mesazhi s’u dërgua, për shkak të pranisë së sesioneve të panjohur. %@ ose %@ tani?";
+"room_unsent_messages_unknown_devices_notification" = "Mesazhi s’u dërgua, për shkak të pranisë së sesioneve të panjohur.";
 "room_ongoing_conference_call" = "Thirrje konference që po zhvillohet. Merrni pjesë si %@ ose %@.";
 "room_ongoing_conference_call_with_close" = "Thirrje konference që po zhvillohet. Merrni pjesë si %@ ose %@. %@.";
 "room_conference_call_no_power" = "Ju duhen leje për të administruar thirrje konferencë në këtë dhomë";
@@ -853,7 +853,7 @@
 "settings_add_3pid_password_title_email" = "Shtoni adresë email";
 "settings_add_3pid_password_title_msidsn" = "Shtoni numër telefoni";
 "settings_add_3pid_password_message" = "Që të vazhdohet, ju lutemi, jepni fjalëkalimin tuaj";
-"settings_add_3pid_invalid_password_message" = "Fjalëkalim i pavlefshëm";
+"settings_add_3pid_invalid_password_message" = "Kredenciale të pavlefshme";
 "settings_devices_description" = "Emri publik i një sesioni është i dukshëm për persona me të cilët komunikoni";
 "settings_discovery_no_identity_server" = "S’po përdorni ndonjë shërbyes identitetesh. Që të jeni i zbulueshëm nga kontakte ekzistuese që njihni, shtoni një të tillë.";
 "settings_discovery_terms_not_signed" = "Pajtohuni me Kushtet e Shërbimit të Shërbyesit të Identiteteve që t’i lejoni vetes të jeni i zbulueshëm përmes adrese email ose numri telefoni.";
@@ -1266,3 +1266,76 @@
 "rooms_empty_view_title" = "Dhoma";
 "people_empty_view_information" = "Fjalosuni në mënyrë të sigurt me këdo. Prekni + që të filloni të shtoni persona.";
 "people_empty_view_title" = "Njerëz";
+"room_intro_cell_information_multiple_dm_sentence2" = "Në këtë bisedë jeni vetëm ju, veç nëse cilido prej jush fton dikë tjetër të vijë.";
+"room_intro_cell_information_dm_sentence2" = "Në këtë bisedë gjenden vetëm ju të dy, s’mund të vijë tjetërkush.";
+"room_intro_cell_information_dm_sentence1_part3" = ". ";
+"room_intro_cell_information_dm_sentence1_part1" = "Ky është fillimi i mesazhit tuaj të drejtpërdrejtë me ";
+"room_intro_cell_information_room_without_topic_sentence2_part2" = " që t’u bëni me dije njerëzve se për çfarë është kjo dhomë.";
+"room_intro_cell_information_room_without_topic_sentence2_part1" = "Shtoni një temë";
+"room_intro_cell_information_room_with_topic_sentence2" = "Temë: %@";
+"room_intro_cell_information_room_sentence1_part3" = ". ";
+"room_intro_cell_information_room_sentence1_part1" = "Ky është fillimi i ";
+
+// Mark: - Room creation introduction cell
+
+"room_intro_cell_add_participants_action" = "Shtoni persona";
+"room_avatar_view_accessibility_hint" = "Ndryshoni avatar dhome";
+
+// Mark: - Room avatar view
+
+"room_avatar_view_accessibility_label" = "avatar";
+"invite_friends_share_text" = "Hej, bisedoni me mua në %@: %@";
+
+// MARK: - Invite friends
+
+"invite_friends_action" = "Ftoni shokë te %@";
+"call_transfer_error_message" = "S’u arrit të shpërngulej thirrje";
+"call_transfer_error_title" = "Gabim";
+"call_transfer_contacts_all" = "Krejt";
+"call_transfer_contacts_recent" = "Së fundi";
+"call_transfer_dialpad" = "Numërator";
+"call_transfer_users" = "Përdorues";
+
+// MARK: - Call Transfer
+"call_transfer_title" = "Shpërngule";
+
+// MARK: - Dial Pad
+"dialpad_title" = "Numërator";
+"pin_protection_settings_change_pin" = "Ndryshoni PIN-in";
+"pin_protection_confirm_pin_to_change" = "Ripohoni PIN-in që të ndryshohet PIN";
+"secrets_recovery_with_key_recovery_key_title" = "Jepeni";
+"secrets_recovery_with_passphrase_passphrase_title" = "Jepeni";
+"bug_report_background_mode" = "Vazhdo në prapaskenë";
+"call_actions_unhold" = "Rimerre";
+"event_formatter_call_back" = "Ktheji thirrjen";
+"event_formatter_call_you_declined" = "Hodhët poshtë këtë thirrje";
+"event_formatter_call_you_currently_in" = "Gjendeni në këtë thirrje";
+"event_formatter_call_has_ended" = "Kjo thirrje ka përfunduar";
+"event_formatter_call_video" = "Thirrje video";
+"event_formatter_call_voice" = "Thirrje audio";
+"security_settings_crosssigning_reset" = "Rikthe te parazgjedhjet <em>cross-signing</em>";
+"security_settings_crosssigning" = "<em>CROSS-SIGNING</em>";
+"settings_show_NSFW_public_rooms" = "Shfaq dhoma publike NSFW";
+"room_open_dialpad" = "Numërator";
+"room_place_voice_call" = "Thirrje audio";
+"room_event_action_delete_confirmation_message" = "Jeni i sigurt se doni të fshihet ky mesazh i padërguar?";
+"room_event_action_delete_confirmation_title" = "Fshi mesazh të padërguar";
+"room_unsent_messages_cancel_message" = "Jeni i sigurt se doni të fshihen krejt mesazhet e padërguar në këtë dhomë?";
+"room_unsent_messages_cancel_title" = "Fshi mesazhet e padërguar";
+"social_login_button_title_sign_up" = "Regjistrohuni me %@";
+"social_login_button_title_sign_in" = "Hyni me %@";
+"social_login_button_title_continue" = "Vazhdo me %@";
+"social_login_list_title_sign_up" = "Ose";
+"social_login_list_title_sign_in" = "Ose";
+
+// Social login
+
+"social_login_list_title_continue" = "Vazhdoni me";
+"callbar_return" = "Rimerre";
+"callbar_only_multiple_paused" = "%@ thirrje të ndalura";
+"callbar_only_single_paused" = "Thirrje e ndalur";
+"callbar_active_and_multiple_paused" = "1 thirrje aktive (%@) · %@ thirrje të ndalura";
+"callbar_active_and_single_paused" = "1 thirrje aktive (%@) · 1 thirrje e ndalur";
+
+// Call Bar
+"callbar_only_single_active" = "Thirrje aktive (%@)";

Riot/Assets/uk.lproj/Vector.strings

@@ -37,7 +37,7 @@
 // Authentication
 "auth_login" = "Увійти";
 "auth_register" = "Зареєструватися";
-"auth_submit" = "Відправити";
+"auth_submit" = "Надіслати";
 "auth_skip" = "Пропустити";
 "auth_send_reset_email" = "Надіслати лист для відновлення";
 "auth_return_to_login" = "Повернутися на екран входу";
@@ -161,7 +161,7 @@
 "people_conversation_section" = "БАЛАЧКИ";
 "people_no_conversation" = "Нема балачок";
 "room_participants_leave_prompt_msg_for_dm" = "Ви впевненні, що бажаєте залишити?";
-"room_participants_leave_prompt_title_for_dm" = "Залишити";
+"room_participants_leave_prompt_title_for_dm" = "Вийти";
 "client_android_name" = "Element Android";
 "store_promotional_text" = "Додаток для чату та сумісної роботи, що зберігає конфіденційність у відкритій мережі. Децентралізований, щоб надати вам контроль над даними. Без обробки даних, без бекдорів, без доступу для третіх сторін.";
 "settings_three_pids_management_information_part3" = ".";
@@ -288,3 +288,40 @@
 "security_settings_secure_backup_delete" = "Видалити";
 "security_settings_secure_backup_synchronise" = "Синхронізувати";
 "security_settings_secure_backup_setup" = "Налаштувати";
+"people_empty_view_information" = "Безпечно спілкуйтеся з будь-ким. Торкніться +, щоб додати співрозмовників.";
+"callbar_return" = "Повернути";
+"callbar_only_multiple_paused" = "%@ викликів у очікуванні";
+"callbar_only_single_paused" = "Виклики в очікуванні";
+"callbar_active_and_multiple_paused" = "1 активний виклик (%@) · %@ викликів у очікуванні";
+"callbar_active_and_single_paused" = "1 активний виклик (%@) · 1 виклик в очікуванні";
+
+// Call Bar
+"callbar_only_single_active" = "Активний виклик (%@)";
+"switch" = "Перемкнути";
+"room_event_action_resend" = "Повторно надіслати";
+"room_event_action_redact" = "Вилучити";
+"room_event_action_quote" = "Цитувати";
+"room_event_action_copy" = "Копіювати";
+"bug_report_send" = "Надіслати";
+"room_details_topic" = "Тема";
+"room_details_room_name_for_dm" = "Назва";
+"create_room_placeholder_topic" = "Тема";
+"create_room_section_header_topic" = "Тема кімнати (необов'язково)";
+"create_room_placeholder_name" = "Назва";
+"create_room_section_header_name" = "Назва кімнати";
+
+// MARK: - Create Room
+
+"create_room_title" = "Нова кімната";
+"searchable_directory_search_placeholder" = "Ім'я або ID";
+"searchable_directory_x_network" = "%@ мережа";
+
+// MARK: - Searchable Directory View Controller
+
+"searchable_directory_create_new_room" = "Створити нову кімнату";
+"biometrics_cant_unlocked_alert_message_retry" = "Повторити";
+"key_backup_setup_skip_alert_skip_action" = "Пропустити";
+"room_participants_action_remove" = "Вилучити з цієї кімнати";
+"room_participants_action_leave" = "Вийти з цієї кімнати";
+"room_participants_action_invite" = "Запросити";
+"room_ongoing_conference_call_close" = "Закрити";

Riot/Assets/zh_Hans.lproj/Localizable.strings

@@ -1,5 +1,5 @@
 /* New message from a specific person, not referencing a room */
-"MSG_FROM_USER" = "%@发送了一条消息";
+"MSG_FROM_USER" = "%@ 发送了一条消息";
 /* New message from a specific person in a named room */
 "MSG_FROM_USER_IN_ROOM" = "%@ 在 %@ 发送了消息";
 /* New message from a specific person, not referencing a room. Content included. */
@@ -27,11 +27,11 @@
 /* Multiple unread messages from three people */
 "MSGS_FROM_THREE_USERS" = "%@ 条未读消息 (来自 %@、%@ 和 %@)";
 /* Multiple unread messages from two plus people (ie. for 4+ people: 'others' replaces the third person) */
-"MSGS_FROM_TWO_PLUS_USERS" = "%@ 条未读消息 (来自 %@、%@ 及更多)";
+"MSGS_FROM_TWO_PLUS_USERS" = "%@ 条未读消息 (来自 %@、%@ 与其他)";
 /* Multiple messages in two rooms */
 "MSGS_IN_TWO_ROOMS" = "%@ 条未读消息 (来自聊天室 %@ 和 %@)";
 /* Look, stuff's happened, alright? Just open the app. */
-"MSGS_IN_TWO_PLUS_ROOMS" = "%@ 条未读消息 (来自聊天室 %@、%@ 和更多)";
+"MSGS_IN_TWO_PLUS_ROOMS" = "%@ 条未读消息 (来自 %@、%@ 与其他)";
 /* A user has invited you to a chat */
 "USER_INVITE_TO_CHAT" = "%@ 邀请您加入私聊";
 /* A user has invited you to an (unamed) group chat */
@@ -54,4 +54,16 @@
 "MSG_FROM_USER_IN_ROOM_TITLE" = "%@（来自 %@）";
 /* Sticker from a specific person, not referencing a room. */
 "STICKER_FROM_USER" = "%@发送了一张贴图";
-"KEY_VERIFICATION_REQUEST_FROM_USER" = "%@想要验证";
+"KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ 想要验证";
+"MESSAGE_PROTECTED" = "未读消息";
+
+/* New message indicator on a room */
+"MESSAGE_IN_X" = "%@ 中的消息";
+
+/* New message indicator from a DM */
+"MESSAGE_FROM_X" = "来自 %@ 的消息";
+
+/** Notification messages **/
+
+/* New message indicator on unknown room */
+"MESSAGE" = "消息";

Riot/Assets/zh_Hans.lproj/Vector.strings

@@ -11,7 +11,7 @@
 "continue" = "继续";
 "create" = "新建";
 "start" = "开始";
-"leave" = "退出";
+"leave" = "离开";
 "remove" = "移除";
 "invite" = "邀请";
 "retry" = "重试";
@@ -27,7 +27,7 @@
 "voice" = "语音";
 "video" = "视频";
 "active_call" = "当前通话";
-"active_call_details" = "当前通话 (%@)";
+"active_call_details" = "当前通话（%@）";
 "later" = "稍后再说";
 "rename" = "重命名";
 // Authentication
@@ -47,7 +47,7 @@
 "auth_phone_placeholder" = "手机号码";
 "auth_repeat_password_placeholder" = "重复密码";
 "auth_repeat_new_password_placeholder" = "确认您的新密码";
-"auth_invalid_login_param" = "无效的用户名和/或密码";
+"auth_invalid_login_param" = "用户名和/或密码无效";
 "auth_invalid_user_name" = "用户名只能包含字母、数字、短横（-）与下划线（_）";
 "auth_invalid_password" = "密码太短（至少 6 个字符）";
 "auth_invalid_email" = "这不像是一个有效的邮箱地址";
@@ -142,8 +142,8 @@
 "room_participants_add_participant" = "添加参加者";
 "room_participants_one_participant" = "1 个参加者";
 "room_participants_multi_participants" = "%d 个参加者";
-"room_participants_leave_prompt_title" = "退出聊天室";
-"room_participants_leave_prompt_msg" = "您确定要退出此聊天室吗？";
+"room_participants_leave_prompt_title" = "离开聊天室";
+"room_participants_leave_prompt_msg" = "您确定要离开此聊天室吗？";
 "room_participants_remove_prompt_title" = "确认";
 "room_participants_remove_prompt_msg" = "您确定要将 %@ 从此聊天室里移除？";
 "room_participants_remove_third_party_invite_msg" = "在 API 实现之前还不支持移除第三方邀请";
@@ -165,18 +165,18 @@
 "room_participants_action_section_devices" = "会话";
 "room_participants_action_section_other" = "选项";
 "room_participants_action_invite" = "邀请";
-"room_participants_action_leave" = "退出此聊天室";
+"room_participants_action_leave" = "离开此聊天室";
 "room_participants_action_remove" = "从此聊天室移除";
 "room_participants_action_ban" = "从此聊天室封禁";
 "room_participants_action_unban" = "解封";
 "room_participants_action_ignore" = "隐藏此用户的所有信息";
 "room_participants_action_unignore" = "显示此用户的所有信息";
 "room_participants_action_set_default_power_level" = "重置到正常用户";
-"room_participants_action_set_moderator" = "使其成为主持人";
+"room_participants_action_set_moderator" = "使其成为协管员";
 "room_participants_action_set_admin" = "使其成为管理员";
 "room_participants_action_start_new_chat" = "发起新的聊天";
-"room_participants_action_start_voice_call" = "开始语音通话";
-"room_participants_action_start_video_call" = "开始视频通话";
+"room_participants_action_start_voice_call" = "发起语音通话";
+"room_participants_action_start_video_call" = "发起视频通话";
 "room_participants_action_mention" = "提及";
 // Chat
 "room_jump_to_first_unread" = "跳到第一条未读信息";
@@ -185,7 +185,7 @@
 "room_one_user_is_typing" = "%@ 正在输入…";
 "room_two_users_are_typing" = "%@ 和 %@ 正在输入…";
 "room_many_users_are_typing" = "%@、%@ 和 %@ 正在输入…";
-"room_message_placeholder" = "发送消息（非加密）…";
+"room_message_placeholder" = "发送消息（未加密）…";
 "encrypted_room_message_placeholder" = "发送加密消息…";
 "room_message_short_placeholder" = "发送消息…";
 "room_offline_notification" = "到服务器的连接已经丢失。";
@@ -252,7 +252,7 @@
 "settings_labs" = "实验室";
 "settings_devices" = "会话";
 "settings_cryptography" = "加密";
-"settings_sign_out" = "退出";
+"settings_sign_out" = "离开";
 "settings_sign_out_confirmation" = "你确定？";
 "settings_sign_out_e2e_warn" = "您将丢失所有端对端加密密钥。这意味着在此设备上您将再也无法阅读已加密聊天室里的旧消息。";
 "settings_profile_picture" = "档案图片";
@@ -326,7 +326,7 @@
 "room_details_history_section_prompt_msg" = "改成谁都可以阅读历史只会应用于此聊天室未来的消息。已经存在的历史消息的可见性将不会改变。";
 "room_details_new_address" = "添加新地址";
 "room_details_new_address_placeholder" = "添加新地址（例如 #foo%@）";
-"room_details_addresses_invalid_address_prompt_title" = "无效的别名格式";
+"room_details_addresses_invalid_address_prompt_title" = "别名格式无效";
 "room_details_addresses_invalid_address_prompt_msg" = "%@ 不是一个有效的别名格式";
 "room_details_addresses_disable_main_address_prompt_title" = "主地址警告";
 "room_details_addresses_disable_main_address_prompt_msg" = "您没有指定主地址。此聊天室的默认主地址会随机选取";
@@ -413,7 +413,7 @@
 // Events formatter
 "event_formatter_member_updates" = "%tu 的成员身份变化";
 "auth_home_server_placeholder" = "URL（例如 https://matrix.org）";
-"auth_identity_server_placeholder" = "网址（例如 https://vector.im）";
+"auth_identity_server_placeholder" = "URL（例如 https://vector.im）";
 "contacts_user_directory_section" = "用户目录";
 "contacts_user_directory_offline_section" = "用户目录（离线）";
 "room_ongoing_conference_call_with_close" = "收到会议通话。以 %@ 或 %@.%@ 加入。";
@@ -454,8 +454,8 @@
 "group_home_multi_rooms_format" = "%tu 个聊天室";
 // Group participants
 "group_participants_add_participant" = "添加成员";
-"group_participants_leave_prompt_title" = "退出群组";
-"group_participants_leave_prompt_msg" = "你确定要退出此群组吗？";
+"group_participants_leave_prompt_title" = "离开群组";
+"group_participants_leave_prompt_msg" = "你确定要离开此群组吗？";
 "group_participants_remove_prompt_title" = "选项";
 "group_participants_remove_prompt_msg" = "你确定要从此群组中移除 %@ 吗？";
 "group_participants_invite_prompt_title" = "选项";
@@ -466,18 +466,18 @@
 "group_participants_invited_section" = "已邀请";
 // Group rooms
 "group_rooms_filter_rooms" = "过滤社区聊天室";
-"event_formatter_widget_added" = "小部件 %@ 已被 %@ 添加";
-"event_formatter_widget_removed" = "小部件 %@ 已被 %@ 移除";
+"event_formatter_widget_added" = "挂件 %@ 已被 %@ 添加";
+"event_formatter_widget_removed" = "挂件 %@ 已被 %@ 移除";
 "do_not_ask_again" = "不再询问";
 "call_already_displayed" = "正在通话。";
 // Widget Integration Manager
 "widget_integration_need_to_be_able_to_invite" = "你需要有邀请用户的权限才能进行此操作。";
-"widget_integration_unable_to_create" = "无法创建小部件。";
+"widget_integration_unable_to_create" = "无法创建挂件。";
 "widget_integration_failed_to_send_request" = "发送请求失败。";
 "widget_integration_room_not_recognised" = "无法识别此房间。";
 "widget_integration_positive_power_level" = "权限级别必须是整数。";
 "widget_integration_must_be_in_room" = "您不在此聊天室中。";
-"e2e_room_key_request_start_verification" = "开始验证……";
+"e2e_room_key_request_start_verification" = "开始验证…";
 "e2e_room_key_request_share_without_verifying" = "在不验证的情况下分享";
 "e2e_room_key_request_ignore_request" = "忽略请求";
 "room_event_action_kick_prompt_reason" = "移除此用户的原因";
@@ -489,8 +489,8 @@
 "group_invitation_format" = "%@ 邀请您加入此社区";
 "group_participants_invite_malformed_id" = "ID 格式错误。一个 Matrix ID 看起来应该像是 “@localpart:domain”";
 // Widget
-"widget_no_power_to_manage" = "你需要相关权限以管理此聊天室的小部件";
-"widget_creation_failure" = "小部件创建失败";
+"widget_no_power_to_manage" = "你需要相关权限以管理此聊天室的挂件";
+"widget_creation_failure" = "挂件创建失败";
 // Room key request dialog
 "e2e_room_key_request_title" = "密钥共享请求";
 "room_recents_server_notice_section" = "系统警告";
@@ -527,20 +527,20 @@
 "room_resource_usage_limit_reached_message_contact_3" = " 以提高限制。";
 // String for App Store
 "store_short_description" = "安全、去中心化的聊天及 VoIP 应用";
-"store_full_description" = "沟通，由你掌控。\n\n一个聊天应用，由你掌控且完全灵活。Element 让你以你的方式沟通。为 [matrix] - 开放、去中心化的沟通而打造。\n\n获取一个免费的 matrix.org 账号，在 https://ems.element.io 获取一个你自己的服务器，或者使用其他 Matrix 服务器。\n\n为什么选择 Element?\n\n完整的沟通：围绕你的团队、你的朋友、你的社区创建聊天室 - 随你喜欢！聊天、分享文件、添加插件和语音视频通话 - 全部免费。\n\n强大的集成度：通过你了解和喜欢的工具来使用 Element 。你甚至可以在 Element 上与其他聊天应用的用户和群组聊天。\n\n隐私和安全：保守你对话的秘密。最先进的端到端加密技术可确保私密通信保持私密性。\n\n开放，而非封闭：开源，基于 Matrix。通过自己开设的服务器来拥有你自己的数据，或者选择你信赖的服务器。\n\n随处可及：在你所有的设备和线上页面 https://app.element.io 上通过完整的历史信息同步让你随处可及。";
+"store_full_description" = "Element 是一种新型的通讯与协作应用：\n\n1. 使您可以掌控您的隐私\n2. 使您与 Matrix 网络中的任何人交流，甚至可以通过集成功能与如 Slack 之类的其他应用通讯\n3. 保护您免受广告，大数据挖掘和封闭服务的侵害\n4. 通过端到端加密保证安全，通过交叉签名验证其他人\n\nElement 与其他通讯与协作应用完全不同，因为它是去中心化且开源的。\n\nElement 允许您自托管——或者选择托管商——因此，您能拥有数据和会话的隐私权，所有权和控制权。它允许您访问开放网络；因此，您可以与 Element 用户以外的人交流。并且它非常安全。\n\nElement 之所以可以做到这些，是因为它在 Matrix 上运行——开放，去中心化通讯的标准。\n\n通过让您选择由谁来托管您的会话，Element 让您掌控一切。在 Element 应用中，您可以选择不同的托管方式：\n\n1. 在由 Matrix 开发者托管的 matrix.org 公共服务器上获取免费帐户，或从志愿者托管的上千个公共服务器中选择\n2. 在您自己的硬件上运行服务器，自托管您的会话\n3. 通过订阅 Element Matrix Services 托管平台，简单地在自定义服务器上注册账户\n\n为什么选择 Element？\n\n掌控您的数据：您来决定存放您的数据和消息的位置。拥有并控制它的是您，而不是挖掘您的数据或与第三方分享的巨型企业。\n\n开放通讯与协作：您可以与 Matrix 网络中的任何人聊天，不论他们使用 Element 还是其他 Matrix 应用，甚至/即使他们在使用不同的通讯系统，例如 Slack，IRC 或 XMPP。\n\n超级安全：支持真正的端到端加密（仅有会话中的人可以解密消息），还有能够验证会话参与方的设备的交叉签名。\n\n完善的通讯方式：消息，语音和视频通话，文件共享，屏幕共享和大量集成功能，机器人和挂件。建立房间与社区，保持联系并完成工作。\n\n随时随地：消息历史可在您的全部设备和 https://app.element.io 网页端之间完全同步，无论您在哪里，都可以保持联系。";
 "auth_accept_policies" = "请查看并接受此主页服务器的服务条款：";
 "room_replacement_information" = "这个聊天室已被替换，不再有效。";
 "settings_flair" = "在允许的地方显示个性徽章";
 "settings_key_backup" = "密钥备份";
 "settings_key_backup_info" = "消息已被端对端安全加密。只有您和持有密钥的接收方可以阅读这些消息。";
-"settings_key_backup_info_checking" = "检查中……";
+"settings_key_backup_info_checking" = "正在检查…";
 "settings_key_backup_info_none" = "您的密钥未从此会话备份。";
 "settings_key_backup_info_signout_warning" = "在登出账号之前把此会话关联到密钥备份以免丢失仅在此设备上的所有密钥。";
 "settings_key_backup_info_version" = "密钥备份版本：%@";
 "settings_key_backup_info_algorithm" = "算法：%@";
 "settings_key_backup_info_valid" = "此会话正在备份密钥。";
 "settings_key_backup_info_not_valid" = "此会话未在备份你的密钥，但你的确一个有可以恢复和继续添加的现有备份。";
-"settings_key_backup_info_progress" = "%@ 个密钥备份中……";
+"settings_key_backup_info_progress" = "正在备份 %@ 个密钥…";
 "settings_key_backup_info_progress_done" = "所有密钥都已备份";
 "settings_key_backup_info_trust_signature_unknown" = "备份具有一个 ID：%@ 的会话的签名";
 "settings_key_backup_info_trust_signature_valid" = "备份具有此会话的一个有效签名";
@@ -558,8 +558,8 @@
 "room_details_fail_to_update_room_direct" = "此聊天室的直接标记更新失败";
 "event_formatter_jitsi_widget_removed" = "VoIP 会议已被 %@ 移除";
 "room_does_not_exist" = "%@ 聊天室不存在";
-"call_incoming_voice" = "来电……";
-"call_incoming_video" = "视频通话来电……";
+"call_incoming_voice" = "收到来电…";
+"call_incoming_video" = "收到视频通话…";
 // Key backup wrong version
 "e2e_key_backup_wrong_version_title" = "新建密钥备份";
 "e2e_key_backup_wrong_version" = "一个新的安全消息密钥备份已被删除。\n\n如果这不是您的操作，请在设置中设定一个新的密码。";
@@ -591,7 +591,7 @@
 "rerequest_keys_alert_message" = "请在另一台可以解密消息的设备上启动Element，这样它就可以将密钥发送到此会话。";
 "key_backup_setup_title" = "密钥备份";
 "key_backup_setup_skip_alert_title" = "您确定吗？";
-"key_backup_setup_skip_alert_message" = "如果您退出或丢失设备，可能会丢失安全消息。";
+"key_backup_setup_skip_alert_message" = "如果您登出或丢失设备，可能会丢失安全消息。";
 "key_backup_setup_skip_alert_skip_action" = "跳过";
 "key_backup_setup_intro_title" = "永不丢失加密消息";
 "key_backup_setup_intro_info" = "加密聊天室中的消息使用端到端加密进行保护。 只有您和拥有密钥的收件人才能阅读这些消息。\n\n安全备份密钥以避免丢失密钥。";
@@ -659,7 +659,7 @@
 "sign_out_key_backup_in_progress_alert_cancel_action" = "等待";
 "auth_login_single_sign_on" = "使用单点登录方式登入";
 "room_message_unable_open_link_error_message" = "无法打开链接。";
-"auth_autodiscover_invalid_response" = "无效的主服务器探测响应";
+"auth_autodiscover_invalid_response" = "主服务器探测响应无效";
 "close" = "关闭";
 // Accessibility
 "accessibility_checkbox_label" = "多选框";
@@ -670,7 +670,7 @@
 "auth_phone_is_required" = "未设置身份认证服务器，所以你不能添加电话号码来重设你的密码。";
 "auth_forgot_password_error_no_configured_identity_server" = "未设置身份认证服务器：添加服务器以重设你的密码。";
 "auth_reset_password_error_is_required" = "未设置身份认证服务器：在服务器选项中添加以便重设你的密码。";
-"auth_softlogout_signed_out" = "你已经登出";
+"auth_softlogout_signed_out" = "你已登出";
 "auth_softlogout_sign_in" = "登录";
 "auth_softlogout_reason" = "你的主服务器（%1$@）管理员已将你的账号%2$@（%3$@）登出。";
 "auth_softlogout_recover_encryption_keys" = "登录以恢复单独保存在此设备上的加密密钥。你需要它们才能阅读任何设备上的安全消息。";
@@ -682,7 +682,7 @@
 "auth_softlogout_clear_data_sign_out_msg" = "你确定希望清空所有当前保存在此设备上数据吗？再次登录可以获取你的账号数据和消息。";
 "auth_softlogout_clear_data_sign_out" = "登出";
 // Errors
-"error_user_already_logged_in" = "看上去你试图连接另一个主服务器。你想要登出吗？";
+"error_user_already_logged_in" = "您似乎正在尝试连接另一个主服务器。您想要登出吗？";
 "room_creation_error_invite_user_by_email_without_identity_server" = "未设置身份认证服务器，所以你不能用邮箱添加参与者。";
 "contacts_address_book_no_identity_server" = "未设置身份认证服务器";
 "room_participants_remove_third_party_invite_prompt_msg" = "你确定想撤回这个邀请吗？";
@@ -691,9 +691,9 @@
 "room_participants_action_security_status_verified" = "已验证";
 "room_participants_action_security_status_verify" = "验证";
 "room_participants_action_security_status_warning" = "警告";
-"room_participants_security_loading" = "载入中……";
-"room_participants_security_information_room_not_encrypted" = "本聊天室中的消息不是端到端加密的。";
-"room_participants_security_information_room_encrypted" = "本聊天室中的消息是端到端加密的。\n\n你的消息被加锁保护，并且只有你和收信人有唯一的解密密钥。";
+"room_participants_security_loading" = "正在载入…";
+"room_participants_security_information_room_not_encrypted" = "此聊天室中的消息未经端对端加密。";
+"room_participants_security_information_room_encrypted" = "本聊天室中的消息已被端对端加密。\n\n您的消息受加密保护，并且只有您和消息接收者拥有唯一解密密钥。";
 "room_accessiblity_scroll_to_bottom" = "滚动到底部";
 "room_event_action_reply" = "回复";
 "room_event_action_edit" = "编辑";
@@ -731,7 +731,7 @@
 "settings_add_3pid_password_title_email" = "添加邮箱地址";
 "settings_add_3pid_password_title_msidsn" = "添加电话号码";
 "settings_add_3pid_password_message" = "请填写你的密码以继续";
-"settings_add_3pid_invalid_password_message" = "无效密码";
+"settings_add_3pid_invalid_password_message" = "验证信息无效";
 "settings_key_backup_button_connect" = "关联此会话到密钥备份";
 "settings_devices_description" = "会话的公开名字会对你联络的人可见";
 "settings_discovery_no_identity_server" = "你现在没有在用身份认证服务器。想要被你认识的现有联系人发现，请添加。";
@@ -754,7 +754,7 @@
 // Security settings
 "security_settings_title" = "安全";
 "security_settings_crypto_sessions" = "我的会话";
-"security_settings_crypto_sessions_loading" = "载入会话中……";
+"security_settings_crypto_sessions_loading" = "正在载入会话…";
 "security_settings_crypto_sessions_description" = "信任会话以给与获得端到端加密的消息的权限。如果你没有认出某个会话，请更改你的登录密码并且重设你用于消息备的消息密码。";
 "security_settings_backup" = "消息备份";
 "security_settings_advanced" = "高级";
@@ -775,14 +775,14 @@
 "identity_server_settings_place_holder" = "输入身份认证服务器";
 "identity_server_settings_add" = "添加";
 "identity_server_settings_change" = "更改";
-"identity_server_settings_disconnect_info" = "从你的身份认证服务器断开连接意味着你不会被其他用户所发现并且不会被其他人通过邮箱或者电话邀请。";
+"identity_server_settings_disconnect_info" = "从你的身份认证服务器断开连接意味着你无法被其他用户所发现，并且不会被其他人通过邮箱或者电话邀请。";
 "identity_server_settings_disconnect" = "断开连接";
 "identity_server_settings_alert_no_terms_title" = "身份认证服务器没有服务条款";
 "identity_server_settings_alert_no_terms" = "你所选择的身份认证服务器并没有任何服务条款。请仅当你信任此服务器所有人时再继续。";
 "identity_server_settings_alert_change_title" = "更改身份认证服务器";
-"identity_server_settings_alert_change" = "断开身份认证服务器%1$@的连接，而连接到%2$@？";
+"identity_server_settings_alert_change" = "断开与身份认证服务器 %1$@ 的连接，转而连接到 %2$@？";
 "identity_server_settings_alert_disconnect_title" = "断开连接身份认证服务器";
-"identity_server_settings_alert_disconnect" = "断开到身份认证服务器%@的连接？";
+"identity_server_settings_alert_disconnect" = "断开到身份认证服务器 %@ 的连接？";
 "identity_server_settings_alert_disconnect_button" = "断开连接";
 "identity_server_settings_alert_disconnect_still_sharing_3pid" = "你仍在身份认证服务器%@分享你的个人数据。\n\n我们建议你在断开连接前从此身份认证服务器删除你的邮箱地址和电话号码。";
 "identity_server_settings_alert_disconnect_still_sharing_3pid_button" = "仍然断开连接";
@@ -810,7 +810,7 @@
 "widget_integration_manager_disabled" = "你需要在设置中打开“集成管理器”";
 // Widget Picker
 "widget_picker_title" = "集成";
-"widget_picker_manage_integrations" = "管理集成……";
+"widget_picker_manage_integrations" = "管理集成…";
 // Room widget permissions
 "room_widget_permission_title" = "载入小插件";
 "room_widget_permission_creator_info_title" = "这个小插件的添加者是：";
@@ -849,13 +849,13 @@
 "device_verification_incoming_description_2" = "验证此会话将标记它为已信任，而且同伴也会标记你的会话为已信任。";
 // MARK: Start
 "device_verification_start_title" = "比较一段短文字来验证";
-"device_verification_start_wait_partner" = "等待同伴接受……";
+"device_verification_start_wait_partner" = "正在等待同伴接受…";
 "device_verification_start_use_legacy" = "啥都没出现？并非所有客户端都支持交互式验证。使用旧的验证方法。";
 "device_verification_start_verify_button" = "开始验证";
 "device_verification_start_use_legacy_action" = "使用老式验证";
 "device_verification_verify_title_emoji" = "通过确认以下emoji表情出现在同伴的屏幕上来验证此会话";
 "device_verification_verify_title_number" = "通过确认以下数字出现在同伴的屏幕上来验证此会话";
-"device_verification_verify_wait_partner" = "等待同伴确认……";
+"device_verification_verify_wait_partner" = "正在等待同伴确认…";
 "key_verification_verify_user_title_emoji" = "通过确认以下唯一的emoji表情，以同样顺序，出现在同伴的屏幕上来验证此用户。";
 "key_verification_verify_user_title_number" = "通过确认以下数字，以同样顺序，出现在同伴的屏幕上来验证此用户。";
 "device_verification_verified_title" = "已验证！";
@@ -949,8 +949,8 @@
 "error_not_supported_on_mobile" = "你不能从移动版%@中进行此操作。";
 "key_verification_tile_request_incoming_title" = "验证请求";
 "key_verification_tile_request_outgoing_title" = "验证已发送";
-"key_verification_tile_request_status_data_loading" = "数据载入中……";
-"key_verification_tile_request_status_waiting" = "等待中……";
+"key_verification_tile_request_status_data_loading" = "正在载入数据…";
+"key_verification_tile_request_status_waiting" = "正在等待…";
 "key_verification_tile_request_status_expired" = "已过期";
 "key_verification_tile_request_status_cancelled_by_me" = "您已取消";
 "key_verification_tile_request_status_cancelled" = "%@已取消";
@@ -963,7 +963,7 @@
 "user_verification_start_verify_action" = "开始验证";
 "user_verification_start_information_part1" = "为了额外的安全性，请验证： ";
 "user_verification_start_information_part2" = " 检查在你的两个设备上的一次性代码。";
-"user_verification_start_waiting_partner" = "等待%@……";
+"user_verification_start_waiting_partner" = "正在等待 %@…";
 "user_verification_start_additional_information" = "为了安全，请当面或者使用其他通信方式进行此操作。";
 "user_verification_sessions_list_user_trust_level_trusted_title" = "已信任";
 "user_verification_sessions_list_user_trust_level_warning_title" = "警告";
@@ -989,16 +989,16 @@
 "client_ios_name" = "Element iOS版";
 "client_android_name" = "Element 安卓版";
 "room_participants_action_security_status_complete_security" = "完整安全性";
-"room_participants_action_security_status_loading" = "加载中……";
-"room_member_power_level_admin_in" = "在 %@ 的管理员";
-"room_member_power_level_moderator_in" = "在 %@ 的主持人";
-"room_member_power_level_short_admin" = "管理员";
-"room_member_power_level_short_moderator" = "主持人";
+"room_participants_action_security_status_loading" = "正在加载…";
+"room_member_power_level_admin_in" = "管理员（%@）";
+"room_member_power_level_moderator_in" = "协管员（%@）";
+"room_member_power_level_short_admin" = "管理";
+"room_member_power_level_short_moderator" = "协管";
 "security_settings_crosssigning" = "交叉签名";
 "security_settings_crosssigning_info_not_bootstrapped" = "交叉签名还没有被设置。";
 "security_settings_crosssigning_info_exists" = "您的帐户有一个交叉签名身份，但是还没有被这个会话信任。完全安全的会话。";
 "skip" = "跳过";
-"room_member_power_level_custom_in" = "自定义(%@) 到%@";
+"room_member_power_level_custom_in" = "自定义（%@）（%@）";
 "room_member_power_level_short_custom" = "自定义";
 "security_settings_crosssigning_info_trusted" = "已启用交叉签名。您可以基于交叉签名信任其他用户和其他会话，但不能从此会话交叉签名，因为它没有交叉签名私钥。此会话完全安全。";
 "security_settings_crosssigning_info_ok" = "交叉签名还没有被设置。";
@@ -1008,7 +1008,7 @@
 "security_settings_cryptography" = "加密";
 "security_settings_complete_security_alert_title" = "绝对安全";
 "security_settings_complete_security_alert_message" = "您应该先完成当前会话的安全防护。";
-"security_settings_coming_soon" = "对不起。这个操作在Element iOS版本上还不可用。请使用另一个Matrix客户端来设置它。Elment iOS会使用它。";
+"security_settings_coming_soon" = "对不起。这个操作在 Element iOS 版本上还不可用。请使用另一个 Matrix 客户端来设置它。Elment iOS 会沿用其他客户端的设置。";
 // Recover from private key
 "key_backup_recover_from_private_key_info" = "备份恢复中…";
 // MARK: - Device Verification
@@ -1023,7 +1023,7 @@
 "device_verification_self_verify_alert_validate_action" = "验证";
 "device_verification_self_verify_start_verify_action" = "开始验证";
 "device_verification_self_verify_start_information" = "使用此会话验证您的新会话，并授予其访问加密信息的权限。";
-"device_verification_self_verify_start_waiting" = "等待中……";
+"device_verification_self_verify_start_waiting" = "正在等待…";
 "key_verification_self_verify_current_session_alert_title" = "验证此会话";
 "key_verification_self_verify_current_session_alert_message" = "其他用户可能不信任它。";
 "key_verification_self_verify_current_session_alert_validate_action" = "验证";
@@ -1104,12 +1104,145 @@
 "switch" = "开关";
 "joined" = "已加入";
 "store_promotional_text" = "在开放网络上保护隐私的聊天和协作应用程序。分散权力让你掌控一切。没有数据挖掘，没有后门，也没有第三方访问。";
-"social_login_button_title_sign_up" = "以 %@ 方式登录";
-"social_login_button_title_sign_in" = "以 %@ 方式登录";
-"social_login_button_title_continue" = "继续 %@ 以其他方式登录";
-"social_login_list_title_sign_in" = "利用社交媒体登录";
-"social_login_list_title_sign_up" = "利用社交媒体注册";
+"social_login_button_title_sign_up" = "使用 %@ 注册";
+"social_login_button_title_sign_in" = "使用 %@ 登录";
+"social_login_button_title_continue" = "使用 %@ 继续";
+"social_login_list_title_sign_in" = "或";
+"social_login_list_title_sign_up" = "或";
 
 // Social login
 
 "social_login_list_title_continue" = "以其他方式登录";
+"security_settings_secure_backup_delete" = "删除";
+"security_settings_secure_backup_synchronise" = "同步";
+"security_settings_secure_backup_setup" = "设置";
+"security_settings_secure_backup_description" = "通过在您的服务器上备份加密密钥，防止失去对加密信息和数据的访问。";
+"security_settings_crypto_sessions_description_2" = "如果您未曾发起登录，请更改密码并重置安全备份。";
+"settings_show_NSFW_public_rooms" = "显示 NSFW 公共聊天室";
+"external_link_confirmation_message" = "此链接 %@ 会将您带至另一个网站：%@\n\n是否前往？";
+"external_link_confirmation_title" = "双击此链接";
+"room_open_dialpad" = "拨号键盘";
+"room_place_voice_call" = "语音通话";
+"room_event_action_delete_confirmation_message" = "您确定要删除这条未发送的消息吗？";
+"room_event_action_delete_confirmation_title" = "删除未发送的消息";
+"room_unsent_messages_cancel_message" = "您确定要删除此聊天室中所有未发送的消息吗？";
+"room_unsent_messages_cancel_title" = "删除未发送的消息";
+"room_participants_security_information_room_encrypted_for_dm" = "这里的消息已被端对端加密。\n\n您的消息受加密保护，并且只有您和消息接收者拥有唯一解密密钥。";
+"room_participants_security_information_room_not_encrypted_for_dm" = "此处的消息未经端对端加密。";
+"room_participants_filter_room_members_for_dm" = "筛选成员";
+"room_participants_leave_prompt_msg_for_dm" = "您确定要离开吗？";
+"room_participants_leave_prompt_title_for_dm" = "离开";
+"callbar_active_and_multiple_paused" = "1 个进行中通话（%@）· %@ 个已暂停通话";
+"callbar_active_and_single_paused" = "1 个进行中通话（%@）· 1 个已暂停通话";
+
+// Call Bar
+"callbar_only_single_active" = "进行中通话（%@）";
+"callbar_only_multiple_paused" = "%@ 个已暂停通话";
+"callbar_only_single_paused" = "已暂停通话";
+"callbar_return" = "返回";
+"room_intro_cell_information_room_sentence1_part3" = "。 ";
+"room_intro_cell_information_dm_sentence1_part3" = "。 ";
+"room_intro_cell_information_room_without_topic_sentence2_part1" = "添加话题";
+"room_intro_cell_information_room_with_topic_sentence2" = "话题：%@";
+
+// Mark: - Room creation introduction cell
+
+"room_intro_cell_add_participants_action" = "添加人员";
+"room_avatar_view_accessibility_hint" = "修改聊天室头像";
+
+// Mark: - Room avatar view
+
+"room_avatar_view_accessibility_label" = "头像";
+
+// MARK: - Invite friends
+
+"invite_friends_action" = "邀请好友至 %@";
+
+// MARK: - Favourites
+
+"favourites_empty_view_title" = "收藏聊天室与对话";
+
+// MARK: - Home
+
+"home_empty_view_title" = "欢迎使用 %@，\n%@";
+"call_transfer_error_message" = "呼叫转移失败";
+"call_transfer_error_title" = "错误";
+"call_transfer_contacts_all" = "全部";
+"call_transfer_contacts_recent" = "最近";
+"call_transfer_dialpad" = "拨号键盘";
+"call_transfer_users" = "用户";
+
+// MARK: - Call Transfer
+"call_transfer_title" = "转移";
+
+// MARK: - Dial Pad
+"dialpad_title" = "拨号键盘";
+"room_info_list_section_other" = "其他";
+"create_room_section_footer_encryption" = "加密一经启用，便无法禁用。";
+"create_room_placeholder_address" = "#testroom:matrix.org";
+"create_room_section_header_address" = "聊天室地址";
+"create_room_section_header_type" = "聊天室类型";
+"create_room_enable_encryption" = "启用加密";
+"create_room_section_header_encryption" = "聊天室加密";
+"create_room_placeholder_topic" = "话题";
+"create_room_section_header_topic" = "聊天室话题（可选）";
+"create_room_placeholder_name" = "名称";
+"create_room_section_header_name" = "聊天室名称";
+
+// MARK: - Create Room
+
+"create_room_title" = "新聊天室";
+"searchable_directory_search_placeholder" = "名称或 ID";
+"searchable_directory_x_network" = "%@ 网络";
+
+// MARK: - Searchable Directory View Controller
+
+"searchable_directory_create_new_room" = "创建新聊天室";
+"biometrics_cant_unlocked_alert_message_retry" = "重试";
+"biometrics_desetup_disable_button_title_x" = "禁用 %@";
+"biometrics_desetup_title_x" = "禁用 %@";
+"biometrics_setup_enable_button_title_x" = "启用 %@";
+"biometrics_setup_title_x" = "启用 %@";
+"biometrics_settings_enable_x" = "启用 %@";
+"biometrics_mode_face_id" = "Face ID";
+
+// MARK: - Biometrics Protection
+
+"biometrics_mode_touch_id" = "Touch ID";
+"pin_protection_mismatch_error_message" = "请再试一次";
+"pin_protection_reset_alert_action_reset" = "重置";
+"pin_protection_choose_pin_welcome_after_register" = "欢迎。";
+
+// MARK: - PIN Protection
+
+"pin_protection_choose_pin_welcome_after_login" = "欢迎回来。";
+"major_update_learn_more_action" = "了解更多";
+
+// MARK: - Major update
+
+"major_update_title" = "Riot 现已成为 Element";
+"secrets_reset_reset_action" = "重置";
+"secrets_setup_recovery_passphrase_summary_title" = "保存您的安全密语";
+"secrets_setup_recovery_passphrase_confirm_passphrase_placeholder" = "确认安全密语";
+"secrets_setup_recovery_passphrase_confirm_passphrase_title" = "确认";
+"secrets_setup_recovery_passphrase_additional_information" = "不要使用你的账号密码。";
+"secrets_setup_recovery_passphrase_validate_action" = "完成";
+
+// Recovery passphrase
+
+"secrets_setup_recovery_passphrase_title" = "设置安全密语";
+"secrets_setup_recovery_key_done_action" = "完成";
+"secrets_setup_recovery_key_export_action" = "保存";
+"secrets_setup_recovery_key_loading" = "正在加载…";
+
+// MARK: - Secrets set up
+
+// Recovery Key
+
+"secrets_setup_recovery_key_title" = "保存您的安全密钥";
+"room_info_list_several_members" = "%@ 位成员";
+
+// MARK: - Room Info
+
+"room_info_list_one_member" = "1 位成员";
+"security_settings_secure_backup" = "安全备份";

Riot/Generated/Images.swift

@@ -98,10 +98,15 @@ internal enum Asset {
     internal static let peopleEmptyScreenArtwork = ImageAsset(name: "people_empty_screen_artwork")
     internal static let peopleEmptyScreenArtworkDark = ImageAsset(name: "people_empty_screen_artwork_dark")
     internal static let peopleFloatingAction = ImageAsset(name: "people_floating_action")
+    internal static let actionCamera = ImageAsset(name: "action_camera")
+    internal static let actionFile = ImageAsset(name: "action_file")
+    internal static let actionMediaLibrary = ImageAsset(name: "action_media_library")
+    internal static let actionSticker = ImageAsset(name: "action_sticker")
     internal static let error = ImageAsset(name: "error")
     internal static let errorMessageTick = ImageAsset(name: "error_message_tick")
     internal static let roomActivitiesRetry = ImageAsset(name: "room_activities_retry")
     internal static let scrolldown = ImageAsset(name: "scrolldown")
+    internal static let scrolldownDark = ImageAsset(name: "scrolldown_dark")
     internal static let sendingMessageTick = ImageAsset(name: "sending_message_tick")
     internal static let sentMessageTick = ImageAsset(name: "sent_message_tick")
     internal static let typing = ImageAsset(name: "typing")
@@ -111,7 +116,15 @@ internal enum Asset {
     internal static let roomContextMenuMore = ImageAsset(name: "room_context_menu_more")
     internal static let roomContextMenuReply = ImageAsset(name: "room_context_menu_reply")
     internal static let roomContextMenuRetry = ImageAsset(name: "room_context_menu_retry")
+    internal static let inputCloseIcon = ImageAsset(name: "input_close_icon")
+    internal static let inputEditIcon = ImageAsset(name: "input_edit_icon")
+    internal static let inputReplyIcon = ImageAsset(name: "input_reply_icon")
+    internal static let inputTextBackground = ImageAsset(name: "input_text_background")
+    internal static let saveIcon = ImageAsset(name: "save_icon")
+    internal static let sendIcon = ImageAsset(name: "send_icon")
     internal static let uploadIcon = ImageAsset(name: "upload_icon")
+    internal static let uploadIconDark = ImageAsset(name: "upload_icon_dark")
+    internal static let videoCall = ImageAsset(name: "video_call")
     internal static let voiceCallHangonIcon = ImageAsset(name: "voice_call_hangon_icon")
     internal static let voiceCallHangupIcon = ImageAsset(name: "voice_call_hangup_icon")
     internal static let addMemberFloatingAction = ImageAsset(name: "add_member_floating_action")

Riot/Generated/Strings.swift

@@ -1514,7 +1514,7 @@ internal enum VectorL10n {
   internal static var identityServerSettingsDisconnect: String { 
     return VectorL10n.tr("Vector", "identity_server_settings_disconnect") 
   }
-  /// Disconnecting from your identity server will mean you won’t be discoverable by other users and  be able to invite others by email or phone.
+  /// Disconnecting from your identity server will mean you won’t be discoverable by other users and be able to invite others by email or phone.
   internal static var identityServerSettingsDisconnectInfo: String { 
     return VectorL10n.tr("Vector", "identity_server_settings_disconnect_info") 
   }
@@ -2294,6 +2294,10 @@ internal enum VectorL10n {
   internal static var roomAccessibilityUpload: String { 
     return VectorL10n.tr("Vector", "room_accessibility_upload") 
   }
+  /// Video Call
+  internal static var roomAccessibilityVideoCall: String { 
+    return VectorL10n.tr("Vector", "room_accessibility_video_call") 
+  }
   /// Scroll to bottom
   internal static var roomAccessiblityScrollToBottom: String { 
     return VectorL10n.tr("Vector", "room_accessiblity_scroll_to_bottom") 
@@ -2614,6 +2618,10 @@ internal enum VectorL10n {
   internal static var roomDetailsHistorySectionPromptTitle: String { 
     return VectorL10n.tr("Vector", "room_details_history_section_prompt_title") 
   }
+  /// Integrations
+  internal static var roomDetailsIntegrations: String { 
+    return VectorL10n.tr("Vector", "room_details_integrations") 
+  }
   /// Low priority
   internal static var roomDetailsLowPriorityTag: String { 
     return VectorL10n.tr("Vector", "room_details_low_priority_tag") 
@@ -2666,6 +2674,10 @@ internal enum VectorL10n {
   internal static var roomDetailsSaveChangesPrompt: String { 
     return VectorL10n.tr("Vector", "room_details_save_changes_prompt") 
   }
+  /// Search room
+  internal static var roomDetailsSearch: String { 
+    return VectorL10n.tr("Vector", "room_details_search") 
+  }
   /// Set as Main Address
   internal static var roomDetailsSetMainAddress: String { 
     return VectorL10n.tr("Vector", "room_details_set_main_address") 
@@ -2894,6 +2906,10 @@ internal enum VectorL10n {
   internal static var roomMemberPowerLevelShortModerator: String { 
     return VectorL10n.tr("Vector", "room_member_power_level_short_moderator") 
   }
+  /// Editing
+  internal static var roomMessageEditing: String { 
+    return VectorL10n.tr("Vector", "room_message_editing") 
+  }
   /// Message edits
   internal static var roomMessageEditsHistoryTitle: String { 
     return VectorL10n.tr("Vector", "room_message_edits_history_title") 
@@ -2910,6 +2926,10 @@ internal enum VectorL10n {
   internal static var roomMessageReplyToShortPlaceholder: String { 
     return VectorL10n.tr("Vector", "room_message_reply_to_short_placeholder") 
   }
+  /// Replying to %@
+  internal static func roomMessageReplyingTo(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "room_message_replying_to", p1)
+  }
   /// Send a message…
   internal static var roomMessageShortPlaceholder: String { 
     return VectorL10n.tr("Vector", "room_message_short_placeholder") 
@@ -2918,6 +2938,10 @@ internal enum VectorL10n {
   internal static var roomMessageUnableOpenLinkErrorMessage: String { 
     return VectorL10n.tr("Vector", "room_message_unable_open_link_error_message") 
   }
+  /// %@ and others
+  internal static func roomMultipleTypingNotification(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "room_multiple_typing_notification", p1)
+  }
   /// %d new message
   internal static func roomNewMessageNotification(_ p1: Int) -> String {
     return VectorL10n.tr("Vector", "room_new_message_notification", p1)

Riot/Managers/Settings/RiotSettings.swift

@@ -37,6 +37,21 @@ final class RiotSettings: NSObject {
         static let hideReviewSessionsAlert = "hideReviewSessionsAlert"
         static let matrixApps = "matrixApps"
         static let showNSFWPublicRooms = "showNSFWPublicRooms"
+        static let settingsScreenShowChangePassword = "settingsScreenShowChangePassword"
+        static let settingsScreenShowInviteFriends = "settingsScreenShowInviteFriends"
+        static let settingsScreenShowEnableStunServerFallback = "settingsScreenShowEnableStunServerFallback"
+        static let settingsSecurityScreenShowSessions = "settingsSecurityScreenShowSessions"
+        static let settingsSecurityScreenShowSetupBackup = "settingsSecurityScreenShowSetupBackup"
+        static let settingsSecurityScreenShowRestoreBackup = "settingsSecurityScreenShowRestoreBackup"
+        static let settingsSecurityScreenShowDeleteBackup = "settingsSecurityScreenShowDeleteBackup"
+        static let settingsSecurityScreenShowCryptographyInfo = "settingsSecurityScreenShowCryptographyInfo"
+        static let settingsSecurityScreenShowCryptographyExport = "settingsSecurityScreenShowCryptographyExport"
+        static let settingsSecurityScreenShowAdvancedUnverifiedDevices = "settingsSecurityScreenShowAdvancedBlacklistUnverifiedDevices"
+        static let roomCreationScreenAllowEncryptionConfiguration = "roomCreationScreenAllowEncryptionConfiguration"
+        static let roomCreationScreenRoomIsEncrypted = "roomCreationScreenRoomIsEncrypted"
+        static let roomCreationScreenAllowRoomTypeConfiguration = "roomCreationScreenAllowRoomTypeConfiguration"
+        static let roomCreationScreenRoomIsPublic = "roomCreationScreenRoomIsPublic"
+        static let allowInviteExernalUsers = "allowInviteExernalUsers"
     }
     
     static let shared = RiotSettings()
@@ -51,6 +66,20 @@ final class RiotSettings: NSObject {
     
     // MARK: - Public
     
+    func reset() {
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsScreenShowChangePassword)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsScreenShowInviteFriends)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsScreenShowEnableStunServerFallback)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsSecurityScreenShowSessions)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsSecurityScreenShowSetupBackup)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsSecurityScreenShowRestoreBackup)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsSecurityScreenShowDeleteBackup)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsSecurityScreenShowCryptographyInfo)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsSecurityScreenShowCryptographyExport)
+        defaults.removeObject(forKey: UserDefaultsKeys.settingsSecurityScreenShowAdvancedUnverifiedDevices)
+        defaults.removeObject(forKey: UserDefaultsKeys.allowInviteExernalUsers)
+    }
+    
     // MARK: Servers
     
     var homeserverUrlString: String {
@@ -212,4 +241,163 @@ final class RiotSettings: NSObject {
             defaults.set(newValue, forKey: UserDefaultsKeys.matrixApps)
         }
     }
+    
+    // MARK: - Room Creation Screen
+
+    var roomCreationScreenAllowEncryptionConfiguration: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.roomCreationScreenAllowEncryptionConfiguration) != nil else {
+                return BuildSettings.roomCreationScreenAllowEncryptionConfiguration
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.roomCreationScreenAllowEncryptionConfiguration)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.roomCreationScreenAllowEncryptionConfiguration)
+        }
+    }
+    var roomCreationScreenRoomIsEncrypted: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.roomCreationScreenRoomIsEncrypted) != nil else {
+                return BuildSettings.roomCreationScreenRoomIsEncrypted
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.roomCreationScreenRoomIsEncrypted)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.roomCreationScreenRoomIsEncrypted)
+        }
+    }
+    var roomCreationScreenAllowRoomTypeConfiguration: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.roomCreationScreenAllowRoomTypeConfiguration) != nil else {
+                return BuildSettings.roomCreationScreenAllowRoomTypeConfiguration
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.roomCreationScreenAllowRoomTypeConfiguration)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.roomCreationScreenAllowRoomTypeConfiguration)
+        }
+    }
+    var roomCreationScreenRoomIsPublic: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.roomCreationScreenRoomIsPublic) != nil else {
+                return BuildSettings.roomCreationScreenRoomIsPublic
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.roomCreationScreenRoomIsPublic)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.roomCreationScreenRoomIsPublic)
+        }
+    }
+
+    // MARK: Features
+
+    var allowInviteExernalUsers: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.allowInviteExernalUsers) != nil else {
+                return BuildSettings.allowInviteExernalUsers
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.allowInviteExernalUsers)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.allowInviteExernalUsers)
+        }
+    }
+
+    // MARK: General Settings
+    
+    var settingsScreenShowChangePassword: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsScreenShowChangePassword) != nil else {
+                return BuildSettings.settingsScreenShowChangePassword
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsScreenShowChangePassword)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsScreenShowChangePassword)
+        }
+    }
+    var settingsScreenShowInviteFriends: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsScreenShowInviteFriends) != nil else {
+                return BuildSettings.settingsScreenShowInviteFriends
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsScreenShowInviteFriends)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsScreenShowInviteFriends)
+        }
+    }
+    var settingsScreenShowEnableStunServerFallback: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsScreenShowInviteFriends) != nil else {
+                return BuildSettings.settingsScreenShowEnableStunServerFallback
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsScreenShowEnableStunServerFallback)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsScreenShowEnableStunServerFallback)
+        }
+    }
+    var settingsSecurityScreenShowSessions: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsSecurityScreenShowSessions) != nil else {
+                return BuildSettings.settingsSecurityScreenShowSessions
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsSecurityScreenShowSessions)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsSecurityScreenShowSessions)
+        }
+    }
+    var settingsSecurityScreenShowSetupBackup: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsSecurityScreenShowSetupBackup) != nil else {
+                return BuildSettings.settingsSecurityScreenShowSetupBackup
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsSecurityScreenShowSetupBackup)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsSecurityScreenShowSetupBackup)
+        }
+    }
+    var settingsSecurityScreenShowRestoreBackup: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsSecurityScreenShowRestoreBackup) != nil else {
+                return BuildSettings.settingsSecurityScreenShowRestoreBackup
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsSecurityScreenShowRestoreBackup)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsSecurityScreenShowRestoreBackup)
+        }
+    }
+    var settingsSecurityScreenShowDeleteBackup: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsSecurityScreenShowDeleteBackup) != nil else {
+                return BuildSettings.settingsSecurityScreenShowDeleteBackup
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsSecurityScreenShowDeleteBackup)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsSecurityScreenShowDeleteBackup)
+        }
+    }
+    var settingsSecurityScreenShowCryptographyInfo: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsSecurityScreenShowCryptographyInfo) != nil else {
+                return BuildSettings.settingsSecurityScreenShowCryptographyInfo
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsSecurityScreenShowCryptographyInfo)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsSecurityScreenShowCryptographyInfo)
+        }
+    }
+    var settingsSecurityScreenShowCryptographyExport: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsSecurityScreenShowCryptographyExport) != nil else {
+                return BuildSettings.settingsSecurityScreenShowCryptographyExport
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsSecurityScreenShowCryptographyExport)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsSecurityScreenShowCryptographyExport)
+        }
+    }
+    var settingsSecurityScreenShowAdvancedUnverifiedDevices: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.settingsSecurityScreenShowAdvancedUnverifiedDevices) != nil else {
+                return BuildSettings.settingsSecurityScreenShowAdvancedUnverifiedDevices
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.settingsSecurityScreenShowAdvancedUnverifiedDevices)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.settingsSecurityScreenShowAdvancedUnverifiedDevices)
+        }
+    }
 }

Riot/Managers/Theme/Theme.swift

@@ -70,6 +70,7 @@ import UIKit
 
     // MARK: - Appearance and style
 
+    var roomInputTextBorder: UIColor { get }
 
     /// Status bar style to use
     var statusBarStyle: UIStatusBarStyle { get }

Riot/Managers/Theme/Themes/DarkTheme.swift

@@ -52,6 +52,8 @@ class DarkTheme: NSObject, Theme {
     var noticeSecondaryColor: UIColor = UIColor(rgb: 0x61708B)
 
     var warningColor: UIColor = UIColor(rgb: 0xFF4B55)
+    
+    var roomInputTextBorder: UIColor = UIColor(rgb: 0x8D97A5).withAlphaComponent(0.2)
 
     var avatarColors: [UIColor] = [
         UIColor(rgb: 0x03B381),

Riot/Managers/Theme/Themes/DefaultTheme.swift

@@ -52,8 +52,8 @@ class DefaultTheme: NSObject, Theme {
     var noticeSecondaryColor: UIColor = UIColor(rgb: 0x61708B)
 
     var warningColor: UIColor = UIColor(rgb: 0xFF4B55)
-
-    var messageTickColor: UIColor = UIColor(rgb: 0xC1C6CD)
+    
+    var roomInputTextBorder: UIColor = UIColor(rgb: 0xE3E8F0)
 
     var avatarColors: [UIColor] = [
         UIColor(rgb: 0x03B381),

Riot/Modules/Application/LegacyAppDelegate.m

@@ -2136,6 +2136,10 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     [self logoutSendingRequestServer:YES completion:^(BOOL isLoggedOut) {
         if (completion)
         {
+            if (isLoggedOut)
+            {
+                [RiotSettings.shared reset];
+            }
             completion (YES);
         }
     }];

Riot/Modules/BadgeLabel/BadgeLabel.swift

@@ -40,7 +40,7 @@ class BadgeLabel: UILabel {
         }
     }
     
-    @IBInspectable var padding: CGSize = CGSize(width: 10, height: 2) {
+    @IBInspectable var padding: CGSize = CGSize(width: 10, height: 3) {
         didSet {
             invalidateIntrinsicContentSize()
         }

Riot/Modules/Contacts/DataSources/ContactsDataSource.m

@@ -499,7 +499,7 @@
     
     if (section == searchInputSection)
     {
-        count = 1;
+        count = RiotSettings.shared.allowInviteExernalUsers ? 1 : 0;
     }
     else if (section == filteredLocalContactsSection && !(shrinkedSectionsBitMask & CONTACTSDATASOURCE_LOCALCONTACTS_BITWISE))
     {