Merge branch 'release/v2.18.0'

Releaseprep/v2.18.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!364

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: true
 contact_links:
   - name: Enhancement or feature request
-    url: https://github.com/vector-im/element-meta/discussions/categories/ideas
+    url: https://github.com/element-hq/element-meta/discussions/categories/ideas
     about: Do you have a suggestion or feature request?
   - name: Element iOS Community Support
     url: https://matrix.to/#/#element-ios:matrix.org

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Pull Request Checklist
 
-- [ ] I read the [contributing guide](https://github.com/vector-im/element-ios/blob/develop/CONTRIBUTING.md)
+- [ ] I read the [contributing guide](https://github.com/element-hq/element-ios/blob/develop/CONTRIBUTING.md)
 - [ ] UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
 - [ ] Accessibility has been taken into account.
 * [ ] Pull request is based on the develop branch

.github/workflows/ci-build.yml

@@ -15,7 +15,7 @@ env:
 jobs:
   build:
     name: Build
-    runs-on: macos-12
+    runs-on: macos-14
     
     # Concurrency group not needed as this workflow only runs on develop which we always want to test.
 

.github/workflows/ci-tests.yml

@@ -16,7 +16,7 @@ env:
 jobs:
   tests:
     name: Tests
-    runs-on: macos-12
+    runs-on: macos-14
     
     concurrency:
       # When running on develop, use the sha to allow all runs of this workflow to run concurrently.

.github/workflows/ci-ui-tests.yml

@@ -12,7 +12,7 @@ env:
 jobs:
   tests:
     name: UI Tests
-    runs-on: macos-12
+    runs-on: macos-14
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.

.github/workflows/release-alpha.yml

@@ -17,7 +17,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'Trigger-PR-Build')
 
     name: Release
-    runs-on: macos-12
+    runs-on: macos-14
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.

.github/workflows/sonarcloud.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Analyze with SonarCloud         
 
         # You can pin the exact commit or the version.
-        uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049
+        uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}   # Generate the token on Sonarcloud.io, add it to the secrets of this repo

.github/workflows/triage-incoming.yml

@@ -1,37 +0,0 @@
-name: Move new issues onto Issue triage board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  automate-project-columns:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
-        with:
-          project: Issue triage
-          column: Incoming
-          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  add_to_triage:
-    runs-on: ubuntu-latest
-    if: >
-      github.repository == 'vector-im/element-ios'
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                }
-              }
-            }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4AMlHr"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-move-labelled.yml

@@ -30,17 +30,6 @@ jobs:
               labels: ['Z-Labs']
             })
 
-  move_needs_info_issues:
-    name: X-Needs-Info issues to Need info column on triage board
-    runs-on: ubuntu-latest
-    steps:
-      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
-        with:
-          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-          project-url: "https://github.com/vector-im/element-ios/projects/12"
-          column-name: "Need info"
-          label-name: "X-Needs-Info"
-
   add_priority_design_issues_to_project:
     name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
@@ -55,7 +44,7 @@ jobs:
     steps:
       - uses: actions/add-to-project@main
         with:
-          project-url: https://github.com/orgs/vector-im/projects/18
+          project-url: https://github.com/orgs/element-hq/projects/18
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   add_product_issues_to_project:
@@ -66,66 +55,5 @@ jobs:
     steps:
       - uses: actions/add-to-project@main
         with:
-          project-url: https://github.com/orgs/vector-im/projects/28
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ex_plorers:
-    name: Add labelled issues to X-Plorer project
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: Element X Feature')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/73
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features1:
-    name: Add labelled issues to PS features team 1
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
-      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
-        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
-      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
-        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/56
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features2:
-    name: Add labelled issues to PS features team 2
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-      contains(github.event.issue.labels.*.name, 'A-Broadcast')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/58
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features3:
-    name: Add labelled issues to PS features team 3
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/57
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  voip:
-    name: Add labelled issues to VoIP project board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: VoIP')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/41
+          project-url: https://github.com/orgs/element-hq/projects/28
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-move-unlabelled.yml

@@ -1,61 +0,0 @@
-name: Move unlabelled from needs info columns to triaged
-
-on:
-  issues:
-    types: [unlabeled]
-    
-jobs:
-  Move_Unabeled_Issue_On_Project_Board:
-    name: Move no longer X-Needs-Info issues to Triaged
-    runs-on: ubuntu-latest
-    if: >
-        ${{
-        !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
-    env:
-      BOARD_NAME: "Issue triage"
-      OWNER: ${{ github.repository_owner }}
-      REPO: ${{ github.event.repository.name }}
-      ISSUE: ${{ github.event.issue.number }}
-    steps:
-      - name: Check if issue is already in "${{ env.BOARD_NAME }}"
-        run: |
-          if curl -i -H 'Content-Type: application/json' -H "Authorization: bearer ${{ secrets.GITHUB_TOKEN }}" -X POST -d '{"query": "query($issue: Int!, $owner: String!, $repo: String!) { repository(owner: $owner, name: $repo) { issue(number: $issue) { projectCards { nodes { project { name } } } } } } ", "variables" : "{ \"issue\": '${ISSUE}', \"owner\": \"'${OWNER}'\", \"repo\": \"'${REPO}'\" }" }' https://api.github.com/graphql | grep "\b$BOARD_NAME\b"; then
-            echo "Issue is already in Project '$BOARD_NAME', proceeding";
-            echo "ALREADY_IN_BOARD=true" >> $GITHUB_ENV
-          else
-            echo "Issue is not in project '$BOARD_NAME', cancelling this workflow"
-            echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
-          fi
-      - name: Move issue
-        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
-        if: ${{ env.ALREADY_IN_BOARD == 'true' }}
-        with:
-          project: Issue triage
-          column: Triaged
-          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  remove_Z-Labs_label:
-    name: Remove Z-Labs label when features behind labs flags are removed
-    runs-on: ubuntu-latest
-    if: >
-        !(contains(github.event.issue.labels.*.name, 'A-Maths') || 
-        contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-        contains(github.event.issue.labels.*.name, 'A-Threads') ||
-        contains(github.event.issue.labels.*.name, 'A-Polls') ||
-        contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-        contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
-        contains(github.event.issue.labels.*.name, 'Z-IA') ||
-        contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
-        contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-        contains(github.event.issue.labels.*.name, 'A-Tags')) &&
-        contains(github.event.issue.labels.*.name, 'Z-Labs')
-    steps:
-      - uses: actions/github-script@v5
-        with:
-          script: |
-            github.rest.issues.removeLabel({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              name: ['Z-Labs']
-            })

.github/workflows/triage-review-requests.yml

@@ -14,7 +14,7 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             query find_team_members($team: String!) {
-              organization(login: "vector-im") {
+              organization(login: "element-hq") {
                 team(slug: $team) {
                   members {
                     nodes {
@@ -81,7 +81,7 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             query find_team_members($team: String!) {
-              organization(login: "vector-im") {
+              organization(login: "element-hq") {
                 team(slug: $team) {
                   members {
                     nodes {

BroadcastUploadExtension/SupportingFiles/PrivacyInfo.xcprivacy

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>7D9E.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>3D61.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>

CHANGES.md

@@ -1,3 +1,75 @@
+## Changes in 1.11.9 (2024-04-02)
+
+Others
+
+- Update matrix-analytics-events to version 0.15.0 ([#7768](https://github.com/element-hq/element-ios/pull/7768))
+- Upgrade to build with Xcode 15.2
+- Add a privacy manifest
+
+
+## Changes in 1.11.8 (2024-03-05)
+
+🙌 Improvements
+
+- Disable the mark as unread feature to avoid it clashing with the new MSC2876 based one ([#7758](https://github.com/element-hq/element-ios/pull/7758))
+
+🐛 Bugfixes
+
+- Fix a bug where QR codes aren't detected if the camera is too close. ([#7762](https://github.com/element-hq/element-ios/pull/7762))
+- Fix dictation when using the Rich Text Editor ([#7752](https://github.com/element-hq/element-ios/issues/7752))
+
+
+## Changes in 1.11.7 (2024-02-07)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.6)).
+
+🐛 Bugfixes
+
+- Fix swapped accessibility label between strikethrough and underline format buttons in RTE. ([#7743](https://github.com/element-hq/element-ios/pull/7743))
+
+
+## Changes in 1.11.6 (2024-01-09)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)).
+
+🧱 Build
+
+- Update CocoaPods and other gems. ([#7720](https://github.com/element-hq/element-ios/pull/7720))
+
+
+## Changes in 1.11.5 (2023-11-28)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.4)).
+- Upgrade Rich Text Editor version. ([v2.18.0](https://github.com/matrix-org/matrix-rich-text-editor/releases/tag/2.18.0))
+
+🐛 Bugfixes
+
+- Call destroy in dealloc to remove all observers of SettingsViewController ([#7697](https://github.com/vector-im/element-ios/pull/7697))
+- Editing a message that ends with an emoji now works as expected. ([#7681](https://github.com/vector-im/element-ios/issues/7681))
+- The "Quote" action has been removed from the menu of the selected message. ([#7691](https://github.com/vector-im/element-ios/issues/7691))
+- The slide to end call for everyone button for the Jitsi widget now also ends the call for the current user. ([#7704](https://github.com/vector-im/element-ios/issues/7704))
+- If a Jitsi call in a room is ongoing when the Jitsi widget is removed from such room the call ends. ([#7706](https://github.com/vector-im/element-ios/issues/7706))
+- If a moderator ends a Jitsi call for everyone the call is now dismissed. ([#7709](https://github.com/vector-im/element-ios/issues/7709))
+
+⚠️ API Changes
+
+- Drop support for iOS 14, raising the deployment target to iOS 15 to support the latest Rich Text Editor version. ([#7711](https://github.com/vector-im/element-ios/pull/7711))
+
+
+## Changes in 1.11.4 (2023-10-04)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.3)).
+- Allow the use of Jitsi for 1:1 calls via a well-known configuration flag. ([#7684](https://github.com/vector-im/element-ios/issues/7684))
+
+
 ## Changes in 1.11.3 (2023-09-13)
 
 🐛 Bugfixes

CHANGES_BWI.md

@@ -1,3 +1,191 @@
+Changes in BWI project 2.18.0 (2024-05-03)
+===================================================
+
+Upstream merge ✨:
+- v1.11.9
+
+Features ✨:
+
+Improvements 🙌:
+- Add save alert for changing users avatar (#5799)
+- Change matomo alert text (#5829)
+
+Bugfix 🐛:
+- Fixed a crash when trying to add system errors to matrix error list (#5950)
+- Fix picture selection for simulators (#5872)
+- Fix button font in dark mode (#5999)
+- Deactivate save button for functions if no text is provided (#5791)
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+- Use XCode 15 for builds (#5948)
+- Parallelized builds (#5761)
+
+Changes in BWI project 2.17.0 (2024-04-11)
+===================================================
+
+Upstream merge ✨:
+- v1.11.8
+
+Features ✨:
+- Simplified login (disabled) (#5145)
+- Federation announcement in new feature banner (#5458)
+
+Improvements 🙌:
+- Activate federation support with well-known (#5892)
+- Reveal lab settings with hidden gesture (#5938)
+- Use new text for unknown and remove filename for size (#5793)
+
+Bugfix 🐛:
+- Disable slash commands in old composer (#5951)
+- Deleted location sharing events were shown as live location (#5806)
+- Maintenance requests sometimes not handled in sync (#5556)
+
+Translations 🗣   :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.16.0 (2024-03-13)
+===================================================
+
+Upstream merge ✨:
+- v1.11.6
+
+Features ✨:
+- Use new iOS Fotopicker (#5365)
+
+Improvements 🙌:
+- Federation Announcement (#5706)
+- Federation explanation for avatars (disabled) (#5610)
+- Federation Introduction (disabled) (#5660)
+- Show ACL related status events in timeline (disabled) (#5575)
+- Matomo Events for federation (disabled) (#5393)
+- Success message when federating a room (disabled) (#5578)
+- Remove "Remind later" Button from alert for unfederated rooms (#5715)
+- Better text for passphrase reset (#5595)
+- disallow http (#5759)
+- Better keybackup UI (#5668)
+- Better Readme (#5734)
+- Change composer default to old composer (bwm only) (#5768)
+
+Bugfix 🐛:
+- Room and user Avatars without borders (#5697)
+- Remove federation status from invites (#5715)
+- Fix Links to answers leading out of the app (#5603)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.15.0 (2024-02-13)
+===================================================
+
+Upstream merge ✨:
+- v1.11.6
+
+Features ✨:
+- Added federation decision view for old rooms (disabled) (#5304)
+
+Improvements 🙌:
+- Changed layout position of matrix id in user search (#5205)
+- Mark federated users when joining / leaving rooms (disabled) (#5290)
+- Added federation in timeline (disabled) (#5223)
+- Added federation in timeline header (disabled) (#5226)
+- No federated admins (disabled) (#5381)
+- Added federation info about users in member search (disabled) (#5300)
+- Users can only be invited to a room if acl is set (disabled) (#5386)
+- Check alias when acl settings are changed (disabled) (#5383)
+- Use the latest avatar in timeline (#5506)
+
+Bugfix 🐛:
+- Swipe gesture for removing room members from a room have been removed (#5671)
+- Fix multiple notes rooms (#5740)
+- Fix permalink prefix (#5158)
+- Fix ACL json (disabled) (#5681)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.14.0 (2024-01-16)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+- Change federation setting in room settings (disabled) (#5410)
+- Change fedration setting on room creation (disabled) (#4846)
+
+Improvements 🙌:
+- Federation info about users in member details (disabled) (#5204)
+
+Bugfix 🐛:
+- Better handling of permalink prefix on testservers (#5158)
+- Outdated app versions shown as pop up (#5276)
+- Copyright claims for location sharing set correctly from style.json (#5279)
+- Corrected appstore link for app version popup (#5276)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+- Enable Renovate
+- Fix Sonarcube warnings
+
+Changes in BWI project 2.12.1 (2023-12-11)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+- Ability to call SSO over browsers via MDM (#5316, #5308)
+- Crosssigning request is now triggered by a button (#5271)
+- UI Update for server display in login view (+5319s)
+
+Bugfix 🐛:
+- Fix half shown button in room list for new user (#5307)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 2.12.0 (2023-11-21)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+- Layout changes OIDC login (#5033)
+- Added restore key backup in settings (#5184)
+- Added federation icons for beta app (#5203, #5208, #5220)
+- Remove grey shield (#5236)
+- Tracking of decryption duration (#5265)
+
+Bugfix 🐛:
+- Fix empty chat bubble (#5297)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
 Changes in BWI project 2.11.0 (2023-10-24)
 ===================================================
 

CONTRIBUTING.md

@@ -7,7 +7,7 @@ Please read the matrix-ios-sdk [contributing guide](https://github.com/matrix-or
 ## I want to help translating
 
 If you want to fix an issue for an English string, please submit a pull request to the Element iOS GitHub repository.
-If you want to fix an issue for another language, add a missing translation, or  add a new language, please read [Element Web translating guide](https://github.com/vector-im/element-web/blob/develop/docs/translating.md) first and then use the Element iOS [Weblate](https://translate.riot.im/projects/riot-ios/).
+If you want to fix an issue for another language, add a missing translation, or  add a new language, please read [Element Web translating guide](https://github.com/element-hq/element-web/blob/develop/docs/translating.md) first and then use the Element iOS [Weblate](https://translate.riot.im/projects/riot-ios/).
 
 If you have any question regarding translations please ask in [Element Translation room](https://matrix.to/#/#element-translations:matrix.org).
 
@@ -26,7 +26,7 @@ Otherwise please have a look to [Apple Swift conventions](https://swift.org/docu
 
 ## Pull request
 
-When you are making a pull request please read carefully the [Pull Request Checklist](https://github.com/vector-im/element-ios/blob/develop/.github/PULL_REQUEST_TEMPLATE.md).
+When you are making a pull request please read carefully the [Pull Request Checklist](https://github.com/element-hq/element-ios/blob/develop/.github/PULL_REQUEST_TEMPLATE.md).
 
 ## Thanks
 

Config/AppConfiguration.swift

@@ -56,9 +56,11 @@ class AppConfiguration: CommonConfiguration {
         // bwi: explicitly set option for key sharing
         MXSDKOptions.sharedInstance().enableRoomSharedHistoryOnInvite = BWIBuildSettings.shared.allowKeySharingOnRoomInvite
         
-        // bwi: #4941 activate WYSIWYG and deactivate voice broadcast
-        RiotSettings.shared.enableWysiwygComposer = BWIBuildSettings.shared.enableFeatureWYSIWYGByDefault
+        // bwi: #4941 deactivate voice broadcast
         RiotSettings.shared.enableVoiceBroadcast = BWIBuildSettings.shared.enableFeatureVoiceBroadcastsByDefault
+        
+        // bwi: #5506 activate use latest avatar
+        RiotSettings.shared.roomScreenUseOnlyLatestUserAvatarAndName = BWIBuildSettings.shared.enableRoomScreenUseOnlyLatestUserAvatarAndNameByDefault
     }
     
     

Config/AppIdentifiers.xcconfig

@@ -19,7 +19,7 @@
 BUNDLE_DISPLAY_NAME = BuM-Beta
 BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-beta
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-beta
-APPLICATION_SCHEME = element
+APPLICATION_SCHEME = BuM
 
 // Team
 DEVELOPMENT_TEAM = Q111Q11QQ1

Config/AppVersion.xcconfig

@@ -16,5 +16,6 @@
 //
 
 // Version
-MARKETING_VERSION = 2.11.0
+MARKETING_VERSION = 2.18.0
 CURRENT_PROJECT_VERSION = 20220714163152
+

Config/BWIBuildSettings.swift

@@ -36,6 +36,8 @@ class BWIBuildSettings: NSObject {
     
     private enum UserDefaultsKeys {
         static let additionalBwiHeaderKey = "bwiHeader"
+        static let isWellknownFederationEnabled = "isWellknownFederationEnabled"
+        static let isLabsFederationEnabled = "isLabsFederationEnabled"
     }
     
     private struct BwiSettingsConstants {
@@ -202,14 +204,22 @@ class BWIBuildSettings: NSObject {
                       "e79f4ce0f3c2772b45fd492a9c11e4e10e869ca21af68f13ff48c9c3bbd446ea",
                       "2d582bed323f226a0e18b6b7104c0d28ccc36423833220a7b5fd2854262ab27e",
                       "c56904235e283557626c327f8013c3b1c654eae86a5e314531e3a6fcb200ff92",
-                      "202bbbaa7c5cd665106d14012c29bcda8217a4b3606cce83e6e6ea0d30733229"
+                      "202bbbaa7c5cd665106d14012c29bcda8217a4b3606cce83e6e6ea0d30733229",
+                      "cca10f6b4b583da69bbd3815ee0fccd193cf0cfd046aee1aeffaa7b5245e8f83",
+                      "36a9ec7368bddedd9deb1e2d1c627bd7304865135c9be30b1979659e3ac9ad07",
+                      "dbaf8618e8a2f8d681591dfbcc73243c921c10dec69a2e5ee50bc91ca7dedcda",
+                      "ed1af0fd873ec749f17c3b61ce4e481ab1644c132003f97a9c4e36516325788a",
+                      "081e6ef90ba86102d678756fd13b07ca744340ad4d58a340e1956dca992f18e3",
+                      "40b22592f2417c8031a0c38098c83dd0bfd28dee4c77ed1e9a022556c6ec0ded",
+                      "00d059071d858e6360e67491f67318f90d664467013b2534185240b0e85b8ad3",
+                      "098d7b8e7487c2228e6848c1baf6b5fec716b8d94d0210c22bad6adba5a332bf"
     ]
     
     // use a different badge color if the user was mentioned in a room
     var showMentionsInRoom = true
 
     // replace feature history link variable with the appropiate build setting
-    var bwiFeatureHistoryLink = "https://messenger.bwi.de/bwmessenger#c6110"
+    var bwiFeatureHistoryLink = "https://messenger.bwi.de/bwmessenger#c7385"
     var bwiReplaceFeatureLink = true
     
     // feature history file path
@@ -512,7 +522,7 @@ class BWIBuildSettings: NSObject {
     var passwordIndicatorOnLogin = true
     
     // MARK: Displays the element base version on the settings screen
-    var elementBaseVersion = "1.11.3"
+    var elementBaseVersion = "1.11.9"
     
     var showElementBaseVersion = true
 
@@ -521,7 +531,7 @@ class BWIBuildSettings: NSObject {
     var forgotPasswordInformationAlert = true
     
     // MARK: Promote new feature within a banner below the navigation view
-    var showTopBanner = false
+    var showTopBanner = true
 
     var showCustomServerDisplayName = true
     var customServerDisplayName = ""
@@ -538,6 +548,9 @@ class BWIBuildSettings: NSObject {
     
     var bwiShowTimelineSettings = false
     
+    // #5506 alway use the latest avatar for data privacy
+    var enableRoomScreenUseOnlyLatestUserAvatarAndNameByDefault = true
+    
     // MARK BWI personal state
     var bwiPersonalState = false
 
@@ -617,7 +630,7 @@ class BWIBuildSettings: NSObject {
     var allowScanServerQRCode = true
     
     // MARK: - Login with qr code
-    var allowLoginWithQR = false   // should be set by the server but we disable it with false also in the app
+    var allowLoginWithQR = true   // should be set by the server but we disable it with false also in the app
 
     // MARK: - Scan permalink qr code
     var clientPermalinkBaseUrl = ""
@@ -662,7 +675,8 @@ class BWIBuildSettings: NSObject {
     var enableFeatureVoiceBroadcastsByDefault = false
     
     // MARK: WYSIWYG
-    var enableFeatureWYSIWYGByDefault = true
+    var enableFeatureWYSIWYGByDefault = false
+    var bwiWYSIWYGVisibilityInSettings = true 
     var enableWYSIWYGCommands = false
     
     // MARK: itunes
@@ -688,4 +702,49 @@ class BWIBuildSettings: NSObject {
     
     // MARK: Content Scanner Status Thumbnail
     var showContentScannerStatusWithFilename = true
+    
+    // MARK: Federation
+    // Enables federation functions and views
+    var isFederationEnabled: Bool {
+        return (isWellknownFederationEnabled || isLabsFederationEnabled)
+    }
+    
+    // Federation status from wellknown config
+    @UserDefault(key: UserDefaultsKeys.isWellknownFederationEnabled, defaultValue: false, storage: RiotSettings.defaults)
+    var isWellknownFederationEnabled
+    
+    // Federation status from labs setting
+    @UserDefault(key: UserDefaultsKeys.isLabsFederationEnabled, defaultValue: false, storage: RiotSettings.defaults)
+    var isLabsFederationEnabled
+    
+    // shows the grey/green/red shield for the room avatar / user avatar
+    var showEncryptionStatusBadgeOnAvatar = false
+    
+    // MARK: Backup restore
+    var enableRestoreKeysFromBackup = true
+    
+    // MARK: Backup restore
+    var showMatrixIDinRoomInfoScreen = false
+
+    
+    // MARK: New photos picker API
+    var useNewPhotosPickerAPI = true
+
+    // MARK: Contacts List
+    var showContactIdentifierInDetailRow = true
+    
+    // MARK: Room Participants
+    // activates swipe gesture action to remove participants from room (RoomParticipantsViewController)
+    var bwiCanEditRoomParticipants = false
+    
+    // MARK: Profile picture hint
+    // (only when federation is enabled)
+    var showChangeProfilePictureHint = false
+    
+    // MARK: Federation Introduction
+    // (only when federation is enabled in the client and well-known flag is set)
+    var showFederationIntroduction = false
+    
+    // MARK: Change Password
+    var showPasswordRequirements = false
 }

Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig

@@ -0,0 +1,39 @@
+// 
+// Copyright 2021 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+// App identity
+BUNDLE_DISPLAY_NAME = BuM-BWI-MDM
+BASE_BUNDLE_IDENTIFIER = de.bwi.bwmessenger.mdm
+APPLICATION_GROUP_IDENTIFIER = group.de.bwmessenger.mdm
+APPLICATION_SCHEME = BuM4BWI
+
+// Team
+DEVELOPMENT_TEAM = Q111Q11QQ1
+
+
+// Provisioning profiles
+RIOT_PROVISIONING_PROFILE_SPECIFIER = Vector App Store
+RIOT_PROVISIONING_PROFILE = 7579fa6f-9887-415e-90fc-2c7acd8812e6
+
+NSE_PROVISIONING_PROFILE_SPECIFIER = "Vector NSE: App Store"
+NSE_PROVISIONING_PROFILE = e73107b2-1bfe-4615-be3e-39fd4dcb2af0
+
+SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Vector Share Extension: App Store"
+SHARE_EXTENSION_PROVISIONING_PROFILE = 8c797ca0-0440-49bd-be8d-11d761152995
+
+SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER = "Vector Siri Intents: App Store"
+SIRI_INTENTS_PROVISIONING_PROFILE = 1690e81a-5ad3-4d99-b578-02693579be71

Config/BuM-BWI-MDM/BWIBuildSettings+BuM-BWI-MDM.swift

@@ -0,0 +1,36 @@
+//
+/*
+ * Copyright (c) 2022 BWI GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Foundation
+
+extension BWIBuildSettings {
+    
+    func overrideTargetSpecificSettings() {
+        secondaryAppName = "BuM-BWI-MDM"
+        locationSharingEnabled = true
+        bwiLocationShareButtonVisible = false
+        bwiLoginFlowLayout = false
+        authScreenShowTestServerOptions = false
+        bwiNotificationTimes = true
+        enableNewSessionManagerByDefault = true
+        bwiUseWellKnownPrivacyPolicyLink = true
+        itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
+        avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
+    }
+    
+}

Config/BuM-Beta/AppIdentifiers-bum-beta.xcconfig

@@ -19,7 +19,7 @@
 BUNDLE_DISPLAY_NAME = BuM-Beta
 BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-beta
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-beta
-APPLICATION_SCHEME = element 
+APPLICATION_SCHEME = BuM-Beta
 
 // Team
 DEVELOPMENT_TEAM = Q111Q11QQ1

Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift

@@ -37,8 +37,11 @@ extension BWIBuildSettings {
         showMaintenanceInfoMessageType = true
         ignoreBlockingMaintenance = true
         bwiUseWellKnownPrivacyPolicyLink = true
-
-        itunesAppLink = "itms://itunes.apple.com/app/bundesmessenger-beta/id1617068656?mt=8"
+        showChangeProfilePictureHint = true
+        showFederationIntroduction = false
+        
+        itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
 }

Config/BuM-Open/AppIdentifiers-bum-open.xcconfig

@@ -19,7 +19,7 @@
 BUNDLE_DISPLAY_NAME = BuM-Open
 BASE_BUNDLE_IDENTIFIER = de.bwi.messenger-open
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger-open
-APPLICATION_SCHEME = element
+APPLICATION_SCHEME = BuM
 
 // Team
 DEVELOPMENT_TEAM = Q111Q11QQ1

Config/BuM-Open/BWIBuildSettings+BuM-Open.swift

@@ -30,8 +30,9 @@ extension BWIBuildSettings {
         
         bwiEnableLoginProtection = false
         
-        itunesAppLink = "itms://itunes.apple.com/app/bundesmessenger-open/id6450672686?mt=8"
+        itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger-open/id6450672686"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
     
 }

Config/BuM/AppIdentifiers-bum.xcconfig

@@ -19,7 +19,7 @@
 BUNDLE_DISPLAY_NAME = Messenger
 BASE_BUNDLE_IDENTIFIER = de.bwi.messenger
 APPLICATION_GROUP_IDENTIFIER = group.de.messenger
-APPLICATION_SCHEME = element 
+APPLICATION_SCHEME = BuM
 
 // Team
 DEVELOPMENT_TEAM = Q111Q11QQ1

Config/BuM/BWIBuildSettings+BuM.swift

@@ -28,8 +28,9 @@ extension BWIBuildSettings {
         bwiNotificationTimes = true
         enableNewSessionManagerByDefault = true
         bwiUseWellKnownPrivacyPolicyLink = true
-        itunesAppLink = "itms://itunes.apple.com/app/bundesmessenger/id1616866351?mt=8"
+        itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
     
 }

Config/Project.xcconfig

@@ -26,7 +26,7 @@ KEYCHAIN_ACCESS_GROUP = $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain
 BROADCAST_UPLOAD_EXTENSION_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).broadcastUploadExtension
 
 // Build settings
-IPHONEOS_DEPLOYMENT_TARGET = 14.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.0
 SDKROOT = iphoneos
 TARGETED_DEVICE_FAMILY = 1,2
 SWIFT_VERSION = 5.6

Config/copyMDMConfig.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+#  setConfig.sh
+#
+# Copyright (c) 2023 BWI GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+    # http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cp -vf ../Config/BuM-BWI-MDM/AppIdentifiers-bum-bwi-mdm.xcconfig ../Config/AppIdentifiers.xcconfig

Config/nexus_upload.sh

@@ -5,8 +5,8 @@ EXT=$3
 VERSION=$4
 DATE_STR=$5
 GITHASH=$6
-SUBDIR=$7
-VERSION_TAG=$8
+VERSION_TAG=$7
+SUBDIR=$8
 
 echo "params: $NEXUS_BASE_URL $VARIANT $EXT $VERSION $DATE_STR $GITHASH $SUBDIR $VERSION_TAG"
 echo "dir: $PWD"

Gemfile

@@ -2,8 +2,7 @@ source "https://rubygems.org"
 
 gem "xcode-install"
 gem "fastlane"
-gem "cocoapods", '~>1.13.0'
-gem 'activesupport', '~> 7.0.8'
+gem "cocoapods", '~>1.14.3'
 gem "slather"
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')

Gemfile.lock

@@ -1,49 +1,57 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (6.1.7.3)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.770.0)
-    aws-sdk-core (3.173.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.899.0)
+    aws-sdk-core (3.191.4)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.78.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.146.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     claide (1.1.0)
     clamp (1.3.2)
-    cocoapods (1.11.3)
+    cocoapods (1.14.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.3)
+      cocoapods-core (= 1.14.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -51,10 +59,10 @@ GEM
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.3)
-      activesupport (>= 5.0, < 7)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.14.3)
+      activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -64,7 +72,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -76,18 +84,19 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
+    drb (2.2.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.99.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -116,8 +125,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.213.0)
+    fastimage (2.3.0)
+    fastlane (2.219.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -136,20 +145,22 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -157,18 +168,18 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-brew (0.1.1)
-    fastlane-plugin-sentry (1.15.0)
+    fastlane-plugin-sentry (1.20.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-versioning (0.5.1)
+    fastlane-plugin-versioning (0.5.2)
     fastlane-plugin-xcodegen (1.1.0)
       fastlane-plugin-brew (~> 0.1.1)
-    ffi (1.15.5)
+    ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.42.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -176,31 +187,29 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -208,44 +217,46 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.13.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.0)
-    memoist (0.16.2)
+    json (2.7.1)
+    jwt (2.8.1)
+      base64
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.18.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.22.3)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
+    mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.15.2)
+    nkf (0.2.0)
+    nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    optparse (0.1.1)
+    optparse (0.4.0)
     os (1.1.4)
-    plist (3.7.0)
+    plist (3.7.1)
     public_suffix (4.0.7)
-    racc (1.6.2)
-    rake (13.0.6)
+    racc (1.7.3)
+    rake (13.1.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.17.0)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -253,35 +264,31 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    slather (2.7.4)
+    slather (2.8.0)
       CFPropertyList (>= 2.2, < 4)
       activesupport
       clamp (~> 1.3)
-      nokogiri (>= 1.13.9)
+      nokogiri (>= 1.14.3)
       xcodeproj (~> 1.21)
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    unicode-display_width (2.5.0)
     word_wrap (1.0.0)
     xcode-install (2.8.1)
       claide (>= 0.9.1)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -292,13 +299,12 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.11.2)
+  cocoapods (~> 1.14.3)
   fastlane
   fastlane-plugin-sentry
   fastlane-plugin-versioning

Podfile

@@ -1,7 +1,7 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 # Uncomment this line to define a global platform for your project
-platform :ios, '14.0'
+platform :ios, '15.0'
 
 # By default, ignore all warnings from any pod
 inhibit_all_warnings!
@@ -16,7 +16,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK 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
-$matrixSDKVersion = '= 0.27.2'
+$matrixSDKVersion = '= 0.27.6'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
@@ -43,7 +43,7 @@ when String # specific MatrixSDK released version
 $matrixSDKVersionSpec = $matrixSDKVersion
 end
 
-$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.11.0' }
+$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.17.0' }
 
 # Method to import the MatrixSDK
 def import_MatrixSDK
@@ -63,7 +63,7 @@ end
 def import_SwiftUI_pods
     pod 'Introspect', '~> 0.1'
     pod 'DSBottomSheet', '~> 0.3'
-    pod 'ZXingObjC', '~> 3.6.5'
+    pod 'ZXingObjC', '~> 3.6.9'
 end
 
 abstract_target 'RiotPods' do
@@ -105,8 +105,6 @@ abstract_target 'RiotPods' do
     pod 'SideMenu', '~> 6.5'
     pod 'DSWaveformImage', '~> 6.1.1'
     
-    pod 'FLEX', '~> 4.5.0', :configurations => ['Debug'], :inhibit_warnings => true
-
     target 'RiotTests' do
       inherit! :search_paths
     end
@@ -132,8 +130,6 @@ abstract_target 'RiotPods' do
       pod 'SwiftJWT', '~> 3.6.200'
       pod 'SideMenu', '~> 6.5'
       pod 'DSWaveformImage', '~> 6.1.1'
-
-      pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
   end
   
     target "BuM-Beta" do
@@ -152,8 +148,6 @@ abstract_target 'RiotPods' do
       pod 'SwiftJWT', '~> 3.6.200'
       pod 'SideMenu', '~> 6.5'
       pod 'DSWaveformImage', '~> 6.1.1'
-
-      pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
   end
     
     target "BuM-Open" do
@@ -172,9 +166,25 @@ abstract_target 'RiotPods' do
         pod 'SwiftJWT', '~> 3.6.200'
         pod 'SideMenu', '~> 6.5'
         pod 'DSWaveformImage', '~> 6.1.1'
-
-        pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
     end
+    
+    target "BuM-BWI-MDM" do
+      import_MatrixSDK
+      import_MatrixKit_pods
+
+      import_SwiftUI_pods
+
+      pod 'UICollectionViewLeftAlignedLayout', '~> 1.0.2'
+      pod 'UICollectionViewRightAlignedLayout', '~> 0.0.3'
+      pod 'KTCenterFlowLayout', '~> 1.3.1'
+      pod 'FlowCommoniOS', '~> 1.12.0'
+      pod 'DTTJailbreakDetection', '~> 0.4.0'
+      pod 'ReadMoreTextView', '~> 3.0.1'
+      pod 'SwiftBase32', '~> 0.9.0'
+      pod 'SwiftJWT', '~> 3.6.200'
+      pod 'SideMenu', '~> 6.5'
+      pod 'DSWaveformImage', '~> 6.1.1'
+  end
 
   target "RiotSwiftUI" do
     import_SwiftUI_pods
@@ -194,7 +204,7 @@ abstract_target 'RiotPods' do
   end
 
   # Disabled due to crypto corruption issues.
-  # https://github.com/vector-im/element-ios/issues/7618
+  # https://github.com/element-hq/element-ios/issues/7618
   # target "RiotShareExtension" do
   #   import_MatrixSDK
   #   import_MatrixKit_pods

Podfile.lock

@@ -20,12 +20,29 @@ PODS:
   - Down (0.11.0)
   - DSBottomSheet (0.3.0)
   - DSWaveformImage (6.1.1)
-  - FLEX (4.5.0)
+  - DTCoreText (1.6.26):
+    - DTCoreText/Core (= 1.6.26)
+    - DTFoundation/Core (~> 1.7.5)
+    - DTFoundation/DTAnimatedGIF (~> 1.7.5)
+    - DTFoundation/DTHTMLParser (~> 1.7.5)
+    - DTFoundation/UIKit (~> 1.7.5)
+  - DTCoreText/Core (1.6.26):
+    - DTFoundation/Core (~> 1.7.5)
+    - DTFoundation/DTAnimatedGIF (~> 1.7.5)
+    - DTFoundation/DTHTMLParser (~> 1.7.5)
+    - DTFoundation/UIKit (~> 1.7.5)
+  - DTFoundation/Core (1.7.18)
+  - DTFoundation/DTAnimatedGIF (1.7.18)
+  - DTFoundation/DTHTMLParser (1.7.18):
+    - DTFoundation/Core
+  - DTFoundation/UIKit (1.7.18):
+    - DTFoundation/Core
+  - DTTJailbreakDetection (0.4.0)
   - FlowCommoniOS (1.12.2)
   - GBDeviceInfo (7.1.0):
     - GBDeviceInfo/Core (= 7.1.0)
   - GBDeviceInfo/Core (7.1.0)
-  - GZIP (1.3.0)
+  - GZIP (1.3.1)
   - Introspect (0.11.0)
   - JitsiMeetSDKLite (8.1.2-lite):
     - JitsiWebRTC (~> 111.0)
@@ -39,20 +56,23 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.2):
-    - MatrixSDK/Core (= 0.27.2)
-  - MatrixSDK/Core (0.27.2):
+  - MatomoTracker (7.5.2):
+    - MatomoTracker/Core (= 7.5.2)
+  - MatomoTracker/Core (7.5.2)
+  - MatrixSDK (0.27.5):
+    - MatrixSDK/Core (= 0.27.5)
+  - MatrixSDK/Core (0.27.5):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - MatrixSDKCrypto (= 0.3.12)
+    - MatrixSDKCrypto (= 0.3.13)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.2):
+  - MatrixSDK/JingleCallStack (0.27.5):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.3.12)
+  - MatrixSDKCrypto (0.3.13)
   - OLMKit (3.2.12):
     - OLMKit/olmc (= 3.2.12)
     - OLMKit/olmcpp (= 3.2.12)
@@ -87,23 +107,25 @@ PODS:
   - UICollectionViewRightAlignedLayout (0.0.3)
   - WeakDictionary (2.0.2)
   - zxcvbn-ios (1.0.4)
-  - ZXingObjC (3.6.5):
-    - ZXingObjC/All (= 3.6.5)
-  - ZXingObjC/All (3.6.5)
+  - ZXingObjC (3.6.9):
+    - ZXingObjC/All (= 3.6.9)
+  - ZXingObjC/All (3.6.9)
 
 DEPENDENCIES:
   - Down (~> 0.11.0)
   - DSBottomSheet (~> 0.3)
   - DSWaveformImage (~> 6.1.1)
-  - FLEX (~> 4.5.0)
+  - DTCoreText (= 1.6.26)
+  - DTTJailbreakDetection (~> 0.4.0)
   - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 7.1.0)
   - Introspect (~> 0.1)
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.27.2)
-  - MatrixSDK/JingleCallStack (= 0.27.2)
+  - MatomoTracker (~> 7.5.2)
+  - MatrixSDK (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v2.17.0`)
+  - MatrixSDK/JingleCallStack (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v2.17.0`)
   - OLMKit
   - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
@@ -119,37 +141,41 @@ DEPENDENCIES:
   - UICollectionViewRightAlignedLayout (~> 0.0.3)
   - WeakDictionary (~> 2.0)
   - zxcvbn-ios
-  - ZXingObjC (~> 3.6.5)
+  - ZXingObjC (~> 3.6.9)
 
 SPEC REPOS:
-  trunk:
+  https://github.com/CocoaPods/Specs.git:
     - AFNetworking
+    - DTCoreText
+    - DTFoundation
+    - DTTJailbreakDetection
+    - GZIP
+    - JitsiMeetSDKLite
+    - JitsiWebRTC
+    - libbase58
+    - MatomoTracker
+    - MatrixSDKCrypto
+    - Realm
+    - SwiftyBeaver
+  trunk:
     - BlueCryptor
     - BlueECC
     - BlueRSA
     - Down
     - DSBottomSheet
     - DSWaveformImage
-    - FLEX
     - FlowCommoniOS
     - GBDeviceInfo
-    - GZIP
     - Introspect
-    - JitsiMeetSDKLite
-    - JitsiWebRTC
     - KeychainAccess
     - KituraContracts
     - KTCenterFlowLayout
-    - libbase58
     - libPhoneNumber-iOS
     - LoggerAPI
     - Logging
-    - MatrixSDK
-    - MatrixSDKCrypto
     - OLMKit
     - PostHog
     - ReadMoreTextView
-    - Realm
     - Reusable
     - Sentry
     - SideMenu
@@ -158,13 +184,22 @@ SPEC REPOS:
     - SwiftGen
     - SwiftJWT
     - SwiftLint
-    - SwiftyBeaver
     - UICollectionViewLeftAlignedLayout
     - UICollectionViewRightAlignedLayout
     - WeakDictionary
     - zxcvbn-ios
     - ZXingObjC
 
+EXTERNAL SOURCES:
+  MatrixSDK:
+    :git: https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk
+    :tag: v2.17.0
+
+CHECKOUT OPTIONS:
+  MatrixSDK:
+    :git: https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk
+    :tag: v2.17.0
+
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
@@ -173,22 +208,25 @@ SPEC CHECKSUMS:
   Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
   DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
-  FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
+  DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
+  DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
+  DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
-  GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
+  GZIP: e6922ed5bdd1d77d84589d50821ac34ea0c38d4b
   Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3
   JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
   JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
   KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
   KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
-  libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
+  libbase58: 8abc2a53ac38cd37720c0acbc53ef3660e9016c2
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: a39e229a03a00394e055ffa7490e9602d45f8a44
-  MatrixSDKCrypto: 25929a40733b4ab54f659aaf6a730552a0a06504
+  MatomoTracker: 1d98ddc58322fd9d65e1a6886b8e41363047bd13
+  MatrixSDK: f92ffead50eda83c99786afefed9be739987f338
+  MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -206,8 +244,8 @@ SPEC CHECKSUMS:
   UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d
   WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
-  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
+  ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: b926e281576aabcdbc2bdcb40ef3ad3e0991abe8
+PODFILE CHECKSUM: 6becaa723b08ad793b53fc0361096601413eb780
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3

README.md

@@ -20,7 +20,7 @@ Fangen wir mit dem Wichtigsten an. Hier findest Du die offizielle App für iOS:
 
 Wenn Dir die App gefällt, lass gerne eine positive Bewertung da.
 
-BundesMessenger-iOS ist ein iOS Matrix Client basierend auf [Element iOS](https://github.com/vector-im/element-ios)
+BundesMessenger-iOS ist ein iOS Matrix Client basierend auf [Element iOS](https://github.com/element-hq/element-ios)
 von [Element Software](https://element.io/).
 
 Allgemeine Infos zum Thema BundesMessenger und was dahinter steckt findet ihr [hier](https://gitlab.opencode.de/bwi/bundesmessenger/info).
@@ -36,7 +36,7 @@ Hierzu durchlaufen wir folgenden Prozess:
   <img src="docs/img/element-bum-bwm.png" width="600">
 </p>
 
-Aufgrund der starken Bindung an *Element iOS* ist es aktuell nicht vorgesehen, dass ihr über das Repository Einfluss auf den BundesMessenger nehmen könnt. Wenn ihr euch beteiligen wollt, müsst ihr eure Contribution direkt in [Element iOS](https://github.com/vector-im/element-ios) einfließen lassen. Diese werden in der Regel im Anschluss in den BundesMessenger übernommen. 
+Aufgrund der starken Bindung an *Element iOS* ist es aktuell nicht vorgesehen, dass ihr über das Repository Einfluss auf den BundesMessenger nehmen könnt. Wenn ihr euch beteiligen wollt, müsst ihr eure Contribution direkt in [Element iOS](https://github.com/element-hq/element-ios) einfließen lassen. Diese werden in der Regel im Anschluss in den BundesMessenger übernommen. 
 
 Wenn ihr euch unsicher seid, haltet hierzu gerne [Rücksprache mit uns](#kontakt).
 
@@ -48,6 +48,35 @@ Wir möchten 100% transparent sein und euch die Möglichkeit geben den Source Co
 
 Wir freuen uns über euer Feedback. Öffnet gerne neue Issues für eure Fragen oder Probleme hier im GitLab.
 
+## Repo
+
+https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios
+
+## Fehler und Verbesserungsvorschläge
+
+https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios/-/issues
+
+
+## Abhängigkeiten
+
+[Element iOS](https://github.com/element-hq/element-iOS)
+
+[BundesMessenger iOS Matrix SDK](https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios-matrix-sdk)
+
+## Für Entwickler
+
+Weiterführende Dokumentation zum Projekt, dem Betrieb und der Architektur findest Du [hier](https://gitlab.opencode.de/bwi/bundesmessenger/info).
+
+Nachdem das Projekt ausgecheckt ist, reichen folgende Anweisungen zum Compilat und zum Start der App
+
+```
+$ bundle install                                        # Installiert Abhängigkeiten falls notwendig
+$ xcodegen                                              # Erzeugt das xcodeproj mit allen Quellcodedateien
+$ pod install                                           # Erzeugt den xcworkspace mit allen Projektabhängigkeiten
+$ Öffne Riot.xcworkspace                                # Öffnet Xcode
+$ Stelle das target auf BuM-Beta oder BundesMessenger
+```
+
 ## Updates
 
 In der Regel werden wir hier alle 4 Wochen ein Update veröffentlichen. In etwa zeitgleich erfolgt das Update der Apps in den App Stores.

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Cocoanetics/DTCoreText",
       "state" : {
-        "revision" : "9d2d4d2296e5d2d852a7d3c592b817d913a5d020",
-        "version" : "1.6.27"
+        "revision" : "b664664825da565b4c2b7a17dbe2369f68ae43d9",
+        "version" : "1.6.26"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-analytics-events",
       "state" : {
-        "revision" : "2f5fa5f1e2f6c6ae1a47c33d953a3ce289167eb0",
-        "version" : "0.5.0"
+        "revision" : "44d5a0e898a71f8abbbe12afe9d73e82d370a9a1",
+        "version" : "0.15.0"
       }
     },
     {
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift",
       "state" : {
-        "revision" : "1100b217c04d096dfe072afb4484660ff794d805",
-        "version" : "2.2.2"
+        "revision" : "f788fe2482c0b89019f679a1f43dccf9c25a0782",
+        "version" : "2.29.0"
       }
     },
     {
@@ -93,7 +93,7 @@
     {
       "identity" : "swift-ogg",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/swift-ogg",
+      "location" : "https://github.com/element-hq/swift-ogg",
       "state" : {
         "branch" : "0.0.1",
         "revision" : "e9a9e7601da662fd8b97d93781ff5c60b4becf88"

Riot/Assets/Images.xcassets/BWI/federation_exclamation_mark_dark.imageset/!-dark.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM10.4709 7.16895C10.3959 6.31395 11.0259 5.56395 11.8809 5.50395C12.7209 5.44395 13.4709 6.07395 13.5609 6.92895V7.16895L13.0809 13.169C13.0359 13.724 12.5709 14.144 12.0159 14.144H11.9259C11.4009 14.099 10.9959 13.694 10.9509 13.169L10.4709 7.16895ZM13.3202 17.0842C13.3202 17.8132 12.7292 18.4042 12.0002 18.4042C11.2712 18.4042 10.6802 17.8132 10.6802 17.0842C10.6802 16.3551 11.2712 15.7642 12.0002 15.7642C12.7292 15.7642 13.3202 16.3551 13.3202 17.0842Z" fill="#A9B2BC"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/federation_exclamation_mark_dark.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "!-dark.svg",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/BWI/federation_exclamation_mark_light.imageset/Contents.json

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

Riot/Assets/Images.xcassets/BWI/federation_exclamation_mark_light.imageset/Warning.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM10.4709 7.16895C10.3959 6.31395 11.0259 5.56395 11.8809 5.50395C12.7209 5.44395 13.4709 6.07395 13.5609 6.92895V7.16895L13.0809 13.169C13.0359 13.724 12.5709 14.144 12.0159 14.144H11.9259C11.4009 14.099 10.9959 13.694 10.9509 13.169L10.4709 7.16895ZM13.3202 17.0842C13.3202 17.8132 12.7292 18.4042 12.0002 18.4042C11.2712 18.4042 10.6802 17.8132 10.6802 17.0842C10.6802 16.3551 11.2712 15.7642 12.0002 15.7642C12.7292 15.7642 13.3202 16.3551 13.3202 17.0842Z" fill="#737D8C"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/federation_pill_de_bum_dark.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App=BUM, platform=iOS, Theme=dark, Outline=background, Language=german.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/federation_pill_de_bum_light.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App=BUM, platform=iOS, Theme=light, Outline=background, Language=german.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/federation_pill_en_bum_dark.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App=BUM, platform=iOS, Theme=dark, Outline=background, Language=english.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/federation_pill_en_bum_light.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App=BUM, platform=iOS, Theme=light, Outline=background, Language=english.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_1_dark.imageset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_1_light.imageset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_2_dark.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Kennzeichnung_BuM_dark_mobile.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_2_dark.imageset/Kennzeichnung_BuM_dark_mobile.svg

@@ -0,0 +1,12 @@
+<svg width="110" height="108" viewBox="0 0 110 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_2287_4246" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.6759 95.0462C73.7757 100.383 64.2518 103.5 54 103.5C42.8565 103.5 32.573 99.8177 24.3 93.6036C12.277 84.5728 4.5 70.1946 4.5 54C4.5 26.6619 26.6619 4.5 54 4.5C81.3381 4.5 103.5 26.6619 103.5 54C103.5 71.0863 94.843 86.1507 81.6759 95.0462ZM54 56.475C62.2014 56.475 68.85 49.2724 68.85 40.3875C68.85 31.5026 62.2014 24.3 54 24.3C45.7986 24.3 39.15 31.5026 39.15 40.3875C39.15 49.2724 45.7986 56.475 54 56.475ZM54 93.6C64.7018 93.6 74.4121 89.3548 81.5387 82.4566C77.1314 71.5753 66.462 63.9 54 63.9C41.538 63.9 30.8686 71.5753 26.4613 82.4566C33.5879 89.3548 43.2982 93.6 54 93.6Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.6759 95.0462C73.7757 100.383 64.2518 103.5 54 103.5C42.8565 103.5 32.573 99.8177 24.3 93.6036C12.277 84.5728 4.5 70.1946 4.5 54C4.5 26.6619 26.6619 4.5 54 4.5C81.3381 4.5 103.5 26.6619 103.5 54C103.5 71.0863 94.843 86.1507 81.6759 95.0462ZM54 56.475C62.2014 56.475 68.85 49.2724 68.85 40.3875C68.85 31.5026 62.2014 24.3 54 24.3C45.7986 24.3 39.15 31.5026 39.15 40.3875C39.15 49.2724 45.7986 56.475 54 56.475ZM54 93.6C64.7018 93.6 74.4121 89.3548 81.5387 82.4566C77.1314 71.5753 66.462 63.9 54 63.9C41.538 63.9 30.8686 71.5753 26.4613 82.4566C33.5879 89.3548 43.2982 93.6 54 93.6Z" fill="#26282D"/>
+<path d="M81.6759 95.0462L82.4596 96.2062L82.4596 96.2062L81.6759 95.0462ZM24.3 93.6036L23.4592 94.723L23.4592 94.723L24.3 93.6036ZM81.5387 82.4566L82.5124 83.4626L83.1907 82.806L82.8363 81.9311L81.5387 82.4566ZM26.4613 82.4566L25.1637 81.9311L24.8093 82.806L25.4876 83.4626L26.4613 82.4566ZM54 104.9C64.5398 104.9 74.3352 101.695 82.4596 96.2062L80.8922 93.8861C73.2161 99.072 63.9638 102.1 54 102.1V104.9ZM23.4592 94.723C31.9663 101.113 42.5429 104.9 54 104.9V102.1C43.1701 102.1 33.1797 98.5225 25.1408 92.4842L23.4592 94.723ZM3.1 54C3.1 70.6535 11.0993 85.4391 23.4592 94.723L25.1408 92.4842C13.4547 83.7064 5.9 69.7357 5.9 54H3.1ZM54 3.1C25.8887 3.1 3.1 25.8887 3.1 54H5.9C5.9 27.4351 27.4351 5.9 54 5.9V3.1ZM104.9 54C104.9 25.8887 82.1113 3.1 54 3.1V5.9C80.5649 5.9 102.1 27.4351 102.1 54H104.9ZM82.4596 96.2062C95.9956 87.0615 104.9 71.5709 104.9 54H102.1C102.1 70.6018 93.6904 85.2398 80.8922 93.8861L82.4596 96.2062ZM67.45 40.3875C67.45 48.6068 61.3248 55.075 54 55.075V57.875C63.078 57.875 70.25 49.938 70.25 40.3875H67.45ZM54 25.7C61.3248 25.7 67.45 32.1682 67.45 40.3875H70.25C70.25 30.837 63.078 22.9 54 22.9V25.7ZM40.55 40.3875C40.55 32.1682 46.6752 25.7 54 25.7V22.9C44.922 22.9 37.75 30.837 37.75 40.3875H40.55ZM54 55.075C46.6752 55.075 40.55 48.6068 40.55 40.3875H37.75C37.75 49.938 44.922 57.875 54 57.875V55.075ZM80.565 81.4507C73.689 88.1063 64.324 92.2 54 92.2V95C65.0796 95 75.1352 90.6033 82.5124 83.4626L80.565 81.4507ZM54 65.3C65.8724 65.3 76.0405 72.6112 80.2411 82.9822L82.8363 81.9311C78.2223 70.5394 67.0517 62.5 54 62.5V65.3ZM27.7589 82.9822C31.9595 72.6112 42.1276 65.3 54 65.3V62.5C40.9483 62.5 29.7777 70.5394 25.1637 81.9311L27.7589 82.9822ZM54 92.2C43.676 92.2 34.311 88.1063 27.4349 81.4507L25.4876 83.4626C32.8648 90.6033 42.9204 95 54 95V92.2Z" fill="#26282D" mask="url(#path-1-inside-1_2287_4246)"/>
+<ellipse cx="75.648" cy="83.52" rx="20.648" ry="20.52" fill="#101317"/>
+<ellipse cx="88.6128" cy="83.52" rx="20.648" ry="20.52" fill="#101317"/>
+<ellipse cx="88.6126" cy="83.5256" rx="14.4056" ry="14.3163" fill="white"/>
+<ellipse cx="75.6484" cy="83.5181" rx="18.2471" ry="18.134" fill="#101317"/>
+<ellipse cx="75.6478" cy="83.5256" rx="14.4056" ry="14.3163" fill="white"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/introduce_federation_2_light.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Kennzeichnung_BuM_light_mobile.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/introduce_federation_2_light.imageset/Kennzeichnung_BuM_light_mobile.svg

@@ -0,0 +1,12 @@
+<svg width="110" height="108" viewBox="0 0 110 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1_2287_4245" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.6759 95.0462C73.7757 100.383 64.2518 103.5 54 103.5C42.8565 103.5 32.573 99.8177 24.3 93.6036C12.277 84.5728 4.5 70.1946 4.5 54C4.5 26.6619 26.6619 4.5 54 4.5C81.3381 4.5 103.5 26.6619 103.5 54C103.5 71.0863 94.843 86.1507 81.6759 95.0462ZM54 56.475C62.2014 56.475 68.85 49.2724 68.85 40.3875C68.85 31.5026 62.2014 24.3 54 24.3C45.7986 24.3 39.15 31.5026 39.15 40.3875C39.15 49.2724 45.7986 56.475 54 56.475ZM54 93.6C64.7018 93.6 74.4121 89.3548 81.5387 82.4566C77.1314 71.5753 66.462 63.9 54 63.9C41.538 63.9 30.8686 71.5753 26.4613 82.4566C33.5879 89.3548 43.2982 93.6 54 93.6Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.6759 95.0462C73.7757 100.383 64.2518 103.5 54 103.5C42.8565 103.5 32.573 99.8177 24.3 93.6036C12.277 84.5728 4.5 70.1946 4.5 54C4.5 26.6619 26.6619 4.5 54 4.5C81.3381 4.5 103.5 26.6619 103.5 54C103.5 71.0863 94.843 86.1507 81.6759 95.0462ZM54 56.475C62.2014 56.475 68.85 49.2724 68.85 40.3875C68.85 31.5026 62.2014 24.3 54 24.3C45.7986 24.3 39.15 31.5026 39.15 40.3875C39.15 49.2724 45.7986 56.475 54 56.475ZM54 93.6C64.7018 93.6 74.4121 89.3548 81.5387 82.4566C77.1314 71.5753 66.462 63.9 54 63.9C41.538 63.9 30.8686 71.5753 26.4613 82.4566C33.5879 89.3548 43.2982 93.6 54 93.6Z" fill="#E3E8F0"/>
+<path d="M81.6759 95.0462L82.4596 96.2062L82.4596 96.2062L81.6759 95.0462ZM24.3 93.6036L23.4592 94.723L23.4592 94.723L24.3 93.6036ZM81.5387 82.4566L82.5124 83.4626L83.1907 82.806L82.8363 81.9311L81.5387 82.4566ZM26.4613 82.4566L25.1637 81.9311L24.8093 82.806L25.4876 83.4626L26.4613 82.4566ZM54 104.9C64.5398 104.9 74.3352 101.695 82.4596 96.2062L80.8922 93.8861C73.2161 99.072 63.9638 102.1 54 102.1V104.9ZM23.4592 94.723C31.9663 101.113 42.5429 104.9 54 104.9V102.1C43.1701 102.1 33.1797 98.5225 25.1408 92.4842L23.4592 94.723ZM3.1 54C3.1 70.6535 11.0993 85.4391 23.4592 94.723L25.1408 92.4842C13.4547 83.7064 5.9 69.7357 5.9 54H3.1ZM54 3.1C25.8887 3.1 3.1 25.8887 3.1 54H5.9C5.9 27.4351 27.4351 5.9 54 5.9V3.1ZM104.9 54C104.9 25.8887 82.1113 3.1 54 3.1V5.9C80.5649 5.9 102.1 27.4351 102.1 54H104.9ZM82.4596 96.2062C95.9956 87.0615 104.9 71.5709 104.9 54H102.1C102.1 70.6018 93.6904 85.2398 80.8922 93.8861L82.4596 96.2062ZM67.45 40.3875C67.45 48.6068 61.3248 55.075 54 55.075V57.875C63.078 57.875 70.25 49.938 70.25 40.3875H67.45ZM54 25.7C61.3248 25.7 67.45 32.1682 67.45 40.3875H70.25C70.25 30.837 63.078 22.9 54 22.9V25.7ZM40.55 40.3875C40.55 32.1682 46.6752 25.7 54 25.7V22.9C44.922 22.9 37.75 30.837 37.75 40.3875H40.55ZM54 55.075C46.6752 55.075 40.55 48.6068 40.55 40.3875H37.75C37.75 49.938 44.922 57.875 54 57.875V55.075ZM80.565 81.4507C73.689 88.1063 64.324 92.2 54 92.2V95C65.0796 95 75.1352 90.6033 82.5124 83.4626L80.565 81.4507ZM54 65.3C65.8724 65.3 76.0405 72.6112 80.2411 82.9822L82.8363 81.9311C78.2223 70.5394 67.0517 62.5 54 62.5V65.3ZM27.7589 82.9822C31.9595 72.6112 42.1276 65.3 54 65.3V62.5C40.9483 62.5 29.7777 70.5394 25.1637 81.9311L27.7589 82.9822ZM54 92.2C43.676 92.2 34.311 88.1063 27.4349 81.4507L25.4876 83.4626C32.8648 90.6033 42.9204 95 54 95V92.2Z" fill="#E3E8F0" mask="url(#path-1-inside-1_2287_4245)"/>
+<ellipse cx="75.648" cy="83.52" rx="20.648" ry="20.52" fill="white"/>
+<ellipse cx="88.6128" cy="83.52" rx="20.648" ry="20.52" fill="white"/>
+<ellipse cx="88.6131" cy="83.5256" rx="14.4056" ry="14.3163" fill="#17191C"/>
+<ellipse cx="75.6477" cy="83.52" rx="17.7669" ry="17.6567" fill="white"/>
+<ellipse cx="75.6483" cy="83.5256" rx="14.4056" ry="14.3163" fill="#17191C"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/introduce_federation_3.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Apple iPhone 11 White (1).png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/Contents.json

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

Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/media_file_unavailable.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.47012 20.9997H19.5301C21.0701 20.9997 22.0301 19.3297 21.2601 17.9997L13.7301 4.98969C12.9601 3.65969 11.0401 3.65969 10.2701 4.98969L2.74012 17.9997C1.97012 19.3297 2.93012 20.9997 4.47012 20.9997V20.9997ZM12.0001 13.9997C11.4501 13.9997 11.0001 13.5497 11.0001 12.9997V10.9997C11.0001 10.4497 11.4501 9.99969 12.0001 9.99969C12.5501 9.99969 13.0001 10.4497 13.0001 10.9997V12.9997C13.0001 13.5497 12.5501 13.9997 12.0001 13.9997ZM13.0001 17.9997H11.0001V15.9997H13.0001V17.9997Z" fill="#BE7A00"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/qr.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "QR_dark_BuM.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/BWI/room_federated_bum_icon_dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "room_federated_bum_icon_dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/BWI/room_federated_bum_icon_dark.imageset/room_federated_bum_icon_dark.svg

@@ -0,0 +1,7 @@
+<svg width="23" height="18" viewBox="0 0 23 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8.6" cy="8.6" r="8.6" fill="#15191E"/>
+<circle cx="14" cy="8.6" r="8.6" fill="#15191E"/>
+<ellipse cx="14" cy="8.60156" rx="6" ry="6" fill="white"/>
+<circle cx="8.6" cy="8.6" r="7.6" fill="#15191E"/>
+<ellipse cx="8.60004" cy="8.60156" rx="6" ry="6" fill="white"/>
+</svg>

Riot/Assets/Images.xcassets/BWI/room_federated_bum_icon_light.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "room_federated_bum_icon_light.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/BWI/room_federated_bum_icon_light.imageset/room_federated_bum_icon_light.svg

@@ -0,0 +1,7 @@
+<svg width="23" height="18" viewBox="0 0 23 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8.6" cy="8.6" r="8.6" fill="white"/>
+<circle cx="14" cy="8.6" r="8.6" fill="white"/>
+<ellipse cx="14" cy="8.60156" rx="6" ry="6" fill="#17191C"/>
+<circle cx="8.59995" cy="8.59922" r="7.4" fill="white"/>
+<ellipse cx="8.60004" cy="8.60156" rx="6" ry="6" fill="#17191C"/>
+</svg>

Riot/Assets/ar.lproj/Vector.strings

@@ -1083,3 +1083,118 @@
 // Others
 "or" = "أو";
 "accessibility_selected" = "تم تحديده";
+"media_type_accessibility_sticker" = "مُلصَق";
+"unknown_devices_call_anyway" = "اتصل على أي حال";
+"notice_voice_broadcast_ended_by_you" = "لقد أنهيت بث صوتي.";
+"thread_copy_link_to_thread" = "نسخ الرابط إلى الموضوع";
+"pill_message_in" = "رسالة في %@";
+"room_accessibility_record_voice_message" = "قم بتسجيل رسالة صوتية";
+"media_type_accessibility_image" = "صُورَة";
+"pill_message" = "رِسَالَة";
+"pill_message_from" = "رسالة من %@";
+
+// Room commands descriptions
+"room_command_change_display_name_description" = "قم بتغيير اسم العرض الخاص بك";
+"room_command_emote_description" = "يعرض الإجراء";
+"room_command_join_room_description" = "ينضم إلى الغرفة بالعنوان المعطى";
+"room_command_part_room_description" = "مغادرة الغرفة";
+"room_command_invite_user_description" = "يدعو المستخدم بالمعرف المعطى للانضمام إلى الغرفة الحالية";
+"room_command_set_user_power_level_description" = "تعريف مستوى الصلاحية للمستخدم";
+"room_title_multiple_active_members" = "%@/%@ أعضاء نشطين";
+"room_first_message_placeholder" = "أرسل أول رسالة لك…";
+"threads_empty_title" = "حافظ على تنظيم المناقشات باستخدام المواضيع";
+"message_from_a_thread" = "من موضوع";
+"authentication_qr_login_failure_device_not_supported" = "الربط مع هذا الجهاز غير مَدعُومَ.";
+"threads_action_my_threads" = "مواضيعي";
+"threads_beta_title" = "مواضيع";
+"room_title_members" = "%@ أعضاء";
+"settings_sending_media" = "إرسال الصور ومقاطع الفيديو";
+
+// MARK: Password policy errors
+"password_policy_too_short_pwd_error" = "كلمة مرور قصيرة جدً";
+"password_policy_weak_pwd_error" = "هذه كلمة المرور ضعيفة جدًا. يجب أن تحتوي على ما لا يقل عن 8 أحرف، بما في ذلك حرف كبير، حرف صغير، رقم وحرف خاص واحد على الأقل.";
+"threads_beta_information_link" = "تعلم أكثر";
+"room_title_one_member" = "عضو واحد";
+
+// MARK: Threads
+"room_thread_title" = "موضوع";
+"threads_beta_cancel" = "ليس الآن";
+"media_type_accessibility_audio" = "صَوت";
+"unknown_devices_answer_anyway" = "أجب على أي حال";
+"threads_notice_done" = "فهمت";
+"notice_voice_broadcast_ended" = "%@ أنهى بثًا صوتيًا.";
+"authentication_login_with_qr" = "تسجيل الدخول بواسطة رمز الاستجابة السريعة";
+"authentication_qr_login_start_step2" = "الإعدَادَات -> الأمَان والخُصُوصِيَّة";
+"authentication_qr_login_start_need_alternative" = "هل تحتاج إلى طريقة بديلة؟";
+"authentication_qr_login_start_subtitle" = "استخدم الكاميرا على هذا الجهاز لمسح رمز الاستجابة السريعة المعروض على جهازك الآخر:";
+"authentication_qr_login_start_step1" = "افتج برنامج Element على جهازك الأخر";
+"authentication_qr_login_start_display_qr" = "عرض رمز الاستجابة السريعة على هذا الجهاز";
+"authentication_qr_login_display_step2" = "اختر 'تسجيل الدخول بواسطة رمز الاستجابة السريعة'";
+"authentication_qr_login_confirm_title" = "تم إنشاء اتصال آمن";
+"authentication_qr_login_loading_connecting_device" = "الاتصال بالجهاز";
+"authentication_qr_login_loading_waiting_signin" = "انتظر حتى يقوم الجهاز بتسجيل الدخول.";
+"authentication_qr_login_loading_signed_in" = "تم تسجيل دخولك على جهازك الآخر.";
+"authentication_qr_login_failure_title" = "فشل الربط";
+"authentication_qr_login_failure_invalid_qr" = "رمز الاستجابة السريعة غير صالح.";
+"authentication_qr_login_failure_retry" = "حاول مرة أخرى";
+"room_accessibility_record_voice_message_hint" = "انقر مزدوجًا واستمر في الضغط للتسجيل.";
+"media_type_accessibility_file" = "مَلَفّ";
+"unknown_devices_title" = "الجلسات المجهولة";
+"room_title_invite_members" = "ادعو الأعضاء";
+"settings_user_settings" = "إعدَادَات المُستَخدِم";
+"notice_voice_broadcast_live" = "بث مباشر";
+"room_no_privileges_to_create_group_call" = "يجب أن تكون مشرفًا أو مديرًا لبدء مكالمة.";
+"external_link_confirmation_title" = "قم بالتحقق تكرارا من هذا الرابط";
+"unknown_devices_verify" = "تحقق…";
+"settings_links" = "روابط";
+"room_creation_only_one_email_invite" = "يمكنك دعوة بريد إلكتروني واحد فقط في كل مرة";
+"room_command_kick_user_description" = "يزيل المستخدم بالمعرف من هذه الغرفة";
+"room_command_ban_user_description" = "يمنع المستخدم بالمعرف المعطى";
+"room_command_unban_user_description" = "يلغي الحظر عن المستخدم بالمعرف المعطى";
+"room_command_reset_user_power_level_description" = "إلغاء صلاحيات المستخدم بالمعرف المعطى";
+"room_command_change_room_topic_description" = "تعيين موضوع الغرفة";
+"threads_title" = "مواضيع";
+"threads_action_all_threads" = "جميع المواضيع";
+"threads_notice_title" = "المواضيع لم تعد تجريبية 🎉";
+"threads_empty_show_all_threads" = "عرض جميع المواضيع";
+"threads_beta_enable" = "جربها";
+"media_type_accessibility_video" = "مَقطَع مَرئي";
+"media_type_accessibility_location" = "مَوقِع جُغرَافِيّ";
+"room_multiple_typing_notification" = "%@ وغيرهم";
+
+// Unknown devices
+"unknown_devices_alert_title" = "الغرفة تحتوي على جلسات مجهولة";
+"unknown_devices_send_anyway" = "أرسل على أي حال";
+"room_title_one_active_member" = "%@/%@ عضو نشط";
+
+// Room Title
+"room_title_new_room" = "غرفة جديدة";
+
+// Settings
+"settings_title" = "الإعدَادَات";
+"notice_error_unformattable_event" = "** غير قادر على عرض الرسالة. يُرجى الإبلاغ عن خلل";
+"authentication_qr_login_start_step3" = "حَّدِد 'اربط الجهاز'";
+"authentication_qr_login_start_title" = "امسح رمز الاستجابة السريعة";
+"authentication_qr_login_start_step4" = "حَّدِد 'إظهَر رمز الQR الموجود في الجهاز'";
+"authentication_qr_login_display_title" = "ربط جهاز";
+"authentication_qr_login_display_subtitle" = "امسح رمز الاستجابة السريعة أدناه باستخدام جهازك الذي تم تسجيل الخروج منه.";
+"authentication_qr_login_display_step1" = "افتح تطبيق Element على جهازك الآخر";
+"authentication_qr_login_scan_title" = "امسح رمز الاستجابة السريعة";
+"authentication_qr_login_failure_request_denied" = "تم رفض الطلب على الجهاز الآخر.";
+"authentication_qr_login_failure_request_timed_out" = "لم يتم الانتهاء من الربط في الوقت المطلوب.";
+"authentication_qr_login_scan_subtitle" = "ضع رمز الاستجابة السريعة في المربع أدناه";
+"authentication_qr_login_confirm_subtitle" = "تأكد أن الرمز أدناه متطابق مع جهازك الآخر:";
+"authentication_qr_login_confirm_alert" = "يرجى التأكد من مصدر هذا الرمز. من خلال ربط الأجهزة، ستمنح الشخص الأخر الصلاحية الكاملة على حسابك.";
+"room_creation_user_not_found_prompt_title" = "تَأكيد";
+"room_creation_user_not_found_prompt_message" = "تعذر العثور على الهوية على مُعَرِّف Matrix. هل ترغب في بدء رسالة مباشرة على أي حال؟";
+"room_creation_user_not_found_prompt_invite_action" = "ابدأ الرسالة المباشرة على أي حال";
+"room_participants_invite_unknown_participant_prompt_to_msg" = "تعذر العثور على هذه الهوية على مُعَرِّف Matrix. هل أنت متأكد أنك تريد دعوة %@ إلى %@؟";
+"room_participants_invite_anyway" = "ادعُ بأي حال";
+"threads_empty_tip" = "نصيحة: انقر فوق رسالة واستخدم 'موضوع' لبدء رسالة جديدة.";
+
+// Pills
+"pill_room_fallback_display_name" = "المساحة/الغرفة";
+"room_command_discard_session_description" = "يجبر على تجاهل الجلسة الجماعية الصادرة حاليا في غرفة مشفرة";
+"room_command_error_unknown_command" = "أمر غير صالح أو غير معالَج";
+"threads_empty_info_all" = "المواضيع تساعد في الحفاظ على محادثاتك ذات موضوع معين وتسهل تتبعها.";
+"threads_empty_info_my" = "الرد على موضوع قائم أو النقر فوق الرسالة واستخدم خاصية 'الموضوع' لبدء رِسَالَة جديد.";

Riot/Assets/be.lproj/InfoPlist.strings

@@ -0,0 +1,11 @@
+
+
+// Permissions usage explanations
+"NSCameraUsageDescription" = "Камера выкарыстоўваецца для відэазванкоў, запісу або загрузкі фота і відэа.";
+"NSPhotoLibraryUsageDescription" = "Дайце доступ да фатаграфій, каб выгружаць здымкі і відэа са сваёй бібліятэкі.";
+"NSMicrophoneUsageDescription" = "Element патрабуе доступ да вашага мікрафона, каб здзяйсняць і прымаць выклікі, здымаць відэа і запісваць галасавыя паведамленні.";
+"NSContactsUsageDescription" = "Яны будуць перададзеныя вашаму серверу ідэнтыфікацыі, каб дапамагчы знайсці вашыя кантакты на Matrix.";
+"NSCalendarsUsageDescription" = "Праглядайце свае запланаваныя сустрэчы ў праграме.";
+"NSFaceIDUsageDescription" = "Face ID выкарыстоўваецца для доступу да праграмы.";
+"NSLocationWhenInUseUsageDescription" = "Калі вы паведамляеце людзям сваё месцазнаходжанне, Element патрэбен доступ, каб паказаць ім карту.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Калі вы паведамляеце людзям сваё месцазнаходжанне, Element патрэбен доступ, каб паказаць ім карту.";

Riot/Assets/be.lproj/Localizable.strings

@@ -0,0 +1,10 @@
+
+
+/** General **/
+
+"Notification" = "Апавяшчэнне";
+
+/** Titles **/
+
+/* Message title for a specific person in a named room */
+"MSG_FROM_USER_IN_ROOM_TITLE" = "%@ у %@";

Riot/Assets/be.lproj/Vector.strings

@@ -0,0 +1,9 @@
+
+
+
+// Titles
+"title_home" = "Галоўная";
+"people_empty_view_title" = "Удзельнікі";
+"group_details_home" = "Галоўная";
+"spaces_home_space_title" = "Галоўная";
+"title_people" = "Удзельнікі";

Riot/Assets/ca.lproj/InfoPlist.strings

@@ -1,8 +1,9 @@
 // Permissions usage explanations
-"NSCameraUsageDescription" = "La càmera s'utilitza per fer fotos i vídeos, fer vídeo conferència.";
-"NSPhotoLibraryUsageDescription" = "La fototeca s'utilitza per enviar fotos i vídeos.";
+"NSCameraUsageDescription" = "La càmera s'utilitza per a fer videotrucades, o per a fer i pujar fotos i vídeos.";
+"NSPhotoLibraryUsageDescription" = "Permeteu l'accés a les fotos per a pujar fotos i vídeos de la galeria.";
 "NSMicrophoneUsageDescription" = "Element necessita accedir al vostre micròfon per a fer i rebre trucades, vídeos i gravar missatges de veu.";
-"NSContactsUsageDescription" = "Element us mostrarà els vostres contactes per si els voleu convidar a xatejar.";
-"NSLocationWhenInUseUsageDescription" = "Quan compartiu la vostra localització amb altres, Element en necessita accés per mostrar-lis un mapa.";
-"NSFaceIDUsageDescription" = "Face ID es fa servir per accedir a la vostra app.";
+"NSContactsUsageDescription" = "Es compartiran amb el vostre servidor d'identitat per ajudar-vos a trobar contactes al Matrix.";
+"NSLocationWhenInUseUsageDescription" = "Quan compartiu la vostra ubicació, l'Element en necessita accés per mostrar-los un mapa.";
+"NSFaceIDUsageDescription" = "Face ID es fa servir per a accedir a l'aplicació.";
 "NSCalendarsUsageDescription" = "Consulteu la vostra agenda de reunions a l'app.";
+"NSLocationAlwaysAndWhenInUseUsageDescription" = "Quan compartiu la vostra ubicació, l'Element en necessita accés per a mostrar-los un mapa.";

Riot/Assets/ca.lproj/Localizable.strings

@@ -1,7 +1,7 @@
 /* New message from a specific person, not referencing a room */
 "MSG_FROM_USER" = "%@ ha enviat un missatge";
 /* New message from a specific person in a named room */
-"MSG_FROM_USER_IN_ROOM" = "%@ publicat a %@";
+"MSG_FROM_USER_IN_ROOM" = "%@ ha publicat a %@";
 /* New message from a specific person, not referencing a room. Content included. */
 "MSG_FROM_USER_WITH_CONTENT" = "%@: %@";
 /* New message from a specific person in a named room. Content included. */
@@ -14,19 +14,19 @@
 /* New action message from a specific person in a named room. */
 "IMAGE_FROM_USER_IN_ROOM" = "%@ ha publicat una foto %@ a %@";
 /* Multiple unread messages in a room */
-"UNREAD_IN_ROOM" = "%@ nous missatges a %@";
+"UNREAD_IN_ROOM" = "%@ missatges nous a %@";
 /* Multiple unread messages from a specific person, not referencing a room */
-"MSGS_FROM_USER" = "%@ nou missatge a %@";
+"MSGS_FROM_USER" = "%@ missatge nou a %@";
 /* Multiple unread messages from two people */
-"MSGS_FROM_TWO_USERS" = "%@ nous missatges de %@ i %@";
+"MSGS_FROM_TWO_USERS" = "%@ missatges nous de: %@ i %@";
 /* Multiple unread messages from three people */
-"MSGS_FROM_THREE_USERS" = "%@ nous missatges de %@, %@ i %@";
+"MSGS_FROM_THREE_USERS" = "%@ missatges nous de: %@, %@ i %@";
 /* Multiple unread messages from two plus people (ie. for 4+ people: 'others' replaces the third person) */
-"MSGS_FROM_TWO_PLUS_USERS" = "%@ nous missatges de %@, %@ i altres";
+"MSGS_FROM_TWO_PLUS_USERS" = "%@ missatges nous de: %@, %@ i altres";
 /* Multiple messages in two rooms */
-"MSGS_IN_TWO_ROOMS" = "%@ nous missatges a %@ i %@";
+"MSGS_IN_TWO_ROOMS" = "%@ missatges nous a %@ i %@";
 /* Look, stuff's happened, alright? Just open the app. */
-"MSGS_IN_TWO_PLUS_ROOMS" = "%@ nous missatges a %@, %@ i altres";
+"MSGS_IN_TWO_PLUS_ROOMS" = "%@ missatges nous a %@, %@ i altres";
 /* A user has invited you to a chat */
 "USER_INVITE_TO_CHAT" = "%@ t'ha convidat a xatejar";
 /* A user has invited you to an (unamed) group chat */
@@ -34,17 +34,17 @@
 /* A user has invited you to a named room */
 "USER_INVITE_TO_NAMED_ROOM" = "%@ t'ha convidat a %@";
 /* Incoming one-to-one voice call */
-"VOICE_CALL_FROM_USER" = "Trucada de %@";
+"VOICE_CALL_FROM_USER" = "Trucada de: %@";
 /* Incoming one-to-one video call */
-"VIDEO_CALL_FROM_USER" = "Vídeo trucada de %@";
+"VIDEO_CALL_FROM_USER" = "Videotrucada de: %@";
 /* Incoming unnamed voice conference invite from a specific person */
-"VOICE_CONF_FROM_USER" = "Trucada grupal de %@";
+"VOICE_CONF_FROM_USER" = "Trucada grupal de: %@";
 /* Incoming unnamed video conference invite from a specific person */
-"VIDEO_CONF_FROM_USER" = "Vídeo trucada grupal de %@";
+"VIDEO_CONF_FROM_USER" = "Videotrucada grupal de: %@";
 /* Incoming named voice conference invite from a specific person */
-"VOICE_CONF_NAMED_FROM_USER" = "Trucada grupal de %@: '%@'";
+"VOICE_CONF_NAMED_FROM_USER" = "Trucada grupal de: %@: '%@'";
 /* Incoming named video conference invite from a specific person */
-"VIDEO_CONF_NAMED_FROM_USER" = "Vídeo trucada grupal de %@: '%@'";
+"VIDEO_CONF_NAMED_FROM_USER" = "Videotrucada grupal de: %@: '%@'";
 /* A single unread message in a room */
 "SINGLE_UNREAD_IN_ROOM" = "Has rebut un missatge a %@";
 /* A single unread message */
@@ -56,7 +56,7 @@
 /* New message indicator on unknown room */
 "MESSAGE" = "Missatge";
 /* New message indicator from a DM */
-"MESSAGE_FROM_X" = "Missatge de %@";
+"MESSAGE_FROM_X" = "Missatge de: %@";
 /* New message indicator on a room */
 "MESSAGE_IN_X" = "Missatge a %@";
 "KEY_VERIFICATION_REQUEST_FROM_USER" = "%@ vol verificar";
@@ -90,10 +90,10 @@
 "REACTION_FROM_USER" = "%@ ha reaccionat amb %@";
 
 /* New message with hidden content due to PIN enabled */
-"MESSAGE_PROTECTED" = "Nou missatge";
+"MESSAGE_PROTECTED" = "Missatge nou";
 
 /* New file message from a specific person, not referencing a room. */
-"LOCATION_FROM_USER" = "%@ ha compartit la localització";
+"LOCATION_FROM_USER" = "%@ ha compartit la ubicació";
 
 /* New file message from a specific person, not referencing a room. */
 "FILE_FROM_USER" = "%@ ha enviat un fitxer %@";
@@ -113,10 +113,13 @@
 "PICTURE_FROM_USER" = "%@ ha enviat una foto";
 
 /* New message reply from a specific person in a named room. */
-"REPLY_FROM_USER_IN_ROOM_TITLE" = "%@ respost a %@";
+"REPLY_FROM_USER_IN_ROOM_TITLE" = "%@ ha respost a %@";
 
 /* New message reply from a specific person, not referencing a room. */
-"REPLY_FROM_USER_TITLE" = "%@ respost";
+"REPLY_FROM_USER_TITLE" = "%@ ha respost";
 /** General **/
 
 "Notification" = "Notificació";
+
+/* New voice broadcast from a specific person, not referencing a room. */
+"VOICE_BROADCAST_FROM_USER" = "%@ ha iniciat una retransmissió de veu";

Riot/Assets/ca.lproj/Vector.strings

@@ -5,23 +5,23 @@
 "title_rooms" = "Sales";
 "warning" = "Avís";
 // Actions
-"view" = "Veure";
+"view" = "Mostra";
 "next" = "Següent";
 "back" = "Torna";
 "continue" = "Continua";
-"create" = "Crear";
-"start" = "Començar";
-"leave" = "Sortir";
-"remove" = "Esborrar";
+"create" = "Crea";
+"start" = "Comença";
+"leave" = "Surt";
+"remove" = "Suprimeix";
 "invite" = "Convida";
 "retry" = "Torna a provar";
-"on" = "Activa";
-"off" = "Apaga";
-"cancel" = "Cancel·lar";
-"save" = "Desar";
-"join" = "Entrar";
-"decline" = "Declinar";
-"accept" = "Acceptar";
+"on" = "Activat";
+"off" = "Desactivat";
+"cancel" = "Cancel·la";
+"save" = "Desa";
+"join" = "Entra";
+"decline" = "Rebutja";
+"accept" = "Accepta";
 "preview" = "Vista prèvia";
 "camera" = "Càmera";
 "voice" = "Veu";
@@ -29,10 +29,10 @@
 "active_call" = "Trucada en curs";
 "active_call_details" = "Trucada en curs (%@)";
 "later" = "Més tard";
-"rename" = "Reanomenar";
-"collapse" = "Contraure";
-"send_to" = "Enviar a %@";
-"sending" = "Enviant";
+"rename" = "Canvia el nom";
+"collapse" = "contrau";
+"send_to" = "Envia a %@";
+"sending" = "S'està enviant";
 // Authentication
 "auth_login" = "Iniciar sessió";
 "auth_register" = "Registre";
@@ -551,7 +551,7 @@
 // String for App Store
 "store_short_description" = "Xat/VoIP segur i descentralitzat";
 "close" = "Tanca";
-"skip" = "Salta";
+"skip" = "Omet";
 "joined" = "Unit";
 "switch" = "Canvia";
 "more" = "Més";
@@ -562,7 +562,6 @@
 
 // MARK: - MatrixKit
 
-
 "matrix" = "Matrix";
 "login_password_placeholder" = "Contrasenya";
 "login_optional_field" = "opcional";
@@ -909,3 +908,43 @@
 "ssl_unexpected_existing_expl" = "El certificat ha canviat respecte al que el teu telèfon hi havia confiat. Això es MOLT INUSUAL. Es recomana que NO ACCEPTIS aquest nou certificat.";
 "ssl_expected_existing_expl" = "El certificat ha canviat del prèviament confiat a un que no es confiable. El servidor pot haver renovat el certificat. Posa't en contacte amb l'administrador del servidor per obtenir l'empremta digital desitjada.";
 "ssl_only_accept" = "NOMÉS accepteu el certificat si l'administrador del servidor ha publicat una empremta digital que coincideixi amb l'anterior.";
+"store_full_description" = "Element és un tipus nou d'aplicació de missatgeria i col·laboració que:\n\n1. Us dona el control per a preservar la vostra privadesa\n2. Us permet comunicar-vos amb qualsevol persona de la xarxa Matrix, i encara més enllà integrant aplicacions com ara Slack\n3. Us protegeix de la publicitat, mineria de dades, portes ocultes i jardins emmurallats\n4. Us salvaguarda mitjançant el xifratge extrem a extrem, amb signatura creuada per a la verificació dels altres\n\nElement és completament diferent d'altres aplicacions de missatgeria i col·laboració perquè és descentralitzada i de codi obert.\n\nElement us permet muntar-vos un servidor propi (o triar un amfitrió) perquè tingueu privadesa i el control sobre les dades i les converses. Us dona accés a una xarxa oberta, no parlareu només amb altres usuaris d'Element. I és molt segura.\n\nElement pot fer tot això perquè opera en Matrix, l'estàndard de les comunicacions obertes i descentralitzades.\n\nElement us dona el control, permetent-vos triar qui és l'amfitrió de les vostres converses. Des de l'aplicació d'Element podeu triar l'amfitrió de maneres diferents:\n\n1. Creeu un compte gratuït al servidor públic de matrix.org\n2. Munteu un servidor local per a acollir el vostre compte\n3. Creeu un compte en un servidor personalitzat subscrivint-vos a la plataforma d'allotjament d'Element Matrix Services \n\nPer què triar Element?\n\nCONTROLEU LES VOSTRES DADES: Vós decidiu on desar les vostres dades i missatges. En sou el propietari i les controleu, no cap MEGACORPORACIÓ que les mina les vostres dades i permet que terceres parts hi accedeixen.\n\nCOL·LABORACIÓ I MISSATGERIA OBERTA: Podeu xatejar amb qualsevol a la xarxa Matrix, tant si utilitzen Element com qualsevol altra aplicació Matrix, i fins i tot si utilitzen algun sistema de missatgeria diferent, com ara Slack, IRC o XMPP.\n\nSUPERSEGURA: Xifratge extrem a extrem real (només els participants de la conversa poden desxifrar els missatges), i signatura creuada per a verificar els dispositius dels participants de la conversa.\n\nCOMUNICACIÓ COMPLETA: Missatges, trucades d'àudio i vídeo, compartició de fitxers, de pantalla i moltes altres integracions, bots i ginys. Construïu sales, comunitats, estigueu en contacte i aconseguir que les coses es facin.\n\nESTIGUEU ON ESTIGUEU: Comuniqueu-vos estigueu on estigueu amb l'historial de missatges completament sincronitzat a tots els dispositius i al web, a https://app.element.io.";
+"store_promotional_text" = "Aplicació de col·laboració i missatgeria que preserva la privadesa, en una xarxa oberta. Descentralitzada per a donar-vos el control. Sense mineria de dades, portes ocultes ni accés a tercers.";
+
+// MARK: Onboarding
+"onboarding_splash_register_button_title" = "Crea un compte";
+"onboarding_splash_page_3_message" = "Xifrat extrem a extrem i no cal cap número de telèfon. Sense publicitat ni mineria de dades.";
+"confirm" = "Confirma";
+"callbar_only_multiple_paused" = "%@ trucades en espera";
+"existing" = "Existent";
+"add" = "Afegeix";
+"joining" = "Unió";
+"stop" = "Atura";
+"new_word" = "Nou";
+"suggest" = "Suggereix";
+"edit" = "Edita";
+
+// Activities
+"loading" = "S'està carregant";
+"saving" = "S'està desant";
+"accessibility_button_label" = "botó";
+"onboarding_splash_login_button_title" = "Ja tinc un compte";
+"onboarding_splash_page_1_title" = "Controleu les vostres converses.";
+"onboarding_splash_page_1_message" = "Comunicació independent i segura que us dona el mateix nivell de privadesa que una conversa cara a cara en casa.";
+"onboarding_splash_page_2_title" = "Sou en control.";
+"onboarding_splash_page_2_message" = "Trieu on es desen les vostres converses, el que us dona control i independència. Connectat via Matrix.";
+"onboarding_splash_page_3_title" = "Missatgeria segura.";
+"open" = "Obre";
+"callbar_return" = "Torna";
+"invite_to" = "Convida a %@";
+"callbar_only_single_active_group" = "Toqueu per a unir-vos a la trucada grupal (%@)";
+"callbar_active_and_multiple_paused" = "1 trucada activa (%@) · %@ trucades en espera";
+"callbar_only_single_paused" = "Trucada en espera";
+"enable" = "Activa";
+"done" = "Fet";
+
+// Call Bar
+"callbar_only_single_active" = "Toqueu per a tornar a la trucada (%@)";
+"callbar_active_and_single_paused" = "1 trucada activa (%@) · 1 trucada en espera";
+"accessibility_selected" = "seleccionat";
+"less" = "Menys";

Riot/Assets/de.lproj/Bwi.strings

@@ -16,14 +16,13 @@
 
 // MARK: - Content Scanner
 
-"content_scan_status_failed" = "Fehler beim Laden";
+"content_scan_status_failed" = "Datei steht nicht mehr zur Verfügung";
 "content_scan_status_in_progress" = "Scanne...";
 "content_scan_status_infected" = "Blockiert";
 "content_scan_status_trusted" = "✓ Sicher";
 
 // MARK: - Location Sharing
 
-"location_sharing_copyright_label" = "";
 "location_sharing_map_credits_title" = "Mapbox Maps SDK für iOS";
 
 // MARK: - Server Downtime
@@ -52,9 +51,17 @@
 "bwi_settings_developer_restrict_user" = "Nutzer einschränken";
 "bwi_settings_developer_unrestrict_user" = "Nutzereinschränkung aufheben";
 "bwi_settings_developer_unmark_banner" = "Banner als nicht gelesen markieren";
+"bwi_settings_developer_introduce_federation" = "Föderation";
+"bwi_settings_developer_introduce_federation_preview" = "Introduction zeigen";
+"bwi_settings_developer_introduce_federation_reset" = "Account Data Flag für Introduction zurücksetzen";
+"bwi_settings_developer_announcement_federation_preview" = "Announcement zeigen";
+"bwi_settings_developer_announcement_federation_reset" = "Account Data Flag für Announcement zurücksetzen";
 "bwi_settings_developer_well_known" = "Well-Known";
 "bwi_settings_developer_capabilities" = "Capabilities";
 "bwi_settings_developer_maintenance" = "Maintenance";
+"bwi_settings_developer_maintenance_reload" = "Aktualisieren";
+"bwi_settings_developer_maintenance_server_data" = "Daten vom Server";
+"bwi_settings_developer_maintenance_local_data" = "UserDefaults / lokale Daten";
 "bwi_settings_developer_user_account_data" = "Account Data";
 "bwi_settings_developer_user_account_data_type" = "Type";
 "bwi_settings_developer_key_backup" = "Key Backup";
@@ -63,6 +70,10 @@
 "bwi_settings_developer_key_backup_etag" = "ETag";
 "bwi_settings_developer_key_backup_version" = "Version";
 
+// MARK: Labor
+"bwi_activate_labs_alert_title" = "Labor ist jetzt verfügbar";
+"bwi_settings_labs_federation_feature" = "Föderation";
+
 // MARK: - MDM
 
 "bwi_mdm_logout_message" = "Die Konfiguration hat sich geändert. Bitte melde dich neu an.";
@@ -218,6 +229,11 @@
 "settings_about" = "Erweitert";
 "bwi_settings_ignored_users_text" = "Ignorierte Nutzer";
 "settings_imprint" = "Impressum";
+"settings_change_profile_avatar_hint" = "Auch Nutzer aus föderierten Organisationen können dein Profilbild sehen.";
+"settings_custom_back_button" = "Zurück";
+"settings_save_changes_alert_title" = "Möchtest du die Änderungen speichern?";
+"settings_save_changes_alert_save_button" = "Ja";
+"settings_save_changes_alert_do_not_save_button" = "Nein";
 
 // MARK: - Room Details
 
@@ -318,6 +334,7 @@
 "key_verification_verified_this_session_information" = "Deine Anmeldung wurde erfolgreich verifiziert.";
 "key_verification_verified_other_session_information" = "Deine Anmeldung wurde erfolgreich verifiziert.";
 "key_verification_tile_request_alert_title" = "Verifizierung angefragt";
+"device_verification_crosssigning_wait_recover_secrets" = "Mit anderem Gerät verifizieren";
 
 // MARK: - Secrets Recovery
 
@@ -347,12 +364,15 @@
 "secrets_setup_recovery_passphrase_confirm_information" = "Gib deinen Wiederherstellungsschlüssel zur Bestätigung erneut ein.";
 "secrets_setup_recovery_passphrase_confirm_passphrase_title" = "";
 "secrets_setup_recovery_passphrase_confirm_passphrase_placeholder" = "Wiederherstellungsschlüssel";
-"secrets_reset_title" = "Verschlüsselung zurücksetzen";
+"secrets_reset_title" = "Zurücksetzen";
 "secrets_reset_information" = "Bitte fahre nur fort, wenn Du kein anderes Gerät hast um diesen Login zu verifizieren.";
-"secrets_reset_warning_title" = "Wenn Du die Verschlüsselung zurücksetzt:";
-"secrets_reset_warning_message" = "Du verlierst dadurch deinen gesamten bisherigen Nachrichtenverlauf, sowie verfizierte Geräte oder Nutzer!";
+"secrets_reset_warning_title" = "Willst du deinen Wiederherstellungsschlüssel wirklich zurücksetzen?";
+"secrets_reset_warning_message" = "Das Zurücksetzen deines Wiederherstellungsschlüssels kann nicht rückgängig gemacht werden. Nach dem Zurücksetzen wirst du alte Nachrichten nicht mehr lesen können.";
 "secrets_reset_reset_action" = "Zurücksetzen";
 "secrets_reset_authentication_message" = "Bestätige mit deinem Passwort!";
+"secrets_recovery_verification_alert_title" = "Anmeldung verifizieren";
+"secrets_recovery_verification_alert_message" = "Eine Verifizierungsanfrage wurde gesendet. Öffne eine deiner anderen Sitzungen, um sie zu akzeptieren und mit der Verifizierung zu beginnen.";
+"secrets_recovery_verification_alert_cancel" = "Ok";
 
 // MARK: - PIN Protection
 
@@ -441,6 +461,10 @@
 "bwi_notes_room_title" = "Meine Notizen";
 "home_context_menu_personal_notes" = "Notizen ausblenden";
 
+// MARK: - New WYSIWYG Composer
+
+"bwi_settings_enable_wysiwyg_composer" = "Neuer Editor (umfangreiche Formatierung)";
+
 // MARK: - Personal State
 
 "bwi_edit_personal_state_title" = "Statusmeldungen bearbeiten";
@@ -533,9 +557,9 @@
 
 "bwi_settings_new_features_header" = "Neue Funktionen";
 "bwi_settings_new_features_show_features" = "Neue Funktionen anzeigen";
-"bwi_feature_banner_header" = "Neue Funktionen";
-"bwi_feature_banner_show_more_button" = "Erfahre mehr";
-"bwi_feature_banner_advertisement_text" = "Beim Schreiben von Nachrichten kannst Du jetzt sehr einfach Textformatierungen verwenden.";
+"bwi_feature_banner_header" = "Föderation jetzt möglich";
+"bwi_feature_banner_show_more_button" = "";
+"bwi_feature_banner_advertisement_text" = "Übergreifende sichere Kommunikation zwischen verschiedenen Organisationen";
 
 // MARK: - Onboarding
 "onboarding_splash_login_button_title" = "Loslegen";
@@ -544,6 +568,11 @@
 "authentication_server_selection_qr_missing_authorization_title" = "Scannen nicht möglich";
 "authentication_server_selection_qr_missing_authorization_message" = "Gehe in die Einstellungen deines iPhones, um der App den Zugriff auf die Kamera zu erlauben.";
 
+// MARK: - Simplified Login
+"authentication_qr_login_scan_title" = "Anmelden mit QR-Code";
+"authentication_qr_login_start_title" = "Anmelden mit QR-Code";
+"authentication_qr_login_start_button_title" = "QR-Code scannen";
+
 // MARK: - Login Protection
 "bwi_login_protection_error_message" = "Der angegebene Server ist nicht für die Nutzung mit dem %@ vorgesehen";
 "bwi_login_protection_info_message" = "Dein Server ist leider noch nicht für den %@ eingerichtet. Wenn du aus der Öffentlichen Verwaltung bist und Fragen hast, wie Du den %@ nutzen kannst, besuche unsere Website.";
@@ -649,3 +678,65 @@
 // MARK: - Crypto Store migration
 "bwi_launch_loading_crypto_store_migration_info" = "Die Ver-/Entschlüsselung von Nachrichten wird verbessert, dies kann ein paar Minuten dauern, bitte schließe die App nicht. Verbesserung läuft.";
 
+// MARK: Secure backup recovery
+"security_settings_secure_backup" = "Nachrichten wiederherstellen";
+"security_settings_secure_backup_info_valid" = "Sofern du Probleme mit nicht-entschlüsselbaren Nachrichten hast, kann es helfen, die Schlüssel neu abzurufen. Klicke hierzu auf den Button und warte solange, bis alle Schlüssel wiederhergestellt wurden. Die App muss dazu geöffnet bleiben.";
+
+
+// MARK: SSO
+"sso_authentication_url_scheme_error_title" = "Fehler bei Authentifizierung";
+"sso_authentication_url_scheme_error_message" = "Authentifizierung über Schema %@ konnte nicht geöffnet werden. Bitte wende dich an deinen Support.";
+
+
+// MARK: - Federation
+"bwi_room_settings_federation_alert_title" = "Achtung!";
+"bwi_room_settings_federation_alert_message" = "Durch das Aufheben der Föderation werden alle Mitglieder der anderen Organisation unwiderruflich entfernt.\n\nFöderation trotzdem aufheben?";
+"bwi_room_settings_federation_alert_withdraw_button" = "Ja, aufheben";
+"room_details_failed_to_update_room_server_acl_rule" = "Aktualisierung der Föderations-Einstellung fehlgeschlagen";
+"room_details_failed_to_change_federation_for_room_error_title" = "Föderation aktiv";
+"room_details_failed_to_change_federation_for_room_error_text" = "Die Föderation konnte nicht geändert werden, bitte versuche es später erneut.";
+"room_details_failed_to_change_federation_alert_dismiss_button" = "Ok";
+
+"create_room_type_federated" = "Für eine Föderation zulassen";
+"create_room_type_federated_subtext" = "(Raum kann von externen Organisationen mitgenutzt werden)";
+"create_room_failed_to_deactivate_federation_for_room_error_title" = "Föderation aktiv";
+"create_room_failed_to_deactivate_federation_for_room_error_text" = "Die Föderation konnte nicht deaktiviert werden, bitte versuche es später erneut.";
+"create_room_failed_to_deactivate_federation_alert_dismiss_button" = "Ok";
+
+"room_member_details_change_federated_member_power_lvl_to_admin_error_text" = "Diese Person kann keine Adminrechte erhalten, da sie nicht aus deiner Organisation stammt. Föderierte Personen können nur Mitglieder oder Moderatoren sein.";
+"room_member_details_change_federated_member_power_lvl_to_admin_error_button" = "Verstanden";
+
+"room_admin_federation_decision_sheet_title" = "\"%@\" für eine Föderation zulassen?";
+"room_admin_federation_decision_sheet_text" = "Hierdurch kann der Raum von externen Organisationen mitgenutzt werden. Dies kann nachträglich in den Einstellungen geändert werden.";
+"room_admin_federation_decision_sheet_activate_federation_button" = "Raum föderieren";
+"room_admin_federation_decision_sheet_deactivate_federation_button" = "Raum intern behalten";
+
+"room_admin_federation_decision_set_federation_error_alert_title" = "Aktion fehlgeschlagen";
+"room_admin_federation_decision_set_federation_error_alert_text" = "Der Server ist aktuell nicht erreichbar. Versuche es später erneut.";
+
+"room_admin_federation_decision_set_federation_success_alert_title" = "Dieser Raum ist jetzt föderiert.";
+"room_admin_federation_decision_set_federation_alert_ok_button" = "Ok";
+
+"room_participants_invite_prompt_federation_for_room_not_allowed_text" = "Du kannst diese Person nicht einladen, da die Föderation für diesen Raum durch den Admin nicht gewünscht ist.";
+"room_participants_invite_prompt_server_acl_for_room_not_configured_text" = "Du kannst noch keine Personen aus einer föderierten Organisation einladen, da die Freigabe hierfür noch nicht erteilt wurde. Gib dem Admin Bescheid, dass die Einstellung getroffen werden muss.";
+
+"room_participants_invite_prompt_server_acl_loading_error_text" = "Die Person kann aktuell nicht eingeladen werden, bitte versuche es später erneut.";
+
+"event_formatter_acl_allow_federation" = "Dieser Raum wurde vom Administrator für eine Föderation zugelassen.";
+"event_formatter_acl_disallow_federation" = "Die Föderation für diesen Raum wurde aufgehoben. Alle föderierten Mitglieder werden automatisch entfernt.";
+"event_formatter_acl_disallow_at_start" = "Die Föderation für diesen Raum wurde nicht zugelassen.";
+"event_formatter_acl_collapsed" = "%tu Föderationseinstellungen wurden geändert.";
+"event_formatter_acl_and_other_collapsed" = "%tu Föderations und weitere Einstellungen geändert.";
+
+"federation_announcement_title" = "Ankündigung";
+"federation_announcement_text" = "Ab Mai 2024 ist die **Föderation** zwischen verschiedenen Organisationen möglich. Dies bietet eine übergreifende sichere Kommunikation.\n\nDetails findest du in der Datenschutzerklärung.";
+"federation_announcement_sub_text" = "Wenn du dein Profilbild vorweg ändern möchtest, gehe zu den Einstellungen.";
+"federation_announcement_button" = "Verstanden";
+
+"introduce_federation_screen1_title" = "Föderation";
+"introduce_federation_screen1_description" = "Übergreifende sichere Kommunikation zwischen verschiedenen Organisationen";
+"introduce_federation_screen2_title" = "Kennzeichnung";
+"introduce_federation_screen2_description" = "Föderierte Personen und Räume erkennst du am Symbol mit den zwei sich überschneidenden Kreisen.";
+"introduce_federation_screen3_title" = "Individuelle Einstellung";
+"introduce_federation_screen3_description" = "Bestimme als Admin, welche Räume für eine Föderation zugelassen sind.";
+"introduce_federation_start" = "Verstanden";

Riot/Assets/de.lproj/Vector.strings

@@ -2544,7 +2544,7 @@
 "all_chats_user_menu_accessibility_label" = "Benutzermenü";
 "settings_labs_enable_new_client_info_feature" = "Bezeichnung, Version und URL der Anwendung registrieren, damit diese Sitzung in der Sitzungsverwaltung besser erkennbar ist";
 "settings_labs_enable_new_session_manager" = "Neue Sitzungsverwaltung";
-"authentication_qr_login_start_step2" = "Gehe zu Einstellungen -> Sicherheit und Privatsphäre";
+"authentication_qr_login_start_step2" = "Gehe zu Alle Einstellungen > Sitzungen";
 "authentication_qr_login_scan_subtitle" = "Positioniere den QR-Code innerhalb des Quadrats";
 "authentication_qr_login_display_step2" = "Wähle „Anmelden mit QR-Code“";
 "authentication_qr_login_scan_title" = "QR-Code einlesen";
@@ -2553,8 +2553,8 @@
 "authentication_qr_login_start_display_qr" = "QR-Code auf diesem Gerät anzeigen";
 "authentication_qr_login_start_step4" = "Wähle „Zeige QR-Code auf diesem Gerät“";
 "authentication_qr_login_display_title" = "Verbinde ein Gerät";
-"authentication_qr_login_start_step3" = "Wähle „Verbinde ein Gerät“";
-"authentication_qr_login_start_title" = "QR-Code einlesen";
+"authentication_qr_login_start_step3" = "Wähle \"Mit QR-Code anmelden\"";
+"authentication_qr_login_start_title" = "QR-Code scannen";
 "authentication_login_with_qr" = "Anmelden mit QR-Code";
 "device_type_name_unknown" = "Unbekannt";
 "device_type_name_mobile" = "Mobil";
@@ -2583,11 +2583,11 @@
 "authentication_qr_login_loading_signed_in" = "Du bist nun mit deinem anderen Gerät angemeldet.";
 "authentication_qr_login_loading_waiting_signin" = "Warte auf Geräteanmeldung.";
 "authentication_qr_login_loading_connecting_device" = "Verbinde mit Gerät";
-"authentication_qr_login_confirm_alert" = "Bitte stelle sicher, dass du die Quelle dieses Codes kennst. Durch das Verbinden des Gerätes wirst du jemandem vollen Zugriff auf dein Konto gewähren.";
+"authentication_qr_login_confirm_alert" = "Keine Übereinstimmung?";
 "authentication_qr_login_confirm_subtitle" = "Bestätige, dass der folgende Code mit dem auf deinem anderen Gerät übereinstimmt:";
 "authentication_qr_login_confirm_title" = "Sichere Verbindung aufgebaut";
 "authentication_qr_login_display_step1" = "Öffne Element auf deinem anderen Gerät";
-"authentication_qr_login_start_step1" = "Öffne Element auf deinem anderen Gerät";
+"authentication_qr_login_start_step1" = "Öffne die Webapp auf deinem dienstlichen Computer";
 "authentication_qr_login_start_subtitle" = "Nutze die Kamera dieses Gerätes, um den auf deinem anderen Gerät angezeigten QR-Code einzulesen:";
 "wysiwyg_composer_start_action_text_formatting" = "Textformatierung";
 "wysiwyg_composer_start_action_camera" = "Kamera";
@@ -2616,8 +2616,8 @@
 "manage_session_name_info" = "Sei dir bitte bewusst, dass Sitzungsnamen auch für Personen, mit denen du kommunizierst, sichtbar sind. %@";
 "manage_session_name_hint" = "Individuelle Sitzungsnamen können dir helfen, deine Geräte einfacher zu erkennen.";
 "user_other_session_filter" = "Filtern";
-"wysiwyg_composer_format_action_strikethrough" = "Unterstrichen formatieren";
-"wysiwyg_composer_format_action_underline" = "Durchgestrichen formatieren";
+"wysiwyg_composer_format_action_strikethrough" = "Durchgestrichen formatieren";
+"wysiwyg_composer_format_action_underline" = "Unterstrichen formatieren";
 "wysiwyg_composer_format_action_italic" = "Kursiv formatieren";
 
 // Formatting Actions
@@ -2718,7 +2718,7 @@
 "poll_history_load_more" = "Weitere Umfragen laden";
 "poll_history_loading_text" = "Zeige Umfragen an";
 "poll_history_fetching_error" = "Fehler beim Laden der Umfragen.";
-"key_backup_recover_from_private_key_progress" = "%@% % abgeschlossen";
+"key_backup_recover_from_private_key_progress" = "%@ %% abgeschlossen";
 "voice_broadcast_playback_unable_to_decrypt" = "Entschlüsseln der Sprachübertragung nicht möglich.";
 "home_context_menu_mark_as_unread" = "Als ungelesen markieren";
 "wysiwyg_composer_format_action_un_indent" = "Einrückung verringern";
@@ -2776,3 +2776,8 @@
 "room_creation_user_not_found_prompt_invite_action" = "Dennoch DM beginnen";
 "room_participants_invite_unknown_participant_prompt_to_msg" = "Wir konnten kein Profil für diese Matrix-ID finden. Möchtest du wirklich %@ nach %@ einladen?";
 "room_participants_invite_anyway" = "Dennoch einladen";
+"settings_manage_account_title" = "Konto";
+"settings_manage_account_description" = "Verwalte dein Konto bei %@";
+"settings_manage_account_action" = "Konto verwalten";
+"manage_session_redirect" = "Du wirst zum Authentifizierungsdienst deines Servers weitergeleitet, um das Abmelden abzuschließen.";
+"manage_session_redirect_error" = "Funktion aktuell nicht verfügbar. Bitte kontaktiere deine Home-Server-Administration";

Riot/Assets/en.lproj/Bwi.strings

@@ -16,14 +16,13 @@
 
 // MARK: - Content Scanner
 
-"content_scan_status_failed" = "Download failed";
+"content_scan_status_failed" = "File is unavailable.";
 "content_scan_status_in_progress" = "Scanning...";
 "content_scan_status_infected" = "Blocked";
 "content_scan_status_trusted" = "✓ Trusted";
 
 // MARK: - Location Sharing
 
-"location_sharing_copyright_label" = "";
 "location_sharing_map_credits_title" = "Mapbox Maps SDK for iOS";
 
 // MARK: - Server Downtime
@@ -53,10 +52,18 @@
 "bwi_settings_developer_restrict_user" = "Restrict user";
 "bwi_settings_developer_unrestrict_user" = "Remove user restriction";
 "bwi_settings_developer_unmark_banner" = "Unmark Feature Banner";
+"bwi_settings_developer_introduce_federation" = "Federation";
+"bwi_settings_developer_introduce_federation_preview" = "Show introduction preview";
+"bwi_settings_developer_introduce_federation_reset" = "Reset account data flag for introduction";
+"bwi_settings_developer_announcement_federation_preview" = "Show announcement preview";
+"bwi_settings_developer_announcement_federation_reset" = "Reset account data flag for announcement";
 "bwi_settings_developer_well_known" = "Well-Known";
 "bwi_settings_developer_capabilities" = "Capabilities";
 "bwi_settings_developer_maintenance" = "Maintenance";
+"bwi_settings_developer_maintenance_reload" = "Reload";
 "bwi_settings_developer_user_account_data" = "Account Data";
+"bwi_settings_developer_maintenance_server_data" = "Data from Server";
+"bwi_settings_developer_maintenance_local_data" = "UserDefaults / local data";
 "bwi_settings_developer_user_account_data_type" = "Type";
 "bwi_settings_developer_key_backup" = "Key Backup";
 "bwi_settings_developer_key_backup_algorithm" = "Algorithm";
@@ -64,6 +71,10 @@
 "bwi_settings_developer_key_backup_etag" = "ETag";
 "bwi_settings_developer_key_backup_version" = "Version";
 
+// MARK: Lab
+"bwi_activate_labs_alert_title" = "Labs now available";
+"bwi_settings_labs_federation_feature" = "Federation";
+
 // MARK: - MDM
 
 "bwi_mdm_logout_message" = "The configuration has changed. Please reconnect.";
@@ -174,6 +185,11 @@
 "settings_deactivate_my_account" = "Deactivate my account";
 "settings_enable_inapp_notifications" = "Enable In-App notifications";
 "settings_imprint" = "Imprint";
+"settings_change_profile_avatar_hint" = "Users from federated organizations can also see your profile picture.";
+"settings_custom_back_button" = "Back";
+"settings_save_changes_alert_title" = "Do you want to save changes?";
+"settings_save_changes_alert_save_button" = "Yes";
+"settings_save_changes_alert_do_not_save_button" = "No";
 
 // MARK: - Room Details
 
@@ -239,6 +255,10 @@
 "key_verification_verify_qr_code_information_other_device" = "Scan code either with this device or another.";
 "key_verification_verify_qr_code_cannot_scan_action" = "Compare with emojis instead";
 "key_verification_tile_request_alert_title" = "Verification requested";
+"device_verification_crosssigning_wait_recover_secrets" = "Verify with other device";
+"secrets_recovery_verification_alert_title" = "Verify";
+"secrets_recovery_verification_alert_message" = "A verification request has been sent. Open one of your sessions to accept and start the verification";
+"secrets_recovery_verification_alert_cancel" = "Ok";
 
 "room_participants_security_information_room_not_encrypted" = "Messages in this room are not end-to-end encrypted.";
 "room_participants_security_information_room_not_encrypted_for_dm" = "Messages here are not end-to-end encrypted.";
@@ -275,6 +295,10 @@
 "key_backup_setup_passphrase_passphrase_placeholder" = "Enter phrase";
 "key_backup_setup_passphrase_passphrase_invalid" = "Try adding a word";
 
+"secrets_reset_title" = "Reset";
+"secrets_reset_warning_title" = "Really reset recovery key?";
+"secrets_reset_warning_message" = "Resetting your recovery key cannot be undone. After resetting, you won't have access to old encrypted messages.";
+
 // MARK: - PIN Protection
 
 "pin_protection_confirm_pin" = "Confirm PIN";
@@ -324,6 +348,7 @@
 
 "room_intro_cell_information_dm_sentence1_part1" = "This is the beginning of your direct message history with ";
 
+
 // MARK: - Notification Times
 
 "settings_enable_notification_times" = "Notification Times";
@@ -354,6 +379,10 @@
 "bwi_notes_room_title" = "My notes";
 "home_context_menu_personal_notes" = "Hide notes";
 
+// MARK: - New WYSIWYG Composer
+
+"bwi_settings_enable_wysiwyg_composer" = "New editor (extensive formatting)";
+
 // MARK: - Personal State
 
 "bwi_edit_personal_state_title" = "Edit state";
@@ -442,13 +471,18 @@
 
 "bwi_settings_new_features_header" = "New Features";
 "bwi_settings_new_features_show_features" = "Show new features";
-"bwi_feature_banner_header" = "New Features";
-"bwi_feature_banner_show_more_button" = "Learn more";
-"bwi_feature_banner_advertisement_text" = "You can now easily use text formatting when writing messages.";
+"bwi_feature_banner_header" = "Federation now possible";
+"bwi_feature_banner_show_more_button" = "";
+"bwi_feature_banner_advertisement_text" = "Cross-organisational secure communication between different organisations";
 
 // MARK: - Onboarding
 "onboarding_splash_login_button_title" = "Let's go";
 
+// MARK: - Simplified Login
+"authentication_qr_login_scan_title" = "Log in via QR code";
+"authentication_qr_login_start_title" = "Log in via QR code";
+"authentication_qr_login_start_button_title" = "Scan QR code";
+
 // MARK: - Login Protection
 "bwi_login_protection_error_message" = "The selected server is not allowed for using with %@";
 "bwi_login_protection_info_message" = "Your server is not yet set up for the %@. If you are from the public sector and have questions about how to use the %@, please visit our website.";
@@ -558,3 +592,64 @@
 
 // MARK: - Crypto Store migration
 "bwi_launch_loading_crypto_store_migration_info" = "Message encryption/decryption has been updated to improve app performance, this may take a few minutes. Please do not close the app during the update. The update is running.";
+
+// MARK: Secure backup recovery
+"security_settings_secure_backup" = "Restore Messages";
+"security_settings_secure_backup_info_valid" = "If you have problems with messages that cannot be decrypted, it may help to retrieve the keys again. To do this, click on the button and wait until all keys have been restored. The app must remain open for this.";
+
+// MARK: SSO
+"sso_authentication_url_scheme_error_title" = "Authentication Error";
+"sso_authentication_url_scheme_error_message" = "Authentication with scheme %@ could not be opened. Please contact support.";
+
+// MARK: - Federation
+"bwi_room_settings_federation_alert_title" = "Warning!";
+"bwi_room_settings_federation_alert_message" = "Withdrawing the Federation removes all users from another organisation permanently. \n\nProceed withdrawing Federation?";
+"bwi_room_settings_federation_alert_withdraw_button" = "Yes, withdraw";
+"room_details_failed_to_update_room_server_acl_rule" = "Fail to update the federation settings";
+"room_details_failed_to_change_federation_for_room_error_title" = "Federation active";
+"room_details_failed_to_change_federation_for_room_error_text" = "The federation could not be changed, please try again later.";
+"room_details_failed_to_change_federation_alert_dismiss_button" = "Ok";
+
+"create_room_type_federated" = "Allow federation";
+"create_room_type_federated_subtext" = "(External organizations can join the room)";
+"create_room_failed_to_deactivate_federation_for_room_error_title" = "Federation active";
+"create_room_failed_to_deactivate_federation_for_room_error_text" = "The federation could not be disabled, please try again later.";
+"create_room_failed_to_deactivate_federation_alert_dismiss_button" = "Ok";
+
+"room_member_details_change_federated_member_power_lvl_to_admin_error_text" = "This user cannot be granted admin rights as they do not come from your organization. Federated users can only be members or moderators.";
+"room_member_details_change_federated_member_power_lvl_to_admin_error_button" = "Ok";
+
+"room_admin_federation_decision_sheet_title" = "Approve \"%@\" for federation?";
+"room_admin_federation_decision_sheet_text" = "This will enable external organizations to access the room. It can be reversed in the room settings afterwards.";
+"room_admin_federation_decision_sheet_activate_federation_button" = "Federrate room";
+"room_admin_federation_decision_sheet_deactivate_federation_button" = "Keep room internal";
+
+"room_admin_federation_decision_set_federation_error_alert_title" = "Action failed";
+"room_admin_federation_decision_set_federation_error_alert_text" = "The server is currently unavailable. Please try again later.";
+
+"room_admin_federation_decision_set_federation_success_alert_title" = "This room is now federated.";
+"room_admin_federation_decision_set_federation_alert_ok_button" = "Ok";
+
+"room_participants_invite_prompt_federation_for_room_not_allowed_text" = "You cannot invite this user because the federation for this room is not desired by the admin";
+"room_participants_invite_prompt_server_acl_for_room_not_configured_text" = "You cannot yet invite people from a federated organization, as this has not yet been approved. Let the admin know that the setting needs to be made.";
+
+"room_participants_invite_prompt_server_acl_loading_error_text" = "You cannot invite this user at the moment, please try again later.";
+
+"event_formatter_acl_allow_federation" = "This room has been federated by the admin.";
+"event_formatter_acl_disallow_federation" = "The federation has been withdrawn. All federated members were automatically removed.";
+"event_formatter_acl_disallow_at_start" = "The federation was not approved for this room.";
+"event_formatter_acl_collapsed" = "%tu Federation settings changed.";
+"event_formatter_acl_and_other_collapsed" = "%tu Federation and other settings changed.";
+
+"federation_announcement_title" = "Announcement";
+"federation_announcement_text" = "The **Federation** will start in May 2024. This enables secure communication across different organizations.\n\nDetails can be found in the privacy policies.";
+"federation_announcement_sub_text" = "If you want to change your profile picture, go to the settings.";
+"federation_announcement_button" = "Understood";
+
+"introduce_federation_screen1_title" = "Federation";
+"introduce_federation_screen1_description" = "Secure communication across different organizations";
+"introduce_federation_screen2_title" = "Characterization";
+"introduce_federation_screen2_description" = "The symbol of overlaping circles helps to identify federated people.";
+"introduce_federation_screen3_title" = "Individual settings";
+"introduce_federation_screen3_description" = "Decide as an admin which room should be authorized for federation.";
+"introduce_federation_start" = "Understood";

Riot/Assets/en.lproj/Vector.strings

@@ -215,9 +215,9 @@
 
 "authentication_qr_login_start_title" = "Scan QR code";
 "authentication_qr_login_start_subtitle" = "Use the camera on this device to scan the QR code shown on your other device:";
-"authentication_qr_login_start_step1" = "Open Element on your other device";
-"authentication_qr_login_start_step2" = "Go to Settings -> Security & Privacy";
-"authentication_qr_login_start_step3" = "Select ‘Link a device’";
+"authentication_qr_login_start_step1" = "Open the Webapp on your business computer";
+"authentication_qr_login_start_step2" = "Go to Settings > Sessions";
+"authentication_qr_login_start_step3" = "Select ‘Login with QR code’";
 "authentication_qr_login_start_step4" = "Select ‘Show QR code on this device’";
 "authentication_qr_login_start_need_alternative" = "Need an alternative method?";
 "authentication_qr_login_start_display_qr" = "Show QR code on this device";
@@ -232,7 +232,7 @@
 
 "authentication_qr_login_confirm_title" = "Secure connection established";
 "authentication_qr_login_confirm_subtitle" = "Confirm that the code below matches with your other device:";
-"authentication_qr_login_confirm_alert" = "Please ensure that you know the origin of this code. By linking devices, you will provide someone with full access to your account.";
+"authentication_qr_login_confirm_alert" = "No match?";
 
 "authentication_qr_login_loading_connecting_device" = "Connecting to device";
 "authentication_qr_login_loading_waiting_signin" = "Waiting for device to sign in.";
@@ -2617,8 +2617,8 @@ To enable access, tap Settings> Location and select Always";
 // Formatting Actions
 "wysiwyg_composer_format_action_bold" = "Apply bold format";
 "wysiwyg_composer_format_action_italic" = "Apply italic format";
-"wysiwyg_composer_format_action_underline" = "Apply strikethrough format";
-"wysiwyg_composer_format_action_strikethrough" = "Apply underline format";
+"wysiwyg_composer_format_action_underline" = "Apply underline format";
+"wysiwyg_composer_format_action_strikethrough" = "Apply strikethrough format";
 "wysiwyg_composer_format_action_link" = "Apply link format";
 "wysiwyg_composer_format_action_inline_code" = "Apply inline code format";
 "wysiwyg_composer_format_action_unordered_list" = "Toggle bulleted list";

Riot/Assets/et.lproj/Vector.strings

@@ -1889,8 +1889,8 @@
 "notice_conference_call_started" = "VoIP rühmakõne algas";
 "notice_conference_call_finished" = "VoIP rühmakõne lõppes";
 // Notice Events with "You"
-"notice_room_invite_by_you" = "Sina kutsusid kasutajat %@";
-"notice_room_invite_you" = "%@ kutsus sind";
+"notice_room_invite_by_you" = "Sina saatsid kutse kasutajale %@";
+"notice_room_invite_you" = "%@ saatis sulle kutse";
 "notice_room_third_party_invite_by_you" = "Sina saatsid kasutajale %@ kutse jututoaga liitumiseks";
 "notice_room_third_party_registered_invite_by_you" = "Sina võtsid vastu kutse %@ nimel";
 "notice_room_third_party_revoked_invite_by_you" = "Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %@";
@@ -2025,7 +2025,7 @@
 "notice_room_third_party_invite_for_dm" = "%@ saatis kutse kasutajale %@";
 "notice_room_third_party_revoked_invite_for_dm" = "%@ võttis tagasi kasutaja %@ kutse";
 "notice_room_name_changed_for_dm" = "%@ muutis jututoa uueks nimeks %@.";
-"notice_room_third_party_invite_by_you_for_dm" = "Sina kutsusid kasutajat %@";
+"notice_room_third_party_invite_by_you_for_dm" = "Sina saatsid kutse kasutajale %@";
 "notice_room_third_party_revoked_invite_by_you_for_dm" = "Sina võtsid tagasi kasutaja %@ kutse";
 "notice_room_name_changed_by_you_for_dm" = "Sa muutsid jututoa uueks nimeks %@.";
 "notice_room_name_removed_by_you_for_dm" = "Sa eemaldasid jututoa nime";
@@ -2499,8 +2499,8 @@
 "authentication_qr_login_start_title" = "Loe QR-koodi";
 "authentication_login_with_qr" = "Logi sisse QR-koodi abil";
 "wysiwyg_composer_format_action_strikethrough" = "Kasuta allajoonitud kirja";
-"wysiwyg_composer_format_action_underline" = "Kasuta läbijoonitud kirja";
-"wysiwyg_composer_format_action_italic" = "Kasuta kaldkirja";
+"wysiwyg_composer_format_action_italic" = "Kasuta läbijoonitud kirja";
+"wysiwyg_composer_format_action_underline" = "Kasuta kaldkirja";
 
 // Formatting Actions
 "wysiwyg_composer_format_action_bold" = "Kasuta paksu kirja";
@@ -2714,3 +2714,8 @@
 "room_creation_user_not_found_prompt_message" = "Sellele Matrix'i kasutajatunnuse profiili ei leidu. Kas sa ikkagi tahaksid temaga vestlust alustada?";
 "room_participants_invite_unknown_participant_prompt_to_msg" = "Sellele Matrix'i kasutajatunnuse profiili ei leidu. Kas sa ikkagi tahaksid saata kutset kasutajale %@ jututuppa %@?";
 "room_participants_invite_anyway" = "Kutsu siiski";
+"settings_manage_account_title" = "Kasutajakonto";
+"settings_manage_account_action" = "Halda kasutajakontot";
+"settings_manage_account_description" = "Halda kasutajakontot koduserveris %@";
+"manage_session_redirect" = "Järgmiseks suuname sind sinu serveriteenuse autentijale ning seal saad sa väljalogimise lõpuni viia.";
+"manage_session_redirect_error" = "See funktsionaalsus pole hetkel saadaval. Lisateavet saad oma koduserveri haldajalt";

Riot/Assets/fr.lproj/Vector.strings

@@ -2631,8 +2631,8 @@
 "wysiwyg_composer_format_action_unordered_list" = "Liste à puces";
 "wysiwyg_composer_format_action_inline_code" = "Formater comme code informatique";
 "wysiwyg_composer_format_action_link" = "Formater comme lien";
-"wysiwyg_composer_format_action_strikethrough" = "Souligner";
-"wysiwyg_composer_format_action_underline" = "Barrer";
+"wysiwyg_composer_format_action_strikethrough" = "Barrer";
+"wysiwyg_composer_format_action_underline" = "Souligner";
 "wysiwyg_composer_format_action_italic" = "Mettre en italique";
 
 // Formatting Actions

Riot/Assets/hu.lproj/Vector.strings

@@ -2501,8 +2501,8 @@
 "room_first_message_placeholder" = "Küld el az első üzenetedet…";
 "authentication_qr_login_confirm_title" = "Biztonságos kapcsolat beállítva";
 "room_event_encryption_info_key_authenticity_not_guaranteed" = "A titkosított üzenetek valódiságát ezen az eszközön nem lehet garantálni.";
-"wysiwyg_composer_format_action_strikethrough" = "Aláhúzott";
-"wysiwyg_composer_format_action_underline" = "Áthúzott";
+"wysiwyg_composer_format_action_underline" = "Aláhúzott";
+"wysiwyg_composer_format_action_strikethrough" = "Áthúzott";
 "wysiwyg_composer_format_action_italic" = "Dőlt";
 
 // Formatting Actions

Riot/Assets/id.lproj/Vector.strings

@@ -2782,8 +2782,8 @@
 "authentication_qr_login_start_subtitle" = "Gunakan kamera pada perangkat ini untuk memindai kode QR yang ditampilkan di perangkat Anda yang lain:";
 "authentication_qr_login_start_title" = "Pindai kode QR";
 "authentication_login_with_qr" = "Masuk dengan kode QR";
-"wysiwyg_composer_format_action_strikethrough" = "Terapkan format garis bawah";
-"wysiwyg_composer_format_action_underline" = "Terapkan format coret";
+"wysiwyg_composer_format_action_underline" = "Terapkan format garis bawah";
+"wysiwyg_composer_format_action_strikethrough" = "Terapkan format coret";
 "wysiwyg_composer_format_action_italic" = "Terapkan format miring";
 
 // Formatting Actions
@@ -2964,3 +2964,13 @@
 "room_command_change_display_name_description" = "Mengubah nama tampilan Anda";
 "notice_display_name_changed_to" = "%@ mengubah nama tampilannya menjadi %@";
 "poll_timeline_loading" = "Memuat...";
+"room_creation_user_not_found_prompt_message" = "Tidak dapat mencari profil untuk ID Matrix ini. Apakah Anda masih ingin membuat percakapan langsung?";
+"room_creation_user_not_found_prompt_title" = "Konfirmasi";
+"room_creation_user_not_found_prompt_invite_action" = "Tetap buat percakapan langsung";
+"room_participants_invite_unknown_participant_prompt_to_msg" = "Tidak dapat mencari profil untuk ID Matrix ini. Apakah Anda masih ingin mengundang %@ ke %@?";
+"room_participants_invite_anyway" = "Tetap undang";
+"settings_manage_account_title" = "Akun";
+"settings_manage_account_action" = "Kelola akun";
+"settings_manage_account_description" = "Kelola akun Anda di %@";
+"manage_session_redirect" = "Anda akan dialihkan ke penyedia autentikasi server Anda untuk menyelesaikan proses keluar.";
+"manage_session_redirect_error" = "Fungsi saat ini tidak tersedia. Silakan hubungi admin homeserver Anda";

Riot/Assets/it.lproj/Vector.strings

@@ -2555,8 +2555,8 @@
 "authentication_qr_login_start_subtitle" = "Usa la fotocamera di questo dispositivo per scansionare il codice QR mostrato nell'altro dispositivo:";
 "authentication_qr_login_start_title" = "Scansiona codice QR";
 "authentication_login_with_qr" = "Accedi con codice QR";
-"wysiwyg_composer_format_action_strikethrough" = "Applica formato sottolineato";
-"wysiwyg_composer_format_action_underline" = "Applica formato sbarrato";
+"wysiwyg_composer_format_action_underline" = "Applica formato sottolineato";
+"wysiwyg_composer_format_action_strikethrough" = "Applica formato sbarrato";
 "wysiwyg_composer_format_action_italic" = "Applica formato corsivo";
 
 // Formatting Actions
@@ -2742,3 +2742,8 @@
 "room_participants_invite_anyway" = "Invita lo stesso";
 "room_participants_invite_unknown_participant_prompt_to_msg" = "Impossibile trovare profili con questo ID Matrix. Vuoi davvero invitare %@ in %@?";
 "room_creation_user_not_found_prompt_message" = "Impossibile trovare profili con questo ID Matrix. Vuoi comunque iniziare un messaggio diretto?";
+"settings_manage_account_title" = "Account";
+"settings_manage_account_action" = "Gestisci account";
+"settings_manage_account_description" = "Gestisci il tuo account su %@";
+"manage_session_redirect" = "Verrai reindirizzato al fornitore di autenticazione del tuo server per completare la disconnessione.";
+"manage_session_redirect_error" = "Funzionalità attualmente non disponibile. Contatta l'amministratore del tuo homeserver";

Riot/Assets/ja.lproj/Vector.strings

@@ -2752,8 +2752,8 @@
 "notice_error_unformattable_event" = "** メッセージを描画できません。不具合を報告してください";
 "wysiwyg_composer_format_action_un_indent" = "インデントを減らす";
 "wysiwyg_composer_format_action_indent" = "インデントを増やす";
-"wysiwyg_composer_format_action_strikethrough" = "下線で装飾";
-"wysiwyg_composer_format_action_underline" = "打ち消し線で装飾";
+"wysiwyg_composer_format_action_underline" = "下線で装飾";
+"wysiwyg_composer_format_action_strikethrough" = "打ち消し線で装飾";
 
 
 // MARK: - WYSIWYG Composer

Riot/Assets/ka.lproj/Vector.strings

@@ -0,0 +1 @@
+

Riot/Assets/new_features.html

@@ -26,6 +26,148 @@
     </style>
 </head>
 <body>
+    <div>
+        <p>
+        <b>Version 2.18.0</b>
+        </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Ein Dialog wird angezeigt, wenn Du dein Profilbild änderst und die Änderung nicht speicherst.
+        </ul>
+        </p>
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Die Buttons auf der Einladungsdetailansicht werden nun im dunklen Erscheinungsbild in der richtigen Farbe angezeigt.
+            <li/>Ein Absturz der App im Zusammenhang mit auftretenden Fehlermeldungen wurde behoben.
+            <li/>Funktionsbezeichnungen können nur mit Hinterlegung von Text gespeichert werden.
+        </ul>
+        </p>
+        <p>
+    </div>
+    <div>
+        <p>
+        <b>Version 2.17.0</b>
+        </p>
+     
+     <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Editor Befehle, die mit einem Schrägstrich beginnen, wurden deaktiviert.
+            <li/>Die Abfrage des Wartungsfensters funktioniert jetzt noch zuverlässiger.
+            <li/>Gelöschte Standorte werden nicht mehr in der Timeline angezeigt.
+        </ul>
+        </p>
+        <p>
+    </div>
+    <div>
+        <p>
+        <b>Version 2.16.0</b>
+        </p>
+     
+     <p>
+     <b>Neue Funktionen</b>
+     <ul>
+         <li/>Für die Fotoauswahl bei Nachrichten, Raum- und Nutzerprofilen wird jetzt der aktuelle Photopicker von Apple verwendet.
+     </ul>
+     </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Als Voreinstellung wird jetzt der alte Editor verwendet. Der neue Editor ist weiterhin über die Einstellungen auswählbar.
+            <li/>Im Chatverlauf wird nun immer das aktuelle Profilbild der Mitglieder angezeigt.
+            <li/>Kleine Text und UI Verbesserungen rund um den Wiederherstellungsschlüssel und das Backup.
+        </ul>
+        </p>
+        
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Nichtquadratische Bilder haben bei Nutzung als Raum- oder Nutzerprofil keinen Rand mehr.
+        </ul>
+        </p>
+        <p>
+        <b>Version 2.15.0</b>
+        </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Verbesserte Lesbarkeit der Nutzer ID in der Nutzersuche.
+            <li/>Im Chatverlauf wird nun immer das aktuelle Profilbild der Mitglieder angezeigt.
+        </ul>
+        </p>
+        
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Die Pin-Eingabe wird nicht mehr durch die Tastatur verhindert.
+            <li/>Die Swipe Geste, um Mitglieder aus einem Raum zu entfernen, wurde deaktiviert, weil diese Funktion zu Fehlern führen konnte.
+        </ul>
+        </p>
+    </div>
+    <div>
+        <p>
+        <b>Version 2.14.0</b>
+        </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Du kannst jetzt den neuen WYSIWYG Editor in den Einstellungen ein- und ausschalten.
+            <li/>In den Nutzerdetails wird die ID des Nutzers angezeigt.
+        </ul>
+        </p>
+        
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Die Copyrighthinweise in den Landkarten werden korrekt angezeigt.
+        </ul>
+        </p>
+    </div>
+    <div>
+        <p>
+        <b>Version 2.12.1</b>
+        </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Der OIDC Login kann jetzt auch über andere Browser als Safari durchgeführt werden.
+            <li/>Die Verifizierung durch andere Geräte wurde verbessert und an die anderen Plattformen angepasst.
+        </ul>
+        </p>
+        
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Der Button zur Raumerstellung ist bei neuen Nutzern nicht mehr abgeschnitten.
+        </ul>
+        </p>
+    </div>
+    <div>
+        <p>
+        <b>Version 2.12.0</b>
+        </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Bei häufig auftretenden Entschlüsselungsproblemen kannst Du in den Einstellungen unter "Sicherheit" > "Von Sicherung wiederherstellen" deine Nachrichten wiederherstellen. In manchen Fällen kann es weiterhin zu Entschlüsselungsproblemen kommen.
+        </ul>
+        </p>
+        
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Vereinzelnd wurden Nachrichten als leere Nachricht angezeigt, dies wurde behoben. Nachrichten mit diesem Problem sind nun wieder lesbar.
+        </ul>
+        </p>
+    </div>
     <div>
         <p>
         <b>Version 2.11.0</b>

Riot/Assets/nl.lproj/Vector.strings

@@ -2646,8 +2646,8 @@
 "invite_to" = "Uitnodigen %@";
 "room_event_encryption_info_key_authenticity_not_guaranteed" = "De authenticiteit van dit versleutelde bericht kan niet worden gegarandeerd op dit apparaat.";
 "deselect_all" = "Deselecteer alles";
-"wysiwyg_composer_format_action_strikethrough" = "Onderstrepen formaat toepassen";
-"wysiwyg_composer_format_action_underline" = "Doorstrepen formaat toepassen";
+"wysiwyg_composer_format_action_underline" = "Onderstrepen formaat toepassen";
+"wysiwyg_composer_format_action_strikethrough" = "Doorstrepen formaat toepassen";
 "wysiwyg_composer_format_action_italic" = "Cursief formaat toepassen";
 
 // Formatting Actions

Riot/Assets/peo.lproj/InfoPlist.strings

@@ -0,0 +1 @@
+

Riot/Assets/pl.lproj/Vector.strings

@@ -2694,8 +2694,8 @@
 "wysiwyg_composer_format_action_unordered_list" = "Przełącz listę punktorów";
 "wysiwyg_composer_format_action_inline_code" = "Zastosuj kod w tekście";
 "wysiwyg_composer_format_action_link" = "Zastosuj link";
-"wysiwyg_composer_format_action_strikethrough" = "Zastosuj podkreślenie";
-"wysiwyg_composer_format_action_underline" = "Zastosuj przekreślenie";
+"wysiwyg_composer_format_action_underline" = "Zastosuj podkreślenie";
+"wysiwyg_composer_format_action_strikethrough" = "Zastosuj przekreślenie";
 "wysiwyg_composer_format_action_italic" = "Zastosuj kursywę";
 
 // Formatting Actions
@@ -2851,3 +2851,13 @@
 "user_session_verified_session_description" = "Sesje zweryfikowane są wszędzie, gdzie korzystasz z Element po wprowadzeniu swojego hasła lub zweryfikowaniu swojej tożsamości za pomocą innej sesji zweryfikowanej.\n\nTo oznacza, że posiadasz wszystkie niezbędne klucze wymagane do odblokowania swoich zaszyfrowanych wiadomości i oznajmiasz innym użytkownikom, że ufasz tej sesji.";
 "space_invite_nav_title" = "Zaproszenie do przestrzeni";
 "user_other_session_unverified_sessions_header_subtitle" = "Dla wzmocnienia bezpiecznych wiadomości, zweryfikuj swoje sesje i wyloguj się ze wszystkich sesji, których nie rozpoznajesz lub nie używasz.";
+"manage_session_redirect" = "Zostaniesz przekierowany do swojego dostawcy uwierzytelniania, aby zakończyć logowanie.";
+"manage_session_redirect_error" = "Funkcja obecnie niedostępna. Skontaktuj się ze swoim administratorem serwera domowego";
+"room_creation_user_not_found_prompt_title" = "Potwierdzenie";
+"room_creation_user_not_found_prompt_message" = "Nie można znaleźć profili dla poniższych ID Matrix. Czy chcesz rozpocząć wiadomość prywatną mimo to?";
+"room_creation_user_not_found_prompt_invite_action" = "Rozpocznij wiadomość prywatną mimo to";
+"room_participants_invite_unknown_participant_prompt_to_msg" = "Nie można znaleźć profili dla poniższych ID Matrix. Czy na pewno chcesz zaprosić %@ do %@?";
+"room_participants_invite_anyway" = "Zaproś mimo to";
+"settings_manage_account_title" = "Konto";
+"settings_manage_account_action" = "Zarządzaj kontem";
+"settings_manage_account_description" = "Zarządzaj swoim kontem w %@";

Riot/Assets/pt_BR.lproj/Vector.strings

@@ -2556,8 +2556,8 @@
 "authentication_qr_login_start_subtitle" = "Use a câmera neste dispositivo para scannar o QR code mostrado em seu outro dispositivo:";
 "authentication_qr_login_start_title" = "Scannar QR code";
 "authentication_login_with_qr" = "Fazer signin com QR code";
-"wysiwyg_composer_format_action_strikethrough" = "Aplicar formato sublinhar";
-"wysiwyg_composer_format_action_underline" = "Aplicar formato tachar";
+"wysiwyg_composer_format_action_underline" = "Aplicar formato sublinhar";
+"wysiwyg_composer_format_action_strikethrough" = "Aplicar formato tachar";
 "wysiwyg_composer_format_action_italic" = "Aplicar formato itálico";
 
 // Formatting Actions

Riot/Assets/sk.lproj/Vector.strings

@@ -2778,8 +2778,8 @@
 "authentication_qr_login_start_subtitle" = "Pomocou fotoaparátu na tomto zariadení naskenujte QR kód zobrazený na vašom druhom zariadení:";
 "authentication_qr_login_start_title" = "Skenovať QR kód";
 "authentication_login_with_qr" = "Prihlásiť sa pomocou QR kódu";
-"wysiwyg_composer_format_action_strikethrough" = "Použiť formát podčiarknutia";
-"wysiwyg_composer_format_action_underline" = "Použiť formát prečiarknutia";
+"wysiwyg_composer_format_action_underline" = "Použiť formát podčiarknutia";
+"wysiwyg_composer_format_action_strikethrough" = "Použiť formát prečiarknutia";
 "wysiwyg_composer_format_action_italic" = "Použiť formát kurzívou";
 
 // Formatting Actions
@@ -2965,3 +2965,8 @@
 "room_participants_invite_anyway" = "Napriek tomu pozvať";
 "room_creation_user_not_found_prompt_message" = "Nie je možné nájsť používateľské profily pre toto Matrix ID. Chcete aj tak poslať priamu správu?";
 "room_participants_invite_unknown_participant_prompt_to_msg" = "Nie je možné nájsť profily pre toto Matrix ID. Ste si istí, že chcete pozvať %@ do %@?";
+"settings_manage_account_title" = "Účet";
+"settings_manage_account_action" = "Spravovať účet";
+"settings_manage_account_description" = "Spravujte svoj účet na %@";
+"manage_session_redirect" = "Budete presmerovaní na poskytovateľa overovania vášho servera, aby ste dokončili odhlásenie.";
+"manage_session_redirect_error" = "Funkcia aktuálne nie je dostupná. Obráťte sa na správcu vášho domovského servera";

Riot/Assets/sq.lproj/InfoPlist.strings

@@ -5,5 +5,5 @@
 "NSContactsUsageDescription" = "Do t’i jepen shërbyesit tuaj të identiteteve, për ta ndihmuar të gjejë kontakte tuajt në Matrix.";
 "NSCalendarsUsageDescription" = "Shihini te aplikacioni takimet tuaja të planifikuara.";
 "NSFaceIDUsageDescription" = "Face ID përdoret që të hyni në aplikacionin tuaj.";
-"NSLocationWhenInUseUsageDescription" = "Kur ndani vendndodhjen tuaj me persona, Element-i ka nevojë për hyrje në të, që t’u trgojë atyre një hartë.";
+"NSLocationWhenInUseUsageDescription" = "Kur u tregoni vendndodhjen tuaj të tjerëve, Element-i ka nevojë për hyrje në të, që t’u tregojë atyre një hartë.";
 "NSLocationAlwaysAndWhenInUseUsageDescription" = "Kur u tregoni vendndodhjen tuaj të tjerëve, Element-it i duhet hyrje për t’u shfaqur një hartë.";

Riot/Assets/sq.lproj/Vector.strings

@@ -127,8 +127,8 @@
 "contacts_user_directory_offline_section" = "DREJTORI PËRDORUESISH (jashtë linje)";
 // Chat participants
 "room_participants_title" = "Pjesëmarrës";
-"room_participants_add_participant" = "Shtoni pjesmarrës";
-"room_participants_one_participant" = "1 pjesmarrës";
+"room_participants_add_participant" = "Shtoni pjesëmarrës";
+"room_participants_one_participant" = "1 pjesëmarrës";
 "room_participants_multi_participants" = "%d pjesëmarrës";
 "room_participants_leave_prompt_title" = "Dilni nga dhomë";
 "room_participants_leave_prompt_msg" = "Jeni i sigurt se doni të ikni nga dhoma?";
@@ -317,7 +317,7 @@
 "group_home_one_room_format" = "1 dhomë";
 "group_invitation_format" = "%@ ju ftoi të bëheni pjesë e kësaj bashkësie";
 // Group participants
-"group_participants_add_participant" = "Shtoni pjesmarrës";
+"group_participants_add_participant" = "Shtoni pjesëmarrës";
 "group_participants_leave_prompt_title" = "Braktiseni grupin";
 "group_participants_leave_prompt_msg" = "Jeni i sigurt se doni ta braktisni grupin?";
 "group_participants_remove_prompt_title" = "Ripohim";
@@ -398,7 +398,7 @@
 "auth_add_email_and_phone_warning" = "Regjistrimi me email dhe me numër telefoni njëherazi nuk mbulohet ende, deri sa të ketë API. Do të merret parasysh vetëm numri i telefonit. Email-in tuaj mund ta shtoni te profili juaj, te rregullimet.";
 "room_creation_appearance_picture" = "Foto fjalosjeje (në daçi)";
 "room_creation_invite_another_user" = "ID Përdoruesi, emër ose email";
-"room_recents_favourites_section" = "TË PARAPALQYERA";
+"room_recents_favourites_section" = "TË PARAPËLQYERA";
 "room_recents_server_notice_section" = "SINJALIZIME SISTEMI";
 "room_recents_join_room_title" = "Hyni në një dhomë";
 "room_participants_invite_another_user" = "Kërkoni / ftoni sipas ID-je Përdoruesi, Emri ose email-i";
@@ -507,7 +507,7 @@
 "room_details_history_section_members_only" = "Vetëm anëtarët (që nga çasti i përzgjedhjes së kësaj mundësie)";
 "room_details_history_section_prompt_msg" = "Ndryshime se cilët mund të lexojnë historikun do të vlejnë vetëm për mesazhe të ardhshëm në këtë dhomë. Dukshmëria e historikut ekzistues nuk do të ndryshohet.";
 "room_details_addresses_disable_main_address_prompt_msg" = "S’do të keni adresë kryesore të specifikuar. Adresa kryesore parazgjedhje për këtë dhomë do të zgjidhet në tym";
-"room_details_advanced_enable_e2e_encryption" = "Aktivizo fshehtëzim (kujdes: s’mund të çaktizohet më!)";
+"room_details_advanced_enable_e2e_encryption" = "Aktivizo fshehtëzim (kujdes: s’mund të çaktivizohet më!)";
 "room_details_advanced_e2e_encryption_prompt_message" = "Fshehtëzimi skaj-më-skaj është eksperimental dhe mund të mos jetë i qëndrueshëm.\n\nS’duhet t’i zini ende besë për sigurim të dhënash.\n\nPajisjet s’do të jenë ende në gjendje të shfshehtëzojnë historik nga periudha përpara se të merrnin pjesë te dhomë.\n\nPasi të jetë aktivizuar fshehtëzimi për një dhomë, s’mund të çaktivizohet më (hëpërhë).\n\nMesazhet e fshehtëzuar s’do të jenë të dukshëm në klientë që nuk sendërtojnë ende fshehtëzimin.";
 "room_details_fail_to_update_room_guest_access" = "S’arrihet të përditësohet mundësia e hyrjes në dhomë të vizitorëve";
 "group_participants_invite_malformed_id" = "ID e keqformuar. Duhet të jetë një ID Matrix, si '@localpart:domain'";
@@ -619,7 +619,7 @@
 "key_backup_setup_intro_setup_action_without_existing_backup" = "Fillo të përdorësh Kopjeruajtje Kyçesh";
 "key_backup_setup_intro_setup_action_with_existing_backup" = "Përdor Kopjeruajtje Kyçesh";
 "key_backup_setup_passphrase_title" = "Sigurojeni kopjeruajtjen tuaj me një Frazë Sigurie";
-"key_backup_setup_passphrase_setup_recovery_key_info" = "Ose, sigurojeni kopjeruajtjen tuaj me një Kyç Sigurie, duke e ruajtur këtë diku të parrezikuar.";
+"key_backup_setup_passphrase_setup_recovery_key_info" = "Ose, sigurojeni kopjeruajtjen tuaj me një Kyç Sigurie, duke e ruajtur këtë diku të parrezik.";
 "key_backup_setup_passphrase_setup_recovery_key_action" = "(Të mëtejshme) Rregullojeni me një Kyç Sigurie";
 "key_backup_setup_success_title" = "Sukses!";
 // Success from passphrase
@@ -627,7 +627,7 @@
 "key_backup_setup_success_from_passphrase_save_recovery_key_action" = "Ruani Kyç Sigurie";
 "key_backup_setup_success_from_passphrase_done_action" = "U krye";
 // Success from recovery key
-"key_backup_setup_success_from_recovery_key_info" = "Po bëhet kopjeruajtja për kyçet tuaj.\n\nBëni një kopje të këtij Kyçi Sigurie dhe mbajeni të parrezikuar.";
+"key_backup_setup_success_from_recovery_key_info" = "Po bëhet kopjeruajtja për kyçet tuaj.\n\nBëni një kopje të këtij Kyçi Sigurie dhe mbajeni të parrezik.";
 "key_backup_setup_success_from_recovery_key_recovery_key_title" = "Kyç Sigurie";
 "key_backup_setup_success_from_recovery_key_make_copy_action" = "Bëni një Kopje";
 "key_backup_setup_success_from_recovery_key_made_copy_action" = "Kam bërë një kopje";
@@ -1129,7 +1129,7 @@
 "secure_key_backup_setup_existing_backup_error_info" = "Shkyçeni, që ta ripërdorni te kopjeruajtja e sigurt ose për ta fshirë që të krijoni një kopjeruajtje të re mesazhesh te kopjeruajtja e sigurt.";
 "secure_key_backup_setup_existing_backup_error_unlock_it" = "Shkyçe";
 "secure_key_backup_setup_existing_backup_error_delete_it" = "Fshije";
-"sign_out_non_existing_key_backup_alert_setup_secure_backup_action" = "Fillo të përdorësh Kojperuajtje të Sigurt";
+"sign_out_non_existing_key_backup_alert_setup_secure_backup_action" = "Fillo të përdorësh Kopjeruajtje të Sigurt";
 "security_settings_crypto_sessions_description_2" = "Nëse nuk njihni një palë kredenciale, ndryshoni fjalëkalimin tuaj Matrix dhe riujdisni Kopjeruajtjen e Sigurt.";
 "cross_signing_setup_banner_title" = "Ujdisni fshehtëzim";
 "cross_signing_setup_banner_subtitle" = "Verifikoni më me lehtësi pajisje të tjera";
@@ -1517,7 +1517,7 @@
 "poll_timeline_vote_not_registered_action" = "OK";
 "poll_timeline_vote_not_registered_subtitle" = "Na ndjeni, vota juaj s’u regjistrua, ju lutemi, riprovoni";
 "poll_timeline_vote_not_registered_title" = "Votë e paregjistruar";
-"poll_timeline_total_final_results" = "Rezultati përfundimtar, bazua në %lu votë";
+"poll_timeline_total_final_results" = "Rezultati përfundimtar, bazua në %lu vota";
 "poll_timeline_total_final_results_one_vote" = "Rezultati përfundimtar, bazua në 1 votë";
 "poll_timeline_total_votes_not_voted" = "%lu vota të hedhura. Që të shihni përfundimet, votoni";
 "poll_timeline_total_one_vote_not_voted" = "1 votë e hedhur. Që të shihni përfundimet, votoni";
@@ -1975,9 +1975,9 @@
 // Room members
 "room_member_ignore_prompt" = "Doni të fshihen krejt mesazhet nga ky përdorues?";
 "room_member_power_level_prompt" = "S’do të jeni në gjendje ta zhbëni këtë ndryshim, ngaqë po e promovoni përdoruesin të ketë të njëjtën shkallë pushteti si ju vetë.\nJeni i sigurt?";
-"attachment_e2e_keys_file_prompt" = "Kjo kartelë përmban kyçe fshehtëzimi të eksportur nga një klient Matrix.\nDoni të shihni lëndën e kartelës apo të importoni kyçet që ajo përmban?";
+"attachment_e2e_keys_file_prompt" = "Kjo kartelë përmban kyçe fshehtëzimi të eksportuar nga një klient Matrix.\nDoni të shihni lëndën e kartelës apo të importoni kyçet që ajo përmban?";
 "e2e_import_prompt" = "Ky proces ju lejon të importoni kyçe fshehtëzimi që keni eksportuar më parë nga një tjetër klient Matrix. Mandej do të jeni në gjendje të shfshehtëzoni çfarëdo mesazhesh që mund të shfshehtëzojë ai klient tjetër.\nKartela e eksportit është e mbrojtur me një frazëkalim. Që të shfshehtëzoni kartelën, duhet ta jepni frazëkalimin këtu.";
-"e2e_export_prompt" = "Ky proces ju lejon të eksportoni te një kartelë vendore kyçet për mesazhe që keni marrë në dhoma të fshehtëzuara. Mandej do të jeni në gjendje ta importoni kartelën te një tjetër klient Matrix në të ardhmen, që kështu ai klient të jetë në gjendje t’i fshehtëzojë këto mesazhe.\nKartela e eksportuar do t’i lejojë, cilitdo që mund ta lexojë, të shfshehtëzojë çfarëdo mesazhesh të fshehtëzuar që mund të shihni ju, ndaj duhet të bëni kujdes ta mbani të parrezikuar.";
+"e2e_export_prompt" = "Ky proces ju lejon të eksportoni te një kartelë vendore kyçet për mesazhe që keni marrë në dhoma të fshehtëzuara. Mandej do të jeni në gjendje ta importoni kartelën te një tjetër klient Matrix në të ardhmen, që kështu ai klient të jetë në gjendje t’i fshehtëzojë këto mesazhe.\nKartela e eksportuar do t’i lejojë, cilitdo që mund ta lexojë, të shfshehtëzojë çfarëdo mesazhesh të fshehtëzuar që mund të shihni ju, ndaj duhet të bëni kujdes ta mbani të parrezik.";
 "error_common_message" = "Ndodhi një gabim. Ju lutemi, riprovoni më vonë.";
 // Permissions
 "camera_access_not_granted_for_call" = "Thirrjet video lypin përdorim të Kamerës, por %@ s’ka leje për ta përdorur";
@@ -1988,7 +1988,7 @@
 "redact" = "Hiqe";
 // contacts list screen 
 "invitation_message" = "Do të doja të bisedoja me ju me Matrix. Për të pasur më tepër itë dhëna, ju lutem, vizitoni sajtin http://matrix.org.";
-"notification_settings_global_info" = "Rregullimet mbi njoftimet ruhen te llogaria juaj e përdoruesit dhe ndahen me krejt klientët që i mbulojnë ato (përfshi njoftimet në desktop).\n\nRregullat zbatohen sipas një radhe; rregulli i parë që ka përputhje përcakton lëndën për mesazhin.\nKështu: njoftimet sipas fjalësh janë më të rëndësishme se njoftimet sipas dhomash të cilat janë më të rëndësishme se njoftimet sipas dërguesish.\nFor multiple rules of the same kind, the first one in the list that matches takes priority.";
+"notification_settings_global_info" = "Rregullimet mbi njoftimet ruhen te llogaria juaj e përdoruesit dhe ndahen me krejt klientët që i mbulojnë ato (përfshi njoftimet në desktop).\n\nRregullat zbatohen sipas një radhe; rregulli i parë që ka përputhje përcakton lëndën për mesazhin.\nKështu: njoftimet sipas fjalësh janë më të rëndësishme se njoftimet sipas dhomash të cilat janë më të rëndësishme se njoftimet sipas dërguesish.\nPër rregulla të shumta të të njëjtit lloj, i pari në listë që ka përputhje ka përparësinë.";
 "notification_settings_per_word_notifications" = "Njoftime sipas fjale";
 "notification_settings_per_word_info" = "Për fjalët përputhjet gjenden pa marrë parasysh shkrimin me të madhe apo të vogël, dhe mund të përfshijnë një shenjë të gjithëpushtetshme *. Kështu:\nkot përputhet me vargun kot të rrethuar nga përkufizues fjalësh (p.sh. shenja pikësimi apo hapësira, ose fillim/fund rreshti).\nkot* përputhet me çfarëdo fjale që fillon me kot.\n*kot* përputhet me çfarëdo fjale që përfshin 3 shkronjat kot.";
 "notification_settings_per_room_notifications" = "Njoftime sipas dhome";
@@ -2420,9 +2420,9 @@
 "all_chats_edit_layout_add_section_message" = "Fiksoni ndarje te kreu, për hyrje të lehtë në ta";
 "room_event_encryption_info_key_authenticity_not_guaranteed" = "S’mund të garantohet mirëfilltësia e këtij mesazhi të fshehtëzuar në këtë pajisje.";
 "deselect_all" = "Shpërzgjidhi Krejt";
-"wysiwyg_composer_format_action_strikethrough" = "Apliko format me të nënvizuara";
-"wysiwyg_composer_format_action_underline" = "Apliko format me të hequravije";
-"wysiwyg_composer_format_action_italic" = "Apliko format me të pjerrta";
+"wysiwyg_composer_format_action_underline" = "Apliko format me të nënvizuara";
+"wysiwyg_composer_format_action_strikethrough" = "Apliko format me të hequravije";
+"wysiwyg_composer_format_action_italic" = "Apliko format me të pjerrëta";
 
 // Formatting Actions
 "wysiwyg_composer_format_action_bold" = "Apliko format me të trasha";
@@ -2448,7 +2448,7 @@
 "user_session_details_device_os" = "Sistem Operativ";
 "user_session_details_device_browser" = "Shfletues";
 "user_session_details_device_model" = "Model";
-"user_session_details_device_ip_location" = "Venndodhje IP-je";
+"user_session_details_device_ip_location" = "Vendndodhje IP-je";
 "user_session_details_device_ip_address" = "Adresë IP";
 "user_session_details_last_activity" = "Veprimtaria e fundit";
 "user_session_details_session_section_footer" = "Kopjoni çfarëdo të dhëne duke prekur mbi të dhe duke e mbajtur të shtypur.";
@@ -2660,7 +2660,7 @@
 "wysiwyg_composer_format_action_link" = "Apliko formatim lidhjeje";
 "notice_voice_broadcast_ended_by_you" = "Përfunduar një transmetim zanor.";
 "notice_voice_broadcast_ended" = "%@ përfundoi një transmetim zanor.";
-"notice_voice_broadcast_live" = "Transmetim i drejtëpërdrejtë";
+"notice_voice_broadcast_live" = "Transmetim i drejtpërdrejtë";
 "user_other_session_security_recommendation_title" = "Sesione të tjerë";
 "poll_timeline_ended_text" = "Përfundoi pyetësori";
 "poll_timeline_decryption_error" = "Për shkak gabimesh shfshehtëzimi, mund të mos jenë numëruar disa vota";
@@ -2746,3 +2746,14 @@
 
 // Room commands descriptions
 "room_command_change_display_name_description" = "Kjo ndryshon nofkën tuaj në ekran";
+"room_creation_user_not_found_prompt_title" = "Ripohim";
+"room_creation_user_not_found_prompt_message" = "S’arrihet të gjenden profile për këtë ID Matrix. Doni të niset një MD, sido që të jetë?";
+"room_creation_user_not_found_prompt_invite_action" = "Nis MD, sido qoftë";
+"room_participants_invite_unknown_participant_prompt_to_msg" = "S’arrihet të gjenden profile për këtë ID Matrix. Jeni i sigurt se doni të ftohet %@ te %@?";
+"room_participants_invite_anyway" = "Ftoje, sido qoftë";
+"poll_timeline_loading" = "Po ngarkohet…";
+"settings_manage_account_description" = "Administroni llogarinë tuaj në %@";
+"manage_session_redirect_error" = "Funksion që s’mund të kihet aktualisht. Ju lutemi, lidhuni me përgjegjësin e shërbyesit tuaj Home";
+"settings_manage_account_title" = "Llogari";
+"settings_manage_account_action" = "Administroni llogari";
+"manage_session_redirect" = "Do të ridrejtoheni te shërbimi i mirëfilltësimit të shërbyesit tuaj, për të plotësuar daljen nga llogaria.";

Riot/Assets/sv.lproj/Vector.strings

@@ -2485,8 +2485,8 @@
 "wysiwyg_composer_format_action_unordered_list" = "Växla punktlista";
 "wysiwyg_composer_format_action_inline_code" = "Tillämpa inline-kodstil";
 "wysiwyg_composer_format_action_link" = "Tillämpa länkformat";
-"wysiwyg_composer_format_action_strikethrough" = "Tillämpa understruken stil";
-"wysiwyg_composer_format_action_underline" = "Tillämpa genomstruken stil";
+"wysiwyg_composer_format_action_underline" = "Tillämpa understruken stil";
+"wysiwyg_composer_format_action_strikethrough" = "Tillämpa genomstruken stil";
 "wysiwyg_composer_format_action_italic" = "Tillämpa kursiv stil";
 
 // Formatting Actions
@@ -2704,3 +2704,13 @@
 "pill_message" = "Meddelande";
 "key_verification_scan_qr_code_information_new_session" = "Rikta kameran mot QR-koden som visas på din andra enhet för att verifiera din nya session";
 "key_verification_scan_qr_code_information_other_session" = "Rikta kameran mot QR-koden som visas på din andra enhet för att verifiera din session";
+"room_creation_user_not_found_prompt_title" = "Bekräftelse";
+"room_creation_user_not_found_prompt_message" = "Kunde inte hitta profiler för det här Matrix-ID:t. Vill du starta en DM ändå?";
+"room_creation_user_not_found_prompt_invite_action" = "Starta en DM ändå";
+"room_participants_invite_unknown_participant_prompt_to_msg" = "Kunde inte hitta profiler för det här Matrix-ID:t. Är du säker på att du vill bjuda in %@ till %@?";
+"room_participants_invite_anyway" = "Bjud in ändå";
+"settings_manage_account_title" = "Konto";
+"settings_manage_account_action" = "Hantera konto";
+"settings_manage_account_description" = "Hantera ditt konto på %@";
+"manage_session_redirect" = "Du kommer att omdirigeras till din servers autentiseringsleverantör för att fortsätta utloggning.";
+"manage_session_redirect_error" = "Funktion för närvarande otillgänglig. Vänligen kontakta din hemserveradministratör";

Riot/Assets/third_party_licenses.html

@@ -1703,7 +1703,7 @@
     
     <li>
         <b>swift-ogg</b> (<a
-            href="https://github.com/vector-im/swift-ogg">https://github.com/vector-im/swift-ogg</a>)
+            href="https://github.com/element-hq/swift-ogg">https://github.com/element-hq/swift-ogg</a>)
         <p>Makes use of code from 5 frameworks:<br/></p>
         <ul>
             <li>

Riot/Assets/uk.lproj/Vector.strings

@@ -801,7 +801,7 @@
 "directory_server_all_native_rooms" = "Усі кімнати сервера Matrix";
 "group_participants_invite_malformed_id_title" = "Помилка запрошення";
 "group_participants_remove_prompt_msg" = "Ви справді хочете вилучити %@ з цієї групи?";
-"room_notifs_settings_encrypted_room_notice" = "Зверніть увагу, що сповіщення про згадки та ключові слова недоступні в зашифрованих кімнатах на мобільних пристроях.";
+"room_notifs_settings_encrypted_room_notice" = "Зауважте, що сповіщення про згадки та ключові слова недоступні в зашифрованих кімнатах на мобільних пристроях.";
 "room_notifs_settings_account_settings" = "Налаштування облікового запису";
 "room_notifs_settings_manage_notifications" = "Ви можете керувати сповіщеннями у %@";
 "room_notifs_settings_cancel_action" = "Скасувати";
@@ -2548,7 +2548,7 @@
 "room_accessibility_record_voice_message_hint" = "Двічі торкніться й утримуйте для запису.";
 "room_accessibility_record_voice_message" = "Записати голосове повідомлення";
 "location_sharing_live_lab_promotion_activation" = "Увімкнути надсилання геоданих наживо";
-"location_sharing_live_lab_promotion_text" = "Зверніть увагу: це експериментальна функція, яка використовує тимчасову реалізацію, яка дозволяє іншим людям у кімнаті постійно бачити історію поширеного вами місця перебування.";
+"location_sharing_live_lab_promotion_text" = "Зауважте: це експериментальна функція, яка використовує тимчасову реалізацію, що дозволяє іншим людям у кімнаті постійно бачити історію поширеного вами місця перебування.";
 "location_sharing_live_lab_promotion_title" = "Надсилання місця перебування наживо";
 "location_sharing_map_credits_title" = "© Авторське право";
 "room_info_back_button_title" = "Відомості кімнати";
@@ -2780,8 +2780,8 @@
 "authentication_qr_login_start_subtitle" = "Використовуйте камеру на цьому пристрої, щоб зісканувати QR-код, показаний на іншому пристрої:";
 "authentication_qr_login_start_title" = "Сканувати QR-код";
 "authentication_login_with_qr" = "Увійти використавши QR-код";
-"wysiwyg_composer_format_action_strikethrough" = "Застосувати форматування підкресленим";
-"wysiwyg_composer_format_action_underline" = "Застосувати форматування перекресленим";
+"wysiwyg_composer_format_action_underline" = "Застосувати форматування підкресленим";
+"wysiwyg_composer_format_action_strikethrough" = "Застосувати форматування перекресленим";
 
 // Formatting Actions
 "wysiwyg_composer_format_action_bold" = "Застосувати форматування жирним";
@@ -2967,3 +2967,8 @@
 "room_creation_user_not_found_prompt_title" = "Підтвердження";
 "room_creation_user_not_found_prompt_message" = "Не вдалося знайти профілі для цього Matrix ID. Усе одно хочете розпочати приватну бесіду?";
 "room_participants_invite_unknown_participant_prompt_to_msg" = "Не вдалося знайти профілі для цього Matrix ID. Ви впевнені, що хочете запросити %@ до %@?";
+"settings_manage_account_title" = "Обліковий запис";
+"settings_manage_account_action" = "Керувати обліковим записом";
+"settings_manage_account_description" = "Керувати обліковим записом у %@";
+"manage_session_redirect" = "Вас буде перенаправлено до постачальника автентифікації вашого сервера для завершення виходу.";
+"manage_session_redirect_error" = "Функціональність наразі недоступна. Зверніться до адміністратора вашого домашнього сервера";

Riot/Assets/vi.lproj/Vector.strings

@@ -135,8 +135,8 @@
 "directory_cell_title" = "Duyệt danh mục";
 "directory_cell_description" = "%tu phòng";
 "directory_search_results_title" = "Kết quả duyệt danh mục";
-"directory_search_results" = "%tu kết quả được tìm thấy cho %@";
-"directory_search_results_more_than" = ">%tu kết quả được tìm thấy cho %@";
+"directory_search_results" = "%1$tu kết quả được tìm thấy cho %2$@";
+"directory_search_results_more_than" = ">%1$tu kết quả được tìm thấy cho %2$@";
 "directory_searching_title" = "Đang tìm danh mục…";
 "directory_search_fail" = "Không thể tìm nạp dữ liệu";
 // Contacts
@@ -210,7 +210,7 @@
 "room_delete_unsent_messages" = "Xoá các tin nhắn chưa được gửi";
 "room_event_action_copy" = "Sao chép";
 "room_event_action_quote" = "Trích dẫn";
-"room_event_action_redact" = "Biên tập lại";
+"room_event_action_redact" = "Xóa";
 "room_event_action_more" = "Thêm";
 "room_event_action_share" = "Chia sẻ";
 "room_event_action_permalink" = "Liên kết";
@@ -1898,7 +1898,7 @@
 "send" = "Gửi";
 "copy_button_name" = "Sao chép";
 "resend" = "Gửi lại";
-"redact" = "Biên tập lại";
+"redact" = "Xóa";
 "share" = "Chia sẻ";
 "set_power_level" = "Độ nhiệt huyết";
 "delete" = "Xoá";

Riot/Assets/zh_Hans.lproj/Vector.strings

@@ -311,7 +311,7 @@
 "room_details_access_section_anyone" = "任何知道此房间链接的人，包括访客";
 "room_details_access_section_no_address_warning" = "要链接一个房间必须设置地址";
 "room_details_access_section_directory_toggle" = "将此房间列入房间目录";
-"room_details_history_section" = "谁可以阅读历史？";
+"room_details_history_section" = "谁可以读取历史？";
 "room_details_history_section_anyone" = "任何人";
 "room_details_history_section_members_only" = "只有成员（从选择这个选项的时间开始）";
 "room_details_history_section_members_only_since_invited" = "只有成员（从他们被邀请开始）";
@@ -928,7 +928,7 @@
 // MARK: Emoji picker
 "emoji_picker_title" = "反应";
 "emoji_picker_people_category" = "表情和人物";
-"emoji_picker_nature_category" = "动物和自热";
+"emoji_picker_nature_category" = "动物和自然";
 "emoji_picker_foods_category" = "食物和饮料";
 "emoji_picker_activity_category" = "活动";
 "emoji_picker_places_category" = "旅游和景点";
@@ -952,7 +952,7 @@
 "key_verification_tile_request_incoming_approval_decline" = "拒绝";
 "key_verification_tile_conclusion_done_title" = "已验证";
 "key_verification_tile_conclusion_warning_title" = "不被信任的登录";
-"key_verification_incoming_request_incoming_alert_message" = "%@想要验证";
+"key_verification_incoming_request_incoming_alert_message" = "%@ 想要进行验证";
 "user_verification_start_verify_action" = "开始验证";
 "user_verification_start_information_part1" = "为了额外的安全性，请验证： ";
 "user_verification_start_information_part2" = " 检查在你的两个设备上的一次性代码。";
@@ -2275,7 +2275,7 @@
 "user_session_learn_more" = "了解更多";
 "manage_session_name_info_link" = "了解更多";
 "threads_beta_information_link" = "了解更多";
-"authentication_qr_login_display_subtitle" = "用你登出的设备扫描下面的QR码。";
+"authentication_qr_login_display_subtitle" = "用你已登出的设备扫描下面的QR码。";
 "room_invite_to_space_option_detail" = "他们可以探索 %@，但不会成为 %@ 的成员。";
 "analytics_prompt_message_new_user" = "通过分享匿名的使用数据，帮助我们识别问题并改进 %@ 。为了了解人们如何使用多个设备，我们将生成一个随机的标识符，由你的设备共享。";
 "threads_notice_done" = "知道了";
@@ -2349,3 +2349,80 @@
 // User sessions management
 "user_sessions_settings" = "管理登陆会话";
 "settings_presence_offline_mode_description" = "如果开启此选项，对其他用户来说，你看起来就会像下线了一样，即使你正在使用此软件。";
+"room_creation_user_not_found_prompt_title" = "确认";
+"room_creation_user_not_found_prompt_message" = "无法找到此Matrix ID的profiles。你仍然想开始私信吗？";
+"room_creation_user_not_found_prompt_invite_action" = "无论如何都要开始私信";
+"room_participants_invite_anyway" = "无论如何，邀请";
+"threads_discourage_information_1" = "你的家服务器目前不支持消息列，所以此功能可能不可靠。有的消息列消息不一定可用。 ";
+"room_command_emote_description" = "显示动作";
+"threads_discourage_information_2" = "\n\n无论如何，启用消息列吗？";
+"settings_timeline" = "时间线";
+"settings_labs_enable_threads" = "消息列消息";
+"settings_labs_use_only_latest_user_avatar_and_name" = "在消息历史中显示用户的最新头像和名称";
+"manage_session_name_hint" = "自定义会话名称能帮你更轻松地识别设备。";
+"manage_session_rename" = "重命名会话";
+/* The placeholder will be replaces with manage_session_name_info_link */
+"manage_session_name_info" = "请注意，与你通信的人也可以看到会话名称。%@";
+"manage_session_sign_out_other_sessions" = "登出全部其他会话";
+"settings_presence_offline_mode" = "离线模式";
+"room_details_polls" = "投票历史";
+"settings_labs_enable_new_app_layout" = "新版应用布局";
+"room_details_access_row_title" = "访问";
+"room_access_settings_screen_restricted_message" = "让空间中的任何人都能找到并加入。\n将要求你确认哪些空间。";
+"room_access_settings_screen_upgrade_required" = "需要升级";
+"room_participants_invite_unknown_participant_prompt_to_msg" = "未找到该 Matrix ID 的配置文件。您确定要邀请 %@ 到 %@？";
+"room_access_settings_screen_upgrade_alert_auto_invite_switch" = "自动邀请成员到新房间";
+"room_preview_decline_invitation_options" = "您想拒绝邀请还是忽略该用户？";
+"room_access_settings_screen_title" = "谁能进入此房间？";
+"room_access_settings_screen_message" = "决定谁能找到并加入 %@。";
+"room_access_settings_screen_edit_spaces" = "编辑空间";
+"room_access_settings_screen_public_message" = "任何人都可以找到并加入。";
+"settings_presence" = "存在";
+"room_details_promote_room_suggest_title" = "推荐给空间成员";
+"settings_push_rules_error" = "更新您的个性化通知时发生错误。请再试一次。";
+"room_access_settings_screen_private_message" = "只有受邀者才能找到并加入。";
+"room_access_settings_screen_upgrade_alert_message" = "%@ 中的任何人都能找到并加入此房间，无需手动邀请所有人。您可随时在房间设置中进行更改。";
+"room_access_settings_screen_upgrade_alert_note" = "请注意，升级后将创建一个新版本的房间。当前所有消息都将保留在此归档房间中。";
+"room_access_settings_screen_upgrade_alert_upgrade_button" = "升级";
+"settings_acceptable_use" = "可接受使用政策";
+"room_command_reset_user_power_level_description" = "删除指定 id 的用户";
+"settings_manage_account_title" = "账户";
+"settings_manage_account_action" = "管理账户";
+"settings_manage_account_description" = "在 %@ 管理您的账户";
+"manage_session_redirect" = "你将被重定向到服务器的验证提供者以完成登出。";
+"manage_session_redirect_error" = "功能目前不可用。请联系你的家服务器管理员";
+"room_details_promote_room_title" = "推广房间";
+
+// Room Access Settings
+"room_access_settings_screen_nav_title" = "进入房间";
+"room_access_settings_screen_upgrade_alert_title" = "升级房间";
+"room_access_settings_screen_upgrade_alert_message_no_param" = "上级房间中的任何人都能找到并加入此房间，无需手动邀请所有人。您可随时在房间设置中进行更改。";
+"room_access_settings_screen_upgrade_alert_upgrading" = "升级房间";
+"room_access_settings_screen_setting_room_access" = "设置房间权限";
+
+// Room suggestion Settings
+"room_suggestion_settings_screen_nav_title" = "建议房间";
+"room_access_space_chooser_known_spaces_section" = "您知道的包含 %@ 的空间";
+"room_access_space_chooser_other_spaces_section_info" = "这些很可能是 %@ 的管理员参与。";
+"room_access_space_chooser_other_spaces_section" = "其他空间或房间";
+"event_formatter_message_deleted" = "消息已删除";
+"network_offline_title" = "您已离线";
+
+// MARK: Sign out warning
+
+"sign_out" = "登出";
+
+// Unverified sessions
+"key_verification_alert_title" = "您有未验证的会话";
+"pill_message_in" = "在 %@ 里的消息";
+
+// Legacy to Rust security upgrade
+
+"key_verification_self_verify_security_upgrade_alert_title" = "应用已更新";
+"sign_out_confirmation_message" = "您确定要登出吗？";
+"device_verification_self_verify_open_on_other_device_title" = "在您的另一台设备上打开 %@";
+"device_verification_self_verify_open_on_other_device_information" = "您需要先验证此会话才能读取加密信息。\n\n在您的其他设备上打开 Element 并按照说明进行操作。";
+"device_verification_self_verify_wait_recover_secrets_additional_help" = "已无法访问 %@ 会话？";
+"network_offline_message" = "您已离线，请检查您的网络链接。";
+"key_verification_alert_body" = "重新检查以确保您的账户安全。";
+"key_verification_scan_qr_code_title" = "扫描 QR Code";

Riot/Assets/zh_Hant.lproj/Vector.strings

@@ -2026,8 +2026,8 @@
 // Links
 "wysiwyg_composer_link_action_text" = "文字";
 "wysiwyg_composer_format_action_link" = "套用連結格式";
-"wysiwyg_composer_format_action_strikethrough" = "套用底線格式";
-"wysiwyg_composer_format_action_underline" = "套用刪除線格式";
+"wysiwyg_composer_format_action_underline" = "套用底線格式";
+"wysiwyg_composer_format_action_strikethrough" = "套用刪除線格式";
 "wysiwyg_composer_format_action_italic" = "套用義式斜體格式";
 
 // Formatting Actions

Riot/Categories/MXEvent.swift

@@ -56,4 +56,19 @@ extension MXEvent {
             return false
         }
     }
+    
+    // bwi: #5806 bugfix: showing live location view when deleting location event
+    @objc
+    var isTimlineLcationEvent: Bool {
+        switch eventType {
+        case .roomMessage:
+            if messageType == .location {
+                return true
+            } else {
+                return false
+            }
+        default:
+            return false
+        }
+    }
 }

Riot/Categories/UIApplication.swift

@@ -21,12 +21,21 @@ extension UIApplication {
         
         let application = UIApplication.shared
         
-        guard application.canOpenURL(url) else {
+        // bwi: override scheme if needed
+        var tmpURL = url
+    
+        if let urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false) {
+            if let newURL = CustomURLSchemeHelper.shared.overrideURLSchemeIfNeeded(urlComponents).url {
+                tmpURL = newURL
+            }
+        }
+        
+        guard application.canOpenURL(tmpURL) else {
             completion?(false)
             return
         }
         
-        application.open(url, options: [:], completionHandler: { success in
+        application.open(tmpURL, options: [:], completionHandler: { success in
             completion?(success)
         })
     }

Riot/Generated/BWIStrings.swift

@@ -51,6 +51,18 @@ public class BWIL10n: NSObject {
   public static var authenticationLoginUsername: String { 
     return BWIL10n.tr("Bwi", "authentication_login_username") 
   }
+  /// Anmelden mit QR-Code
+  public static var authenticationQrLoginScanTitle: String { 
+    return BWIL10n.tr("Bwi", "authentication_qr_login_scan_title") 
+  }
+  /// QR-Code scannen
+  public static var authenticationQrLoginStartButtonTitle: String { 
+    return BWIL10n.tr("Bwi", "authentication_qr_login_start_button_title") 
+  }
+  /// Anmelden mit QR-Code
+  public static var authenticationQrLoginStartTitle: String { 
+    return BWIL10n.tr("Bwi", "authentication_qr_login_start_title") 
+  }
   /// Willkommen!
   public static var authenticationServerSelectionLoginTitle: String { 
     return BWIL10n.tr("Bwi", "authentication_server_selection_login_title") 
@@ -115,6 +127,10 @@ public class BWIL10n: NSObject {
   public static var bwiAccessibilityDeclarationButtonTitle: String { 
     return BWIL10n.tr("Bwi", "bwi_accessibility_declaration_button_title") 
   }
+  /// Labor ist jetzt verfügbar
+  public static var bwiActivateLabsAlertTitle: String { 
+    return BWIL10n.tr("Bwi", "bwi_activate_labs_alert_title") 
+  }
   /// Wir brauchen Deine Hilfe, um Fehler im %@ besser analysieren zu können. Dazu würden wir gerne anonymisierte Diagnosedaten erfassen. Es werden keine Daten an Dritte übermittelt. Details findest Du in der Datenschutzerklärung.\n\nFalls Du nicht mehr mithelfen möchtest, kannst Du dies in den Einstellungen jederzeit wieder deaktivieren.\n\nMöchtest du bei der Fehler-Analyse unterstützen?
   public static func bwiAnalyticsAlertBody(_ p1: String) -> String {
     return BWIL10n.tr("Bwi", "bwi_analytics_alert_body", p1)
@@ -239,15 +255,15 @@ public class BWIL10n: NSObject {
   public static var bwiErrorRoomNotAvailableTitle: String { 
     return BWIL10n.tr("Bwi", "bwi_error_room_not_available_title") 
   }
-  /// Beim Schreiben von Nachrichten kannst Du jetzt sehr einfach Textformatierungen verwenden.
+  /// Übergreifende sichere Kommunikation zwischen verschiedenen Organisationen
   public static var bwiFeatureBannerAdvertisementText: String { 
     return BWIL10n.tr("Bwi", "bwi_feature_banner_advertisement_text") 
   }
-  /// Neue Funktionen
+  /// Föderation jetzt möglich
   public static var bwiFeatureBannerHeader: String { 
     return BWIL10n.tr("Bwi", "bwi_feature_banner_header") 
   }
-  /// Erfahre mehr
+  /// 
   public static var bwiFeatureBannerShowMoreButton: String { 
     return BWIL10n.tr("Bwi", "bwi_feature_banner_show_more_button") 
   }
@@ -511,6 +527,18 @@ public class BWIL10n: NSObject {
   public static var bwiRoomParticipantsSectionModerator: String { 
     return BWIL10n.tr("Bwi", "bwi_room_participants_section_moderator") 
   }
+  /// Durch das Aufheben der Föderation werden alle Mitglieder der anderen Organisation unwiderruflich entfernt.\n\nFöderation trotzdem aufheben?
+  public static var bwiRoomSettingsFederationAlertMessage: String { 
+    return BWIL10n.tr("Bwi", "bwi_room_settings_federation_alert_message") 
+  }
+  /// Achtung!
+  public static var bwiRoomSettingsFederationAlertTitle: String { 
+    return BWIL10n.tr("Bwi", "bwi_room_settings_federation_alert_title") 
+  }
+  /// Ja, aufheben
+  public static var bwiRoomSettingsFederationAlertWithdrawButton: String { 
+    return BWIL10n.tr("Bwi", "bwi_room_settings_federation_alert_withdraw_button") 
+  }
   /// Details dazu findest du in der Datenschutzerklärung
   public static var bwiSettingsAnalyticsSectionFooter: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_analytics_section_footer") 
@@ -527,6 +555,14 @@ public class BWIL10n: NSObject {
   public static var bwiSettingsDeveloper: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_developer") 
   }
+  /// Announcement zeigen
+  public static var bwiSettingsDeveloperAnnouncementFederationPreview: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_developer_announcement_federation_preview") 
+  }
+  /// Account Data Flag für Announcement zurücksetzen
+  public static var bwiSettingsDeveloperAnnouncementFederationReset: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_developer_announcement_federation_reset") 
+  }
   /// MDM Config: MSG Demo
   public static var bwiSettingsDeveloperApplyAppConfig: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_developer_apply_app_config") 
@@ -543,6 +579,18 @@ public class BWIL10n: NSObject {
   public static var bwiSettingsDeveloperCreateNewPersonalNotesRoom: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_developer_create_new_personal_notes_room") 
   }
+  /// Föderation
+  public static var bwiSettingsDeveloperIntroduceFederation: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_developer_introduce_federation") 
+  }
+  /// Introduction zeigen
+  public static var bwiSettingsDeveloperIntroduceFederationPreview: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_developer_introduce_federation_preview") 
+  }
+  /// Account Data Flag für Introduction zurücksetzen
+  public static var bwiSettingsDeveloperIntroduceFederationReset: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_developer_introduce_federation_reset") 
+  }
   /// Key Backup
   public static var bwiSettingsDeveloperKeyBackup: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_developer_key_backup") 
@@ -567,6 +615,18 @@ public class BWIL10n: NSObject {
   public static var bwiSettingsDeveloperMaintenance: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_developer_maintenance") 
   }
+  /// UserDefaults / lokale Daten
+  public static var bwiSettingsDeveloperMaintenanceLocalData: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_developer_maintenance_local_data") 
+  }
+  /// Aktualisieren
+  public static var bwiSettingsDeveloperMaintenanceReload: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_developer_maintenance_reload") 
+  }
+  /// Daten vom Server
+  public static var bwiSettingsDeveloperMaintenanceServerData: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_developer_maintenance_server_data") 
+  }
   /// Der alte Notizen-Raum Raum wurde durch einen neuen ersetzt.
   public static var bwiSettingsDeveloperNewPersonalNotesRoomCreated: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_developer_new_personal_notes_room_created") 
@@ -627,10 +687,18 @@ public class BWIL10n: NSObject {
   public static var bwiSettingsEnableNotesRoomTitle: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_enable_notes_room_title") 
   }
+  /// Neuer Editor (umfangreiche Formatierung)
+  public static var bwiSettingsEnableWysiwygComposer: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_enable_wysiwyg_composer") 
+  }
   /// Ignorierte Nutzer
   public static var bwiSettingsIgnoredUsersText: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_ignored_users_text") 
   }
+  /// Föderation
+  public static var bwiSettingsLabsFederationFeature: String { 
+    return BWIL10n.tr("Bwi", "bwi_settings_labs_federation_feature") 
+  }
   /// Netiquette
   public static var bwiSettingsNetiquette: String { 
     return BWIL10n.tr("Bwi", "bwi_settings_netiquette") 
@@ -691,7 +759,7 @@ public class BWIL10n: NSObject {
   public static var collapse: String { 
     return BWIL10n.tr("Bwi", "collapse") 
   }
-  /// Fehler beim Laden
+  /// Datei steht nicht mehr zur Verfügung
   public static var contentScanStatusFailed: String { 
     return BWIL10n.tr("Bwi", "content_scan_status_failed") 
   }
@@ -715,14 +783,38 @@ public class BWIL10n: NSObject {
   public static var create: String { 
     return BWIL10n.tr("Bwi", "create") 
   }
+  /// Ok
+  public static var createRoomFailedToDeactivateFederationAlertDismissButton: String { 
+    return BWIL10n.tr("Bwi", "create_room_failed_to_deactivate_federation_alert_dismiss_button") 
+  }
+  /// Die Föderation konnte nicht deaktiviert werden, bitte versuche es später erneut.
+  public static var createRoomFailedToDeactivateFederationForRoomErrorText: String { 
+    return BWIL10n.tr("Bwi", "create_room_failed_to_deactivate_federation_for_room_error_text") 
+  }
+  /// Föderation aktiv
+  public static var createRoomFailedToDeactivateFederationForRoomErrorTitle: String { 
+    return BWIL10n.tr("Bwi", "create_room_failed_to_deactivate_federation_for_room_error_title") 
+  }
   /// Thema
   public static var createRoomPlaceholderTopic: String { 
     return BWIL10n.tr("Bwi", "create_room_placeholder_topic") 
   }
+  /// Für eine Föderation zulassen
+  public static var createRoomTypeFederated: String { 
+    return BWIL10n.tr("Bwi", "create_room_type_federated") 
+  }
+  /// (Raum kann von externen Organisationen mitgenutzt werden)
+  public static var createRoomTypeFederatedSubtext: String { 
+    return BWIL10n.tr("Bwi", "create_room_type_federated_subtext") 
+  }
   /// Verifizierung abgebrochen. Du kannst sie erneut starten.
   public static var deviceVerificationCancelled: String { 
     return BWIL10n.tr("Bwi", "device_verification_cancelled") 
   }
+  /// Mit anderem Gerät verifizieren
+  public static var deviceVerificationCrosssigningWaitRecoverSecrets: String { 
+    return BWIL10n.tr("Bwi", "device_verification_crosssigning_wait_recover_secrets") 
+  }
   /// Anmeldung verifizieren
   public static var deviceVerificationOtherLoginVerifyWaitTitle: String { 
     return BWIL10n.tr("Bwi", "device_verification_other_login_verify_wait_title") 
@@ -787,6 +879,42 @@ public class BWIL10n: NSObject {
   public static var e2eKeyBackupWrongVersion: String { 
     return BWIL10n.tr("Bwi", "e2e_key_backup_wrong_version") 
   }
+  /// Dieser Raum wurde vom Administrator für eine Föderation zugelassen.
+  public static var eventFormatterAclAllowFederation: String { 
+    return BWIL10n.tr("Bwi", "event_formatter_acl_allow_federation") 
+  }
+  /// %tu Föderations und weitere Einstellungen geändert.
+  public static func eventFormatterAclAndOtherCollapsed(_ p1: Int) -> String {
+    return BWIL10n.tr("Bwi", "event_formatter_acl_and_other_collapsed", p1)
+  }
+  /// %tu Föderationseinstellungen wurden geändert.
+  public static func eventFormatterAclCollapsed(_ p1: Int) -> String {
+    return BWIL10n.tr("Bwi", "event_formatter_acl_collapsed", p1)
+  }
+  /// Die Föderation für diesen Raum wurde nicht zugelassen.
+  public static var eventFormatterAclDisallowAtStart: String { 
+    return BWIL10n.tr("Bwi", "event_formatter_acl_disallow_at_start") 
+  }
+  /// Die Föderation für diesen Raum wurde aufgehoben. Alle föderierten Mitglieder werden automatisch entfernt.
+  public static var eventFormatterAclDisallowFederation: String { 
+    return BWIL10n.tr("Bwi", "event_formatter_acl_disallow_federation") 
+  }
+  /// Verstanden
+  public static var federationAnnouncementButton: String { 
+    return BWIL10n.tr("Bwi", "federation_announcement_button") 
+  }
+  /// Wenn du dein Profilbild vorweg ändern möchtest, gehe zu den Einstellungen.
+  public static var federationAnnouncementSubText: String { 
+    return BWIL10n.tr("Bwi", "federation_announcement_sub_text") 
+  }
+  /// Ab Mai 2024 ist die **Föderation** zwischen verschiedenen Organisationen möglich. Dies bietet eine übergreifende sichere Kommunikation.\n\nDetails findest du in der Datenschutzerklärung.
+  public static var federationAnnouncementText: String { 
+    return BWIL10n.tr("Bwi", "federation_announcement_text") 
+  }
+  /// Ankündigung
+  public static var federationAnnouncementTitle: String { 
+    return BWIL10n.tr("Bwi", "federation_announcement_title") 
+  }
   /// Notizen ausblenden
   public static var homeContextMenuPersonalNotes: String { 
     return BWIL10n.tr("Bwi", "home_context_menu_personal_notes") 
@@ -807,6 +935,34 @@ public class BWIL10n: NSObject {
   public static var integrityAlertTitle: String { 
     return BWIL10n.tr("Bwi", "integrity_alert_title") 
   }
+  /// Übergreifende sichere Kommunikation zwischen verschiedenen Organisationen
+  public static var introduceFederationScreen1Description: String { 
+    return BWIL10n.tr("Bwi", "introduce_federation_screen1_description") 
+  }
+  /// Föderation
+  public static var introduceFederationScreen1Title: String { 
+    return BWIL10n.tr("Bwi", "introduce_federation_screen1_title") 
+  }
+  /// Föderierte Personen und Räume erkennst du am Symbol mit den zwei sich überschneidenden Kreisen.
+  public static var introduceFederationScreen2Description: String { 
+    return BWIL10n.tr("Bwi", "introduce_federation_screen2_description") 
+  }
+  /// Kennzeichnung
+  public static var introduceFederationScreen2Title: String { 
+    return BWIL10n.tr("Bwi", "introduce_federation_screen2_title") 
+  }
+  /// Bestimme als Admin, welche Räume für eine Föderation zugelassen sind.
+  public static var introduceFederationScreen3Description: String { 
+    return BWIL10n.tr("Bwi", "introduce_federation_screen3_description") 
+  }
+  /// Individuelle Einstellung
+  public static var introduceFederationScreen3Title: String { 
+    return BWIL10n.tr("Bwi", "introduce_federation_screen3_title") 
+  }
+  /// Verstanden
+  public static var introduceFederationStart: String { 
+    return BWIL10n.tr("Bwi", "introduce_federation_start") 
+  }
   /// Einladen
   public static var invite: String { 
     return BWIL10n.tr("Bwi", "invite") 
@@ -971,10 +1127,6 @@ public class BWIL10n: NSObject {
   public static var keyVerificationVerifyQrCodeTitle: String { 
     return BWIL10n.tr("Bwi", "key_verification_verify_qr_code_title") 
   }
-  /// 
-  public static var locationSharingCopyrightLabel: String { 
-    return BWIL10n.tr("Bwi", "location_sharing_copyright_label") 
-  }
   /// Mapbox Maps SDK für iOS
   public static var locationSharingMapCreditsTitle: String { 
     return BWIL10n.tr("Bwi", "location_sharing_map_credits_title") 
@@ -1087,6 +1239,38 @@ public class BWIL10n: NSObject {
   public static var retry: String { 
     return BWIL10n.tr("Bwi", "retry") 
   }
+  /// Ok
+  public static var roomAdminFederationDecisionSetFederationAlertOkButton: String { 
+    return BWIL10n.tr("Bwi", "room_admin_federation_decision_set_federation_alert_ok_button") 
+  }
+  /// Der Server ist aktuell nicht erreichbar. Versuche es später erneut.
+  public static var roomAdminFederationDecisionSetFederationErrorAlertText: String { 
+    return BWIL10n.tr("Bwi", "room_admin_federation_decision_set_federation_error_alert_text") 
+  }
+  /// Aktion fehlgeschlagen
+  public static var roomAdminFederationDecisionSetFederationErrorAlertTitle: String { 
+    return BWIL10n.tr("Bwi", "room_admin_federation_decision_set_federation_error_alert_title") 
+  }
+  /// Dieser Raum ist jetzt föderiert.
+  public static var roomAdminFederationDecisionSetFederationSuccessAlertTitle: String { 
+    return BWIL10n.tr("Bwi", "room_admin_federation_decision_set_federation_success_alert_title") 
+  }
+  /// Raum föderieren
+  public static var roomAdminFederationDecisionSheetActivateFederationButton: String { 
+    return BWIL10n.tr("Bwi", "room_admin_federation_decision_sheet_activate_federation_button") 
+  }
+  /// Raum intern behalten
+  public static var roomAdminFederationDecisionSheetDeactivateFederationButton: String { 
+    return BWIL10n.tr("Bwi", "room_admin_federation_decision_sheet_deactivate_federation_button") 
+  }
+  /// Hierdurch kann der Raum von externen Organisationen mitgenutzt werden. Dies kann nachträglich in den Einstellungen geändert werden.
+  public static var roomAdminFederationDecisionSheetText: String { 
+    return BWIL10n.tr("Bwi", "room_admin_federation_decision_sheet_text") 
+  }
+  /// "%@" für eine Föderation zulassen?
+  public static func roomAdminFederationDecisionSheetTitle(_ p1: String) -> String {
+    return BWIL10n.tr("Bwi", "room_admin_federation_decision_sheet_title", p1)
+  }
   /// Raumbild ändern
   public static var roomAvatarViewAccessibilityHint: String { 
     return BWIL10n.tr("Bwi", "room_avatar_view_accessibility_hint") 
@@ -1135,6 +1319,22 @@ public class BWIL10n: NSObject {
   public static var roomDetailsAdvancedRoomIdForDm: String { 
     return BWIL10n.tr("Bwi", "room_details_advanced_room_id_for_dm") 
   }
+  /// Ok
+  public static var roomDetailsFailedToChangeFederationAlertDismissButton: String { 
+    return BWIL10n.tr("Bwi", "room_details_failed_to_change_federation_alert_dismiss_button") 
+  }
+  /// Die Föderation konnte nicht geändert werden, bitte versuche es später erneut.
+  public static var roomDetailsFailedToChangeFederationForRoomErrorText: String { 
+    return BWIL10n.tr("Bwi", "room_details_failed_to_change_federation_for_room_error_text") 
+  }
+  /// Föderation aktiv
+  public static var roomDetailsFailedToChangeFederationForRoomErrorTitle: String { 
+    return BWIL10n.tr("Bwi", "room_details_failed_to_change_federation_for_room_error_title") 
+  }
+  /// Aktualisierung der Föderations-Einstellung fehlgeschlagen
+  public static var roomDetailsFailedToUpdateRoomServerAclRule: String { 
+    return BWIL10n.tr("Bwi", "room_details_failed_to_update_room_server_acl_rule") 
+  }
   /// Dateien
   public static var roomDetailsFiles: String { 
     return BWIL10n.tr("Bwi", "room_details_files") 
@@ -1175,6 +1375,14 @@ public class BWIL10n: NSObject {
   public static var roomIntroCellInformationDmSentence1Part1: String { 
     return BWIL10n.tr("Bwi", "room_intro_cell_information_dm_sentence1_part1") 
   }
+  /// Verstanden
+  public static var roomMemberDetailsChangeFederatedMemberPowerLvlToAdminErrorButton: String { 
+    return BWIL10n.tr("Bwi", "room_member_details_change_federated_member_power_lvl_to_admin_error_button") 
+  }
+  /// Diese Person kann keine Adminrechte erhalten, da sie nicht aus deiner Organisation stammt. Föderierte Personen können nur Mitglieder oder Moderatoren sein.
+  public static var roomMemberDetailsChangeFederatedMemberPowerLvlToAdminErrorText: String { 
+    return BWIL10n.tr("Bwi", "room_member_details_change_federated_member_power_lvl_to_admin_error_text") 
+  }
   /// Du kannst dich nur zurückstufen, wenn du vorher einen weiteren Admin benennst.
   public static var roomMemberDetailsDowngradeLastAdmin: String { 
     return BWIL10n.tr("Bwi", "room_member_details_downgrade_last_admin") 
@@ -1247,6 +1455,18 @@ public class BWIL10n: NSObject {
   public static var roomParticipantsInviteAnotherUser: String { 
     return BWIL10n.tr("Bwi", "room_participants_invite_another_user") 
   }
+  /// Du kannst diese Person nicht einladen, da die Föderation für diesen Raum durch den Admin nicht gewünscht ist.
+  public static var roomParticipantsInvitePromptFederationForRoomNotAllowedText: String { 
+    return BWIL10n.tr("Bwi", "room_participants_invite_prompt_federation_for_room_not_allowed_text") 
+  }
+  /// Du kannst noch keine Personen aus einer föderierten Organisation einladen, da die Freigabe hierfür noch nicht erteilt wurde. Gib dem Admin Bescheid, dass die Einstellung getroffen werden muss.
+  public static var roomParticipantsInvitePromptServerAclForRoomNotConfiguredText: String { 
+    return BWIL10n.tr("Bwi", "room_participants_invite_prompt_server_acl_for_room_not_configured_text") 
+  }
+  /// Die Person kann aktuell nicht eingeladen werden, bitte versuche es später erneut.
+  public static var roomParticipantsInvitePromptServerAclLoadingErrorText: String { 
+    return BWIL10n.tr("Bwi", "room_participants_invite_prompt_server_acl_loading_error_text") 
+  }
   /// Bist du sicher, dass du %@ zu %@ einladen möchtest
   public static func roomParticipantsInvitePromptToMsg(_ p1: String, _ p2: String) -> String {
     return BWIL10n.tr("Bwi", "room_participants_invite_prompt_to_msg", p1, p2)
@@ -1331,6 +1551,18 @@ public class BWIL10n: NSObject {
   public static var secretsRecoveryResetActionPart2: String { 
     return BWIL10n.tr("Bwi", "secrets_recovery_reset_action_part_2") 
   }
+  /// Ok
+  public static var secretsRecoveryVerificationAlertCancel: String { 
+    return BWIL10n.tr("Bwi", "secrets_recovery_verification_alert_cancel") 
+  }
+  /// Eine Verifizierungsanfrage wurde gesendet. Öffne eine deiner anderen Sitzungen, um sie zu akzeptieren und mit der Verifizierung zu beginnen.
+  public static var secretsRecoveryVerificationAlertMessage: String { 
+    return BWIL10n.tr("Bwi", "secrets_recovery_verification_alert_message") 
+  }
+  /// Anmeldung verifizieren
+  public static var secretsRecoveryVerificationAlertTitle: String { 
+    return BWIL10n.tr("Bwi", "secrets_recovery_verification_alert_title") 
+  }
   /// Gib dein Verschlüsselungskennwort ein, um auf deine verschlüsselten Nachrichten und deine Cross-Signing-Identität zuzugreifen. Mit der Cross-Signing-Identität kannst du andere Sitzungen verifizieren.
   public static var secretsRecoveryWithKeyInformationDefault: String { 
     return BWIL10n.tr("Bwi", "secrets_recovery_with_key_information_default") 
@@ -1407,15 +1639,15 @@ public class BWIL10n: NSObject {
   public static var secretsResetResetAction: String { 
     return BWIL10n.tr("Bwi", "secrets_reset_reset_action") 
   }
-  /// Verschlüsselung zurücksetzen
+  /// Zurücksetzen
   public static var secretsResetTitle: String { 
     return BWIL10n.tr("Bwi", "secrets_reset_title") 
   }
-  /// Du verlierst dadurch deinen gesamten bisherigen Nachrichtenverlauf, sowie verfizierte Geräte oder Nutzer!
+  /// Das Zurücksetzen deines Wiederherstellungsschlüssels kann nicht rückgängig gemacht werden. Nach dem Zurücksetzen wirst du alte Nachrichten nicht mehr lesen können.
   public static var secretsResetWarningMessage: String { 
     return BWIL10n.tr("Bwi", "secrets_reset_warning_message") 
   }
-  /// Wenn Du die Verschlüsselung zurücksetzt:
+  /// Willst du deinen Wiederherstellungsschlüssel wirklich zurücksetzen?
   public static var secretsResetWarningTitle: String { 
     return BWIL10n.tr("Bwi", "secrets_reset_warning_title") 
   }
@@ -1491,10 +1723,18 @@ public class BWIL10n: NSObject {
   public static var securitySettingsCryptoSessionsDescription: String { 
     return BWIL10n.tr("Bwi", "security_settings_crypto_sessions_description") 
   }
+  /// Nachrichten wiederherstellen
+  public static var securitySettingsSecureBackup: String { 
+    return BWIL10n.tr("Bwi", "security_settings_secure_backup") 
+  }
   /// Lösche
   public static var securitySettingsSecureBackupDelete: String { 
     return BWIL10n.tr("Bwi", "security_settings_secure_backup_delete") 
   }
+  /// Sofern du Probleme mit nicht-entschlüsselbaren Nachrichten hast, kann es helfen, die Schlüssel neu abzurufen. Klicke hierzu auf den Button und warte solange, bis alle Schlüssel wiederhergestellt wurden. Die App muss dazu geöffnet bleiben.
+  public static var securitySettingsSecureBackupInfoValid: String { 
+    return BWIL10n.tr("Bwi", "security_settings_secure_backup_info_valid") 
+  }
   /// Bestätige deine Identität durch Eingabe des Passwort
   public static var securitySettingsUserPasswordDescription: String { 
     return BWIL10n.tr("Bwi", "security_settings_user_password_description") 
@@ -1515,6 +1755,10 @@ public class BWIL10n: NSObject {
   public static var settingsCallInvitations: String { 
     return BWIL10n.tr("Bwi", "settings_call_invitations") 
   }
+  /// Auch Nutzer aus föderierten Organisationen können dein Profilbild sehen.
+  public static var settingsChangeProfileAvatarHint: String { 
+    return BWIL10n.tr("Bwi", "settings_change_profile_avatar_hint") 
+  }
   /// Neues Passwort bestätigen
   public static var settingsConfirmPassword: String { 
     return BWIL10n.tr("Bwi", "settings_confirm_password") 
@@ -1523,6 +1767,10 @@ public class BWIL10n: NSObject {
   public static var settingsCopyright: String { 
     return BWIL10n.tr("Bwi", "settings_copyright") 
   }
+  /// Zurück
+  public static var settingsCustomBackButton: String { 
+    return BWIL10n.tr("Bwi", "settings_custom_back_button") 
+  }
   /// Benachrichtigungen
   public static var settingsDefault: String { 
     return BWIL10n.tr("Bwi", "settings_default") 
@@ -1687,6 +1935,18 @@ public class BWIL10n: NSObject {
   public static var settingsRoomUpgrades: String { 
     return BWIL10n.tr("Bwi", "settings_room_upgrades") 
   }
+  /// Nein
+  public static var settingsSaveChangesAlertDoNotSaveButton: String { 
+    return BWIL10n.tr("Bwi", "settings_save_changes_alert_do_not_save_button") 
+  }
+  /// Ja
+  public static var settingsSaveChangesAlertSaveButton: String { 
+    return BWIL10n.tr("Bwi", "settings_save_changes_alert_save_button") 
+  }
+  /// Möchtest du die Änderungen speichern?
+  public static var settingsSaveChangesAlertTitle: String { 
+    return BWIL10n.tr("Bwi", "settings_save_changes_alert_title") 
+  }
   /// Support
   public static var settingsSupport: String { 
     return BWIL10n.tr("Bwi", "settings_support") 
@@ -1743,6 +2003,14 @@ public class BWIL10n: NSObject {
   public static var splashScreenTitle: String { 
     return BWIL10n.tr("Bwi", "splash_screen_title") 
   }
+  /// Authentifizierung über Schema %@ konnte nicht geöffnet werden. Bitte wende dich an deinen Support.
+  public static func ssoAuthenticationUrlSchemeErrorMessage(_ p1: String) -> String {
+    return BWIL10n.tr("Bwi", "sso_authentication_url_scheme_error_message", p1)
+  }
+  /// Fehler bei Authentifizierung
+  public static var ssoAuthenticationUrlSchemeErrorTitle: String { 
+    return BWIL10n.tr("Bwi", "sso_authentication_url_scheme_error_title") 
+  }
   /// Der Server ist momentan nicht erreichbar. Versuche es später erneut.
   public static var standardErrorAlertTitleDowntime: String { 
     return BWIL10n.tr("Bwi", "standard_error_alert_title_downtime") 

Riot/Generated/Images.swift

@@ -46,10 +46,32 @@ internal class Asset: NSObject {
     internal static let authenticationTermsIcon = ImageAsset(name: "authentication_terms_icon")
     internal static let binoculars = ImageAsset(name: "binoculars")
     internal static let birthdayCake = ImageAsset(name: "birthday_cake")
+    internal static let buttonNewDark = ImageAsset(name: "button_new_dark")
+    internal static let buttonNewLight = ImageAsset(name: "button_new_light")
+    internal static let bwiSettingsFilled = ImageAsset(name: "bwi_settings_filled")
+    internal static let federationExclamationMarkDark = ImageAsset(name: "federation_exclamation_mark_dark")
+    internal static let federationExclamationMarkLight = ImageAsset(name: "federation_exclamation_mark_light")
+    internal static let federationPillDeBumDark = ImageAsset(name: "federation_pill_de_bum_dark")
+    internal static let federationPillDeBumLight = ImageAsset(name: "federation_pill_de_bum_light")
+    internal static let federationPillEnBumDark = ImageAsset(name: "federation_pill_en_bum_dark")
+    internal static let federationPillEnBumLight = ImageAsset(name: "federation_pill_en_bum_light")
     internal static let fileAttachmentIcon = ImageAsset(name: "file_attachment_icon")
     internal static let fileScanInfected = ImageAsset(name: "file_scan_infected")
+    internal static let introduceFederation1Dark = ImageAsset(name: "introduce_federation_1_dark")
+    internal static let introduceFederation1Light = ImageAsset(name: "introduce_federation_1_light")
+    internal static let introduceFederation2Dark = ImageAsset(name: "introduce_federation_2_dark")
+    internal static let introduceFederation2Light = ImageAsset(name: "introduce_federation_2_light")
+    internal static let introduceFederation3 = ImageAsset(name: "introduce_federation_3")
+    internal static let mediaFileUnavailable = ImageAsset(name: "media_file_unavailable")
     internal static let newFeatures = ImageAsset(name: "new_features")
+    internal static let qr = ImageAsset(name: "qr")
     internal static let qrcodeViewfinder = ImageAsset(name: "qrcode_viewfinder")
+    internal static let roomFederatedBumIconDark = ImageAsset(name: "room_federated_bum_icon_dark")
+    internal static let roomFederatedBumIconLight = ImageAsset(name: "room_federated_bum_icon_light")
+    internal static let roomFilterToggleDarkOff = ImageAsset(name: "room_filter_toggle_dark_off")
+    internal static let roomFilterToggleDarkOn = ImageAsset(name: "room_filter_toggle_dark_on")
+    internal static let roomFilterToggleLightOff = ImageAsset(name: "room_filter_toggle_light_off")
+    internal static let roomFilterToggleLightOn = ImageAsset(name: "room_filter_toggle_light_on")
     internal static let welcomeExperience1 = ImageAsset(name: "welcome_experience_1")
     internal static let welcomeExperience2 = ImageAsset(name: "welcome_experience_2")
     internal static let welcomeExperience3 = ImageAsset(name: "welcome_experience_3")