chore: Use correct versions of adaptive_dialog

Currently translated at 100.0% (549 of 549 strings)

Translation: FluffyChat/Translations
Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fa/

.gitlab-ci.yml

@@ -1,9 +1,7 @@
 variables:
-  FLUTTER_VERSION: 3.7.0
+  FLUTTER_VERSION: 3.10.0
 
-image:
+image: ghcr.io/cirruslabs/flutter:${FLUTTER_VERSION}
-  name: cirrusci/flutter:${FLUTTER_VERSION}
-  pull_policy: if-not-present
 
 .shared_windows_runners:
   tags:
@@ -18,23 +16,25 @@ stages:
 
 code_analyze:
   stage: test
-  script: [ ./scripts/code_analyze.sh ]
+  script:
+    - flutter pub get
+    - dart run import_sorter:main --no-comments --exit-if-changed
+    - dart format lib/ test/ --set-exit-if-changed
+    - flutter analyze
+    - git apply ./scripts/enable-android-google-services.patch
+    - flutter pub get
+    - flutter analyze
+    - flutter pub run dart_code_metrics:metrics lib -r gitlab > code-quality-report.json || true
   artifacts:
     reports:
       codequality: code-quality-report.json
-  tags:
-    - docker
-    - famedly
 
 widget_test:
   stage: test
-  script: [ flutter test ]
+  script: [flutter test]
-  tags:
-    - docker
-    - famedly
 
 # the basic integration test configuration testing FLOSS builds on Synapse
-integration_test:
+.integration_test:
   image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/integration/stable:${FLUTTER_VERSION}
   stage: test
   services:
@@ -74,9 +74,8 @@ integration_test:
     - ffmpeg -i video.mkv -vf scale=iw/2:-2 -crf 40 -b:v 2000k -preset fast video.mp4 || true
   timeout: 30m
   retry: 2
-  rules:
+  only:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - tags
-      when: always
   artifacts:
     when: always
     paths:
@@ -85,12 +84,10 @@ integration_test:
     - docker
     - famedly
 
-
 # integration tests for Linux builds
 ### disabled because of Linux headless issues
 .integration_test_linux:
-  image: cirrusci/flutter:${FLUTTER_VERSION}
+  extends: .integration_test
-  extends: integration_test
   parallel:
     matrix:
       - HOMESERVER_IMPLEMENTATION:
@@ -100,12 +97,12 @@ integration_test:
     - apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libsecret-1-dev libjsoncpp-dev
     - flutter pub get
     - flutter test integration_test -d linux --dart-define=HOMESERVER=$HOMESERVER --dart-define=USER1_NAME=$USER1_NAME --dart-define=USER2_NAME=$USER2_NAME --dart-define=USER1_PW=$USER1_PW --dart-define=USER2_PW=$USER2_PW || ( sleep 10 && exit 1 )
-  after_script: [ ]
+  after_script: []
   artifacts:
 
 # extending the default tests to test the Google-flavored builds
-integration_test_proprietary:
+.integration_test_proprietary:
-  extends: integration_test
+  extends: .integration_test
   parallel:
     matrix:
       - HOMESERVER_IMPLEMENTATION:
@@ -137,6 +134,8 @@ release_mode_launches:
     # generate temporary release build configuration and ensure app launches
     - scripts/integration-check-release-build.sh
   timeout: 20m
+  only:
+    - tags
   tags:
     - docker
     - famedly
@@ -144,14 +143,12 @@ release_mode_launches:
 build_web:
   stage: build
   before_script:
-    [ sudo apt update && sudo apt install curl -y, ./scripts/prepare-web.sh ]
+    [sudo apt update && sudo apt install curl -y, ./scripts/prepare-web.sh]
-  script: [ ./scripts/build-web.sh ]
+  script:
+    - flutter build web --release --verbose --source-maps
   artifacts:
     paths:
       - build/web/
-  tags:
-    - docker
-    - famedly
 
 # yes, we *do* build a Windows DLL on Linux. More reliable.
 build_olm_windows:
@@ -197,28 +194,28 @@ build_windows:
 
 build_android_debug:
   stage: build
-  script: [ ./scripts/build-android-debug.sh ]
+  script: [flutter build apk --debug]
   artifacts:
     when: on_success
     paths:
       - build/app/outputs/apk/debug/app-debug.apk
-  except:
-    - main
-    - tags
   tags:
     - docker
     - famedly
+  except:
+    - main
+    - tags
 
 build_android_apk:
   stage: build
   before_script:
     - git apply ./scripts/enable-android-google-services.patch
     - ./scripts/prepare-android-release.sh
-  script: [ ./scripts/build-android-apk.sh ]
+  script: [flutter build apk --release]
   artifacts:
     when: on_success
     paths:
-      - build/android/app-release.apk
+      - build/app/outputs/apk/release/app-release.apk
   tags:
     - docker
     - famedly
@@ -231,7 +228,7 @@ deploy_playstore_internal:
   before_script:
     - git apply ./scripts/enable-android-google-services.patch
     - ./scripts/prepare-android-release.sh
-  script: [ ./scripts/release-playstore-beta.sh ]
+  script: [./scripts/release-playstore-beta.sh]
   artifacts:
     when: on_success
     paths:
@@ -258,9 +255,6 @@ fdroid_repo:
   needs:
     - "build_android_apk"
   resource_group: playstore_release
-  tags:
-    - docker
-    - famedly
   allow_failure: true
   only:
     - main
@@ -280,12 +274,7 @@ pages:
     - cd ..
     - mv docs public
     - mv repo public || true
-    - mv build/web/ public/nightly
+    - mv build/web/ public/web
-    # ensure the nightly deployment knows its location
-    - sed -i "s/href=\"\/web\/\"/href=\"\/nightly\/\"/g" public/nightly/index.html
-    - rm -rf build
-    - ./scripts/download-web-stable.sh
-    - mv stable public/web
   artifacts:
     paths:
       - public
@@ -294,12 +283,11 @@ pages:
 
 build_linux_x86:
   stage: build
-  image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/flutter-linux/stable
+  image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/flutter-linux/stable:${FLUTTER_VERSION}
   before_script:
-    [
+    - sudo apt-get update
-      sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 -y,
+    - sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 -y
-    ]
+  script: [flutter build linux --release]
-  script: [ ./scripts/build-linux.sh ]
   tags:
     - docker
     - famedly
@@ -310,9 +298,10 @@ build_linux_x86:
 
 build_linux_arm64:
   stage: build
-  before_script: [ flutter upgrade ]
+  before_script:
-  script: [ ./scripts/build-linux.sh ]
+    - flutter upgrade $FLUTTER_VERSION --force
-  tags: [ docker_arm64 ]
+  script: [flutter build linux --release]
+  tags: [docker_arm64]
   only:
     - main
     - tags
@@ -324,9 +313,7 @@ build_linux_arm64:
 
 update_dependencies:
   stage: build
-  needs: [ ]
+  needs: []
-  tags:
-    - docker
   only:
     - schedules
   variables:
@@ -351,9 +338,6 @@ update_dependencies:
 .release:
   stage: deploy
   image: curlimages/curl:latest
-  tags:
-    - docker
-    - famedly
   rules:
     - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/'
     - if: '$CI_COMMIT_TAG =~ /^rc\d+\.\d+\.\d+-\d+$/'
@@ -366,29 +350,29 @@ upload_android:
   extends: .release
   script:
     - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build/android/app-release.apk ${PACKAGE_REGISTRY_URL}/fluffychat.apk
+      curl --fail-with-body --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build/app/outputs/apk/release/app-release.apk ${PACKAGE_REGISTRY_URL}/fluffychat.apk
 
 upload_web:
   extends: .release
   script:
-    # workaround bug of Flutter engine
+    - tar czf package.tar.gz -C build/web/ .
-    - tar czf package.tar.gz --ignore-failed-read -C build/web/ .
     - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.tar.gz ${PACKAGE_REGISTRY_URL}/fluffychat-web.tar.gz
+      curl --fail-with-body --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.tar.gz ${PACKAGE_REGISTRY_URL}/fluffychat-web.tar.gz
 
 upload_linux_x86:
   extends: .release
   script:
     - tar czf package.tar.gz -C build/linux/x64/release/bundle/ .
     - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.tar.gz ${PACKAGE_REGISTRY_URL}/fluffychat-linux-x86.tar.gz
+      curl --fail-with-body --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.tar.gz ${PACKAGE_REGISTRY_URL}/fluffychat-linux-x86.tar.gz
 
 upload_linux_arm64:
   extends: .release
   script:
     - tar czf package.tar.gz -C build/linux/arm64/release/bundle/ .
     - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.tar.gz ${PACKAGE_REGISTRY_URL}/fluffychat-linux-arm64.tar.gz
+      curl --fail-with-body --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.tar.gz ${PACKAGE_REGISTRY_URL}/fluffychat-linux-arm64.tar.gz
+  allow_failure: true
 
 upload_windows:
   extends: .release
@@ -398,15 +382,16 @@ upload_windows:
     - mv build/windows/runner/Release/fluffychat.msix fluffychat.msix
     - cd build/windows/runner/Release; zip -r ../../../../package.zip  . ; cd -
     - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.zip ${PACKAGE_REGISTRY_URL}/fluffychat-windows.zip
+      curl --fail-with-body --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.zip ${PACKAGE_REGISTRY_URL}/fluffychat-windows.zip
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file fluffychat.msix ${PACKAGE_REGISTRY_URL}/fluffychat-windows.msix
+      curl --fail-with-body --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file fluffychat.msix ${PACKAGE_REGISTRY_URL}/fluffychat-windows.msix
+  allow_failure: true
 
 deploy_playstore:
   stage: deploy
   before_script:
     - git apply ./scripts/enable-android-google-services.patch
     - ./scripts/prepare-android-release.sh
-  script: [ ./scripts/release-playstore.sh ]
+  script: [./scripts/release-playstore.sh]
   resource_group: playstore_release
   only:
     - tags

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled.
 
 version:
-  revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+  revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
   channel: stable
 
 project_type: app
@@ -13,26 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      create_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
-    - platform: android
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: ios
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: linux
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
     - platform: macos
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      create_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
-    - platform: web
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: windows
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
 
   # User provided section
 

CHANGELOG.md

@@ -1,3 +1,165 @@
+## v1.12.0
+- Added translation using Weblate (Toki Pona) (Mæve Rey)
+- Translated using Weblate (Arabic) (Rex_sa)
+- Translated using Weblate (Chinese (Simplified)) (Eric)
+- Translated using Weblate (Croatian) (Milo Ivir)
+- Translated using Weblate (Estonian) (Priit Jõerüüt)
+- Translated using Weblate (Galician) (josé m)
+- Translated using Weblate (Indonesian) (Linerly)
+- Translated using Weblate (Polish) (lauren n. liberda)
+- Translated using Weblate (Romanian) (Riley)
+- Translated using Weblate (Russian) (DarkCoder15)
+- Translated using Weblate (Spanish) (José Muñoz)
+- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
+- build: Remove dependency overwrite for ffi (Krille)
+- build: Update dependencies (Krille)
+- builds: Change minsdkversion of Android from 16 to 19 (Krille)
+- builds: Do not allow failure for linux x86 (Krille)
+- builds: Do not use verbose mode on building linux (Krille)
+- builds: Linux with flutter 3.10 (Krille)
+- builds: Remove workaround for building linux arm64 (Krille)
+- builds: Update file_picker to 5.3.0 (Krille)
+- builds: Update flutter table html (Krille)
+- builds: Update flutter_html (Krille)
+- builds: migrate to dart 3.0/flutter 3.10 (lauren n. liberda)
+- chore: Add missing blockquote style (Krille)
+- chore: Allow failure in build linux for now (Krille)
+- chore: Ask for storage persistence (Krille)
+- chore: Clean unused translations (Malin Errenst)
+- chore: Enhance room pills (Krille)
+- chore: Minor code clean up (Krille)
+- chore: Update flutter webrtc (Krille)
+- chore: Upgrade to Flutter 3.10.1 (Malin Errenst)
+- chore: change release curl calls to use --fail-with-body (Tim Flink)
+- chore: update macOS icons and add build script (TheOneWithTheBraid)
+- design: Replace anime images with neutral cupertino icons (Krille)
+- feat: Add toggle to mute notifications from chat groups (fbievan)
+- feat: Allow ruby tags in html (Krille)
+- feat: Display progress value for initial sync (Krille)
+- feat: Implement new error reporting tool when critical features break like playing audio or video messages or opening a chat (Krille)
+- feat: clean up macOS build metadata (TheOneWithTheBraid)
+- feat: set display information correctly (TheOneWithTheBraid)
+- feat: update macOS build files (TheOneWithTheBraid)
+- feat: update macOS build information for macOS Ventura (TheOneWithTheBraid)
+- fix "Unhandled Exception: VRouter.of(context) was called with a context which does not contain a VRouter." (Lauren N. Liberda)
+- fix: Broken arb file (Krille)
+- fix: Do not unnecessary request all members in public rooms (Krille)
+- fix: Remove wrong rendered linebreak in html (Krille)
+- fix: Scroll down button (Krille)
+- fix: Scroll up and scroll down buttons in chat list (Krille)
+- fix: Scrolldown button (Krille)
+- fix: Too long file name cause a render overflow (Skying)
+- fix: Try to reload timeline on IOException (Krille)
+- fix: User pills (Krille)
+- fix: broken CI artifact uploads (TheOneWithTheBraid)
+- fix: custom emote placeholder (TheOneWithTheBraid)
+- fix: path of libolm (TheOneWithTheBraid)
+- fix: Quick account switching (JHansen)
+- fix: read reciepts (JHansen)
+- perf: Use valuenotifier to not rebuild chatlist (Krille)
+- refactor: Reimplement flutter matrix html locally (Krille)
+- refactor: Update Roboto and Noto Emoji (The one with the Braid)
+- refactor: Use AnimatedSize for FAB (Krille)
+- refactor: Use DateTime for weekday localization (Malin Errenst)
+
+## v1.11.2
+- Translated using Weblate (Croatian) (Milo Ivir)
+- Translated using Weblate (Dutch) (Jelv)
+- Translated using Weblate (Estonian) (Priit Jõerüüt)
+- Translated using Weblate (Galician) (josé m)
+- Translated using Weblate (Polish) (Eryk Michalak)
+- Translated using Weblate (Turkish) (Oğuz Ersen)
+- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
+- feat: Permission dialog before open link in browser (Krille)
+- fix: Chats do not load (Krille)
+
+## v1.11.1 - 2023-04-20
+- fix: Download files on web and iOS with correct mimetype
+
+## v1.11.0 - 2023-04-14
+- feat: Add visual read marker (Krille)
+- feat: Jump to last read event (Krille)
+- feat: Use fragmented timeline to jump to event (Krille)
+- feat: change to flutterwebauth2 (ShootingStarDragons)
+- fix: Join public room (Krille)
+- fix: Set fcm priority to max on android (Krille)
+- refactor: CI scripts and old workarounds for build scripts (Krille)
+- refactor: Client in ChatPage (Krille)
+- refactor: Not nullable room in ChatPage (Krille)
+- refactor: Switch to file_picker package and get rid of some dependency overrides (Krille)
+- refactor: Use correct Matrix instance (Krille)
+- style: Make emptypage logo bigger (Krille)
+- style: Minor adjustments for modal bottom sheets (Krille)
+- style: Move chats to top (Krille)
+- style: Use SliverList for chatlist (Krille)
+- refactor: Container -> SizedBox.shrink() (noob_tea)
+- Translated using Weblate (Chinese (Simplified)) (Eric)
+- Translated using Weblate (Dutch) (Jelv)
+- Translated using Weblate (Estonian) (Priit Jõerüüt)
+- Translated using Weblate (French) (Anne Onyme 017)
+- Translated using Weblate (Galician) (josé m)
+- Translated using Weblate (Indonesian) (Linerly)
+- Translated using Weblate (Persian) (Parsa)
+- Translated using Weblate (Persian) (Siavash)
+- Translated using Weblate (Polish) (Luna)
+- Translated using Weblate (Swedish) (Kristoffer Grundström)
+- Translated using Weblate (Turkish) (Oğuz Ersen)
+- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
+
+## v1.10.0 - 2023-02-25
+- Added translation using Weblate (Thai) (Wphaoka)
+- Added translation using Weblate (Tibetan) (Nathan Freitas)
+- Default hardcoded message when l10n is not available (fabienli)
+- Fix: The stable repo fingerprint (TODO the qr-code should be updated) (machiav3lli)
+- Translated using Weblate (Basque) (xabirequejo)
+- Translated using Weblate (Dutch) (Jelv)
+- Translated using Weblate (Estonian) (Priit Jõerüüt)
+- Translated using Weblate (French) (Anne Onyme 017)
+- Translated using Weblate (Galician) (josé m)
+- Translated using Weblate (Galician) (josé m)
+- Translated using Weblate (Indonesian) (Linerly)
+- Translated using Weblate (Japanese) (Suguru Hirahara)
+- Translated using Weblate (Persian) (Farooq Karimi Zadeh)
+- Translated using Weblate (Swedish) (Joaquim Homrighausen)
+- Translated using Weblate (Turkish) (Oğuz Ersen)
+- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
+- chore: Disable stable for web until script is fixed (Krille)
+- chore: Display warning when logout without backup (Krille)
+- chore: Downgrade flutter CI version (Krille)
+- chore: Follow up audioplayer on linux (Krille)
+- chore: Follow up chat encryption desgin (Krille)
+- chore: Follow up fix audioplayer on android (Christian Pauly)
+- chore: Follow up formatting (Christian Pauly)
+- chore: Follow up formatting (Krille)
+- chore: Follow up remove hero animation (Krille)
+- chore: Follow up secrity settings design (Krille)
+- chore: Follow up settings page (Krille)
+- chore: Follow up settings page design (Christian Pauly)
+- chore: Follow up style adjustments (Krille)
+- chore: Lookup l10n in pushhelper if null (Krille)
+- chore: Update matrix package to 0.17.0 (Krille)
+- chore: Update to Flutter 3.7.1 (Krille)
+- docs/qr-stable.svg: update the QR code (Aminda Suomalainen)
+- feat: Enable audioplayer for web and linux (Christian Pauly)
+- fix: Display error when user tries to send too large file (Christian Pauly)
+- refactor: Do only instantiate AudioPlayer() object when in use (Christian Pauly)
+- refactor: Remove syncstatus verbose logs (Christian Pauly)
+- refactor: Store cached files in tmp directory so OS will clear file cache from time to time (Krille)
+- style: Adjust key verification dialog (Christian Pauly)
+- style: Bootstrap design adjustments (Christian Pauly)
+- style: Encryption page adjustments (Christian Pauly)
+- style: Enhance user device settings design (Krille)
+- style: Enhanced chat details design (Krille)
+- style: Give chat list list tiles rounded corners (Krille)
+- style: Link underline color (Christian Pauly)
+- style: Make adaptive bottom sheets scrollable by default (Krille)
+- style: Make invite page more pretty (Krille)
+- style: New settings design (Krille)
+- style: Nicer chips in encryption settings and icons showing device status (Krille)
+- style: Use emojis on web as well (Christian Pauly)
+- style: Use robotomono to display device keys (Christian Pauly)
+- utils/url_launcher: force opening http(s) links in external browser (Marcus Hoffmann)
+
 ## v1.9.0 - 2023-01-29
 - Translated using Weblate (Czech) (Michal Bedáň)
 - Translated using Weblate (Czech) (grreby)

Dockerfile

@@ -1,4 +1,4 @@
-FROM cirrusci/flutter as builder
+FROM ghcr.io/cirruslabs/flutter as builder
 RUN sudo apt update && sudo apt install curl -y
 COPY . /app
 WORKDIR /app

analysis_options.yaml

@@ -8,6 +8,7 @@ linter:
     - prefer_final_locals
     - prefer_final_in_for_each
     - sort_pub_dependencies
+    - require_trailing_commas
 
 analyzer:
   errors:

android/app/build.gradle

@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         applicationId "chat.fluffy.fluffychat"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/app/src/main/AndroidManifest.xml

@@ -93,8 +93,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.linusu.flutter_web_auth.CallbackActivity"
+        <activity
-            android:exported="true">
+          android:name="com.linusu.flutter_web_auth_2.CallbackActivity"
+          android:exported="true">
             <intent-filter android:label="flutter_web_auth">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />

android/build.gradle

@@ -27,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/fastlane/report.xml

@@ -5,12 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: update_fastlane" time="0.000202">
+      <testcase classname="fastlane.lanes" name="0: update_fastlane" time="1.455419">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: default_platform" time="7.9e-05">
+      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.000127">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="2: google_play_track_version_codes" time="2.638619">
         
       </testcase>
     

assets/l10n/intl_bo.arb

@@ -0,0 +1 @@
+{}

assets/l10n/intl_ca.arb

@@ -71,11 +71,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Sala arxivada",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Accés dels usuaris convidats",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -400,11 +395,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Signatura creuada activada",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Actiu actualment",
     "@currentlyActive": {
         "type": "text",
@@ -602,11 +592,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "divendres",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "Des de la unió",
     "@fromJoining": {
         "type": "text",
@@ -772,11 +757,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Les claus estan desades a la memòria cau",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username} ha expulsat a {targetName}",
     "@kicked": {
         "type": "text",
@@ -906,11 +886,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "dilluns",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Silencia el xat",
     "@muteChat": {
         "type": "text",
@@ -1201,11 +1176,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "dissabte",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "security": "Seguretat",
     "@security": {
         "type": "text",
@@ -1394,11 +1364,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "diumenge",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "Sistema",
     "@systemTheme": {
         "type": "text",
@@ -1414,16 +1379,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Aquesta sala ha estat arxivada.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "dijous",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1445,11 +1400,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "dimarts",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "No disponible",
     "@unavailable": {
         "type": "text",
@@ -1610,11 +1560,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "dimecres",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "Us hem enviat un missatge de correu electrònic",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -1801,8 +1746,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "yourUserId": "El vostre id. d’usuari:",
-    "@yourUserId": {},
     "enableEncryption": "Activa el xifratge",
     "@enableEncryption": {
         "type": "text",
@@ -2065,11 +2008,6 @@
             "supportedVersions": {}
         }
     },
-    "discover": "Descobreix",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "editChatPermissions": "Edita els permisos del xat",
     "@editChatPermissions": {
         "type": "text",

assets/l10n/intl_el.arb

@@ -0,0 +1 @@
+{}

assets/l10n/intl_en.arb

@@ -134,11 +134,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Archived Room",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Are guest users allowed to join",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -388,8 +383,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "yourUserId": "Your user ID:",
-    "@yourUserId": {},
     "yourChatBackupHasBeenSetUp": "Your chat backup has been set up.",
     "@yourChatBackupHasBeenSetUp": {},
     "chatBackup": "Chat backup",
@@ -537,12 +530,12 @@
         },
         "description": "State that {command} is not a valid /command."
     },
-    "compareEmojiMatch": "Compare and make sure the following emoji match those of the other device:",
+    "compareEmojiMatch": "Please compare the emojis",
     "@compareEmojiMatch": {
         "type": "text",
         "placeholders": {}
     },
-    "compareNumbersMatch": "Compare and make sure the following numbers match those of the other device:",
+    "compareNumbersMatch": "Please compare the numbers",
     "@compareNumbersMatch": {
         "type": "text",
         "placeholders": {}
@@ -633,11 +626,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Cross-signing on",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Currently active",
     "@currentlyActive": {
         "type": "text",
@@ -723,6 +711,11 @@
         "type": "text",
         "placeholders": {}
     },
+"allRooms": "All Group Chats",
+    "@allRooms": {
+        "type": "text",
+        "placeholders": {}
+    },
     "discover": "Discover",
     "@discover": {
         "type": "text",
@@ -896,11 +889,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Friday",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "From joining",
     "@fromJoining": {
         "type": "text",
@@ -1091,11 +1079,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Keys are cached",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "👞 {username} kicked {targetName}",
     "@kicked": {
         "type": "text",
@@ -1160,8 +1143,6 @@
     "@dehydrate": {},
     "dehydrateWarning": "This action cannot be undone. Ensure you safely store the backup file.",
     "@dehydrateWarning": {},
-    "dehydrateShare": "This is your private FluffyChat export. Ensure you don't lose it and keep it private.",
-    "@dehydrateShare": {},
     "dehydrateTor": "TOR Users: Export session",
     "@dehydrateTor": {},
     "dehydrateTorLong": "For TOR users, it is recommended to export the session before closing the window.",
@@ -1236,17 +1217,11 @@
         "type": "text",
         "placeholders": {}
     },
-    "noSearchResult": "No matching search results.",
     "moderator": "Moderator",
     "@moderator": {
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Monday",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Mute chat",
     "@muteChat": {
         "type": "text",
@@ -1312,8 +1287,6 @@
     },
     "shareYourInviteLink": "Share your invite link",
     "@shareYourInviteLink": {},
-    "typeInInviteLinkManually": "Type in invite link manually...",
-    "@typeInInviteLinkManually": {},
     "scanQrCode": "Scan QR code",
     "@scanQrCode": {},
     "none": "None",
@@ -1671,11 +1644,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Saturday",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "saveFile": "Save file",
     "@saveFile": {
         "type": "text",
@@ -1929,11 +1897,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Sunday",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "synchronizingPleaseWait": "Synchronizing… Please wait.",
     "@synchronizingPleaseWait": {
         "type": "text",
@@ -1954,16 +1917,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "This room has been archived.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "Thursday",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -2000,11 +1953,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "Tuesday",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "Unavailable",
     "@unavailable": {
         "type": "text",
@@ -2177,11 +2125,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Wednesday",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "We sent you an email",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -2436,8 +2379,6 @@
     "@stories": {},
     "users": "Users",
     "@users": {},
-    "enableAutoBackups": "Enable auto backups",
-    "@enableAutoBackups": {},
     "unlockOldMessages": "Unlock old messages",
     "@unlockOldMessages": {},
     "storeInSecureStorageDescription": "Store the recovery key in the secure storage of this device.",
@@ -2480,7 +2421,7 @@
     "@otherCallingPermissions": {},
     "whyIsThisMessageEncrypted": "Why is this message unreadable?",
     "@whyIsThisMessageEncrypted": {},
-    "noKeyForThisMessage": "This can happen if the message was sent before you have signed in to your account at this device.\n\nIt is also possible that the sender has blocked your device or something went wrong with the internet connection.\n\nAre you able to read the message on another session? Then you can transfer the message from it! Go to Settings > Devices and make sure that your devices have verified each other. When you open the room the next time and both sessions are in the foreground, the keys will be transmitted automatically.\n\nDo you not want to loose the keys when logging out or switching devices? Make sure that you have enabled the chat backup in the settings.",
+    "noKeyForThisMessage": "This can happen if the message was sent before you have signed in to your account at this device.\n\nIt is also possible that the sender has blocked your device or something went wrong with the internet connection.\n\nAre you able to read the message on another session? Then you can transfer the message from it! Go to Settings > Devices and make sure that your devices have verified each other. When you open the room the next time and both sessions are in the foreground, the keys will be transmitted automatically.\n\nDo you not want to lose the keys when logging out or switching devices? Make sure that you have enabled the chat backup in the settings.",
     "@noKeyForThisMessage": {},
     "newGroup": "New group",
     "@newGroup": {},
@@ -2516,5 +2457,24 @@
     "deviceKeys": "Device keys:",
     "letsStart": "Let's start",
     "enterInviteLinkOrMatrixId": "Enter invite link or Matrix ID...",
-    "reopenChat": "Reopen chat"
+    "reopenChat": "Reopen chat",
-}
+    "noBackupWarning": "Warning! Without enabling chat backup, you will lose access to your encrypted messages. It is highly recommended to enable the chat backup first before logging out.",
+    "noOtherDevicesFound": "No other devices found",
+    "fileIsTooBigForServer": "The server reports that the file is too large to be sent.",
+    "fileHasBeenSavedAt": "File has been saved at {path}",
+    "@fileHasBeenSavedAt": {
+        "type": "text",
+        "placeholders": {
+            "path": {}
+        }
+    },
+    "jumpToLastReadMessage": "Jump to last read message",
+    "readUpToHere": "Read up to here",
+    "jump": "Jump",
+    "openLinkInBrowser": "Open link in browser",
+    "reportErrorDescription": "Oh no. Something went wrong. Please try again later. If you want, you can report the bug to the developers.",
+    "report": "report",
+    "signInWithPassword": "Sign in with password",
+    "continueWith": "Continue with:",
+    "pleaseTryAgainLaterOrChooseDifferentServer": "Please try again later or choose a different server."
+}

assets/l10n/intl_eo.arb

@@ -81,11 +81,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Arĥivita ĉambro",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Ĉu gastoj rajtas aliĝi",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -533,11 +528,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Delegaj subskriboj estas ŝaltitaj",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Nun aktiva",
     "@currentlyActive": {
         "type": "text",
@@ -623,11 +613,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Trovi",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "Prezenta nomo ŝanĝiĝis",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -794,11 +779,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Vendredo",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "Ekde aliĝo",
     "@fromJoining": {
         "type": "text",
@@ -989,11 +969,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Ŝlosiloj estas kaŝmemoritaj",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username} forpelis uzanton {targetName}",
     "@kicked": {
         "type": "text",
@@ -1118,11 +1093,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Lundo",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Silentigi babilon",
     "@muteChat": {
         "type": "text",
@@ -1503,11 +1473,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Sabato",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "saveFile": "Konservi dosieron",
     "@saveFile": {
         "type": "text",
@@ -1742,11 +1707,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Dimanĉo",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "synchronizingPleaseWait": "Spegulante… Bonvolu atendi.",
     "@synchronizingPleaseWait": {
         "type": "text",
@@ -1767,16 +1727,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Ĉi tiu ĉambro arĥiviĝis.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "Ĵaŭdo",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1813,11 +1763,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "Mardo",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "Nedisponeble",
     "@unavailable": {
         "type": "text",
@@ -1988,11 +1933,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Merkredo",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "Ni sendis retleteron al vi",
     "@weSentYouAnEmail": {
         "type": "text",

assets/l10n/intl_et.arb

@@ -82,11 +82,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "archivedRoom": "Arhiveeritud jututuba",
-  "@archivedRoom": {
-    "type": "text",
-    "placeholders": {}
-  },
   "areGuestsAllowedToJoin": "Kas külalised võivad liituda",
   "@areGuestsAllowedToJoin": {
     "type": "text",
@@ -448,12 +443,12 @@
     },
     "description": "State that {command} is not a valid /command."
   },
-  "compareEmojiMatch": "Võrdle ja kontrolli, et emotikonid on teises seadmes täpselt samad:",
+  "compareEmojiMatch": "Palun võrdle emotikone",
   "@compareEmojiMatch": {
     "type": "text",
     "placeholders": {}
   },
-  "compareNumbersMatch": "Võrdle ja kontrolli, et järgnevad numbrid on teises seadmes täpselt samad:",
+  "compareNumbersMatch": "Palun võrdle numbreid",
   "@compareNumbersMatch": {
     "type": "text",
     "placeholders": {}
@@ -544,11 +539,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "crossSigningEnabled": "Risttunnustamine on kasutusel",
-  "@crossSigningEnabled": {
-    "type": "text",
-    "placeholders": {}
-  },
   "currentlyActive": "Hetkel aktiivne",
   "@currentlyActive": {
     "type": "text",
@@ -634,11 +624,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "discover": "Avasta",
-  "@discover": {
-    "type": "text",
-    "placeholders": {}
-  },
   "displaynameHasBeenChanged": "Kuvatav nimi on muudetud",
   "@displaynameHasBeenChanged": {
     "type": "text",
@@ -805,11 +790,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "friday": "Reede",
-  "@friday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "fromJoining": "Alates liitumise hetkest",
   "@fromJoining": {
     "type": "text",
@@ -1000,11 +980,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "keysCached": "Krüptovõtmed on puhverdatud",
-  "@keysCached": {
-    "type": "text",
-    "placeholders": {}
-  },
   "kicked": "👞 {username} müksas kasutaja {targetName} välja",
   "@kicked": {
     "type": "text",
@@ -1139,11 +1114,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "monday": "Esmaspäev",
-  "@monday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "muteChat": "Summuta vestlus",
   "@muteChat": {
     "type": "text",
@@ -1537,11 +1507,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "saturday": "Laupäev",
-  "@saturday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "saveFile": "Salvesta fail",
   "@saveFile": {
     "type": "text",
@@ -1780,11 +1745,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "sunday": "Pühapäev",
-  "@sunday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "synchronizingPleaseWait": "Sünkroniseerin andmeid… Palun oota.",
   "@synchronizingPleaseWait": {
     "type": "text",
@@ -1805,16 +1765,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "thisRoomHasBeenArchived": "See jututuba on arhiveeritud.",
-  "@thisRoomHasBeenArchived": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "thursday": "Neljapäev",
-  "@thursday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "title": "FluffyChat",
   "@title": {
     "description": "Title for the application",
@@ -1851,11 +1801,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "tuesday": "Teisipäev",
-  "@tuesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "unavailable": "Eemal",
   "@unavailable": {
     "type": "text",
@@ -2026,11 +1971,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "wednesday": "Kolmapäev",
-  "@wednesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "weSentYouAnEmail": "Me saatsime sulle e-kirja",
   "@weSentYouAnEmail": {
     "type": "text",
@@ -2107,8 +2047,6 @@
   "@addToSpace": {},
   "scanQrCode": "Skaneeri QR-koodi",
   "@scanQrCode": {},
-  "typeInInviteLinkManually": "Sisesta kutse link käsitsi...",
-  "@typeInInviteLinkManually": {},
   "shareYourInviteLink": "Jaga oma kutselinki",
   "@shareYourInviteLink": {},
   "sendOnEnter": "Saada sõnum sisestusklahvi vajutusel",
@@ -2135,8 +2073,6 @@
   "@link": {},
   "yourChatBackupHasBeenSetUp": "Sinu vestluste varundus on seadistatud.",
   "@yourChatBackupHasBeenSetUp": {},
-  "yourUserId": "Sinu kasutajatunnus:",
-  "@yourUserId": {},
   "unverified": "Verifitseerimata",
   "@unverified": {},
   "repeatPassword": "Korda salasõna",
@@ -2374,8 +2310,6 @@
   "@recoveryKey": {},
   "users": "Kasutajad",
   "@users": {},
-  "enableAutoBackups": "Võta kasutusele automaatne varundus",
-  "@enableAutoBackups": {},
   "stories": "Jutustused",
   "@stories": {},
   "storeInSecureStorageDescription": "Salvesta taastevõti selle seadme turvahoidlas.",
@@ -2402,8 +2336,6 @@
   },
   "dehydrate": "Ekspordi sessiooni teave ja kustuta nutiseadmest rakenduse andmed",
   "@dehydrate": {},
-  "dehydrateShare": "See on sinu FluffyChat'i privaatsete andmete eksport. Palun hoia teda turvaliselt ja vaata, et sa seda ei kaotaks.",
-  "@dehydrateShare": {},
   "dehydrateTor": "TOR'i kasutajad: Ekspordi sessioon",
   "@dehydrateTor": {},
   "hydrateTor": "TOR'i kasutajatele: impordi viimati eksporditud sessiooni andmed",
@@ -2532,12 +2464,51 @@
   "@deviceKeys": {},
   "newSpaceDescription": "Kogukonnad võimaldavad sul koondada erinevaid vestlusi ning korraldada avalikku või privaatset ühistegevust.",
   "@newSpaceDescription": {},
-  "noSearchResult": "Sobivaid otsingutulemusi ei leidu.",
-  "@noSearchResult": {},
   "enterInviteLinkOrMatrixId": "Sisesta kutse link või Matrix ID...",
   "@enterInviteLinkOrMatrixId": {},
   "letsStart": "Sõidame!",
   "@letsStart": {},
   "reopenChat": "Alusta vestlust uuesti",
-  "@reopenChat": {}
+  "@reopenChat": {},
+  "noOtherDevicesFound": "Muid seadmeid ei leidu",
+  "@noOtherDevicesFound": {},
+  "noBackupWarning": "Hoiatus! Kui sa ei lülita sisse vestluse varundust, siis sul puudub hiljem ligipääs krüptitud sõnumitele. Me tungivalt soovitame, et palun lülita vestluse varundamine sisse enne väljalogimist.",
+  "@noBackupWarning": {},
+  "fileIsTooBigForServer": "Serveri seadistuste alusel on see fail saatmiseks liiga suur.",
+  "@fileIsTooBigForServer": {},
+  "fileHasBeenSavedAt": "Fail on salvestatud kausta: {path}",
+  "@fileHasBeenSavedAt": {
+    "type": "text",
+    "placeholders": {
+      "path": {}
+    }
+  },
+  "jumpToLastReadMessage": "Liigu viimase loetud sõnumini",
+  "@jumpToLastReadMessage": {},
+  "readUpToHere": "Siiamaani on loetud",
+  "@readUpToHere": {},
+  "jump": "Hüppa",
+  "@jump": {},
+  "openLinkInBrowser": "Ava link veebibrauseris",
+  "@openLinkInBrowser": {},
+  "discover": "Otsi ja leia",
+  "@discover": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "report": "teata",
+  "@report": {},
+  "allRooms": "Kõik vestlusrühmad",
+  "@allRooms": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "reportErrorDescription": "Oh appike! Midagi läks valesti. Palun proovi hiljem uuesti. Kui soovid, võid sellest veast arendajatele teatada.",
+  "@reportErrorDescription": {},
+  "continueWith": "Jätkamiseks kasuta:",
+  "@continueWith": {},
+  "signInWithPassword": "Logi sisse salasõnaga",
+  "@signInWithPassword": {},
+  "pleaseTryAgainLaterOrChooseDifferentServer": "Palun proovi hiljem uuesti või muuda serveri nime.",
+  "@pleaseTryAgainLaterOrChooseDifferentServer": {}
 }

assets/l10n/intl_ga.arb

@@ -9,11 +9,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Dé Céadaoin",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "warning": "Rabhadh!",
     "@warning": {
         "type": "text",
@@ -49,32 +44,17 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "Dé Máirt",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
         "type": "text",
         "placeholders": {}
     },
-    "thursday": "Déardaoin",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "Córas",
     "@systemTheme": {
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Dé Domhnaigh",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "submit": "Cuir isteach",
     "@submit": {
         "type": "text",
@@ -120,11 +100,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Dé Sathairn",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "reply": "Freagair",
     "@reply": {
         "type": "text",
@@ -205,11 +180,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Tá cros-shíniú tosaithe",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "createNewSpace": "Spás nua",
     "@createNewSpace": {
         "type": "text",
@@ -267,11 +237,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Dé Luain",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "moderator": "Modhnóir",
     "@moderator": {
         "type": "text",
@@ -352,11 +317,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Dé hAoine",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "forward": "Seol ar aghaidh",
     "@forward": {
         "type": "text",
@@ -384,11 +344,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Tar ar",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "devices": "Gléasanna",
     "@devices": {
         "type": "text",
@@ -534,11 +489,6 @@
     },
     "sendOnEnter": "Seol ar iontráil",
     "@sendOnEnter": {},
-    "archivedRoom": "Seomra cartlainne",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "archive": "Cartlann",
     "@archive": {
         "type": "text",
@@ -1312,8 +1262,6 @@
     },
     "scanQrCode": "Scan cód QR",
     "@scanQrCode": {},
-    "typeInInviteLinkManually": "Clóscríobh an nasc cuiridh de láimh...",
-    "@typeInInviteLinkManually": {},
     "inviteText": "Thug {username} cuireadh duit chuig FluffyChat.\n1. Suiteáil FluffyChat: https://fluffychat.im\n2. Cláraigh nó sínigh isteach\n3. Oscail an nasc cuiridh: {link}",
     "@inviteText": {
         "type": "text",
@@ -1451,11 +1399,6 @@
             "targetName": {}
         }
     },
-    "keysCached": "Cuirtear eochracha i dtaisce",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "joinedTheChat": "Tháinig {username} isteach sa chomhrá",
     "@joinedTheChat": {
         "type": "text",
@@ -1740,11 +1683,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Tá an seomra seo curtha i gcartlann.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
     "theyDontMatch": "Níl siad céanna",
     "@theyDontMatch": {
         "type": "text",
@@ -2153,8 +2091,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "yourUserId": "D'aitheantas úsáideora:",
-    "@yourUserId": {},
     "yourChatBackupHasBeenSetUp": "Bunaíodh do chúltaca comhrá.",
     "@yourChatBackupHasBeenSetUp": {},
     "openVideoCamera": "Oscail físcheamara",

assets/l10n/intl_gl.arb

@@ -23,7 +23,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "activatedEndToEndEncryption": "🔐 {username} activou o cifrado extremo-a-extremo",
+  "activatedEndToEndEncryption": "🔐 {username} activou a cifraxe extremo-a-extremo",
   "@activatedEndToEndEncryption": {
     "type": "text",
     "placeholders": {
@@ -82,11 +82,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "archivedRoom": "Sala arquivada",
-  "@archivedRoom": {
-    "type": "text",
-    "placeholders": {}
-  },
   "areGuestsAllowedToJoin": "Permitir o acceso de convidadas",
   "@areGuestsAllowedToJoin": {
     "type": "text",
@@ -319,7 +314,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "channelCorruptedDecryptError": "O cifrado está corrompido",
+  "channelCorruptedDecryptError": "A cifraxe está estragada",
   "@channelCorruptedDecryptError": {
     "type": "text",
     "placeholders": {}
@@ -448,12 +443,12 @@
     },
     "description": "State that {command} is not a valid /command."
   },
-  "compareEmojiMatch": "Comparar e asegurarse de que estas emoticonas concordan no outro dispositivo:",
+  "compareEmojiMatch": "Compara estes emojis",
   "@compareEmojiMatch": {
     "type": "text",
     "placeholders": {}
   },
-  "compareNumbersMatch": "Compara e asegúrate de que os seguintes números concordan cos do outro dispositivo:",
+  "compareNumbersMatch": "Compara estes números",
   "@compareNumbersMatch": {
     "type": "text",
     "placeholders": {}
@@ -544,11 +539,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "crossSigningEnabled": "Sinatura-Cruzada activada",
-  "@crossSigningEnabled": {
-    "type": "text",
-    "placeholders": {}
-  },
   "currentlyActive": "Actualmente activo",
   "@currentlyActive": {
     "type": "text",
@@ -634,11 +624,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "discover": "Descubrir",
-  "@discover": {
-    "type": "text",
-    "placeholders": {}
-  },
   "displaynameHasBeenChanged": "O nome público mudou",
   "@displaynameHasBeenChanged": {
     "type": "text",
@@ -719,12 +704,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "enableEncryption": "Activar cifrado",
+  "enableEncryption": "Activar cifraxe",
   "@enableEncryption": {
     "type": "text",
     "placeholders": {}
   },
-  "enableEncryptionWarning": "Non poderás desactivar o cifrado posteriormente, tes certeza?",
+  "enableEncryptionWarning": "Non poderás desactivar a cifraxe posteriormente, tes certeza?",
   "@enableEncryptionWarning": {
     "type": "text",
     "placeholders": {}
@@ -734,12 +719,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "encryption": "Cifrado",
+  "encryption": "Cifraxe",
   "@encryption": {
     "type": "text",
     "placeholders": {}
   },
-  "encryptionNotEnabled": "O cifrado non está activado",
+  "encryptionNotEnabled": "A cifraxe non está activada",
   "@encryptionNotEnabled": {
     "type": "text",
     "placeholders": {}
@@ -805,11 +790,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "friday": "Venres",
-  "@friday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "fromJoining": "Desde que se una",
   "@fromJoining": {
     "type": "text",
@@ -1000,11 +980,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "keysCached": "Chaves almacenadas",
-  "@keysCached": {
-    "type": "text",
-    "placeholders": {}
-  },
   "kicked": "👞 {username} expulsou a {targetName}",
   "@kicked": {
     "type": "text",
@@ -1139,17 +1114,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "monday": "Luns",
-  "@monday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "muteChat": "Acalar chat",
   "@muteChat": {
     "type": "text",
     "placeholders": {}
   },
-  "needPantalaimonWarning": "Ten en conta que polo de agora precisas Pantalaimon para o cifrado extremo-a-extremo.",
+  "needPantalaimonWarning": "Ten en conta que polo de agora precisas Pantalaimon para a cifraxe extremo-a-extremo.",
   "@needPantalaimonWarning": {
     "type": "text",
     "placeholders": {}
@@ -1189,7 +1159,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "noEncryptionForPublicRooms": "Só podes activar o cifrado tan pronto como a sala non sexa públicamente accesible.",
+  "noEncryptionForPublicRooms": "Só podes activar a cifraxe tan pronto como a sala non sexa públicamente accesible.",
   "@noEncryptionForPublicRooms": {
     "type": "text",
     "placeholders": {}
@@ -1537,11 +1507,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "saturday": "Sábado",
-  "@saturday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "saveFile": "Gardar ficheiro",
   "@saveFile": {
     "type": "text",
@@ -1780,11 +1745,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "sunday": "Domingo",
-  "@sunday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "synchronizingPleaseWait": "Sincronizando... Agarda.",
   "@synchronizingPleaseWait": {
     "type": "text",
@@ -1805,16 +1765,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "thisRoomHasBeenArchived": "A sala foi arquivada.",
-  "@thisRoomHasBeenArchived": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "thursday": "Xoves",
-  "@thursday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "title": "FluffyChat",
   "@title": {
     "description": "Title for the application",
@@ -1851,11 +1801,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "tuesday": "Martes",
-  "@tuesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "unavailable": "Non dispoñible",
   "@unavailable": {
     "type": "text",
@@ -1879,7 +1824,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "unknownEncryptionAlgorithm": "Algoritmo de cifrado descoñecido",
+  "unknownEncryptionAlgorithm": "Algoritmo de cifraxe descoñecido",
   "@unknownEncryptionAlgorithm": {
     "type": "text",
     "placeholders": {}
@@ -2026,11 +1971,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "wednesday": "Mércores",
-  "@wednesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "weSentYouAnEmail": "Enviamosche un email",
   "@weSentYouAnEmail": {
     "type": "text",
@@ -2107,8 +2047,6 @@
   "@addToSpace": {},
   "scanQrCode": "Escanear código QR",
   "@scanQrCode": {},
-  "typeInInviteLinkManually": "Escribe manualmente a ligazón do convite...",
-  "@typeInInviteLinkManually": {},
   "shareYourInviteLink": "Comparte a túa ligazón de convite",
   "@shareYourInviteLink": {},
   "sendOnEnter": "Enter para enviar",
@@ -2129,8 +2067,6 @@
   "@yourChatBackupHasBeenSetUp": {},
   "unverified": "Sen verificar",
   "@unverified": {},
-  "yourUserId": "O teu ID:",
-  "@yourUserId": {},
   "pleaseEnterValidEmail": "Escribe un enderezo de email válido.",
   "@pleaseEnterValidEmail": {},
   "passwordsDoNotMatch": "Os contrasinais non concordan!",
@@ -2167,7 +2103,7 @@
     "type": "text",
     "description": "Usage hint for the command /discardsession"
   },
-  "commandHint_create": "Crear un grupo de conversa baleiro\nUsa --no-encryption para desactivar o cifrado",
+  "commandHint_create": "Crear un grupo de conversa baleiro\nUsa --no-encryption para desactivar a cifraxe",
   "@commandHint_create": {
     "type": "text",
     "description": "Usage hint for the command /create"
@@ -2177,7 +2113,7 @@
     "type": "text",
     "description": "Usage hint for the command /clearcache"
   },
-  "commandHint_dm": "Iniciar un chat directo\nUsa --no-encryption para desactivar o cifrado",
+  "commandHint_dm": "Iniciar un chat directo\nUsa --no-encryption para desactivar a cifraxe",
   "@commandHint_dm": {
     "type": "text",
     "description": "Usage hint for the command /dm"
@@ -2388,8 +2324,6 @@
   "@pleaseEnterRecoveryKeyDescription": {},
   "users": "Usuarias",
   "@users": {},
-  "enableAutoBackups": "Activar copia automática",
-  "@enableAutoBackups": {},
   "storeInSecureStorageDescription": "Gardar a chave de recuperación na almacenaxe segura deste dispositivo.",
   "@storeInSecureStorageDescription": {},
   "countFiles": "{count} ficheiros",
@@ -2400,8 +2334,6 @@
   },
   "unlockOldMessages": "Desbloquear mensaxes antigas",
   "@unlockOldMessages": {},
-  "dehydrateShare": "Esta é a copia de apoio privada de FluffyChat. Pon coidado en non perdela e mantela segura.",
-  "@dehydrateShare": {},
   "dehydrateTorLong": "Para usuarias de TOR, é recomendable exportar a sesión antes de pechar a ventál.",
   "@dehydrateTorLong": {},
   "hydrateTor": "Usuarias TOR: Importar a sesión exportada",
@@ -2511,15 +2443,13 @@
       "senderName": {}
     }
   },
-  "noSearchResult": "Non hai resultados para a busca.",
-  "@noSearchResult": {},
   "enterInviteLinkOrMatrixId": "Escribe a ligazón de convite ou ID Matrix...",
   "@enterInviteLinkOrMatrixId": {},
   "encryptThisChat": "Cifrar esta conversa",
   "@encryptThisChat": {},
-  "endToEndEncryption": "Cifrado de extremo a extremo",
+  "endToEndEncryption": "Cifraxe de extremo a extremo",
   "@endToEndEncryption": {},
-  "disableEncryptionWarning": "Por razóns de seguridade non podes desactivar o cifrado dunha conversa onde foi activado previamente.",
+  "disableEncryptionWarning": "Por razóns de seguridade non podes desactivar a cifraxe dunha conversa onde foi activada previamente.",
   "@disableEncryptionWarning": {},
   "sorryThatsNotPossible": "Lamentámolo... iso non é posible",
   "@sorryThatsNotPossible": {},
@@ -2539,5 +2469,46 @@
     }
   },
   "reopenChat": "Reabrir conversa",
-  "@reopenChat": {}
+  "@reopenChat": {},
+  "noOtherDevicesFound": "Non se atopan outros dispositivos",
+  "@noOtherDevicesFound": {},
+  "noBackupWarning": "Aviso! Se non activas a copia de apoio do chat, perderás o acceso ás túas mensaxes cifradas. É totalmente recomendable activar a copia de apoio do chat antes de pechar a sesión.",
+  "@noBackupWarning": {},
+  "fileIsTooBigForServer": "O servidor informa de que o ficheiro é demasiado grande para envialo.",
+  "@fileIsTooBigForServer": {},
+  "fileHasBeenSavedAt": "Gardouse o ficheiro en {path}",
+  "@fileHasBeenSavedAt": {
+    "type": "text",
+    "placeholders": {
+      "path": {}
+    }
+  },
+  "jumpToLastReadMessage": "Ir á última mensaxe lida",
+  "@jumpToLastReadMessage": {},
+  "readUpToHere": "Lin ate aquí",
+  "@readUpToHere": {},
+  "openLinkInBrowser": "Abrir ligazón no navegador",
+  "@openLinkInBrowser": {},
+  "jump": "Ir alá",
+  "@jump": {},
+  "report": "informar",
+  "@report": {},
+  "allRooms": "Todas as Conversas en grupo",
+  "@allRooms": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "reportErrorDescription": "Vaia! Algo fallou. Inténtao máis tarde. Se queres, podes informar do problema aos desenvolvedores.",
+  "@reportErrorDescription": {},
+  "discover": "Descubrir",
+  "@discover": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "signInWithPassword": "Accede con contrasinal",
+  "@signInWithPassword": {},
+  "continueWith": "Continuar con:",
+  "@continueWith": {},
+  "pleaseTryAgainLaterOrChooseDifferentServer": "Inténtao máis tarde ou elixe un servidor diferente.",
+  "@pleaseTryAgainLaterOrChooseDifferentServer": {}
 }

assets/l10n/intl_he.arb

@@ -61,11 +61,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "חדר בארכיון",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "האם משתמשים אורחים מורשים להצטרף",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -343,8 +338,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "yourUserId": "מזהה המשתמש שלך:",
-    "@yourUserId": {},
     "yourChatBackupHasBeenSetUp": "גיבוי הצ'אט שלך הוגדר.",
     "@yourChatBackupHasBeenSetUp": {},
     "chatBackup": "גיבוי צ'אט",
@@ -477,11 +470,6 @@
             "username": {}
         }
     },
-    "crossSigningEnabled": "חתימה צולבת על",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "פעיל כעת",
     "@currentlyActive": {
         "type": "text",
@@ -543,11 +531,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "לגלות",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "downloadFile": "הורד קובץ",
     "@downloadFile": {
         "type": "text",
@@ -630,11 +613,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "יום שישי",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "מהצטרפות",
     "@fromJoining": {
         "type": "text",
@@ -755,11 +733,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "המפתחות נשמרים במטמון",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username} בעט ב {targetName}",
     "@kicked": {
         "type": "text",
@@ -1146,8 +1119,6 @@
     },
     "shareYourInviteLink": "שתף את קישור ההזמנה שלך",
     "@shareYourInviteLink": {},
-    "typeInInviteLinkManually": "הקלד את קישור ההזמנה באופן ידני...",
-    "@typeInInviteLinkManually": {},
     "noRoomsFound": "לא נמצאו חדרים…",
     "@noRoomsFound": {
         "type": "text",
@@ -1312,11 +1283,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "יום שני",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "noGoogleServicesWarning": "נראה שאין לך שירותי גוגל בטלפון שלך. זו החלטה טובה לפרטיות שלך! כדי לקבל התרעות ב- FluffyChat אנו ממליצים להשתמש https://microg.org/ או https://unifiedpush.org/.",
     "@noGoogleServicesWarning": {
         "type": "text",

assets/l10n/intl_id.arb

@@ -247,11 +247,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "friday": "Jumat",
-  "@friday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "forward": "Teruskan",
   "@forward": {
     "type": "text",
@@ -449,11 +444,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "crossSigningEnabled": "Tanda tangan silang dinyalakan",
-  "@crossSigningEnabled": {
-    "type": "text",
-    "placeholders": {}
-  },
   "createNewGroup": "Buat grup baru",
   "@createNewGroup": {
     "type": "text",
@@ -729,11 +719,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "archivedRoom": "Ruangan yang Diarsipkan",
-  "@archivedRoom": {
-    "type": "text",
-    "placeholders": {}
-  },
   "appLock": "Kunci aplikasi",
   "@appLock": {
     "type": "text",
@@ -786,12 +771,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "compareNumbersMatch": "Bandingkan dan pastikan angka cocok di perangkat lainnya:",
+  "compareNumbersMatch": "Bandingkan angka",
   "@compareNumbersMatch": {
     "type": "text",
     "placeholders": {}
   },
-  "compareEmojiMatch": "Bandingkan dan pastikan emoji cocok di perangkat lainnya:",
+  "compareEmojiMatch": "Bandingkan emoji",
   "@compareEmojiMatch": {
     "type": "text",
     "placeholders": {}
@@ -885,11 +870,6 @@
       "targetName": {}
     }
   },
-  "keysCached": "Kunci telah ditembolok",
-  "@keysCached": {
-    "type": "text",
-    "placeholders": {}
-  },
   "joinRoom": "Bergabung dengan ruangan",
   "@joinRoom": {
     "type": "text",
@@ -967,11 +947,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "monday": "Senin",
-  "@monday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "moderator": "Moderator",
   "@moderator": {
     "type": "text",
@@ -1176,11 +1151,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "wednesday": "Rabu",
-  "@wednesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "warning": "Peringatan!",
   "@warning": {
     "type": "text",
@@ -1334,11 +1304,6 @@
       "targetName": {}
     }
   },
-  "tuesday": "Selasa",
-  "@tuesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "tryToSendAgain": "Coba kirim lagi",
   "@tryToSendAgain": {
     "type": "text",
@@ -1370,16 +1335,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "thursday": "Kamis",
-  "@thursday": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "thisRoomHasBeenArchived": "Ruangan ini telah diarsipkan.",
-  "@thisRoomHasBeenArchived": {
-    "type": "text",
-    "placeholders": {}
-  },
   "theyMatch": "Cocok",
   "@theyMatch": {
     "type": "text",
@@ -1400,11 +1355,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "sunday": "Minggu",
-  "@sunday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "submit": "Kirim",
   "@submit": {
     "type": "text",
@@ -1775,8 +1725,6 @@
   },
   "scanQrCode": "Pindai kode QR",
   "@scanQrCode": {},
-  "typeInInviteLinkManually": "Masukkan tautan undangan secara manual...",
-  "@typeInInviteLinkManually": {},
   "shareYourInviteLink": "Bagikan tautan undanganmu",
   "@shareYourInviteLink": {},
   "noMatrixServer": "{server1} itu bukan server Matrix, gunakan {server2} saja?",
@@ -1885,11 +1833,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "discover": "Temukan",
-  "@discover": {
-    "type": "text",
-    "placeholders": {}
-  },
   "defaultPermissionLevel": "Level izin default",
   "@defaultPermissionLevel": {
     "type": "text",
@@ -2068,11 +2011,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "saturday": "Sabtu",
-  "@saturday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "removeDevice": "Hapus perangkat",
   "@removeDevice": {
     "type": "text",
@@ -2134,8 +2072,6 @@
   "@link": {},
   "yourChatBackupHasBeenSetUp": "Cadangan obrolanmu telah disiapkan.",
   "@yourChatBackupHasBeenSetUp": {},
-  "yourUserId": "ID penggunamu:",
-  "@yourUserId": {},
   "unverified": "Tidak terverifikasi",
   "@unverified": {},
   "pleaseEnterValidEmail": "Mohon masukkan alamat email yang valid.",
@@ -2389,8 +2325,6 @@
   "@recoveryKeyLost": {},
   "storeInAndroidKeystore": "Simpan di Android KeyStore",
   "@storeInAndroidKeystore": {},
-  "enableAutoBackups": "Aktifkan cadangan otomatis",
-  "@enableAutoBackups": {},
   "storeSecurlyOnThisDevice": "Simpan secara aman di perangkat ini",
   "@storeSecurlyOnThisDevice": {},
   "countFiles": "{count} file",
@@ -2399,8 +2333,6 @@
       "count": {}
     }
   },
-  "dehydrateShare": "Ini adalah ekspor FluffyChat privat kamu. Pastikan kamu tidak menghilangkannya dan tetap rahasia.",
-  "@dehydrateShare": {},
   "hydrate": "Pulihkan dari file cadangan",
   "@hydrate": {},
   "indexedDbErrorTitle": "Masalah dengan mode privat",
@@ -2531,12 +2463,51 @@
   "@endToEndEncryption": {},
   "disableEncryptionWarning": "Demi keamanan kamu tidak bisa menonaktifkan enkripsi dalam sebuah obrolan di mana sebelumbya sudah diaktifkan.",
   "@disableEncryptionWarning": {},
-  "noSearchResult": "Tidak ada hasil pencarian yang cocok.",
-  "@noSearchResult": {},
   "letsStart": "Mari kita mulai",
   "@letsStart": {},
   "enterInviteLinkOrMatrixId": "Masukkan tautan undangan atau ID Matrix...",
   "@enterInviteLinkOrMatrixId": {},
   "reopenChat": "Buka obrolan lagi",
-  "@reopenChat": {}
+  "@reopenChat": {},
+  "noBackupWarning": "Peringatan! Tanpa mengaktifkan cadangan percakapan, kamu akan kehilangan akses ke pesan terenkripsimu. Disarankan untuk mengaktifkan cadangan percakapan terlebih dahulu sebelum keluar dari akun.",
+  "@noBackupWarning": {},
+  "noOtherDevicesFound": "Tidak ada perangkat lain yang ditemukan",
+  "@noOtherDevicesFound": {},
+  "fileIsTooBigForServer": "Server melaporkan bahwa file terlalu besar untuk dikirim.",
+  "@fileIsTooBigForServer": {},
+  "fileHasBeenSavedAt": "Berkas telah disimpan di {path}",
+  "@fileHasBeenSavedAt": {
+    "type": "text",
+    "placeholders": {
+      "path": {}
+    }
+  },
+  "jumpToLastReadMessage": "Pergi ke pesan terakhir dibaca",
+  "@jumpToLastReadMessage": {},
+  "readUpToHere": "Baca sampai sini",
+  "@readUpToHere": {},
+  "jump": "Lompat",
+  "@jump": {},
+  "openLinkInBrowser": "Buka tautan dalam peramban",
+  "@openLinkInBrowser": {},
+  "discover": "Jelajahi",
+  "@discover": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "allRooms": "Semua Percakapan Grup",
+  "@allRooms": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "report": "laporkan",
+  "@report": {},
+  "reportErrorDescription": "Aduh. Ada yang salah. Silakan coba lahi nanti. Jika kamu mau, kamu bisa melaporkan kutu ini kepada para pengembang.",
+  "@reportErrorDescription": {},
+  "signInWithPassword": "Masuk dengan kata sandi",
+  "@signInWithPassword": {},
+  "continueWith": "Lanjutkan dengan:",
+  "@continueWith": {},
+  "pleaseTryAgainLaterOrChooseDifferentServer": "Silakan coba lagi nanti atau pilih server yang lain.",
+  "@pleaseTryAgainLaterOrChooseDifferentServer": {}
 }

assets/l10n/intl_ie.arb

@@ -34,11 +34,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Decovrir",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "containsUserName": "Contene li nómine",
     "@containsUserName": {
         "type": "text",
@@ -189,11 +184,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Claves es in cache",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "lastActiveAgo": "Ultim activité: {localizedTimeShort}",
     "@lastActiveAgo": {
         "type": "text",
@@ -340,11 +330,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "Mardí",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "Índisponibil",
     "@unavailable": {
         "type": "text",
@@ -465,11 +450,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Saturdí",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "dateWithYear": "{day}.{month}.{year}",
     "@dateWithYear": {
         "type": "text",
@@ -494,11 +474,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Venerdí",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "lightTheme": "Lucid",
     "@lightTheme": {
         "type": "text",
@@ -529,11 +504,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thursday": "Jovedí",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "username": "Nómine de usator",
     "@username": {
         "type": "text",
@@ -544,11 +514,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Mercurdí",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "submit": "Inviar",
     "@submit": {
         "type": "text",
@@ -683,11 +648,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Archivat chambre",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "changePassword": "Cambiar li contrasigne",
     "@changePassword": {
         "type": "text",
@@ -970,8 +930,6 @@
     },
     "updateAvailable": "Un actualisament de FluffyChat es disponibil",
     "@updateAvailable": {},
-    "yourUserId": "Vor ID de usator:",
-    "@yourUserId": {},
     "editWidgets": "Modificar li widgets",
     "@editWidgets": {},
     "widgetEtherpad": "Textual nota",
@@ -1165,11 +1123,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Lunedí",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "newGroup": "Crear un gruppe",
     "@newGroup": {},
     "newSpace": "Crear un spacie",
@@ -1218,11 +1171,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Soledí",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unverified": "Ínverificat",
     "@unverified": {},
     "deviceId": "ID de aparate",

assets/l10n/intl_it.arb

@@ -76,11 +76,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Stanza archiviata",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Gli utenti ospiti possono partecipare",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -432,11 +427,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Firma incrociata abilitata",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Attualmente attivo",
     "@currentlyActive": {
         "type": "text",
@@ -522,11 +512,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Scopri",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "Il nominativo è stato cambiato",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -679,11 +664,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "venerdì",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "Dall'adesione",
     "@fromJoining": {
         "type": "text",
@@ -874,11 +854,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Le chiave sono memorizzate nella cache",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username} ha espulso {targetName}",
     "@kicked": {
         "type": "text",
@@ -996,11 +971,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "lunedì",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Silenzia discussione",
     "@muteChat": {
         "type": "text",
@@ -1346,11 +1316,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "sabato",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "search": "Cerca",
     "@search": {
         "type": "text",
@@ -1550,11 +1515,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "domenica",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "Sistema",
     "@systemTheme": {
         "type": "text",
@@ -1570,16 +1530,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Questa stanza è stata archiviata.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "giovedì",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1616,11 +1566,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "martedì",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "Non disponibile",
     "@unavailable": {
         "type": "text",
@@ -1791,11 +1736,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "mercoledì",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "Ti abbiamo inviato un'e-mail",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -1936,8 +1876,6 @@
     "@passwordsDoNotMatch": {},
     "pleaseEnterValidEmail": "Inserire un indirizzo email valido.",
     "@pleaseEnterValidEmail": {},
-    "yourUserId": "Il tuo ID utente:",
-    "@yourUserId": {},
     "commandHint_leave": "Lascia questa stanza",
     "@commandHint_leave": {
         "type": "text",

assets/l10n/intl_ja.arb

@@ -11,7 +11,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "acceptedTheInvitation": "{username}が招待を承諾しました",
+    "acceptedTheInvitation": "👍{username}が招待を承諾しました",
     "@acceptedTheInvitation": {
         "type": "text",
         "placeholders": {
@@ -23,7 +23,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "activatedEndToEndEncryption": "{username}がエンドツーエンド暗号化を有効にしました",
+    "activatedEndToEndEncryption": "🔐{username}がエンドツーエンド暗号化を有効にしました",
     "@activatedEndToEndEncryption": {
         "type": "text",
         "placeholders": {
@@ -77,11 +77,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "アーカイブされた部屋",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "ゲストユーザーの参加を許可する",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -109,7 +104,7 @@
             "username": {}
         }
     },
-    "badServerLoginTypesException": "ホームサーバーでサポートされているログインタイプ：\n{serverVersions}\nアプリでは{supportedVersions}しかサポートされていません",
+    "badServerLoginTypesException": "ホームサーバーでサポートされているログインタイプ：\n{serverVersions}\nアプリがサポートしているログインタイプ：\n{supportedVersions}",
     "@badServerLoginTypesException": {
         "type": "text",
         "placeholders": {
@@ -312,7 +307,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "chatBackupDescription": "チャットのバックアップは秘密鍵によって保存されます。失くさないように気をつけてください。",
+    "chatBackupDescription": "古いメッセージはリカバリーキーで保護されます。紛失しないようにご注意ください。",
     "@chatBackupDescription": {
         "type": "text",
         "placeholders": {}
@@ -423,7 +418,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "createdTheChat": "{username}がチャットを作成しました",
+    "createdTheChat": "💬 {username}がチャットを作成しました",
     "@createdTheChat": {
         "type": "text",
         "placeholders": {
@@ -435,11 +430,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "相互署名ON",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "現在アクティブです",
     "@currentlyActive": {
         "type": "text",
@@ -525,11 +515,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "発見する",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "表示名が変更されました",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -687,11 +672,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "金曜日",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "参加時点から閲覧可能",
     "@fromJoining": {
         "type": "text",
@@ -839,7 +819,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "invitedUser": "{username}が{targetName}を招待しました",
+    "invitedUser": "📩 {username} が {targetName} を招待しました",
     "@invitedUser": {
         "type": "text",
         "placeholders": {
@@ -870,7 +850,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "joinedTheChat": "{username}がチャットに参加しました",
+    "joinedTheChat": "👋 {username} がチャットに参加しました",
     "@joinedTheChat": {
         "type": "text",
         "placeholders": {
@@ -882,12 +862,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "鍵はキャッシュされたいます",
+    "kicked": "👞 {username} は {targetName} をキックしました",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "kicked": "{username}は{targetName}をキックしました",
     "@kicked": {
         "type": "text",
         "placeholders": {
@@ -895,7 +870,7 @@
             "targetName": {}
         }
     },
-    "kickedAndBanned": "{username}は{targetName}をキックしBANしました",
+    "kickedAndBanned": "🙅 {username} が {targetName} をキックしブロックしました",
     "@kickedAndBanned": {
         "type": "text",
         "placeholders": {
@@ -1004,11 +979,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "月曜日",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "チャットのミュート",
     "@muteChat": {
         "type": "text",
@@ -1024,7 +994,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "newMessageInFluffyChat": "FluffyChatに新しいメッセージがあります",
+    "newMessageInFluffyChat": "💬 FluffyChatに新しいメッセージがあります",
     "@newMessageInFluffyChat": {
         "type": "text",
         "placeholders": {}
@@ -1059,7 +1029,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "noGoogleServicesWarning": "あなたのスマホにはグーグルサービスがないようですね。プライバシーを保護するための良い選択です！Push通知を受け取るにはmicroGを使うことを推奨しています: https://microg.org/",
+    "noGoogleServicesWarning": "あなたのスマホにはGoogleサービスがないようですね。プライバシーを保護するための良い選択です！プッシュ通知を受け取るには https://microg.org/ または https://unifiedpush.org/ を使うことをお勧めします。",
     "@noGoogleServicesWarning": {
         "type": "text",
         "placeholders": {}
@@ -1319,7 +1289,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "unbanFromChat": "追放を取り消し",
+    "unbanFromChat": "チャットからのブロックを解除する",
     "@unbanFromChat": {
         "type": "text",
         "placeholders": {}
@@ -1359,11 +1329,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "土曜日",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "search": "検索",
     "@search": {
         "type": "text",
@@ -1437,35 +1402,35 @@
         "type": "text",
         "placeholders": {}
     },
-    "sentAFile": "{username}はファイルを送信しました",
+    "sentAFile": "📁 {username}はファイルを送信しました",
     "@sentAFile": {
         "type": "text",
         "placeholders": {
             "username": {}
         }
     },
-    "sentAnAudio": "{username}は音声を送信しました",
+    "sentAnAudio": "🎤 {username}は音声を送信しました",
     "@sentAnAudio": {
         "type": "text",
         "placeholders": {
             "username": {}
         }
     },
-    "sentAPicture": "{username}は画像を送信しました",
+    "sentAPicture": "🖼️ {username}は画像を送信しました",
     "@sentAPicture": {
         "type": "text",
         "placeholders": {
             "username": {}
         }
     },
-    "sentASticker": "{username}はステッカーを送信しました",
+    "sentASticker": "😊 {username}はステッカーを送信しました",
     "@sentASticker": {
         "type": "text",
         "placeholders": {
             "username": {}
         }
     },
-    "sentAVideo": "{username}は動画を送信しました",
+    "sentAVideo": "🎥 {username}は動画を送信しました",
     "@sentAVideo": {
         "type": "text",
         "placeholders": {
@@ -1568,11 +1533,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "日曜日",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "システム",
     "@systemTheme": {
         "type": "text",
@@ -1588,16 +1548,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "この部屋はアーカイブされています。",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "木曜日",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1634,11 +1584,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "火曜日",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "不在",
     "@unavailable": {
         "type": "text",
@@ -1684,7 +1629,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "unreadChats": "{unreadCount, plural, other{{unreadCount}の未読メッセージ}}",
+    "unreadChats": "{unreadCount, plural, =1{1件の未読メッセージ} other{{unreadCount}件の未読メッセージ}}",
     "@unreadChats": {
         "type": "text",
         "placeholders": {
@@ -1714,7 +1659,7 @@
             "username": {}
         }
     },
-    "userLeftTheChat": "{username}は退室しました",
+    "userLeftTheChat": "🚪 {username}はチャットから退室しました",
     "@userLeftTheChat": {
         "type": "text",
         "placeholders": {
@@ -1809,11 +1754,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "水曜日",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "あなたにメールを送信しました",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -1829,12 +1769,12 @@
         "type": "text",
         "placeholders": {}
     },
-    "whyDoYouWantToReportThis": "なぜこれを通報したいのですか？",
+    "whyDoYouWantToReportThis": "これを通報する理由",
     "@whyDoYouWantToReportThis": {
         "type": "text",
         "placeholders": {}
     },
-    "wipeChatBackup": "新しい秘密鍵を作るためにチャットのバックアップを消去しますか？",
+    "wipeChatBackup": "チャットのバックアップを消去して、新しいリカバリーキーを作りますか？",
     "@wipeChatBackup": {
         "type": "text",
         "placeholders": {}
@@ -1921,8 +1861,6 @@
         "type": "text",
         "placeholder": {}
     },
-    "yourUserId": "あなたのユーザーID:",
-    "@yourUserId": {},
     "yourChatBackupHasBeenSetUp": "チャットバックアップを設定ました。",
     "@yourChatBackupHasBeenSetUp": {},
     "sendOnEnter": "Enterで送信",
@@ -1945,5 +1883,508 @@
         "description": "Usage hint for the command /clearcache"
     },
     "addToStory": "ストーリーに追加",
-    "@addToStory": {}
+    "@addToStory": {},
+    "commandInvalid": "コマンドが無効",
+    "@commandInvalid": {
+        "type": "text"
+    },
+    "updateNow": "バックグラウンドでアップデートを開始",
+    "@updateNow": {},
+    "updateAvailable": "FluffyChatのアップデートが利用可能",
+    "@updateAvailable": {},
+    "commandHint_create": "空のグループチャットを作成\n暗号化を無効にするには、--no-encryption を使用",
+    "@commandHint_create": {
+        "type": "text",
+        "description": "Usage hint for the command /create"
+    },
+    "commandHint_discardsession": "セッションを破棄",
+    "@commandHint_discardsession": {
+        "type": "text",
+        "description": "Usage hint for the command /discardsession"
+    },
+    "confirmMatrixId": "アカウントを削除するには、Matrix IDを確認してください。",
+    "@confirmMatrixId": {},
+    "commandHint_markasgroup": "グループとしてマーク",
+    "@commandHint_markasgroup": {},
+    "commandHint_join": "指定した部屋に参加",
+    "@commandHint_join": {
+        "type": "text",
+        "description": "Usage hint for the command /join"
+    },
+    "commandHint_send": "テキストを送信",
+    "@commandHint_send": {
+        "type": "text",
+        "description": "Usage hint for the command /send"
+    },
+    "hydrate": "バックアップファイルから復元",
+    "@hydrate": {},
+    "commandHint_html": "HTML形式のテキストを送信",
+    "@commandHint_html": {
+        "type": "text",
+        "description": "Usage hint for the command /html"
+    },
+    "commandHint_invite": "指定したユーザーをこの部屋に招待",
+    "@commandHint_invite": {
+        "type": "text",
+        "description": "Usage hint for the command /invite"
+    },
+    "commandMissing": "{command} はコマンドではありません。",
+    "@commandMissing": {
+        "type": "text",
+        "placeholders": {
+            "command": {}
+        },
+        "description": "State that {command} is not a valid /command."
+    },
+    "oneClientLoggedOut": "クライアントの 1つがログアウトしました",
+    "@oneClientLoggedOut": {},
+    "addAccount": "アカウントを追加",
+    "@addAccount": {},
+    "editBundlesForAccount": "このアカウントのバンドルを編集",
+    "@editBundlesForAccount": {},
+    "unverified": "未検証",
+    "@unverified": {},
+    "sender": "送信者",
+    "@sender": {},
+    "unsubscribeStories": "ストーリーの購読を解除する",
+    "@unsubscribeStories": {},
+    "yourStory": "あなたのストーリー",
+    "@yourStory": {},
+    "matrixWidgets": "Matrixのウィジェット",
+    "@matrixWidgets": {},
+    "placeCall": "電話をかける",
+    "@placeCall": {},
+    "voiceCall": "音声通話",
+    "@voiceCall": {},
+    "unsupportedAndroidVersionLong": "この機能を利用するには、より新しいAndroidのバージョンが必要です。アップデートまたはLineage OSのサポートをご確認ください。",
+    "@unsupportedAndroidVersionLong": {},
+    "widgetVideo": "動画",
+    "@widgetVideo": {},
+    "widgetName": "名称",
+    "@widgetName": {},
+    "widgetCustom": "カスタム",
+    "@widgetCustom": {},
+    "widgetJitsi": "Jitsi Meet",
+    "@widgetJitsi": {},
+    "dehydrateWarning": "この操作は元に戻せません。バックアップファイルを安全に保存してください。",
+    "@dehydrateWarning": {},
+    "dehydrate": "セッションのエクスポートとデバイスの消去",
+    "@dehydrate": {},
+    "messageType": "メッセージの種類",
+    "@messageType": {},
+    "start": "開始",
+    "@start": {},
+    "publish": "公開",
+    "@publish": {},
+    "addDescription": "説明を追加",
+    "@addDescription": {},
+    "indexedDbErrorTitle": "プライベートモードに関する問題",
+    "@indexedDbErrorTitle": {},
+    "addWidget": "ウィジェットを追加",
+    "@addWidget": {},
+    "youBannedUser": "{user} を禁止しました",
+    "@youBannedUser": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "youJoinedTheChat": "チャットに参加しました",
+    "@youJoinedTheChat": {},
+    "youHaveWithdrawnTheInvitationFor": "{user} への招待を取り下げました",
+    "@youHaveWithdrawnTheInvitationFor": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "users": "ユーザー",
+    "@users": {},
+    "youRejectedTheInvitation": "招待を拒否しました",
+    "@youRejectedTheInvitation": {},
+    "screenSharingDetail": "FuffyChatで画面を共有しています",
+    "@screenSharingDetail": {},
+    "enterASpacepName": "スペース名を入力してください",
+    "@enterASpacepName": {},
+    "homeserver": "ホームサーバー",
+    "@homeserver": {},
+    "scanQrCode": "QRコードをスキャン",
+    "@scanQrCode": {},
+    "obtainingLocation": "位置情報を取得しています…",
+    "@obtainingLocation": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "addToBundle": "バンドルに追加",
+    "@addToBundle": {},
+    "removeFromBundle": "このバンドルから削除",
+    "@removeFromBundle": {},
+    "bundleName": "バンドル名",
+    "@bundleName": {},
+    "noMatrixServer": "{server1} はMatrixのサーバーではありません。代わりに {server2} を使用しますか?",
+    "@noMatrixServer": {
+        "type": "text",
+        "placeholders": {
+            "server1": {},
+            "server2": {}
+        }
+    },
+    "openVideoCamera": "ビデオ用にカメラを開く",
+    "@openVideoCamera": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "link": "リンク",
+    "@link": {},
+    "or": "または",
+    "@or": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "register": "登録",
+    "@register": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "removeYourAvatar": "アバターを削除する",
+    "@removeYourAvatar": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "saveFile": "ファイルを保存",
+    "@saveFile": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "recoveryKey": "リカバリーキー",
+    "@recoveryKey": {},
+    "showDirectChatsInSpaces": "関連するダイレクトチャットをスペースに表示する",
+    "@showDirectChatsInSpaces": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "singlesignon": "シングルサインオン",
+    "@singlesignon": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "spaceIsPublic": "スペースは公開されています",
+    "@spaceIsPublic": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "spaceName": "スペース名",
+    "@spaceName": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "startFirstChat": "最初のチャットを開始する",
+    "@startFirstChat": {},
+    "addToSpaceDescription": "このチャットを追加するスペースを選択してください。",
+    "@addToSpaceDescription": {},
+    "messageInfo": "メッセージの情報",
+    "@messageInfo": {},
+    "openGallery": "ギャラリーを開く",
+    "@openGallery": {},
+    "removeFromSpace": "スペースから削除",
+    "@removeFromSpace": {},
+    "pleaseEnterRecoveryKeyDescription": "古いメッセージを解除するには、以前のセッションで生成されたリカバリーキーを入力してください。リカバリーキーはパスワードではありません。",
+    "@pleaseEnterRecoveryKeyDescription": {},
+    "thisUserHasNotPostedAnythingYet": "このユーザーはまだストーリーに何も投稿していません",
+    "@thisUserHasNotPostedAnythingYet": {},
+    "replyHasBeenSent": "返信が送信されました",
+    "@replyHasBeenSent": {},
+    "videoWithSize": "ビデオ ({size})",
+    "@videoWithSize": {
+        "type": "text",
+        "placeholders": {
+            "size": {}
+        }
+    },
+    "storyFrom": "{date}からのストーリー:\n{body}",
+    "@storyFrom": {
+        "type": "text",
+        "placeholders": {
+            "date": {},
+            "body": {}
+        }
+    },
+    "whoCanSeeMyStoriesDesc": "あなたのストーリーでは、人々がお互いを見て連絡を取ることができることに注意してください。",
+    "@whoCanSeeMyStoriesDesc": {},
+    "iUnderstand": "わかりました",
+    "@iUnderstand": {},
+    "openChat": "チャットを開く",
+    "@openChat": {},
+    "experimentalVideoCalls": "実験的なビデオ通話",
+    "@experimentalVideoCalls": {},
+    "emailOrUsername": "メールアドレスまたはユーザー名",
+    "@emailOrUsername": {},
+    "switchToAccount": "アカウント {number} に切り替える",
+    "@switchToAccount": {
+        "type": "number",
+        "placeholders": {
+            "number": {}
+        }
+    },
+    "nextAccount": "次のアカウント",
+    "@nextAccount": {},
+    "youAcceptedTheInvitation": "👍 招待を承諾しました",
+    "@youAcceptedTheInvitation": {},
+    "errorAddingWidget": "ウィジェットの追加中にエラーが発生しました。",
+    "@errorAddingWidget": {},
+    "widgetNameError": "表示名を入力してください。",
+    "@widgetNameError": {},
+    "stories": "ストーリー",
+    "@stories": {},
+    "youUnbannedUser": "{user} の禁止を解除しました",
+    "@youUnbannedUser": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "youInvitedBy": "📩 {user} から招待されました",
+    "@youInvitedBy": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "youKicked": "👞 {user} をキックしました",
+    "@youKicked": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "youKickedAndBanned": "🙅 {user} をキックしてブロックしました",
+    "@youKickedAndBanned": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "storeInAppleKeyChain": "Apple KeyChainに保存",
+    "@storeInAppleKeyChain": {},
+    "storeInAndroidKeystore": "Android KeyStoreに保存する",
+    "@storeInAndroidKeystore": {},
+    "storeInSecureStorageDescription": "このデバイスの安全なストレージにリカバリーキーを保存。",
+    "@storeInSecureStorageDescription": {},
+    "unlockOldMessages": "古いメッセージのロックを解除する",
+    "@unlockOldMessages": {},
+    "callingAccount": "通話アカウント",
+    "@callingAccount": {},
+    "callingPermissions": "通話の権限",
+    "@callingPermissions": {},
+    "screenSharingTitle": "画面共有",
+    "@screenSharingTitle": {},
+    "foregroundServiceRunning": "この通知は、フォアグラウンド サービスの実行中に表示されます。",
+    "@foregroundServiceRunning": {},
+    "custom": "カスタム",
+    "@custom": {},
+    "countFiles": "{count}個のファイル",
+    "@countFiles": {
+        "placeholders": {
+            "count": {}
+        }
+    },
+    "storeSecurlyOnThisDevice": "このデバイスに安全に保管する",
+    "@storeSecurlyOnThisDevice": {},
+    "whyIsThisMessageEncrypted": "このメッセージが読めない理由",
+    "@whyIsThisMessageEncrypted": {},
+    "otherCallingPermissions": "マイク、カメラ、その他FluffyChatの権限",
+    "@otherCallingPermissions": {},
+    "appearOnTopDetails": "アプリをトップに表示できるようにする（すでに通話アカウントとしてFluffychatを設定している場合は必要ありません）",
+    "@appearOnTopDetails": {},
+    "loginWithOneClick": "ワンクリックでサインイン",
+    "@loginWithOneClick": {},
+    "dehydrateTorLong": "TOR ユーザーの場合、ウィンドウを閉じる前にセッションをエクスポートすることをお勧めします。",
+    "@dehydrateTorLong": {},
+    "hydrateTorLong": "前回、TOR でセッションをエクスポートしましたか？すぐにインポートしてチャットを続けましょう。",
+    "@hydrateTorLong": {},
+    "shareYourInviteLink": "招待リンクを共有する",
+    "@shareYourInviteLink": {},
+    "enableMultiAccounts": "(ベータ版) このデバイスで複数のアカウントを有効にする",
+    "@enableMultiAccounts": {},
+    "pleaseEnterRecoveryKey": "リカバリーキーを入力してください。",
+    "@pleaseEnterRecoveryKey": {},
+    "serverRequiresEmail": "このサーバーは、登録のためにメールアドレスを検証する必要があります。",
+    "@serverRequiresEmail": {},
+    "sendSticker": "ステッカーを送る",
+    "@sendSticker": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "synchronizingPleaseWait": "同期中...お待ちください。",
+    "@synchronizingPleaseWait": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "emojis": "絵文字",
+    "@emojis": {},
+    "storyPrivacyWarning": "あなたのストーリーでは、人々がお互いを見て連絡を取ることができることに注意してください。ストーリーは24時間表示されますが、すべてのデバイスとサーバーから削除されるという保証はありません。",
+    "@storyPrivacyWarning": {},
+    "markAsRead": "既読にする",
+    "@markAsRead": {},
+    "videoCallsBetaWarning": "ビデオ通話は、現在ベータ版であることにご注意ください。すべてのプラットフォームで期待通りに動作しない、あるいはまったく動作しない可能性があります。",
+    "@videoCallsBetaWarning": {},
+    "confirmEventUnpin": "イベントの固定を完全に解除してもよろしいですか？",
+    "@confirmEventUnpin": {},
+    "unsupportedAndroidVersion": "サポートされていないAndroidのバージョン",
+    "@unsupportedAndroidVersion": {},
+    "user": "ユーザー",
+    "@user": {},
+    "enterInviteLinkOrMatrixId": "招待リンクまたはMatrixのIDを入力してください...",
+    "@enterInviteLinkOrMatrixId": {},
+    "newGroup": "新しいグループ",
+    "@newGroup": {},
+    "noBackupWarning": "警告！チャットのバックアップを有効にしないと、暗号化されたメッセージにアクセスできなくなります。ログアウトする前に、まずチャットのバックアップを有効にすることを強くお勧めします。",
+    "@noBackupWarning": {},
+    "disableEncryptionWarning": "セキュリティ上の理由から、以前は暗号化が有効だったチャットで暗号化を無効にすることはできません。",
+    "@disableEncryptionWarning": {},
+    "youInvitedUser": "📩 {user} を招待しました",
+    "@youInvitedUser": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "reactedWith": "{sender} が {reaction} で反応しました",
+    "@reactedWith": {
+        "type": "text",
+        "placeholders": {
+            "sender": {},
+            "reaction": {}
+        }
+    },
+    "createNewSpace": "新しいスペース",
+    "@createNewSpace": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "widgetUrlError": "有効なURLではありません。",
+    "@widgetUrlError": {},
+    "reportUser": "ユーザーを報告",
+    "@reportUser": {},
+    "errorObtainingLocation": "位置情報の取得中にエラーが発生しました: {error}",
+    "@errorObtainingLocation": {
+        "type": "text",
+        "placeholders": {
+            "error": {}
+        }
+    },
+    "pinMessage": "部屋にピン留めする",
+    "@pinMessage": {},
+    "previousAccount": "前のアカウント",
+    "@previousAccount": {},
+    "editWidgets": "ウィジェットを編集",
+    "@editWidgets": {},
+    "pleaseChoose": "選択してください",
+    "@pleaseChoose": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "oopsPushError": "おっと！残念ながら、プッシュ通知の設定中にエラーが発生しました。",
+    "@oopsPushError": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "noOtherDevicesFound": "他のデバイスが見つかりません",
+    "@noOtherDevicesFound": {},
+    "recoveryKeyLost": "リカバリーキーを紛失した場合",
+    "@recoveryKeyLost": {},
+    "shareLocation": "位置情報の共有",
+    "@shareLocation": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "time": "時間",
+    "@time": {},
+    "sendAsText": "テキストとして送信",
+    "@sendAsText": {
+        "type": "text"
+    },
+    "commandHint_googly": "ぎょろ目を送る",
+    "@commandHint_googly": {},
+    "commandHint_hug": "ハグを送る",
+    "@commandHint_hug": {},
+    "encryptThisChat": "このチャットを暗号化する",
+    "@encryptThisChat": {},
+    "noEmailWarning": "有効なメールアドレスを入力してください。入力しないと、パスワードをリセットすることができなくなります。不要な場合は、もう一度ボタンをタップして続けてください。",
+    "@noEmailWarning": {},
+    "commandHint_markasdm": "ダイレクトメッセージの部屋としてマークする",
+    "@commandHint_markasdm": {},
+    "commandHint_dm": "ダイレクトチャットを開始する\n暗号化を無効にするには、--no-encryptionを使用してください",
+    "@commandHint_dm": {
+        "type": "text",
+        "description": "Usage hint for the command /dm"
+    },
+    "commandHint_leave": "この部屋を退出",
+    "@commandHint_leave": {
+        "type": "text",
+        "description": "Usage hint for the command /leave"
+    },
+    "commandHint_myroomavatar": "この部屋の写真を設定する (mxc-uriで)",
+    "@commandHint_myroomavatar": {
+        "type": "text",
+        "description": "Usage hint for the command /myroomavatar"
+    },
+    "commandHint_myroomnick": "この部屋の表示名を設定する",
+    "@commandHint_myroomnick": {
+        "type": "text",
+        "description": "Usage hint for the command /myroomnick"
+    },
+    "commandHint_plain": "書式設定されていないテキストを送信する",
+    "@commandHint_plain": {
+        "type": "text",
+        "description": "Usage hint for the command /plain"
+    },
+    "commandHint_react": "リアクションとして返信を送信する",
+    "@commandHint_react": {
+        "type": "text",
+        "description": "Usage hint for the command /react"
+    },
+    "dehydrateTor": "TOR ユーザー: セッションをエクスポート",
+    "@dehydrateTor": {},
+    "hydrateTor": "TOR ユーザー: セッションのエクスポートをインポート",
+    "@hydrateTor": {},
+    "locationDisabledNotice": "位置情報サービスが無効になっています。位置情報を共有できるようにするには、位置情報サービスを有効にしてください。",
+    "@locationDisabledNotice": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "locationPermissionDeniedNotice": "位置情報の権限が拒否されました。位置情報を共有できるように許可してください。",
+    "@locationPermissionDeniedNotice": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "letsStart": "始めましょう",
+    "@letsStart": {},
+    "deviceKeys": "デバイスキー:",
+    "@deviceKeys": {},
+    "sorryThatsNotPossible": "申し訳ありません...それは不可能です",
+    "@sorryThatsNotPossible": {},
+    "endToEndEncryption": "エンドツーエンド暗号化",
+    "@endToEndEncryption": {},
+    "wasDirectChatDisplayName": "空のチャット (以前は {oldDisplayName})",
+    "@wasDirectChatDisplayName": {
+        "type": "text",
+        "placeholders": {
+            "oldDisplayName": {}
+        }
+    },
+    "doNotShowAgain": "今後表示しない",
+    "@doNotShowAgain": {},
+    "hideUnimportantStateEvents": "重要でない状態イベントを非表示にする",
+    "@hideUnimportantStateEvents": {},
+    "numChats": "{number} チャット",
+    "@numChats": {
+        "type": "number",
+        "placeholders": {
+            "number": {}
+        }
+    },
+    "allSpaces": "すべてのスペース",
+    "@allSpaces": {},
+    "enterRoom": "部屋に入る",
+    "@enterRoom": {},
+    "enterSpace": "スペースに入る",
+    "@enterSpace": {},
+    "newSpace": "新しいスペース",
+    "@newSpace": {},
+    "reopenChat": "チャットを再開する",
+    "@reopenChat": {}
 }

assets/l10n/intl_lt.arb

@@ -14,8 +14,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "yourUserId": "Tavo vartotojo ID:",
-    "@yourUserId": {},
     "edit": "Redaguoti",
     "@edit": {
         "type": "text",
@@ -26,11 +24,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Penktadienis",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "about": "Apie",
     "@about": {
         "type": "text",
@@ -66,26 +59,11 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Pirmadienis",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "skip": "Praleisti",
     "@skip": {
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Sekmadienis",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "tuesday": "Antradienis",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "share": "Bendrinti",
     "@share": {
         "type": "text",
@@ -103,11 +81,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thursday": "Ketvirtadienis",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "sender": "Siuntėjas",
     "@sender": {},
     "yes": "Taip",
@@ -270,8 +243,6 @@
     },
     "shareYourInviteLink": "Bendrinti savo pakvietimo nuorodą",
     "@shareYourInviteLink": {},
-    "typeInInviteLinkManually": "Įvesti pakvietimo nuorodą rankiniu būdu...",
-    "@typeInInviteLinkManually": {},
     "none": "Nė vienas",
     "@none": {
         "type": "text",
@@ -484,11 +455,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Šeštadienis",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "search": "Ieškoti",
     "@search": {
         "type": "text",
@@ -875,11 +841,6 @@
         "type": "text",
         "description": "Usage hint for the command /me"
     },
-    "discover": "Rasti",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "Rodomas vardas buvo pakeistas",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -1276,11 +1237,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Archyvuotas kambarys",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Ar svečiams leidžiama prisijungti",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -1303,12 +1259,12 @@
     },
     "chatHasBeenAddedToThisSpace": "Pokalbis buvo pridėtas prie šios erdvės",
     "@chatHasBeenAddedToThisSpace": {},
-    "compareEmojiMatch": "Palyginkite ir įsitikinkite, kad šie jaustukai atitinka kito įrenginio jaustukus:",
+    "compareEmojiMatch": "Palyginkite jaustukus",
     "@compareEmojiMatch": {
         "type": "text",
         "placeholders": {}
     },
-    "compareNumbersMatch": "Palyginkite ir įsitikinkite, kad šie skaičiai sutampa su kito įrenginio skaičiais:",
+    "compareNumbersMatch": "Palyginkite skaičius",
     "@compareNumbersMatch": {
         "type": "text",
         "placeholders": {}
@@ -1385,11 +1341,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Trečiadienis",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "Išsiuntėme jums el. laišką",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -1949,11 +1900,6 @@
             "username": {}
         }
     },
-    "keysCached": "Raktai talpinami į atmintinę",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "👞 {username} išmetė {targetName}",
     "@kicked": {
         "type": "text",
@@ -1999,11 +1945,6 @@
             "username2": {}
         }
     },
-    "thisRoomHasBeenArchived": "Šis kambarys buvo suarchyvuotas.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
     "toggleFavorite": "Perjungti parankinius",
     "@toggleFavorite": {
         "type": "text",
@@ -2220,11 +2161,6 @@
             "user": {}
         }
     },
-    "crossSigningEnabled": "Kryžminis pasirašymas įjungtas",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "dateAndTimeOfDay": "{date}, {timeOfDay}",
     "@dateAndTimeOfDay": {
         "type": "text",
@@ -2363,8 +2299,6 @@
     "@dehydrateTorLong": {},
     "dehydrateWarning": "Šio veiksmo negalima atšaukti. Įsitikinkite, kad saugiai saugote atsarginę kopiją.",
     "@dehydrateWarning": {},
-    "dehydrateShare": "Tai jūsų privatus FluffyChat eksportas. Pasirūpinkite, kad jo neprarastumėte ir išsaugotumėte privatumą.",
-    "@dehydrateShare": {},
     "hydrateTorLong": "Ar paskutinį kartą eksportavote savo sesiją naudodami TOR? Greitai ją importuokite ir tęskite pokalbį.",
     "@hydrateTorLong": {},
     "commandHint_markasgroup": "Pažymėti kaip grupę",
@@ -2420,8 +2354,6 @@
     "@indexedDbErrorLong": {},
     "noEmailWarning": "Įveskite galiojantį el. pašto adresą. Priešingu atveju negalėsite iš naujo nustatyti slaptažodžio. Jei nenorite, dar kartą bakstelėkite mygtuką, kad galėtumėte tęsti.",
     "@noEmailWarning": {},
-    "enableAutoBackups": "Įjungti automatines atsargines kopijas",
-    "@enableAutoBackups": {},
     "countFiles": "{count} failai",
     "@countFiles": {
         "placeholders": {

assets/l10n/intl_nb.arb

@@ -71,11 +71,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Arkivert rom",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Skal gjester tillates å ta del",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -401,11 +396,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Videreformidling av tillit på",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Aktiv nå",
     "@currentlyActive": {
         "type": "text",
@@ -491,11 +481,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Oppdag",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "Visningsnavn endret",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -648,11 +633,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Fredag",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "Fra å ta del",
     "@fromJoining": {
         "type": "text",
@@ -838,11 +818,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Nøkler hurtiglagret",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username} kastet ut {targetName}",
     "@kicked": {
         "type": "text",
@@ -960,11 +935,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Mandag",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Forstum sludring",
     "@muteChat": {
         "type": "text",
@@ -1275,11 +1245,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Lørdag",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "search": "Søk",
     "@search": {
         "type": "text",
@@ -1474,11 +1439,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Søndag",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "System",
     "@systemTheme": {
         "type": "text",
@@ -1494,16 +1454,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Dette rommet har blitt arkivert.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "Torsdag",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1525,11 +1475,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "Tirsdag",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "Utilgjengelig",
     "@unavailable": {
         "type": "text",
@@ -1685,11 +1630,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Onsdag",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "Du har fått en e-post",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -1839,7 +1779,5 @@
     "@changeYourAvatar": {
         "type": "text",
         "placeholders": {}
-    },
+    }
-    "yourUserId": "Din bruker ID:",
-    "@yourUserId": {}
 }

assets/l10n/intl_pl.arb

@@ -1,7 +1,7 @@
 {
   "@@locale": "pl",
   "@@last_modified": "2021-08-14 12:41:09.943634",
-  "about": "O nas",
+  "about": "O aplikacji",
   "@about": {
     "type": "text",
     "placeholders": {}
@@ -11,7 +11,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "acceptedTheInvitation": "{username} zaakceptował/-a zaproszenie",
+  "acceptedTheInvitation": "👍 {username} zaakceptował/-a zaproszenie",
   "@acceptedTheInvitation": {
     "type": "text",
     "placeholders": {
@@ -23,7 +23,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "activatedEndToEndEncryption": "{username} aktywował/-a szyfrowanie end-to-end",
+  "activatedEndToEndEncryption": "🔐 {username} aktywował/-a szyfrowanie od końca do końca",
   "@activatedEndToEndEncryption": {
     "type": "text",
     "placeholders": {
@@ -40,7 +40,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "admin": "Admin",
+  "admin": "Administrator",
   "@admin": {
     "type": "text",
     "placeholders": {}
@@ -67,22 +67,17 @@
     "type": "text",
     "placeholders": {}
   },
-  "archivedRoom": "Zarchiwizowane pokoje",
-  "@archivedRoom": {
-    "type": "text",
-    "placeholders": {}
-  },
   "areGuestsAllowedToJoin": "Czy użytkownicy-goście mogą dołączyć",
   "@areGuestsAllowedToJoin": {
     "type": "text",
     "placeholders": {}
   },
-  "areYouSure": "Jesteś pewny/-a?",
+  "areYouSure": "Czy na pewno?",
   "@areYouSure": {
     "type": "text",
     "placeholders": {}
   },
-  "areYouSureYouWantToLogout": "Czy napewno chcesz się wylogować?",
+  "areYouSureYouWantToLogout": "Czy na pewno chcesz się wylogować?",
   "@areYouSureYouWantToLogout": {
     "type": "text",
     "placeholders": {}
@@ -188,7 +183,7 @@
       "username": {}
     }
   },
-  "changedTheDisplaynameTo": "{username} zmienił/-a wyświetlany nick na: {displayname}",
+  "changedTheDisplaynameTo": "{username} zmienił/-a swój nick na: '{displayname}'",
   "@changedTheDisplaynameTo": {
     "type": "text",
     "placeholders": {
@@ -302,7 +297,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "chatBackupDescription": "Twoja kopia zapasowa Rozmów jest zabezpieczona kluczem bezpieczeństwa. Uważaj żeby go nie zgubić.",
+  "chatBackupDescription": "Twoje stare wiadomości są zabezpieczone kluczem odzyskiwania. Uważaj żeby go nie zgubić.",
   "@chatBackupDescription": {
     "type": "text",
     "placeholders": {}
@@ -416,12 +411,12 @@
     },
     "description": "State that {command} is not a valid /command."
   },
-  "compareEmojiMatch": "Porównaj i sprawdź czy na innym urządzeniu wyświetlają się te same emoji:",
+  "compareEmojiMatch": "Porównaj emoji",
   "@compareEmojiMatch": {
     "type": "text",
     "placeholders": {}
   },
-  "compareNumbersMatch": "Porównaj i sprawdź czy na innym urządzeniu wyświetlają się te same cyfry:",
+  "compareNumbersMatch": "Porównaj cyfry",
   "@compareNumbersMatch": {
     "type": "text",
     "placeholders": {}
@@ -485,7 +480,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "createdTheChat": "{username} stworzył/-a czat",
+  "createdTheChat": "💬 {username} zaczął/-ęła rozmowę",
   "@createdTheChat": {
     "type": "text",
     "placeholders": {
@@ -523,7 +518,7 @@
       "day": {}
     }
   },
-  "dateWithYear": "{day}-{month}-{year}",
+  "dateWithYear": "{day}.{month}.{year}",
   "@dateWithYear": {
     "type": "text",
     "placeholders": {
@@ -532,7 +527,7 @@
       "day": {}
     }
   },
-  "deactivateAccountWarning": "To dezaktywuje twoje konto. To jest nieodwracalne ! Czy jesteś pewien?",
+  "deactivateAccountWarning": "To zdezaktywuje twoje konto. To jest nieodwracalne! Na pewno chcesz to zrobić?",
   "@deactivateAccountWarning": {
     "type": "text",
     "placeholders": {}
@@ -704,11 +699,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "friday": "Piątek",
-  "@friday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "fromJoining": "Od dołączenia",
   "@fromJoining": {
     "type": "text",
@@ -836,7 +826,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "invitedUser": "{username} zaprosił/-a {targetName}",
+  "invitedUser": "📩 {username} zaprosił/-a {targetName}",
   "@invitedUser": {
     "type": "text",
     "placeholders": {
@@ -867,7 +857,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "joinedTheChat": "{username} dołączył/-a do czatu",
+  "joinedTheChat": "👋 {username} dołączył/-a do czatu",
   "@joinedTheChat": {
     "type": "text",
     "placeholders": {
@@ -879,12 +869,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "keysCached": "Klucze są załadowane",
+  "kicked": "👞 {username} wyrzucił/-a {targetName}",
-  "@keysCached": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "kicked": "{username} wyrzucił/-a {targetName}",
   "@kicked": {
     "type": "text",
     "placeholders": {
@@ -892,7 +877,7 @@
       "targetName": {}
     }
   },
-  "kickedAndBanned": "{username} wyrzucił/-a i zbanował/-a {targetName}",
+  "kickedAndBanned": "🙅 {username} wyrzucił/-a i zbanował/-a {targetName}",
   "@kickedAndBanned": {
     "type": "text",
     "placeholders": {
@@ -954,7 +939,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "login": "Zaloguj",
+  "login": "Zaloguj się",
   "@login": {
     "type": "text",
     "placeholders": {}
@@ -966,7 +951,7 @@
       "homeserver": {}
     }
   },
-  "logout": "Wyloguj",
+  "logout": "Wyloguj się",
   "@logout": {
     "type": "text",
     "placeholders": {}
@@ -996,11 +981,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "monday": "Poniedziałek",
-  "@monday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "muteChat": "Wycisz czat",
   "@muteChat": {
     "type": "text",
@@ -1016,7 +996,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "newMessageInFluffyChat": "Nowa wiadomość w FluffyChat",
+  "newMessageInFluffyChat": "💬 Nowa wiadomość w FluffyChat",
   "@newMessageInFluffyChat": {
     "type": "text",
     "placeholders": {}
@@ -1128,12 +1108,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "pleaseEnterAMatrixIdentifier": "Wprowadź proszę identyfikator matrix.",
+  "pleaseEnterAMatrixIdentifier": "Wprowadź identyfikator Matrix.",
   "@pleaseEnterAMatrixIdentifier": {
     "type": "text",
     "placeholders": {}
   },
-  "pleaseEnterYourPassword": "Wpisz swoje hasło",
+  "pleaseEnterYourPassword": "Wprowadź swoje hasło",
   "@pleaseEnterYourPassword": {
     "type": "text",
     "placeholders": {}
@@ -1209,7 +1189,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "unbanFromChat": "Usuń blokadę",
+  "unbanFromChat": "Odbanuj z czatu",
   "@unbanFromChat": {
     "type": "text",
     "placeholders": {}
@@ -1229,11 +1209,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "saturday": "Sobota",
-  "@saturday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "seenByUser": "Zobaczone przez {username}",
   "@seenByUser": {
     "type": "text",
@@ -1277,35 +1252,35 @@
     "type": "text",
     "placeholders": {}
   },
-  "sentAFile": "{username} wysłał/-a plik",
+  "sentAFile": "📁 {username} wysłał/-a plik",
   "@sentAFile": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "sentAnAudio": "{username} wysłał/-a plik audio",
+  "sentAnAudio": "🎤 {username} wysłał/-a plik audio",
   "@sentAnAudio": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "sentAPicture": "{username} wysłał/-a obraz",
+  "sentAPicture": "🖼️ {username} wysłał/-a zdjęcie",
   "@sentAPicture": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "sentASticker": "{username} wysłał/-a naklejkę",
+  "sentASticker": "😊 {username} wysłał/-a naklejkę",
   "@sentASticker": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "sentAVideo": "{username} wysłał/-a wideo",
+  "sentAVideo": "🎥 {username} wysłał/-a film",
   "@sentAVideo": {
     "type": "text",
     "placeholders": {
@@ -1342,7 +1317,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "sharedTheLocation": "{username} udostępnił/-a lokalizacje",
+  "sharedTheLocation": "{username} udostępnił/-a swoją lokalizacje",
   "@sharedTheLocation": {
     "type": "text",
     "placeholders": {
@@ -1369,11 +1344,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "sunday": "Niedziela",
-  "@sunday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "synchronizingPleaseWait": "Synchronizacja… Proszę czekać.",
   "@synchronizingPleaseWait": {
     "type": "text",
@@ -1384,16 +1354,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "thisRoomHasBeenArchived": "Ten pokój został przeniesiony do archiwum.",
-  "@thisRoomHasBeenArchived": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "thursday": "Czwartek",
-  "@thursday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "title": "FluffyChat",
   "@title": {
     "description": "Title for the application",
@@ -1410,11 +1370,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "tuesday": "Wtorek",
-  "@tuesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "unbannedUser": "{username} odbanował/-a {targetName}",
   "@unbannedUser": {
     "type": "text",
@@ -1450,7 +1405,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "unreadChats": "{unreadCount, plural, other{{unreadCount} nieprzeczytanych czatów}}",
+  "unreadChats": "{unreadCount, plural, =1{1 unread chat} other{{unreadCount} unread chats}}",
   "@unreadChats": {
     "type": "text",
     "placeholders": {
@@ -1480,14 +1435,14 @@
       "username": {}
     }
   },
-  "userLeftTheChat": "{username} opuścił/-a czat",
+  "userLeftTheChat": "🚪 {username} opuścił/-a czat",
   "@userLeftTheChat": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "username": "Nick",
+  "username": "Nazwa użytkownika",
   "@username": {
     "type": "text",
     "placeholders": {}
@@ -1540,11 +1495,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "wednesday": "Środa",
-  "@wednesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "whoIsAllowedToJoinThisGroup": "Kto może dołączyć do tej grupy",
   "@whoIsAllowedToJoinThisGroup": {
     "type": "text",
@@ -1580,7 +1530,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "youHaveBeenBannedFromThisChat": "Zostałeś zbanowany na tym czacie",
+  "youHaveBeenBannedFromThisChat": "Zostałeś/-aś zbanowany/-a z tego czatu",
   "@youHaveBeenBannedFromThisChat": {
     "type": "text",
     "placeholders": {}
@@ -1748,7 +1698,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "whatIsGoingOn": "Co u Ciebie słychać?",
+  "whatIsGoingOn": "Co u ciebie słychać?",
   "@whatIsGoingOn": {},
   "pleaseEnterValidEmail": "Proszę podaj poprawny adres email.",
   "@pleaseEnterValidEmail": {},
@@ -1821,8 +1771,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "yourUserId": "Twoja nazwa użytkownika:",
-  "@yourUserId": {},
   "yourChatBackupHasBeenSetUp": "Twoja kopia zapasowa chatu została ustawiona.",
   "@yourChatBackupHasBeenSetUp": {},
   "chatHasBeenAddedToThisSpace": "Chat został dodany do tej przestrzeni",
@@ -1832,11 +1780,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "discover": "Odkrywaj",
-  "@discover": {
-    "type": "text",
-    "placeholders": {}
-  },
   "editRoomAvatar": "Edytuj zdjęcie pokoju",
   "@editRoomAvatar": {
     "type": "text",
@@ -1874,7 +1817,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "pleaseEnterYourPin": "Proszę podaj pin",
+  "pleaseEnterYourPin": "Podaj swój PIN",
   "@pleaseEnterYourPin": {
     "type": "text",
     "placeholders": {}
@@ -1947,8 +1890,6 @@
   "@scanQrCode": {},
   "addToStory": "Dodaj do relacji",
   "@addToStory": {},
-  "typeInInviteLinkManually": "Wpisz link ręcznie...",
-  "@typeInInviteLinkManually": {},
   "createNewSpace": "Nowa przestrzeń",
   "@createNewSpace": {
     "type": "text",
@@ -2030,5 +1971,517 @@
   "@tooManyRequestsWarning": {
     "type": "text",
     "placeholders": {}
-  }
+  },
+  "commandHint_discardsession": "Odrzuć sesję",
+  "@commandHint_discardsession": {
+    "type": "text",
+    "description": "Usage hint for the command /discardsession"
+  },
+  "warning": "Uwaga!",
+  "@warning": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "messageInfo": "Informacje o wiadomości",
+  "@messageInfo": {},
+  "time": "Czas",
+  "@time": {},
+  "messageType": "Rodzaj wiadomości",
+  "@messageType": {},
+  "whoCanSeeMyStoriesDesc": "Pamiętaj, że w Twojej relacji ludzie mogą się widzieć i kontaktować ze sobą.",
+  "@whoCanSeeMyStoriesDesc": {},
+  "shareYourInviteLink": "Udostępnij swój link zaproszenia",
+  "@shareYourInviteLink": {},
+  "separateChatTypes": "Oddzielenie czatów bezpośrednich i grup",
+  "@separateChatTypes": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "waitingPartnerAcceptRequest": "Oczekiwanie na zaakceptowanie prośby przez drugą osobę…",
+  "@waitingPartnerAcceptRequest": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "waitingPartnerEmoji": "Oczekiwanie na zaakceptowanie emoji przez drugą osobę…",
+  "@waitingPartnerEmoji": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "pleaseChooseAPasscode": "Wybierz kod dostępu",
+  "@pleaseChooseAPasscode": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "showDirectChatsInSpaces": "Pokaż powiązane czaty bezpośrednie w przestrzeniach",
+  "@showDirectChatsInSpaces": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "unblockDevice": "Odblokuj urządzenie",
+  "@unblockDevice": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "whyDoYouWantToReportThis": "Dlaczego chcesz to zgłosić?",
+  "@whyDoYouWantToReportThis": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "removeFromSpace": "Usuń z przestrzeni",
+  "@removeFromSpace": {},
+  "replyHasBeenSent": "Wysłano odpowiedź",
+  "@replyHasBeenSent": {},
+  "iUnderstand": "Rozumiem",
+  "@iUnderstand": {},
+  "extremeOffensive": "Bardzo obraźliwe",
+  "@extremeOffensive": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "errorObtainingLocation": "Błąd w ustalaniu lokalizacji: {error}",
+  "@errorObtainingLocation": {
+    "type": "text",
+    "placeholders": {
+      "error": {}
+    }
+  },
+  "howOffensiveIsThisContent": "Jak bardzo obraźliwe są te treści?",
+  "@howOffensiveIsThisContent": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "inoffensive": "Nieobraźliwe",
+  "@inoffensive": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "recoveryKey": "Klucz odzyskiwania",
+  "@recoveryKey": {},
+  "recoveryKeyLost": "Utracono klucz odzyskiwania?",
+  "@recoveryKeyLost": {},
+  "sentCallInformations": "{senderName} wysłał/-a informacje o połączeniu",
+  "@sentCallInformations": {
+    "type": "text",
+    "placeholders": {
+      "senderName": {}
+    }
+  },
+  "singlesignon": "Pojedyncze logowanie",
+  "@singlesignon": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "startFirstChat": "Rozpocznij swój pierwszy czat",
+  "@startFirstChat": {},
+  "verifyStart": "Rozpocznij weryfikację",
+  "@verifyStart": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "verifySuccess": "Pomyślnie zweryfikowano!",
+  "@verifySuccess": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "verifyTitle": "Weryfikowanie innego konta",
+  "@verifyTitle": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "waitingPartnerNumbers": "Oczekiwanie na zaakceptowanie numerów przez drugą osobę…",
+  "@waitingPartnerNumbers": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "sender": "Nadawca",
+  "@sender": {},
+  "openGallery": "Otwórz galerię",
+  "@openGallery": {},
+  "start": "Start",
+  "@start": {},
+  "pleaseEnterRecoveryKeyDescription": "Aby odblokować wcześniejsze wiadomości, wprowadź swój klucz odzyskiwania, który został wygenerowany w poprzedniej sesji. Twój klucz odzyskiwania NIE jest Twoim hasłem.",
+  "@pleaseEnterRecoveryKeyDescription": {},
+  "videoWithSize": "Film ({size})",
+  "@videoWithSize": {
+    "type": "text",
+    "placeholders": {
+      "size": {}
+    }
+  },
+  "thisUserHasNotPostedAnythingYet": "Ten użytkownik jeszcze nic nie zamieścił na swojej relacji",
+  "@thisUserHasNotPostedAnythingYet": {},
+  "storyFrom": "Relacja z {date}: \n{body}",
+  "@storyFrom": {
+    "type": "text",
+    "placeholders": {
+      "date": {},
+      "body": {}
+    }
+  },
+  "addDescription": "Dodaj opis",
+  "@addDescription": {},
+  "unsubscribeStories": "Odsubskrybuj relacje",
+  "@unsubscribeStories": {},
+  "updateNow": "Rozpocznij aktualizację w tle",
+  "@updateNow": {},
+  "hydrateTorLong": "Czy ostatnio eksportowałeś/-aś swoją sesję na TOR? Szybko ją zaimportuj i kontynuuj rozmowy.",
+  "@hydrateTorLong": {},
+  "dehydrateTorLong": "W przypadku użytkowników sieci TOR zaleca się eksportowanie sesji przed zamknięciem okna.",
+  "@dehydrateTorLong": {},
+  "hydrate": "Przywracanie z pliku kopii zapasowej",
+  "@hydrate": {},
+  "noMatrixServer": "{server1} nie jest serwerem matriksa, czy chcesz zamiast niego użyć {server2}?",
+  "@noMatrixServer": {
+    "type": "text",
+    "placeholders": {
+      "server1": {},
+      "server2": {}
+    }
+  },
+  "hydrateTor": "Użytkownicy TOR-a: Importuj eksport sesji",
+  "@hydrateTor": {},
+  "numUsersTyping": "{count} użytkowników pisze…",
+  "@numUsersTyping": {
+    "type": "text",
+    "placeholders": {
+      "count": {}
+    }
+  },
+  "onlineKeyBackupEnabled": "Kopia zapasowa kluczy online jest włączona",
+  "@onlineKeyBackupEnabled": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "pleaseEnterRecoveryKey": "Wprowadź swój klucz odzyskiwania:",
+  "@pleaseEnterRecoveryKey": {},
+  "submit": "Odeślij",
+  "@submit": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "weSentYouAnEmail": "Wysłaliśmy Ci maila",
+  "@weSentYouAnEmail": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "unverified": "Niezweryfikowane",
+  "@unverified": {},
+  "wipeChatBackup": "Wymazać kopię zapasową czatu, aby utworzyć nowy klucz odzyskiwania?",
+  "@wipeChatBackup": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "whoCanPerformWhichAction": "Kto może wykonywać jakie czynności",
+  "@whoCanPerformWhichAction": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "reportUser": "Zgłoś użytkownika",
+  "@reportUser": {},
+  "dismiss": "Odrzuć",
+  "@dismiss": {},
+  "storyPrivacyWarning": "Pamiętaj, że w Twojej relacji ludzie mogą się widzieć i kontaktować ze sobą. Twoje relacje będą widoczne przez 24 godziny, ale nie ma gwarancji, że zostaną usunięte ze wszystkich urządzeń i serwerów.",
+  "@storyPrivacyWarning": {},
+  "markAsRead": "Oznacz jako przeczytane",
+  "@markAsRead": {},
+  "passphraseOrKey": "fraza dostępu lub klucz odzyskiwania",
+  "@passphraseOrKey": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "openChat": "Otwórz czat",
+  "@openChat": {},
+  "addToSpaceDescription": "Wybierz przestrzeń, do której ten czat ma być dodany.",
+  "@addToSpaceDescription": {},
+  "updateAvailable": "Aktualizacja FluffyChat jest dostępna",
+  "@updateAvailable": {},
+  "supposedMxid": "To powinno być {mxid}",
+  "@supposedMxid": {
+    "type": "text",
+    "placeholders": {
+      "mxid": {}
+    }
+  },
+  "commandHint_markasdm": "Oznacz jako pokój wiadomości bezpośrednich",
+  "@commandHint_markasdm": {},
+  "confirmMatrixId": "Potwierdź swój identyfikator Matrix w celu usunięcia konta.",
+  "@confirmMatrixId": {},
+  "commandHint_markasgroup": "Oznacz jako grupę",
+  "@commandHint_markasgroup": {},
+  "noEmotesFound": "Nie znaleziono żadnych emotek. 😕",
+  "@noEmotesFound": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "dehydrate": "Eksportuj sesję i wymaż urządzenie",
+  "@dehydrate": {},
+  "dehydrateWarning": "Tego nie można cofnąć. Upewnij się, że plik kopii zapasowej jest bezpiecznie przechowywany.",
+  "@dehydrateWarning": {},
+  "dehydrateTor": "Użytkownicy TOR-a: Eksportuj sesję",
+  "@dehydrateTor": {},
+  "matrixWidgets": "Widżety Matrix",
+  "@matrixWidgets": {},
+  "unsupportedAndroidVersion": "Nieobsługiwana wersja systemu Android",
+  "@unsupportedAndroidVersion": {},
+  "widgetCustom": "Własny",
+  "@widgetCustom": {},
+  "widgetEtherpad": "Notatka",
+  "@widgetEtherpad": {},
+  "widgetJitsi": "Jitsi Meet",
+  "@widgetJitsi": {},
+  "pinMessage": "Przypnij do pokoju",
+  "@pinMessage": {},
+  "confirmEventUnpin": "Czy na pewno chcesz trwale odpiąć wydarzenie?",
+  "@confirmEventUnpin": {},
+  "youJoinedTheChat": "Dołączono do czatu",
+  "@youJoinedTheChat": {},
+  "noEmailWarning": "Wprowadź prawidłowy adres e-mail. W przeciwnym razie resetowanie hasła nie będzie możliwe. Jeśli nie chcesz, dotknij ponownie przycisku, aby kontynuować.",
+  "@noEmailWarning": {},
+  "user": "Użytkownik",
+  "@user": {},
+  "custom": "Własne",
+  "@custom": {},
+  "newGroup": "Nowa grupa",
+  "@newGroup": {},
+  "newSpace": "Nowa przestrzeń",
+  "@newSpace": {},
+  "enterInviteLinkOrMatrixId": "Wprowadź link zaproszenia lub identyfikator Matrix...",
+  "@enterInviteLinkOrMatrixId": {},
+  "fileIsTooBigForServer": "Serwer zgłasza, że plik jest zbyt duży, aby go wysłać.",
+  "@fileIsTooBigForServer": {},
+  "youBannedUser": "Zbanowałeś/-aś {user}",
+  "@youBannedUser": {
+    "placeholders": {
+      "user": {}
+    }
+  },
+  "users": "Użytkownicy",
+  "@users": {},
+  "countFiles": "{count} plików",
+  "@countFiles": {
+    "placeholders": {
+      "count": {}
+    }
+  },
+  "noOtherDevicesFound": "Nie znaleziono innych urządzeń",
+  "@noOtherDevicesFound": {},
+  "widgetUrlError": "Niepoprawny URL.",
+  "@widgetUrlError": {},
+  "widgetNameError": "Podaj nazwę wyświetlaną.",
+  "@widgetNameError": {},
+  "encryptThisChat": "Zaszyfruj ten czat",
+  "@encryptThisChat": {},
+  "endToEndEncryption": "Szyfrowanie od końca do końca",
+  "@endToEndEncryption": {},
+  "disableEncryptionWarning": "Ze względów bezpieczeństwa nie można wyłączyć szyfrowania w czacie, w którym zostało ono wcześniej włączone.",
+  "@disableEncryptionWarning": {},
+  "deviceKeys": "Klucze urządzenia:",
+  "@deviceKeys": {},
+  "emailOrUsername": "Adres e-mail lub nazwa użytkownika",
+  "@emailOrUsername": {},
+  "indexedDbErrorLong": "Przechowywanie wiadomości niestety nie jest domyślnie włączone w trybie prywatnym.\nOdwiedź\n - about:config\n - ustaw dom.indexedDB.privateBrowsing.enabled na true\nW przeciwnym razie nie jest możliwe uruchomienie FluffyChat.",
+  "@indexedDbErrorLong": {},
+  "saveKeyManuallyDescription": "Zapisz ten klucz ręcznie, uruchamiając systemowe okno dialogowe udostępniania lub schowek.",
+  "@saveKeyManuallyDescription": {},
+  "screenSharingTitle": "udostępnianie ekranu",
+  "@screenSharingTitle": {},
+  "appearOnTopDetails": "Umożliwia wyświetlanie aplikacji nad innymi (nie jest to konieczne, jeśli FluffyChat jest już ustawiony jako konto do dzwonienia)",
+  "@appearOnTopDetails": {},
+  "noKeyForThisMessage": "Może się to zdarzyć, jeśli wiadomość została wysłana przed zalogowaniem się na to konto na tym urządzeniu.\n\nMożliwe jest również, że nadawca zablokował Twoje urządzenie lub coś poszło nie tak z połączeniem internetowym.\n\nJesteś w stanie odczytać wiadomość na innej sesji? W takim razie możesz przenieść z niej wiadomość! Wejdź w Ustawienia > Urządzenia i upewnij się, że Twoje urządzenia zweryfikowały się wzajemnie. Gdy następnym razem otworzysz pokój i obie sesje będą włączone, klucze zostaną przekazane automatycznie.\n\nNie chcesz stracić kluczy podczas wylogowania lub przełączania urządzeń? Upewnij się, że w ustawieniach masz włączoną kopię zapasową czatu.",
+  "@noKeyForThisMessage": {},
+  "sorryThatsNotPossible": "Przepraszamy... to nie jest możliwe",
+  "@sorryThatsNotPossible": {},
+  "noBackupWarning": "Uwaga! Bez włączenia kopii zapasowej czatu, stracisz dostęp do swoich zaszyfrowanych wiadomości. Zaleca się włączenie kopii zapasowej czatu przed wylogowaniem.",
+  "@noBackupWarning": {},
+  "commandHint_googly": "Wyślij kręcące się oczka",
+  "@commandHint_googly": {},
+  "callingPermissions": "Uprawnienia połączeń",
+  "@callingPermissions": {},
+  "storeInAndroidKeystore": "Przechowaj w Android KeyStore",
+  "@storeInAndroidKeystore": {},
+  "commandHint_cuddle": "Wyślij przytulenie",
+  "@commandHint_cuddle": {},
+  "googlyEyesContent": "{senderName} wysyła ci kręcące się oczka",
+  "@googlyEyesContent": {
+    "type": "text",
+    "placeholders": {
+      "senderName": {}
+    }
+  },
+  "cuddleContent": "{senderName} przytula cię",
+  "@cuddleContent": {
+    "type": "text",
+    "placeholders": {
+      "senderName": {}
+    }
+  },
+  "hugContent": "{senderName} uściska cię",
+  "@hugContent": {
+    "type": "text",
+    "placeholders": {
+      "senderName": {}
+    }
+  },
+  "commandHint_hug": "Wyślij uścisk",
+  "@commandHint_hug": {},
+  "letsStart": "Zacznijmy",
+  "@letsStart": {},
+  "reactedWith": "{sender} zareagował/-a z {reaction}",
+  "@reactedWith": {
+    "type": "text",
+    "placeholders": {
+      "sender": {},
+      "reaction": {}
+    }
+  },
+  "emojis": "Emoji",
+  "@emojis": {},
+  "placeCall": "Zadzwoń",
+  "@placeCall": {},
+  "voiceCall": "Połączenie głosowe",
+  "@voiceCall": {},
+  "unsupportedAndroidVersionLong": "Ta funkcja wymaga nowszej wersji systemu Android. Sprawdź aktualizacje lub wsparcie Lineage OS.",
+  "@unsupportedAndroidVersionLong": {},
+  "videoCallsBetaWarning": "Należy pamiętać, że połączenia wideo są obecnie w fazie beta. Mogą nie działać zgodnie z oczekiwaniami lub nie działać w ogóle na wszystkich platformach.",
+  "@videoCallsBetaWarning": {},
+  "experimentalVideoCalls": "Eksperymentalne połączenia wideo",
+  "@experimentalVideoCalls": {},
+  "indexedDbErrorTitle": "Problemy związane z trybem prywatnym",
+  "@indexedDbErrorTitle": {},
+  "switchToAccount": "Przełącz na konto {number}",
+  "@switchToAccount": {
+    "type": "number",
+    "placeholders": {
+      "number": {}
+    }
+  },
+  "nextAccount": "Następne konto",
+  "@nextAccount": {},
+  "previousAccount": "Poprzednie konto",
+  "@previousAccount": {},
+  "editWidgets": "Edytuj widżety",
+  "@editWidgets": {},
+  "addWidget": "Dodaj widżet",
+  "@addWidget": {},
+  "widgetVideo": "Film",
+  "@widgetVideo": {},
+  "widgetName": "Nazwa",
+  "@widgetName": {},
+  "errorAddingWidget": "Błąd podczas dodawania widżetu.",
+  "@errorAddingWidget": {},
+  "youRejectedTheInvitation": "Odrzucono zaproszenie",
+  "@youRejectedTheInvitation": {},
+  "youAcceptedTheInvitation": "👍 Zaakceptowałeś/-aś zaproszenie",
+  "@youAcceptedTheInvitation": {},
+  "youHaveWithdrawnTheInvitationFor": "Wycofano zaproszenie dla {user}",
+  "@youHaveWithdrawnTheInvitationFor": {
+    "placeholders": {
+      "user": {}
+    }
+  },
+  "youInvitedBy": "📩 Zostałeś/-aś zaproszony/-a przez {user}",
+  "@youInvitedBy": {
+    "placeholders": {
+      "user": {}
+    }
+  },
+  "youInvitedUser": "📩 Zaprosiłeś/-aś {user}",
+  "@youInvitedUser": {
+    "placeholders": {
+      "user": {}
+    }
+  },
+  "youKicked": "👞 Wyrzuciłeś/-aś {user}",
+  "@youKicked": {
+    "placeholders": {
+      "user": {}
+    }
+  },
+  "youKickedAndBanned": "🙅 Wyrzuciłeś/-aś i zbanowałeś/-aś {user}",
+  "@youKickedAndBanned": {
+    "placeholders": {
+      "user": {}
+    }
+  },
+  "youUnbannedUser": "Odbanowałeś/-aś {user}",
+  "@youUnbannedUser": {
+    "placeholders": {
+      "user": {}
+    }
+  },
+  "stories": "Relacje",
+  "@stories": {},
+  "unlockOldMessages": "Odblokuj stare wiadomości",
+  "@unlockOldMessages": {},
+  "storeInSecureStorageDescription": "Przechowaj klucz odzyskiwania w bezpiecznym magazynie tego urządzenia.",
+  "@storeInSecureStorageDescription": {},
+  "storeInAppleKeyChain": "Przechowaj w pęku kluczy Apple",
+  "@storeInAppleKeyChain": {},
+  "storeSecurlyOnThisDevice": "Przechowaj bezpiecznie na tym urządzeniu",
+  "@storeSecurlyOnThisDevice": {},
+  "foregroundServiceRunning": "To powiadomienie pojawia się, gdy usługa w tle jest uruchomiona.",
+  "@foregroundServiceRunning": {},
+  "screenSharingDetail": "Udostępniasz swój ekran w FluffyChat",
+  "@screenSharingDetail": {},
+  "callingAccount": "Konto połączeń",
+  "@callingAccount": {},
+  "callingAccountDetails": "Pozwala FluffyChat używać natywnej aplikacji do wykonywania połączeń w Androidzie.",
+  "@callingAccountDetails": {},
+  "appearOnTop": "Wyświetlaj nad innymi",
+  "@appearOnTop": {},
+  "otherCallingPermissions": "Mikrofon, kamera i inne uprawnienia FluffyChat",
+  "@otherCallingPermissions": {},
+  "whyIsThisMessageEncrypted": "Dlaczego nie można odczytać tej wiadomości?",
+  "@whyIsThisMessageEncrypted": {},
+  "enterSpace": "Wejdź do przestrzeni",
+  "@enterSpace": {},
+  "enterRoom": "Wejdź do pokoju",
+  "@enterRoom": {},
+  "allSpaces": "Wszystkie przestrzenie",
+  "@allSpaces": {},
+  "numChats": "{number} czatów",
+  "@numChats": {
+    "type": "number",
+    "placeholders": {
+      "number": {}
+    }
+  },
+  "hideUnimportantStateEvents": "Ukryj nieistotne wydarzenia stanu",
+  "@hideUnimportantStateEvents": {},
+  "doNotShowAgain": "Nie pokazuj ponownie",
+  "@doNotShowAgain": {},
+  "wasDirectChatDisplayName": "Pusty czat (wcześniej {oldDisplayName})",
+  "@wasDirectChatDisplayName": {
+    "type": "text",
+    "placeholders": {
+      "oldDisplayName": {}
+    }
+  },
+  "newSpaceDescription": "Przestrzenie pozwalają na konsolidację czatów i budowanie prywatnych lub publicznych społeczności.",
+  "@newSpaceDescription": {},
+  "reopenChat": "Otwórz ponownie czat",
+  "@reopenChat": {},
+  "fileHasBeenSavedAt": "Plik został zapisany w ścieżce {path}",
+  "@fileHasBeenSavedAt": {
+    "type": "text",
+    "placeholders": {
+      "path": {}
+    }
+  },
+  "addToBundle": "Dodaj do pakietu",
+  "@addToBundle": {},
+  "bundleName": "Nazwa pakietu",
+  "@bundleName": {},
+  "editBundlesForAccount": "Edytuj paczki dla tego konta",
+  "@editBundlesForAccount": {},
+  "jumpToLastReadMessage": "Przejdź do ostatnio przeczytanej wiadomości",
+  "@jumpToLastReadMessage": {},
+  "readUpToHere": "Czytaj do tego miejsca",
+  "@readUpToHere": {},
+  "jump": "Przejdź",
+  "@jump": {},
+  "removeFromBundle": "Usuń z tej paczki",
+  "@removeFromBundle": {},
+  "openLinkInBrowser": "Otwórz link w przeglądarce",
+  "@openLinkInBrowser": {}
 }

assets/l10n/intl_pt.arb

@@ -10,21 +10,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "segunda-feira",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "saturday": "sábado",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "wednesday": "quarta-feira",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "about": "Sobre",
     "@about": {
         "type": "text",
@@ -107,11 +92,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "terça-feira",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "logout": "Terminar sessão",
     "@logout": {
         "type": "text",
@@ -122,11 +102,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "domingo",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "users": "Utilizadores",
     "@users": {},
     "close": "Fechar",
@@ -141,15 +116,5 @@
             "month": {},
             "day": {}
         }
-    },
-    "friday": "sexta-feira",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "quinta-feira",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
     }
 }

assets/l10n/intl_pt_BR.arb

@@ -81,11 +81,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Sala arquivada",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Usuários convidados podem participar",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -543,11 +538,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Assinatura cruzada ativada",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Ativo",
     "@currentlyActive": {
         "type": "text",
@@ -633,11 +623,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Desvendar",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "O nome de exibição foi alterado",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -804,11 +789,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Sexta-feira",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "Desde que entrou",
     "@fromJoining": {
         "type": "text",
@@ -999,11 +979,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Chaves guardadas",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "👞 {username} enxotou {targetName}",
     "@kicked": {
         "type": "text",
@@ -1138,11 +1113,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Segunda-feira",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Silenciar",
     "@muteChat": {
         "type": "text",
@@ -1536,11 +1506,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Sábado",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "saveFile": "Salvar arquivo",
     "@saveFile": {
         "type": "text",
@@ -1779,11 +1744,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Domingo",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "synchronizingPleaseWait": "Sincronizando… Por favor, aguarde.",
     "@synchronizingPleaseWait": {
         "type": "text",
@@ -1804,16 +1764,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Esta sala foi arquivada.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "Quinta-feira",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1850,11 +1800,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "Terça-feira",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "Indisponível",
     "@unavailable": {
         "type": "text",
@@ -2025,11 +1970,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Quarta-feira",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "Enviamos um e-mail para você",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -2102,8 +2042,6 @@
     },
     "shareYourInviteLink": "Compartilhar o link do convite",
     "@shareYourInviteLink": {},
-    "typeInInviteLinkManually": "Digitar o link do convite manualmente...",
-    "@typeInInviteLinkManually": {},
     "oneClientLoggedOut": "Um dos seus clientes foi desvinculado",
     "@oneClientLoggedOut": {},
     "addAccount": "Adicionar conta",
@@ -2176,8 +2114,6 @@
     "@sendOnEnter": {},
     "homeserver": "Servidor matriz",
     "@homeserver": {},
-    "yourUserId": "Seu ID de usuário:",
-    "@yourUserId": {},
     "chatHasBeenAddedToThisSpace": "A conversa foi adicionada a este espaço",
     "@chatHasBeenAddedToThisSpace": {},
     "commandHint_clearcache": "Limpar dados temporários",
@@ -2419,8 +2355,6 @@
     "@commandHint_markasdm": {},
     "commandHint_markasgroup": "Marcar como grupo",
     "@commandHint_markasgroup": {},
-    "dehydrateShare": "Este é seu extrato FluffyChat. Cuidado para não perdê-lo e o mantenha privado.",
-    "@dehydrateShare": {},
     "hydrateTor": "Usuários TOR: Importar sessão",
     "@hydrateTor": {},
     "hydrateTorLong": "Você exportou sua última sessão no TOR? Importe ela rapidamente e continue conversando.",
@@ -2491,8 +2425,6 @@
     "@dehydrateWarning": {},
     "dehydrateTorLong": "Para usuários TOR, é recomendado exportar a sessão antes de fechar a janela.",
     "@dehydrateTorLong": {},
-    "enableAutoBackups": "Habilitar backups automáticos",
-    "@enableAutoBackups": {},
     "whyIsThisMessageEncrypted": "Por que esta mensagem está ilegível?",
     "@whyIsThisMessageEncrypted": {},
     "screenSharingTitle": "Compartilhar tela",

assets/l10n/intl_pt_PT.arb

@@ -90,11 +90,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Sala arquivada",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Todos os visitantes podem entrar",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -294,8 +289,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "yourUserId": "O teu ID de utilizador:",
-    "@yourUserId": {},
     "yourChatBackupHasBeenSetUp": "A cópia de segurança foi configurada.",
     "@yourChatBackupHasBeenSetUp": {},
     "chatBackup": "Cópia de segurança de conversas",
@@ -515,11 +508,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Assinatura cruzada ativada",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Ativo(a) agora",
     "@currentlyActive": {
         "type": "text",
@@ -605,11 +593,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Descobrir",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "Nome de exibição alterado",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -778,11 +761,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Sexta-feira",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "goToTheNewRoom": "Ir para a nova sala",
     "@goToTheNewRoom": {
         "type": "text",
@@ -963,11 +941,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Chaves estão armazenadas em cache",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username} expulsou {targetName}",
     "@kicked": {
         "type": "text",
@@ -1097,11 +1070,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Segunda-feira",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Silenciar conversa",
     "@muteChat": {
         "type": "text",
@@ -1167,8 +1135,6 @@
     },
     "shareYourInviteLink": "Partilhar a ligação de convite",
     "@shareYourInviteLink": {},
-    "typeInInviteLinkManually": "Escrever a ligação de convite manualmente...",
-    "@typeInInviteLinkManually": {},
     "none": "Nenhum",
     "@none": {
         "type": "text",
@@ -1581,11 +1547,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Sábado",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "saveFile": "Guardar ficheiro",
     "@saveFile": {
         "type": "text",
@@ -1709,8 +1670,6 @@
     "@dehydrate": {},
     "dehydrateWarning": "Esta ação não pode ser revertida. Assegura-te que guardas bem a cópia de segurança.",
     "@dehydrateWarning": {},
-    "dehydrateShare": "Esta é a tua exportação privada do FluffyChat. Assegura-te que não a perdes e que a manténs privada.",
-    "@dehydrateShare": {},
     "hydrateTorLong": "Exportaste a tua sessão na última vez que estiveste no TOR? Importa-a rapidamente e continua a conversar.",
     "@hydrateTorLong": {},
     "dehydrateTor": "Utilizadores do TOR: Exportar sessão",

assets/l10n/intl_sk.arb

@@ -55,11 +55,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Archivovaná miestnosť",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Môžu sa pripojiť hostia",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -330,11 +325,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Vzájomné overenie je zapnuté",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Momentálne prítomní",
     "@currentlyActive": {
         "type": "text",
@@ -480,11 +470,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Piatok",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "Od pripojenia",
     "@fromJoining": {
         "type": "text",
@@ -610,11 +595,6 @@
             "username": {}
         }
     },
-    "keysCached": "Kľúče sú uložené",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username} vyhodili {targetName}",
     "@kicked": {
         "type": "text",
@@ -717,11 +697,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Pondelok",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Stlmiť chat",
     "@muteChat": {
         "type": "text",
@@ -920,11 +895,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Sobota",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "seenByUser": "Videné užívateľom {username}",
     "@seenByUser": {
         "type": "text",
@@ -1060,11 +1030,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Nedeľa",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "Systémová farba",
     "@systemTheme": {
         "type": "text",
@@ -1080,16 +1045,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Táto miestnosť bola archivovaná.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "Štvrtok",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1101,11 +1056,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "Utorok",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unbannedUser": "{username} odbanovali {targetName}",
     "@unbannedUser": {
         "type": "text",
@@ -1256,11 +1206,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Streda",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "whoIsAllowedToJoinThisGroup": "Kto môže vstúpiť do tejto skupiny",
     "@whoIsAllowedToJoinThisGroup": {
         "type": "text",
@@ -1440,8 +1385,6 @@
     },
     "sendOnEnter": "Odoslať pri vstupe",
     "@sendOnEnter": {},
-    "yourUserId": "Vaše užívateľské ID:",
-    "@yourUserId": {},
     "ignoredUsers": "Ignorovaní užívatelia",
     "@ignoredUsers": {
         "type": "text",

assets/l10n/intl_sl.arb

@@ -71,11 +71,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Arhivirana soba",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "askSSSSSign": "Če želite podpisati drugo osebo, vnesite geslo za varno trgovino ali obnovitveni ključ.",
     "@askSSSSSign": {
         "type": "text",
@@ -259,8 +254,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "yourUserId": "Vaš ID uporabnika:",
-    "@yourUserId": {},
     "yourChatBackupHasBeenSetUp": "Varnostna kopija klepeta je nastavljena.",
     "@yourChatBackupHasBeenSetUp": {},
     "chatBackup": "Varnostno kopiranje klepeta",
@@ -558,11 +551,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Navzkrižno podpisovanje DA",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Trenutno aktiven",
     "@currentlyActive": {
         "type": "text",

assets/l10n/intl_sr.arb

@@ -76,11 +76,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Архивирана соба",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Да ли је гостима дозвољен приступ",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -504,11 +499,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Међу-потписивање укључено",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "Тренутно активно",
     "@currentlyActive": {
         "type": "text",
@@ -594,11 +584,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Истражи",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "Име за приказ је измењено",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -756,11 +741,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "петак",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "од приступања",
     "@fromJoining": {
         "type": "text",
@@ -951,11 +931,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Кључеви су кеширани",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username} избаци корисника {targetName}",
     "@kicked": {
         "type": "text",
@@ -1080,11 +1055,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "понедељак",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Ућуткај ћаскање",
     "@muteChat": {
         "type": "text",
@@ -1460,11 +1430,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "субота",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "search": "Претражи",
     "@search": {
         "type": "text",
@@ -1674,11 +1639,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "недеља",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "системски",
     "@systemTheme": {
         "type": "text",
@@ -1694,16 +1654,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Ова соба је архивирана.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "четвртак",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1740,11 +1690,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "уторак",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "Недоступно",
     "@unavailable": {
         "type": "text",
@@ -1915,11 +1860,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "среда",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "Послали смо вам е-пошту",
     "@weSentYouAnEmail": {
         "type": "text",

assets/l10n/intl_sv.arb

@@ -10,7 +10,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "acceptedTheInvitation": "{username} accepterade inbjudan",
+    "acceptedTheInvitation": "👍 {username} accepterade inbjudan",
     "@acceptedTheInvitation": {
         "type": "text",
         "placeholders": {
@@ -22,7 +22,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "activatedEndToEndEncryption": "{username} aktiverade ändpunktskryptering",
+    "activatedEndToEndEncryption": "🔐 {username} aktiverade ändpunktskryptering",
     "@activatedEndToEndEncryption": {
         "type": "text",
         "placeholders": {
@@ -71,11 +71,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Arkiverat Rum",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Får gästanvändare gå med",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -308,12 +303,12 @@
         "type": "text",
         "placeholders": {}
     },
-    "compareEmojiMatch": "Jämför och se till att följande emoji matchar den andra enheten:",
+    "compareEmojiMatch": "Vänligen jämför uttryckssymbolerna",
     "@compareEmojiMatch": {
         "type": "text",
         "placeholders": {}
     },
-    "compareNumbersMatch": "Jämför och se till att följande nummer matchar den andra enheten:",
+    "compareNumbersMatch": "Vänligen jämför siffrorna",
     "@compareNumbersMatch": {
         "type": "text",
         "placeholders": {}
@@ -382,7 +377,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "createdTheChat": "{username} skapade chatten",
+    "createdTheChat": "💬 {username} skapade chatten",
     "@createdTheChat": {
         "type": "text",
         "placeholders": {
@@ -394,11 +389,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "Korssignering på",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "För närvarande aktiv",
     "@currentlyActive": {
         "type": "text",
@@ -484,11 +474,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "Utforska",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "Visningsnamn har ändrats",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -631,11 +616,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "Fredag",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "Från att gå med",
     "@fromJoining": {
         "type": "text",
@@ -778,7 +758,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "invitedUser": "{username} bjöd in {targetName}",
+    "invitedUser": "📩 {username} bjöd in {targetName}",
     "@invitedUser": {
         "type": "text",
         "placeholders": {
@@ -809,7 +789,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "joinedTheChat": "{username} anslöt till chatten",
+    "joinedTheChat": "👋 {username} anslöt till chatten",
     "@joinedTheChat": {
         "type": "text",
         "placeholders": {
@@ -821,12 +801,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "Nycklarna är cachade",
+    "kicked": "👞 {username} sparkade ut {targetName}",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "kicked": "{username} sparkade {targetName}",
     "@kicked": {
         "type": "text",
         "placeholders": {
@@ -834,7 +809,7 @@
             "targetName": {}
         }
     },
-    "kickedAndBanned": "{username} sparkade och bannade {targetName}",
+    "kickedAndBanned": "🙅 {username} sparkade och bannade {targetName}",
     "@kickedAndBanned": {
         "type": "text",
         "placeholders": {
@@ -943,11 +918,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "Måndag",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "Tysta chatt",
     "@muteChat": {
         "type": "text",
@@ -963,7 +933,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "newMessageInFluffyChat": "Nya meddelanden i FluffyChat",
+    "newMessageInFluffyChat": "💬 Nya meddelanden i FluffyChat",
     "@newMessageInFluffyChat": {
         "type": "text",
         "placeholders": {}
@@ -1060,7 +1030,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "oopsSomethingWentWrong": "Oops, någonting gick fel…",
+    "oopsSomethingWentWrong": "Hoppsan, något gick fel…",
     "@oopsSomethingWentWrong": {
         "type": "text",
         "placeholders": {}
@@ -1278,11 +1248,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "Lördag",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "search": "Sök",
     "@search": {
         "type": "text",
@@ -1356,35 +1321,35 @@
         "type": "text",
         "placeholders": {}
     },
-    "sentAFile": "{username} skickade en fil",
+    "sentAFile": "📁 {username} skickade en fil",
     "@sentAFile": {
         "type": "text",
         "placeholders": {
             "username": {}
         }
     },
-    "sentAnAudio": "{username} skickade ett ljudklipp",
+    "sentAnAudio": "🎤 {username} skickade ett ljudklipp",
     "@sentAnAudio": {
         "type": "text",
         "placeholders": {
             "username": {}
         }
     },
-    "sentAPicture": "{username} skickade ett ljudklipp",
+    "sentAPicture": "🖼️ {username} skickade en bild",
     "@sentAPicture": {
         "type": "text",
         "placeholders": {
             "username": {}
         }
     },
-    "sentASticker": "{username} skickade en sticker",
+    "sentASticker": "😊 {username} skickade ett klistermärke",
     "@sentASticker": {
         "type": "text",
         "placeholders": {
             "username": {}
         }
     },
-    "sentAVideo": "{username} skickade en video",
+    "sentAVideo": "🎥 {username} skickade en video",
     "@sentAVideo": {
         "type": "text",
         "placeholders": {
@@ -1477,11 +1442,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "Söndag",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "System",
     "@systemTheme": {
         "type": "text",
@@ -1497,16 +1457,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "Detta rummet har blivit arkiverat.",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "Torsdag",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1538,11 +1488,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "Tisdag",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "Upptagen",
     "@unavailable": {
         "type": "text",
@@ -1618,7 +1563,7 @@
             "username": {}
         }
     },
-    "userLeftTheChat": "{username} lämnade chatten",
+    "userLeftTheChat": "🚪 {username} lämnade chatten",
     "@userLeftTheChat": {
         "type": "text",
         "placeholders": {
@@ -1708,11 +1653,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "Onsdag",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "Vi skickade dig ett e-postmeddelande",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -2079,7 +2019,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "wipeChatBackup": "Radera din chatt-backup för att skapa en ny säkerhetsnyckel?",
+    "wipeChatBackup": "Radera din chatt-backup för att skapa en ny återställningsnyckel?",
     "@wipeChatBackup": {
         "type": "text",
         "placeholders": {}
@@ -2096,7 +2036,7 @@
     },
     "shareYourInviteLink": "Dela din inbjudan",
     "@shareYourInviteLink": {},
-    "chatBackupDescription": "Din chatt backup är skyddad av en säkerhets nyckel. Se till att du inte förlorar den.",
+    "chatBackupDescription": "Din chatt backup är skyddad av en säkerhetsnyckel. Se till att du inte förlorar den.",
     "@chatBackupDescription": {
         "type": "text",
         "placeholders": {}
@@ -2211,8 +2151,6 @@
     "@reportUser": {},
     "openChat": "Öppna Chatt",
     "@openChat": {},
-    "yourUserId": "Ditt användar-ID:",
-    "@yourUserId": {},
     "sendOnEnter": "Skicka med Enter",
     "@sendOnEnter": {},
     "addToStory": "Addera till berättelse",
@@ -2230,8 +2168,6 @@
     "@yourChatBackupHasBeenSetUp": {},
     "loginWithOneClick": "Logga in med ett klick",
     "@loginWithOneClick": {},
-    "typeInInviteLinkManually": "Skriv in länk med inbjudan manuellt...",
-    "@typeInInviteLinkManually": {},
     "removeFromBundle": "Ta bort från paket",
     "@removeFromBundle": {},
     "enableMultiAccounts": "(BETA) Aktivera multi-konton på denna enhet",
@@ -2244,7 +2180,7 @@
     "@thisUserHasNotPostedAnythingYet": {},
     "storyPrivacyWarning": "Notera att användare kan se och kontakta varandra i din berättelse. Din berättelse är synlig i 24 timmar, men det finns ingen garanti för att berättelser raderas från alla enheter och servrar.",
     "@storyPrivacyWarning": {},
-    "emojis": "Emojis",
+    "emojis": "Uttryckssymboler",
     "@emojis": {},
     "placeCall": "Ring",
     "@placeCall": {},
@@ -2303,8 +2239,251 @@
     "@errorAddingWidget": {},
     "editWidgets": "Redigera widgetar",
     "@editWidgets": {},
-    "widgetJitsi": "Jitsi Meet",
+    "widgetJitsi": "Jitsi-möte",
     "@widgetJitsi": {},
     "widgetNameError": "Vänligen ange ett visningsnamn.",
-    "@widgetNameError": {}
+    "@widgetNameError": {},
+    "storeSecurlyOnThisDevice": "Lagra säkert på denna enhet",
+    "@storeSecurlyOnThisDevice": {},
+    "youJoinedTheChat": "Du gick med i chatten",
+    "@youJoinedTheChat": {},
+    "youAcceptedTheInvitation": "👍 Du accepterade inbjudan",
+    "@youAcceptedTheInvitation": {},
+    "youKicked": "👞 Du sparkade ut {user}",
+    "@youKicked": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "hugContent": "{senderName} kramar dig",
+    "@hugContent": {
+        "type": "text",
+        "placeholders": {
+            "senderName": {}
+        }
+    },
+    "commandHint_markasgroup": "Märk som grupp",
+    "@commandHint_markasgroup": {},
+    "recoveryKeyLost": "Borttappad återställningsnyckel?",
+    "@recoveryKeyLost": {},
+    "indexedDbErrorTitle": "Problem med privat läge",
+    "@indexedDbErrorTitle": {},
+    "youHaveWithdrawnTheInvitationFor": "Du har återkallat inbjudan till {user}",
+    "@youHaveWithdrawnTheInvitationFor": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "youUnbannedUser": "Du återkallade förbudet för {user}",
+    "@youUnbannedUser": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "unlockOldMessages": "Lås upp äldre meddelanden",
+    "@unlockOldMessages": {},
+    "newSpace": "Nytt utrymme",
+    "@newSpace": {},
+    "googlyEyesContent": "{senderName} skickar dig googly ögon",
+    "@googlyEyesContent": {
+        "type": "text",
+        "placeholders": {
+            "senderName": {}
+        }
+    },
+    "dehydrate": "Exportera sessionen och rensa enheten",
+    "@dehydrate": {},
+    "dehydrateWarning": "Denna åtgärd kan inte ångras. Försäkra dig om att backupen är i säkert förvar.",
+    "@dehydrateWarning": {},
+    "dehydrateTor": "TOR-användare: Exportera session",
+    "@dehydrateTor": {},
+    "hydrateTor": "TOR-användare: Importera session från tidigare export",
+    "@hydrateTor": {},
+    "hydrateTorLong": "Exporterade du sessionen när du senast använde TOR? Importera den enkelt och fortsätt chatta.",
+    "@hydrateTorLong": {},
+    "recoveryKey": "Återställningsnyckel",
+    "@recoveryKey": {},
+    "separateChatTypes": "Separata direktchattar och grupper",
+    "@separateChatTypes": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "showDirectChatsInSpaces": "Visa relaterade direktchattar i utrymmen",
+    "@showDirectChatsInSpaces": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "startFirstChat": "Starta din första chatt",
+    "@startFirstChat": {},
+    "pleaseEnterRecoveryKeyDescription": "Ange din återställningsnyckel från en tidigare session för att låsa upp äldre meddelanden. Din återställningsnyckel är INTE ditt lösenord.",
+    "@pleaseEnterRecoveryKeyDescription": {},
+    "encryptThisChat": "Kryptera denna chatt",
+    "@encryptThisChat": {},
+    "enterInviteLinkOrMatrixId": "Ange länk för inbjudan eller Matrix-ID...",
+    "@enterInviteLinkOrMatrixId": {},
+    "dehydrateTorLong": "TOR-användare rekommenderas att exportera sessionen innan fönstret stängs.",
+    "@dehydrateTorLong": {},
+    "noBackupWarning": "Varning! Om du inte aktiverar säkerhetskopiering av chattar så tappar du åtkomst till krypterade meddelanden. Det är rekommenderat att du aktiverar säkerhetskopiering innan du loggar ut.",
+    "@noBackupWarning": {},
+    "noOtherDevicesFound": "Inga andra enheter hittades",
+    "@noOtherDevicesFound": {},
+    "endToEndEncryption": "Totalsträckskryptering",
+    "@endToEndEncryption": {},
+    "disableEncryptionWarning": "Av säkerhetsskäl kan du inte stänga av kryptering i en chatt där det tidigare aktiverats.",
+    "@disableEncryptionWarning": {},
+    "sorryThatsNotPossible": "Det där är inte möjligt",
+    "@sorryThatsNotPossible": {},
+    "confirmMatrixId": "Bekräfta ditt Matrix-ID för att radera ditt konto.",
+    "@confirmMatrixId": {},
+    "updateAvailable": "FluffyChat-uppdatering tillgänglig",
+    "@updateAvailable": {},
+    "updateNow": "Påbörja uppdatering i bakgrunden",
+    "@updateNow": {},
+    "supposedMxid": "Detta bör vara {mxid}",
+    "@supposedMxid": {
+        "type": "text",
+        "placeholders": {
+            "mxid": {}
+        }
+    },
+    "pleaseEnterRecoveryKey": "Ange din återställningsnyckel:",
+    "@pleaseEnterRecoveryKey": {},
+    "commandHint_markasdm": "Märk som rum för direktmeddelanden",
+    "@commandHint_markasdm": {},
+    "noEmailWarning": "Utan en giltig e-postadress kommer du inte kunna återställa ditt lösenord. Om du inte vill ange en e-postadress, tryck på knappen igen för att fortsätta.",
+    "@noEmailWarning": {},
+    "user": "Användare",
+    "@user": {},
+    "indexedDbErrorLong": "Meddelandelagring är tyvärr inte aktiverat i privat läge som standard.\nGå till\n - about:config\n - sätt dom.indexedDB.privateBrowsing.enabled till true\nAnnars går det inte att använda FluffyChat.",
+    "@indexedDbErrorLong": {},
+    "storeInSecureStorageDescription": "Lagra återställningsnyckeln på säker plats på denna enhet.",
+    "@storeInSecureStorageDescription": {},
+    "storeInAppleKeyChain": "Lagra i Apples nyckelkedja (KeyChain)",
+    "@storeInAppleKeyChain": {},
+    "foregroundServiceRunning": "Denna notifikation visas när förgrundstjänsten körs.",
+    "@foregroundServiceRunning": {},
+    "custom": "Anpassad",
+    "@custom": {},
+    "countFiles": "{count} filer",
+    "@countFiles": {
+        "placeholders": {
+            "count": {}
+        }
+    },
+    "screenSharingTitle": "skärmdelning",
+    "@screenSharingTitle": {},
+    "noKeyForThisMessage": "Detta kan hända om meddelandet skickades innan du loggade in på ditt konto i den här enheten.\n\nDet kan också vara så att avsändaren har blockerat din enhet eller att något gick fel med internetanslutningen.\n\nKan du läsa meddelandet i en annan session? I sådana fall kan du överföra meddelandet från den sessionen! Gå till Inställningar > Enhet och säkerställ att dina enheter har verifierat varandra. När du öppnar rummet nästa gång och båda sessionerna är i förgrunden, så kommer nycklarna att överföras automatiskt.\n\nVill du inte förlora nycklarna vid utloggning eller när du byter enhet? Säkerställ att du har aktiverat säkerhetskopiering för chatten i inställningarna.",
+    "@noKeyForThisMessage": {},
+    "fileIsTooBigForServer": "Servern informerar om att filen är för stor för att skickas.",
+    "@fileIsTooBigForServer": {},
+    "deviceKeys": "Enhetsnycklar:",
+    "@deviceKeys": {},
+    "enterSpace": "Gå till utrymme",
+    "@enterSpace": {},
+    "commandHint_googly": "Skicka några googly ögon",
+    "@commandHint_googly": {},
+    "commandHint_cuddle": "Skicka en omfamning",
+    "@commandHint_cuddle": {},
+    "commandHint_hug": "Skicka en kram",
+    "@commandHint_hug": {},
+    "users": "Användare",
+    "@users": {},
+    "cuddleContent": "{senderName} omfamnar dig",
+    "@cuddleContent": {
+        "type": "text",
+        "placeholders": {
+            "senderName": {}
+        }
+    },
+    "hydrate": "Återställ från säkerhetskopia",
+    "@hydrate": {},
+    "screenSharingDetail": "Du delar din skärm i FluffyChat",
+    "@screenSharingDetail": {},
+    "letsStart": "Lås oss börja",
+    "@letsStart": {},
+    "youRejectedTheInvitation": "Du avvisade inbjudan",
+    "@youRejectedTheInvitation": {},
+    "youBannedUser": "Du förbjöd {user}",
+    "@youBannedUser": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "youInvitedBy": "📩 Du har blivit inbjuden av {user}",
+    "@youInvitedBy": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "youInvitedUser": "📩 Du bjöd in {user}",
+    "@youInvitedUser": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "youKickedAndBanned": "🙅 Du sparkade ut och förbjöd {user}",
+    "@youKickedAndBanned": {
+        "placeholders": {
+            "user": {}
+        }
+    },
+    "stories": "Berättelser",
+    "@stories": {},
+    "saveKeyManuallyDescription": "Spara nyckeln manuellt genom att aktivera dela-funktionen eller urklippshanteraren på enheten.",
+    "@saveKeyManuallyDescription": {},
+    "storeInAndroidKeystore": "Lagra i Androids nyckellagring (KeyStore)",
+    "@storeInAndroidKeystore": {},
+    "callingPermissions": "Samtalsbehörighet",
+    "@callingPermissions": {},
+    "callingAccount": "Samtalskonto",
+    "@callingAccount": {},
+    "callingAccountDetails": "Tillåt FluffyChat att använda Androids ring-app.",
+    "@callingAccountDetails": {},
+    "appearOnTop": "Visa ovanpå",
+    "@appearOnTop": {},
+    "appearOnTopDetails": "Tillåt att appen visas ovanpå (behövs inte om du redan har FluffyChat konfigurerat som ett samtalskonto)",
+    "@appearOnTopDetails": {},
+    "otherCallingPermissions": "Mikrofon, kamera och andra behörigheter för FluffyChat",
+    "@otherCallingPermissions": {},
+    "whyIsThisMessageEncrypted": "Varför kan inte detta meddelande läsas?",
+    "@whyIsThisMessageEncrypted": {},
+    "newGroup": "Ny grupp",
+    "@newGroup": {},
+    "enterRoom": "Gå till rummet",
+    "@enterRoom": {},
+    "allSpaces": "Alla utrymmen",
+    "@allSpaces": {},
+    "numChats": "{number} chattar",
+    "@numChats": {
+        "type": "number",
+        "placeholders": {
+            "number": {}
+        }
+    },
+    "hideUnimportantStateEvents": "Göm oviktiga tillståndshändelser",
+    "@hideUnimportantStateEvents": {},
+    "doNotShowAgain": "Visa inte igen",
+    "@doNotShowAgain": {},
+    "wasDirectChatDisplayName": "Tom chatt (var {oldDisplayName})",
+    "@wasDirectChatDisplayName": {
+        "type": "text",
+        "placeholders": {
+            "oldDisplayName": {}
+        }
+    },
+    "newSpaceDescription": "Utrymmen möjliggör konsolidering av chattar och att bygga privata eller offentliga gemenskaper.",
+    "@newSpaceDescription": {},
+    "reopenChat": "Återöppna chatt",
+    "@reopenChat": {},
+    "jumpToLastReadMessage": "Hoppa till det senast lästa meddelandet",
+    "@jumpToLastReadMessage": {},
+    "readUpToHere": "Läs upp till hit",
+    "@readUpToHere": {},
+    "fileHasBeenSavedAt": "Filen har sparats i {path}",
+    "@fileHasBeenSavedAt": {
+        "type": "text",
+        "placeholders": {
+            "path": {}
+        }
+    }
 }

assets/l10n/intl_th.arb

@@ -0,0 +1 @@
+{}

assets/l10n/intl_tr.arb

@@ -84,11 +84,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "archivedRoom": "Arşivlenmiş Oda",
-  "@archivedRoom": {
-    "type": "text",
-    "placeholders": {}
-  },
   "areGuestsAllowedToJoin": "Misafir kullanıcıların katılmasına izin veriliyor mu",
   "@areGuestsAllowedToJoin": {
     "type": "text",
@@ -452,12 +447,12 @@
     },
     "description": "State that {command} is not a valid /command."
   },
-  "compareEmojiMatch": "Karşılaştırın ve aşağıdaki emojilerin diğer aygıttaki emojilerle eşleştiğinden emin olun:",
+  "compareEmojiMatch": "Lütfen emojileri karşılaştırın",
   "@compareEmojiMatch": {
     "type": "text",
     "placeholders": {}
   },
-  "compareNumbersMatch": "Karşılaştırın ve aşağıdaki numaraların diğer aygıttaki numaralarla eşleştiğinden emin olun:",
+  "compareNumbersMatch": "Lütfen sayıları karşılaştırın",
   "@compareNumbersMatch": {
     "type": "text",
     "placeholders": {}
@@ -548,11 +543,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "crossSigningEnabled": "Çapraz imzalama açık",
-  "@crossSigningEnabled": {
-    "type": "text",
-    "placeholders": {}
-  },
   "currentlyActive": "Şu anda etkin",
   "@currentlyActive": {
     "type": "text",
@@ -638,11 +628,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "discover": "Keşfet",
-  "@discover": {
-    "type": "text",
-    "placeholders": {}
-  },
   "displaynameHasBeenChanged": "Görünen ad değiştirildi",
   "@displaynameHasBeenChanged": {
     "type": "text",
@@ -809,11 +794,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "friday": "Cuma",
-  "@friday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "fromJoining": "Katılmadan",
   "@fromJoining": {
     "type": "text",
@@ -1004,11 +984,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "keysCached": "Anahtarlar önbelleğe alındı",
-  "@keysCached": {
-    "type": "text",
-    "placeholders": {}
-  },
   "kicked": "👞 {username}, {targetName} kişisini attı",
   "@kicked": {
     "type": "text",
@@ -1143,11 +1118,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "monday": "Pazartesi",
-  "@monday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "muteChat": "Sohbeti sessize al",
   "@muteChat": {
     "type": "text",
@@ -1541,11 +1511,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "saturday": "Cumartesi",
-  "@saturday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "saveFile": "Dosyayı kaydet",
   "@saveFile": {
     "type": "text",
@@ -1784,11 +1749,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "sunday": "Pazar",
-  "@sunday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "synchronizingPleaseWait": "Eşzamanlanıyor… Lütfen bekleyin.",
   "@synchronizingPleaseWait": {
     "type": "text",
@@ -1809,16 +1769,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "thisRoomHasBeenArchived": "Bu oda arşivlendi.",
-  "@thisRoomHasBeenArchived": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "thursday": "Perşembe",
-  "@thursday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "title": "FluffyChat",
   "@title": {
     "description": "Title for the application",
@@ -1855,11 +1805,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "tuesday": "Salı",
-  "@tuesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "unavailable": "Yok",
   "@unavailable": {
     "type": "text",
@@ -2030,11 +1975,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "wednesday": "Çarşamba",
-  "@wednesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "weSentYouAnEmail": "Size bir e-posta gönderdik",
   "@weSentYouAnEmail": {
     "type": "text",
@@ -2107,8 +2047,6 @@
   },
   "scanQrCode": "QR kodunu tarayın",
   "@scanQrCode": {},
-  "typeInInviteLinkManually": "Davet bağlantısını el ile yazın...",
-  "@typeInInviteLinkManually": {},
   "shareYourInviteLink": "Davet bağlantınızı paylaşın",
   "@shareYourInviteLink": {},
   "sendOnEnter": "Enter tuşu ile gönder",
@@ -2137,8 +2075,6 @@
   "@yourChatBackupHasBeenSetUp": {},
   "unverified": "Doğrulanmadı",
   "@unverified": {},
-  "yourUserId": "Kullanıcı kimliğiniz:",
-  "@yourUserId": {},
   "repeatPassword": "Parolayı tekrarlayın",
   "@repeatPassword": {},
   "passwordsDoNotMatch": "Parolalar eşleşmiyor!",
@@ -2380,8 +2316,6 @@
   "@users": {},
   "storeInSecureStorageDescription": "Kurtarma anahtarını bu aygıtın güvenli deposunda saklayın.",
   "@storeInSecureStorageDescription": {},
-  "enableAutoBackups": "Otomatik yedeklemeleri etkinleştir",
-  "@enableAutoBackups": {},
   "recoveryKey": "Kurtarma anahtarı",
   "@recoveryKey": {},
   "stories": "Hikayeler",
@@ -2414,8 +2348,6 @@
   "@indexedDbErrorTitle": {},
   "dehydrateWarning": "Bu eylem geri alınamaz. Yedekleme dosyasını güvenli bir şekilde sakladığınızdan emin olun.",
   "@dehydrateWarning": {},
-  "dehydrateShare": "Bu sizin özel FluffyChat dışa aktarımınızdır. Kaybetmediğinizden ve gizli tuttuğunuzdan emin olun.",
-  "@dehydrateShare": {},
   "hydrateTorLong": "TOR'da en son oturumunuzu dışa aktardınız mı? Hızlıca içe aktarın ve sohbete devam edin.",
   "@hydrateTorLong": {},
   "indexedDbErrorLong": "Mesaj saklama özelliği ne yazık ki öntanımlı olarak gizli modda etkin değildir.\nLütfen\n - about:config sayfasına gidin ve\n - dom.indexedDB.privateBrowsing.enabled seçeneğini true olarak ayarlayın\nAksi takdirde FluffyChat çalıştırılamaz.",
@@ -2443,7 +2375,7 @@
   "@commandHint_markasdm": {},
   "whyIsThisMessageEncrypted": "Bu mesaj neden okunamıyor?",
   "@whyIsThisMessageEncrypted": {},
-  "noKeyForThisMessage": "Bu durum, mesaj siz bu aygıtta hesabınızda oturum açmadan önce gönderildiyse meydana gelebilir. \n \nGönderenin aygıtınızı engellemiş olması veya internet bağlantısında bir sorun olması da mümkündür. \n \nMesajı başka bir oturumda okuyabiliyor musunuz? O zaman mesajı oradan aktarabilirsiniz! Ayarlar > Aygıtlar bölümüne gidin ve aygıtlarınızın birbirini doğruladığından emin olun. Odayı bir sonraki sefer açtığınızda ve her iki oturum da ön planda olduğunda, anahtarlar otomatik olarak iletilecektir. \n \nOturumu kapatırken veya aygıt değiştirirken anahtarları kaybetmek istemiyor musunuz? Ayarlarda sohbet yedeklemesini etkinleştirdiğinizden emin olun.",
+  "noKeyForThisMessage": "Bu durum, mesaj siz bu aygıtta hesabınızda oturum açmadan önce gönderildiyse meydana gelebilir.\n\nGönderenin aygıtınızı engellemiş olması veya internet bağlantısında bir sorun olması da mümkündür.\n\nMesajı başka bir oturumda okuyabiliyor musunuz? O zaman mesajı oradan aktarabilirsiniz! Ayarlar > Aygıtlar bölümüne gidin ve aygıtlarınızın birbirini doğruladığından emin olun. Odayı bir sonraki sefer açtığınızda ve her iki oturum da ön planda olduğunda, anahtarlar otomatik olarak iletilecektir.\n\nOturumu kapatırken veya aygıt değiştirirken anahtarları kaybetmek istemiyor musunuz? Ayarlarda sohbet yedeklemesini etkinleştirdiğinizden emin olun.",
   "@noKeyForThisMessage": {},
   "screenSharingTitle": "ekran paylaşımı",
   "@screenSharingTitle": {},
@@ -2532,12 +2464,51 @@
   "@sorryThatsNotPossible": {},
   "deviceKeys": "Aygıt anahtarları:",
   "@deviceKeys": {},
-  "noSearchResult": "Eşleşen arama sonucu yok.",
-  "@noSearchResult": {},
   "letsStart": "Başlayalım",
   "@letsStart": {},
   "enterInviteLinkOrMatrixId": "Davet bağlantısını veya Matris kimliğini girin...",
   "@enterInviteLinkOrMatrixId": {},
   "reopenChat": "Sohbeti yeniden aç",
-  "@reopenChat": {}
+  "@reopenChat": {},
+  "noBackupWarning": "Uyarı! Sohbet yedeklemesini etkinleştirmezseniz, şifrelenen mesajlarınıza erişiminizi kaybedersiniz. Oturumu kapatmadan önce sohbet yedeklemesini etkinleştirmeniz önemle tavsiye edilir.",
+  "@noBackupWarning": {},
+  "noOtherDevicesFound": "Başka aygıt bulunamadı",
+  "@noOtherDevicesFound": {},
+  "fileIsTooBigForServer": "Sunucu, dosyanın gönderilemeyecek kadar büyük olduğunu bildiriyor.",
+  "@fileIsTooBigForServer": {},
+  "fileHasBeenSavedAt": "Dosya {path} konumuna kaydedildi",
+  "@fileHasBeenSavedAt": {
+    "type": "text",
+    "placeholders": {
+      "path": {}
+    }
+  },
+  "jumpToLastReadMessage": "Son okunan mesaja atla",
+  "@jumpToLastReadMessage": {},
+  "readUpToHere": "Buraya kadar oku",
+  "@readUpToHere": {},
+  "jump": "Atla",
+  "@jump": {},
+  "openLinkInBrowser": "Bağlantıyı tarayıcıda aç",
+  "@openLinkInBrowser": {},
+  "allRooms": "Tüm Grup Sohbetleri",
+  "@allRooms": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "discover": "Keşfet",
+  "@discover": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "reportErrorDescription": "Olamaz. Bir şeyler yanlış gitti. Lütfen daha sonra tekrar deneyin. İsterseniz hatayı geliştiricilere bildirebilirsiniz.",
+  "@reportErrorDescription": {},
+  "report": "bildir",
+  "@report": {},
+  "signInWithPassword": "Parola ile oturum aç",
+  "@signInWithPassword": {},
+  "continueWith": "Devam et:",
+  "@continueWith": {},
+  "pleaseTryAgainLaterOrChooseDifferentServer": "Lütfen daha sonra tekrar deneyin veya farklı bir sunucu seçin.",
+  "@pleaseTryAgainLaterOrChooseDifferentServer": {}
 }

assets/l10n/intl_uk.arb

@@ -62,11 +62,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "archivedRoom": "Заархівована кімната",
-  "@archivedRoom": {
-    "type": "text",
-    "placeholders": {}
-  },
   "areGuestsAllowedToJoin": "Чи дозволено гостям приєднуватись",
   "@areGuestsAllowedToJoin": {
     "type": "text",
@@ -271,12 +266,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "compareEmojiMatch": "Порівняйте і переконайтесь, що показані емодзі збігаються емодзі на іншому пристрої:",
+  "compareEmojiMatch": "Порівняйте емодзі",
   "@compareEmojiMatch": {
     "type": "text",
     "placeholders": {}
   },
-  "compareNumbersMatch": "Порівняйте і переконайтесь, що вказані числа збігаються з числами на іншому пристрої:",
+  "compareNumbersMatch": "Порівняйте цифри",
   "@compareNumbersMatch": {
     "type": "text",
     "placeholders": {}
@@ -337,11 +332,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "crossSigningEnabled": "Перехресне підписування увімкнено",
-  "@crossSigningEnabled": {
-    "type": "text",
-    "placeholders": {}
-  },
   "currentlyActive": "Зараз у мережі",
   "@currentlyActive": {
     "type": "text",
@@ -494,11 +484,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "friday": "П'ятниця",
-  "@friday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "fromJoining": "З моменту приєднання",
   "@fromJoining": {
     "type": "text",
@@ -624,11 +609,6 @@
       "username": {}
     }
   },
-  "keysCached": "Ключі кешовано",
-  "@keysCached": {
-    "type": "text",
-    "placeholders": {}
-  },
   "kicked": "👞 {username} вилучає {targetName}",
   "@kicked": {
     "type": "text",
@@ -731,11 +711,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "monday": "Понеділок",
-  "@monday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "muteChat": "Вимкнути сповіщення",
   "@muteChat": {
     "type": "text",
@@ -934,11 +909,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "saturday": "Субота",
-  "@saturday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "seenByUser": "Переглянуто {username}",
   "@seenByUser": {
     "type": "text",
@@ -1066,11 +1036,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "sunday": "Неділя",
-  "@sunday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "systemTheme": "Системна",
   "@systemTheme": {
     "type": "text",
@@ -1086,16 +1051,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "thisRoomHasBeenArchived": "Цю кімнату було заархівовано.",
-  "@thisRoomHasBeenArchived": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "thursday": "Четвер",
-  "@thursday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "title": "FluffyChat",
   "@title": {
     "description": "Title for the application",
@@ -1107,11 +1062,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "tuesday": "Вівторок",
-  "@tuesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "unbannedUser": "{username} розблоковує {targetName}",
   "@unbannedUser": {
     "type": "text",
@@ -1255,11 +1205,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "wednesday": "Середа",
-  "@wednesday": {
-    "type": "text",
-    "placeholders": {}
-  },
   "whoIsAllowedToJoinThisGroup": "Кому дозволено приєднуватися до цієї групи",
   "@whoIsAllowedToJoinThisGroup": {
     "type": "text",
@@ -1494,8 +1439,6 @@
   },
   "shareYourInviteLink": "Поділіться своїм посиланням запрошення",
   "@shareYourInviteLink": {},
-  "typeInInviteLinkManually": "Введіть посилання запрошення власноруч...",
-  "@typeInInviteLinkManually": {},
   "scanQrCode": "Сканувати QR-код",
   "@scanQrCode": {},
   "noPasswordRecoveryDescription": "Ви ще не додали спосіб відновлення пароля.",
@@ -1851,8 +1794,6 @@
     "type": "text",
     "description": "Usage hint for the command /html"
   },
-  "yourUserId": "Ваш ID користувача:",
-  "@yourUserId": {},
   "commandHint_invite": "Запросіть цього користувача до цієї кімнати",
   "@commandHint_invite": {
     "type": "text",
@@ -1990,11 +1931,6 @@
       "senderName": {}
     }
   },
-  "discover": "Огляд",
-  "@discover": {
-    "type": "text",
-    "placeholders": {}
-  },
   "cantOpenUri": "Не вдалося відкрити URI {uri}",
   "@cantOpenUri": {
     "type": "text",
@@ -2384,8 +2320,6 @@
   "@recoveryKey": {},
   "recoveryKeyLost": "Ключ відновлення втрачено?",
   "@recoveryKeyLost": {},
-  "enableAutoBackups": "Увімкнути автоматичне резервне копіювання",
-  "@enableAutoBackups": {},
   "users": "Користувачі",
   "@users": {},
   "stories": "Історії",
@@ -2412,8 +2346,6 @@
   "@dehydrate": {},
   "dehydrateWarning": "Цю дію не можна скасувати. Переконайтеся, що ви безпечно зберігаєте файл резервної копії.",
   "@dehydrateWarning": {},
-  "dehydrateShare": "Це ваш приватний експорт FluffyChat. Переконайтеся, що ви не втратите його та зберігайте його приватно.",
-  "@dehydrateShare": {},
   "dehydrateTor": "Користувачі TOR: експорт сеансу",
   "@dehydrateTor": {},
   "dehydrateTorLong": "Для користувачів TOR рекомендується експортувати сеанс перед закриттям вікна.",
@@ -2532,12 +2464,51 @@
   "@sorryThatsNotPossible": {},
   "deviceKeys": "Ключі пристрою:",
   "@deviceKeys": {},
-  "noSearchResult": "Немає відповідних результатів пошуку.",
-  "@noSearchResult": {},
   "letsStart": "Розпочнімо",
   "@letsStart": {},
   "enterInviteLinkOrMatrixId": "Введіть запрошувальне посилання або Matrix ID...",
   "@enterInviteLinkOrMatrixId": {},
   "reopenChat": "Відновити бесіду",
-  "@reopenChat": {}
+  "@reopenChat": {},
+  "noOtherDevicesFound": "Інших пристроїв не знайдено",
+  "@noOtherDevicesFound": {},
+  "noBackupWarning": "Увага! Якщо ви не ввімкнете резервне копіювання бесіди, ви втратите доступ до своїх зашифрованих повідомлень. Наполегливо радимо ввімкнути резервне копіювання бесіди перед виходом.",
+  "@noBackupWarning": {},
+  "fileIsTooBigForServer": "Сервер повідомляє, що файл завеликий для надсилання.",
+  "@fileIsTooBigForServer": {},
+  "fileHasBeenSavedAt": "Файл збережено в {path}",
+  "@fileHasBeenSavedAt": {
+    "type": "text",
+    "placeholders": {
+      "path": {}
+    }
+  },
+  "jumpToLastReadMessage": "Перейти до останнього прочитаного повідомлення",
+  "@jumpToLastReadMessage": {},
+  "readUpToHere": "Читати тут",
+  "@readUpToHere": {},
+  "jump": "Перейти",
+  "@jump": {},
+  "openLinkInBrowser": "Відкрити посилання у браузері",
+  "@openLinkInBrowser": {},
+  "allRooms": "Усі групові бесіди",
+  "@allRooms": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "reportErrorDescription": "О, ні. Щось пішло не так. Повторіть спробу пізніше. Якщо хочете, можете повідомити про помилку розробникам.",
+  "@reportErrorDescription": {},
+  "report": "повідомити",
+  "@report": {},
+  "discover": "Огляд",
+  "@discover": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "pleaseTryAgainLaterOrChooseDifferentServer": "Спробуйте пізніше або виберіть інший сервер.",
+  "@pleaseTryAgainLaterOrChooseDifferentServer": {},
+  "signInWithPassword": "Увійти за допомогою пароля",
+  "@signInWithPassword": {},
+  "continueWith": "Продовжити за допомогою:",
+  "@continueWith": {}
 }

assets/l10n/intl_vi.arb

@@ -61,11 +61,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "Phòng hội thảo đã lưu trữ",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "Khách vãng lai có được tham gia không",
     "@areGuestsAllowedToJoin": {
         "type": "text",

assets/l10n/intl_zh_Hant.arb

@@ -76,11 +76,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "archivedRoom": "已封存的對話",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
     "areGuestsAllowedToJoin": "是否允許訪客加入",
     "@areGuestsAllowedToJoin": {
         "type": "text",
@@ -427,11 +422,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "crossSigningEnabled": "第三方登入已啟用",
-    "@crossSigningEnabled": {
-        "type": "text",
-        "placeholders": {}
-    },
     "currentlyActive": "目前活躍",
     "@currentlyActive": {
         "type": "text",
@@ -517,11 +507,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "discover": "探索",
-    "@discover": {
-        "type": "text",
-        "placeholders": {}
-    },
     "displaynameHasBeenChanged": "顯示名稱已被變更",
     "@displaynameHasBeenChanged": {
         "type": "text",
@@ -674,11 +659,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "friday": "星期五",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "fromJoining": "自加入起",
     "@fromJoining": {
         "type": "text",
@@ -864,11 +844,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "keysCached": "金鑰已被快取",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
     "kicked": "{username}踢了{targetName}",
     "@kicked": {
         "type": "text",
@@ -986,11 +961,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "monday": "星期一",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "muteChat": "將該聊天室靜音",
     "@muteChat": {
         "type": "text",
@@ -1326,11 +1296,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "saturday": "星期六",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "search": "搜尋",
     "@search": {
         "type": "text",
@@ -1530,11 +1495,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "sunday": "星期日",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "systemTheme": "自動",
     "@systemTheme": {
         "type": "text",
@@ -1550,16 +1510,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "thisRoomHasBeenArchived": "這個聊天室已被封存。",
-    "@thisRoomHasBeenArchived": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "星期四",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "title": "FluffyChat",
     "@title": {
         "description": "Title for the application",
@@ -1596,11 +1546,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "tuesday": "星期二",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "unavailable": "無法取得",
     "@unavailable": {
         "type": "text",
@@ -1771,11 +1716,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "wednesday": "星期三",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
     "weSentYouAnEmail": "我們向您傳送了一封電子郵件",
     "@weSentYouAnEmail": {
         "type": "text",
@@ -1972,8 +1912,6 @@
         "type": "text",
         "placeholders": {}
     },
-    "yourUserId": "您的ID：",
-    "@yourUserId": {},
     "chatHasBeenAddedToThisSpace": "聊天室已添加到此空間",
     "@chatHasBeenAddedToThisSpace": {},
     "clearArchive": "清除存檔",

docs/fdroid_repo.md

@@ -7,11 +7,9 @@ are also published on it.
 
 Easiest way to add the Repository is to either **scan the QR-Code** or if you are on your phone **directly click it**.
 
-{::nomarkdown}
+<a href="fdroidrepos://fluffychat.im/repo/stable/repo/?fingerprint=5EDB5C4395B2F2D9BA682F6A1D275170CCE5365A6FA27D2220EA8D52A6D95F07" >
-<a href="fdroidrepos://fluffychat.im/repo/stable/repo/?fingerprint=8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB" >
     <img src="qr-stable.svg" width="300" height="300"/>
 </a>
-{:/}
 
 
 ### If the QR-Code doesn't work:
@@ -24,11 +22,11 @@ If this still isn't working follow the next steps:
 2. Go to the `Settings` Tab in the Bottom bar
 3. Click the `Repositories` Action
 4. Click on the plus sign at the top.
-5. Fill in `https://fluffychat.im/repo/stable/repo/` into the top field and `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB` in the bottom field.
+5. Fill in `https://fluffychat.im/repo/stable/repo/` into the top field and `5EDB5C4395B2F2D9BA682F6A1D275170CCE5365A6FA27D2220EA8D52A6D95F07` in the bottom field.
 
 ## What is the fingerprint?
 
-The fingerprint of the Repository is: `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB`
+The fingerprint of the Repository is: `5EDB5C4395B2F2D9BA682F6A1D275170CCE5365A6FA27D2220EA8D52A6D95F07`
 
 # Nightly Repository
 
@@ -36,11 +34,9 @@ The fingerprint of the Repository is: `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3
 
 Easiest way to add the Repository is to either **scan the QR-Code** or if you are on your phone **directly click** it.
 
-{::nomarkdown}
 <a href="fdroidrepos://fluffychat.im/repo/nightly/repo/?fingerprint=21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D" >
     <img src="qr-nightly.svg" width="300" height="300"/>
 </a>
-{:/}
 
 
 ### If the QR-Code doesn't work:

docs/index.html

@@ -40,7 +40,7 @@
 				class="w-36 pr-2 mb-2 inline hover:scale-105 transition-transform"></a>
 		<a href="https://play.google.com/store/apps/details?id=chat.fluffy.fluffychat"><img src="google-play-badge.png"
 				class="w-36 pr-2 mb-2  hover:scale-105 transition-transform inline">
-		</a><a href="https://f-droid.org/de/packages/chat.fluffy.fluffychat/"><img src="fdroid_button.png"
+		</a><a href="https://f-droid.org/packages/chat.fluffy.fluffychat/"><img src="fdroid_button.png"
 				class="w-36 pr-2 mb-2  hover:scale-105 transition-transform inline">
 		</a>
 		<a href="https://fluffychat.im/web">
@@ -55,7 +55,7 @@
 	<div class="flex mb-8 justify-center content-center">
 		<a rel="me"
 			class="inline-block text-indigo-500 no-underline hover:text-indigo-900 hover:scale-105 transition-all text-center h-auto p-4"
-			rel="me" href="https://metalhead.club/@krille">
+			rel="me" href="https://mastodon.art/@krille">
 			<svg class="fill-current h-6" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg"
 				xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
 				style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">

integration_test/app_test.dart

@@ -144,13 +144,15 @@ void main() {
 
         await tester.waitFor(
           find.descendant(
-              of: find.byType(InvitationSelectionView),
+            of: find.byType(InvitationSelectionView),
-              matching: find.byType(TextField)),
+            matching: find.byType(TextField),
+          ),
         );
         await tester.enterText(
           find.descendant(
-              of: find.byType(InvitationSelectionView),
+            of: find.byType(InvitationSelectionView),
-              matching: find.byType(TextField)),
+            matching: find.byType(TextField),
+          ),
           Users.user2.name,
         );
 
@@ -160,14 +162,17 @@ void main() {
         await Future.delayed(const Duration(milliseconds: 1000));
         await tester.pumpAndSettle();
 
-        await tester.tap(find
+        await tester.tap(
-            .descendant(
+          find
+              .descendant(
                 of: find.descendant(
                   of: find.byType(InvitationSelectionView),
                   matching: find.byType(ListTile),
                 ),
-                matching: find.text(Users.user2.name))
+                matching: find.text(Users.user2.name),
-            .last);
+              )
+              .last,
+        );
         await tester.pumpAndSettle();
 
         await tester.waitFor(find.maybeUppercaseText('Yes'));

integration_test/extensions/default_flows.dart

@@ -2,7 +2,6 @@ import 'dart:developer';
 
 import 'package:fluffychat/pages/chat_list/chat_list_body.dart';
 import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart';
-import 'package:fluffychat/pages/settings_account/settings_account_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -120,17 +119,6 @@ extension DefaultFlowExtensions on WidgetTester {
         ),
       );
       await tester.pumpAndSettle();
-      await tester.tap(find.text('Account'));
-      await tester.pumpAndSettle();
-      await tester.scrollUntilVisible(
-        find.text('Logout'),
-        500,
-        scrollable: find.descendant(
-          of: find.byType(SettingsAccountView),
-          matching: find.byType(Scrollable),
-        ),
-      );
-      await tester.pumpAndSettle();
       await tester.tap(find.text('Logout'));
       await tester.pumpAndSettle();
       await tester.tap(find.maybeUppercaseText('Yes'));
@@ -156,7 +144,8 @@ extension DefaultFlowExtensions on WidgetTester {
     do {
       if (DateTime.now().isAfter(end)) {
         throw Exception(
-            'Timed out waiting for HomeserverPicker or ChatListViewBody');
+          'Timed out waiting for HomeserverPicker or ChatListViewBody',
+        );
       }
 
       await pumpAndSettle();

ios/Runner.xcodeproj/project.pbxproj

@@ -291,6 +291,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (

ios/fastlane/Appfile

@@ -1,5 +1,5 @@
 app_identifier("im.fluffychat.app") # The bundle identifier of your app
-apple_id("christian.pauly@wtal.de") # Your Apple email address
+apple_id("christian-kussowski@posteo.de") # Your Apple email address
 
 itc_team_id("122628977") # App Store Connect Team ID
 team_id("4NXF6Z997G") # Developer Portal Team ID

lib/config/app_config.dart

@@ -16,7 +16,7 @@ abstract class AppConfig {
   static const double messageFontSize = 15.75;
   static const bool allowOtherHomeservers = true;
   static const bool enableRegistration = true;
-  static const Color primaryColor = Color.fromARGB(255, 135, 103, 172);
+  static const Color primaryColor = Color(0xFF5625BA);
   static const Color primaryColorLight = Color(0xFFCCBDEA);
   static const Color secondaryColor = Color(0xFF41a2bc);
   static String _privacyUrl =
@@ -33,6 +33,11 @@ abstract class AppConfig {
   static const String sourceCodeUrl = 'https://gitlab.com/famedly/fluffychat';
   static const String supportUrl =
       'https://gitlab.com/famedly/fluffychat/issues';
+  static final Uri newIssueUrl = Uri(
+    scheme: 'https',
+    host: 'gitlab.com',
+    path: '/famedly/fluffychat/-/issues/new',
+  );
   static const bool enableSentry = true;
   static const String sentryDns =
       'https://8591d0d863b646feb4f3dda7e5dcab38@o256755.ingest.sentry.io/5243143';
@@ -70,8 +75,9 @@ abstract class AppConfig {
         colorSchemeSeed = Color(json['chat_color']);
       } catch (e) {
         Logs().w(
-            'Invalid color in config.json! Please make sure to define the color in this format: "0xffdd0000"',
+          'Invalid color in config.json! Please make sure to define the color in this format: "0xffdd0000"',
-            e);
+          e,
+        );
       }
     }
     if (json['application_name'] is String) {

lib/config/routes.dart

@@ -9,7 +9,6 @@ import 'package:fluffychat/pages/chat_details/chat_details.dart';
 import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart';
 import 'package:fluffychat/pages/chat_list/chat_list.dart';
 import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings.dart';
-import 'package:fluffychat/pages/connect/connect_page.dart';
 import 'package:fluffychat/pages/device_settings/device_settings.dart';
 import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart';
 import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart';
@@ -19,7 +18,6 @@ import 'package:fluffychat/pages/new_private_chat/new_private_chat.dart';
 import 'package:fluffychat/pages/new_space/new_space.dart';
 import 'package:fluffychat/pages/settings/settings.dart';
 import 'package:fluffychat/pages/settings_3pid/settings_3pid.dart';
-import 'package:fluffychat/pages/settings_account/settings_account.dart';
 import 'package:fluffychat/pages/settings_chat/settings_chat.dart';
 import 'package:fluffychat/pages/settings_emotes/settings_emotes.dart';
 import 'package:fluffychat/pages/settings_ignore_list/settings_ignore_list.dart';
@@ -28,7 +26,6 @@ import 'package:fluffychat/pages/settings_notifications/settings_notifications.d
 import 'package:fluffychat/pages/settings_security/settings_security.dart';
 import 'package:fluffychat/pages/settings_stories/settings_stories.dart';
 import 'package:fluffychat/pages/settings_style/settings_style.dart';
-import 'package:fluffychat/pages/sign_up/signup.dart';
 import 'package:fluffychat/pages/story/story_page.dart';
 import 'package:fluffychat/widgets/layouts/empty_page.dart';
 import 'package:fluffychat/widgets/layouts/loading_view.dart';
@@ -71,21 +68,25 @@ class AppRoutes {
               widget: const ChatDetails(),
               stackedRoutes: _chatDetailsRoutes,
             ),
-            VWidget(path: ':roomid', widget: const Chat(), stackedRoutes: [
+            VWidget(
-              VWidget(
+              path: ':roomid',
-                path: 'encryption',
+              widget: const ChatPage(),
-                widget: const ChatEncryptionSettings(),
+              stackedRoutes: [
-              ),
+                VWidget(
-              VWidget(
+                  path: 'encryption',
-                path: 'invite',
+                  widget: const ChatEncryptionSettings(),
-                widget: const InvitationSelection(),
+                ),
-              ),
+                VWidget(
-              VWidget(
+                  path: 'invite',
-                path: 'details',
+                  widget: const InvitationSelection(),
-                widget: const ChatDetails(),
+                ),
-                stackedRoutes: _chatDetailsRoutes,
+                VWidget(
-              ),
+                  path: 'details',
-            ]),
+                  widget: const ChatDetails(),
+                  stackedRoutes: _chatDetailsRoutes,
+                ),
+              ],
+            ),
             VWidget(
               path: '/settings',
               widget: const Settings(),
@@ -97,7 +98,7 @@ class AppRoutes {
               stackedRoutes: [
                 VWidget(
                   path: ':roomid',
-                  widget: const Chat(),
+                  widget: const ChatPage(),
                   buildTransition: _dynamicTransition,
                 ),
               ],
@@ -171,14 +172,14 @@ class AppRoutes {
                 VNester(
                   path: ':roomid',
                   widgetBuilder: (child) => SideViewLayout(
-                    mainView: const Chat(),
+                    mainView: const ChatPage(),
                     sideView: child,
                   ),
                   buildTransition: _fadeTransition,
                   nestedRoutes: [
                     VWidget(
                       path: '',
-                      widget: const Chat(),
+                      widget: const ChatPage(),
                       buildTransition: _fadeTransition,
                     ),
                     VWidget(
@@ -242,7 +243,7 @@ class AppRoutes {
                 ),
                 VWidget(
                   path: ':roomid',
-                  widget: const Chat(),
+                  widget: const ChatPage(),
                   buildTransition: _dynamicTransition,
                 ),
               ],
@@ -263,22 +264,6 @@ class AppRoutes {
               widget: const Login(),
               buildTransition: _fadeTransition,
             ),
-            VWidget(
-                path: 'connect',
-                widget: const ConnectPage(),
-                buildTransition: _fadeTransition,
-                stackedRoutes: [
-                  VWidget(
-                    path: 'login',
-                    widget: const Login(),
-                    buildTransition: _fadeTransition,
-                  ),
-                  VWidget(
-                    path: 'signup',
-                    widget: const SignupPage(),
-                    buildTransition: _fadeTransition,
-                  ),
-                ]),
             VWidget(
               path: 'logs',
               widget: const LogViewer(),
@@ -345,37 +330,14 @@ class AppRoutes {
           ],
         ),
         VWidget(
-          path: 'account',
+          path: 'addaccount',
-          widget: const SettingsAccount(),
+          widget: const HomeserverPicker(),
-          buildTransition: _dynamicTransition,
+          buildTransition: _fadeTransition,
           stackedRoutes: [
             VWidget(
-              path: 'add',
+              path: 'login',
-              widget: const HomeserverPicker(),
+              widget: const Login(),
               buildTransition: _fadeTransition,
-              stackedRoutes: [
-                VWidget(
-                  path: 'login',
-                  widget: const Login(),
-                  buildTransition: _fadeTransition,
-                ),
-                VWidget(
-                    path: 'connect',
-                    widget: const ConnectPage(),
-                    buildTransition: _fadeTransition,
-                    stackedRoutes: [
-                      VWidget(
-                        path: 'login',
-                        widget: const Login(),
-                        buildTransition: _fadeTransition,
-                      ),
-                      VWidget(
-                        path: 'signup',
-                        widget: const SignupPage(),
-                        buildTransition: _fadeTransition,
-                      ),
-                    ]),
-              ],
             ),
           ],
         ),

lib/config/themes.dart

@@ -9,7 +9,10 @@ import 'app_config.dart';
 abstract class FluffyThemes {
   static const double columnWidth = 360.0;
 
-  static bool isColumnModeByWidth(double width) => width > columnWidth * 2 + 64;
+  static const double navRailWidth = 64.0;
+
+  static bool isColumnModeByWidth(double width) =>
+      width > columnWidth * 2 + navRailWidth;
 
   static bool isColumnMode(BuildContext context) =>
       isColumnModeByWidth(MediaQuery.of(context).size.width);
@@ -38,6 +41,22 @@ abstract class FluffyThemes {
     titleSmall: fallbackTextStyle,
   );
 
+  static LinearGradient backgroundGradient(
+    BuildContext context,
+    int alpha,
+  ) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return LinearGradient(
+      begin: Alignment.topCenter,
+      colors: [
+        colorScheme.primaryContainer.withAlpha(alpha),
+        colorScheme.secondaryContainer.withAlpha(alpha),
+        colorScheme.tertiaryContainer.withAlpha(alpha),
+        colorScheme.primaryContainer.withAlpha(alpha),
+      ],
+    );
+  }
+
   static const Duration animationDuration = Duration(milliseconds: 250);
   static const Curve animationCurve = Curves.easeInOut;
 
@@ -47,7 +66,7 @@ abstract class FluffyThemes {
         useMaterial3: true,
         brightness: brightness,
         colorSchemeSeed: seed ?? AppConfig.colorSchemeSeed,
-        textTheme: PlatformInfos.isDesktop
+        textTheme: PlatformInfos.isDesktop || PlatformInfos.isWeb
             ? brightness == Brightness.light
                 ? Typography.material2018().black.merge(fallbackTextTheme)
                 : Typography.material2018().white.merge(fallbackTextTheme)
@@ -94,10 +113,18 @@ abstract class FluffyThemes {
             ),
           ),
         ),
+        dialogTheme: DialogTheme(
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
+          ),
+        ),
         elevatedButtonTheme: ElevatedButtonThemeData(
           style: ElevatedButton.styleFrom(
             padding: const EdgeInsets.all(16),
             textStyle: const TextStyle(fontSize: 16),
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(AppConfig.borderRadius),
+            ),
           ),
         ),
       );

lib/pages/add_story/add_story.dart

@@ -3,7 +3,8 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 
-import 'package:file_picker_cross/file_picker_cross.dart';
+import 'package:collection/collection.dart';
+import 'package:file_picker/file_picker.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:matrix/matrix.dart';
@@ -68,14 +69,15 @@ class AddStoryController extends State<AddStoryPage> {
   }
 
   void importMedia() async {
-    final picked = await FilePickerCross.importFromStorage(
+    final picked = await FilePicker.platform.pickFiles(
-      type: FileTypeCross.image,
+      type: FileType.image,
+      withData: true,
     );
-    final fileName = picked.fileName;
+    final file = picked?.files.firstOrNull;
-    if (fileName == null) return;
+    if (file == null) return;
     final matrixFile = MatrixImageFile(
-      bytes: picked.toUint8List(),
+      bytes: file.bytes!,
-      name: fileName,
+      name: file.name,
     );
     setState(() {
       image = matrixFile;
@@ -88,14 +90,15 @@ class AddStoryController extends State<AddStoryPage> {
     );
     if (picked == null) return;
     final matrixFile = await showFutureLoadingDialog(
-        context: context,
+      context: context,
-        future: () async {
+      future: () async {
-          final bytes = await picked.readAsBytes();
+        final bytes = await picked.readAsBytes();
-          return MatrixImageFile(
+        return MatrixImageFile(
-            bytes: bytes,
+          bytes: bytes,
-            name: picked.name,
+          name: picked.name,
-          );
+        );
-        });
+      },
+    );
 
     setState(() {
       image = matrixFile.result;

lib/pages/add_story/invite_story_page.dart

@@ -92,34 +92,39 @@ class InviteStoryPageState extends State<InviteStoryPage> {
           const Divider(height: 1),
           Expanded(
             child: FutureBuilder<List<User>>(
-                future: loadContacts,
+              future: loadContacts,
-                builder: (context, snapshot) {
+              builder: (context, snapshot) {
-                  final contacts = snapshot.data;
+                final contacts = snapshot.data;
-                  if (contacts == null) {
+                if (contacts == null) {
-                    final error = snapshot.error;
+                  final error = snapshot.error;
-                    if (error != null) {
+                  if (error != null) {
-                      return Center(
+                    return Center(
-                          child: Text(error.toLocalizedString(context)));
+                      child: Text(error.toLocalizedString(context)),
-                    }
+                    );
-                    return const Center(
-                        child: CircularProgressIndicator.adaptive());
                   }
-                  _undecided = contacts.map((u) => u.id).toSet();
+                  return const Center(
-                  return ListView.builder(
+                    child: CircularProgressIndicator.adaptive(),
-                    itemCount: contacts.length,
-                    itemBuilder: (context, i) => SwitchListTile.adaptive(
-                      value: _invite.contains(contacts[i].id),
-                      onChanged: (b) => setState(() => b
-                          ? _invite.add(contacts[i].id)
-                          : _invite.remove(contacts[i].id)),
-                      secondary: Avatar(
-                        mxContent: contacts[i].avatarUrl,
-                        name: contacts[i].calcDisplayname(),
-                      ),
-                      title: Text(contacts[i].calcDisplayname()),
-                    ),
                   );
-                }),
+                }
+                _undecided = contacts.map((u) => u.id).toSet();
+                return ListView.builder(
+                  itemCount: contacts.length,
+                  itemBuilder: (context, i) => SwitchListTile.adaptive(
+                    value: _invite.contains(contacts[i].id),
+                    onChanged: (b) => setState(
+                      () => b
+                          ? _invite.add(contacts[i].id)
+                          : _invite.remove(contacts[i].id),
+                    ),
+                    secondary: Avatar(
+                      mxContent: contacts[i].avatarUrl,
+                      name: contacts[i].calcDisplayname(),
+                    ),
+                    title: Text(contacts[i].calcDisplayname()),
+                  ),
+                );
+              },
+            ),
           ),
         ],
       ),

lib/pages/archive/archive_view.dart

@@ -36,19 +36,22 @@ class ArchiveView extends StatelessWidget {
           builder: (BuildContext context) {
             if (snapshot.hasError) {
               return Center(
-                  child: Text(
+                child: Text(
-                L10n.of(context)!.oopsSomethingWentWrong,
+                  L10n.of(context)!.oopsSomethingWentWrong,
-                textAlign: TextAlign.center,
+                  textAlign: TextAlign.center,
-              ));
+                ),
+              );
             }
             if (!snapshot.hasData) {
               return const Center(
-                  child: CircularProgressIndicator.adaptive(strokeWidth: 2));
+                child: CircularProgressIndicator.adaptive(strokeWidth: 2),
+              );
             } else {
               archive = snapshot.data;
               if (archive == null || archive!.isEmpty) {
                 return const Center(
-                    child: Icon(Icons.archive_outlined, size: 80));
+                  child: Icon(Icons.archive_outlined, size: 80),
+                );
               }
               return ListView.builder(
                 itemCount: archive!.length,

lib/pages/bootstrap/bootstrap_dialog.dart

@@ -125,9 +125,12 @@ class BootstrapDialogState extends State<BootstrapDialog> {
               children: [
                 ListTile(
                   contentPadding: const EdgeInsets.symmetric(horizontal: 8.0),
-                  trailing: Icon(
+                  trailing: CircleAvatar(
-                    Icons.info_outlined,
+                    backgroundColor: Colors.transparent,
-                    color: Theme.of(context).colorScheme.primary,
+                    child: Icon(
+                      Icons.info_outlined,
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
                   ),
                   subtitle: Text(L10n.of(context)!.chatBackupDescription),
                 ),
@@ -136,11 +139,15 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                   thickness: 1,
                 ),
                 TextField(
-                  minLines: 4,
+                  minLines: 2,
                   maxLines: 4,
                   readOnly: true,
-                  style: const TextStyle(fontFamily: 'monospace'),
+                  style: const TextStyle(fontFamily: 'RobotoMono'),
                   controller: TextEditingController(text: key),
+                  decoration: const InputDecoration(
+                    contentPadding: EdgeInsets.all(16),
+                    suffixIcon: Icon(Icons.key_outlined),
+                  ),
                 ),
                 const SizedBox(height: 16),
                 if (_supportsSecureStorage)
@@ -234,12 +241,13 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                 icon: const Icon(Icons.close),
                 onPressed: Navigator.of(context).pop,
               ),
-              title: Text(L10n.of(context)!.unlockOldMessages),
+              title: Text(L10n.of(context)!.chatBackup),
             ),
             body: Center(
               child: ConstrainedBox(
                 constraints: const BoxConstraints(
-                    maxWidth: FluffyThemes.columnWidth * 1.5),
+                  maxWidth: FluffyThemes.columnWidth * 1.5,
+                ),
                 child: ListView(
                   padding: const EdgeInsets.all(16.0),
                   children: [
@@ -251,11 +259,12 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                         color: Theme.of(context).colorScheme.primary,
                       ),
                       subtitle: Text(
-                          L10n.of(context)!.pleaseEnterRecoveryKeyDescription),
+                        L10n.of(context)!.pleaseEnterRecoveryKeyDescription,
+                      ),
                     ),
                     const Divider(height: 32),
                     TextField(
-                      minLines: 2,
+                      minLines: 1,
                       maxLines: 2,
                       autocorrect: false,
                       readOnly: _recoveryKeyInputLoading,
@@ -263,68 +272,72 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                           ? null
                           : [AutofillHints.password],
                       controller: _recoveryKeyTextEditingController,
-                      style: const TextStyle(fontFamily: 'monospace'),
+                      style: const TextStyle(fontFamily: 'RobotoMono'),
                       decoration: InputDecoration(
-                        hintText: 'Abc123 Def456',
+                        contentPadding: const EdgeInsets.all(16),
-                        labelStyle: TextStyle(
+                        hintStyle: TextStyle(
-                            fontFamily: Theme.of(context)
+                          fontFamily:
-                                .textTheme
+                              Theme.of(context).textTheme.bodyLarge?.fontFamily,
-                                .bodyLarge
+                        ),
-                                ?.fontFamily),
+                        hintText: L10n.of(context)!.recoveryKey,
-                        labelText: L10n.of(context)!.recoveryKey,
                         errorText: _recoveryKeyInputError,
                       ),
                     ),
                     const SizedBox(height: 16),
                     ElevatedButton.icon(
-                        style: ElevatedButton.styleFrom(
+                      style: ElevatedButton.styleFrom(
-                          foregroundColor:
+                        foregroundColor:
-                              Theme.of(context).colorScheme.onPrimary,
+                            Theme.of(context).colorScheme.onPrimary,
-                          backgroundColor: Theme.of(context).primaryColor,
+                        backgroundColor: Theme.of(context).primaryColor,
-                        ),
-                        icon: _recoveryKeyInputLoading
-                            ? const CircularProgressIndicator.adaptive()
-                            : const Icon(Icons.lock_open_outlined),
-                        label: Text(L10n.of(context)!.unlockOldMessages),
-                        onPressed: _recoveryKeyInputLoading
-                            ? null
-                            : () async {
-                                setState(() {
-                                  _recoveryKeyInputError = null;
-                                  _recoveryKeyInputLoading = true;
-                                });
-                                try {
-                                  final key =
-                                      _recoveryKeyTextEditingController.text;
-                                  await bootstrap.newSsssKey!.unlock(
-                                    keyOrPassphrase: key,
-                                  );
-                                  Logs().d('SSSS unlocked');
-                                  await bootstrap
-                                      .client.encryption!.crossSigning
-                                      .selfSign(
-                                    keyOrPassphrase: key,
-                                  );
-                                  Logs().d('Successful elfsigned');
-                                  await bootstrap.openExistingSsss();
-                                } catch (e, s) {
-                                  Logs().w('Unable to unlock SSSS', e, s);
-                                  setState(() => _recoveryKeyInputError =
-                                      L10n.of(context)!.oopsSomethingWentWrong);
-                                } finally {
-                                  setState(
-                                      () => _recoveryKeyInputLoading = false);
-                                }
-                              }),
-                    const SizedBox(height: 16),
-                    Row(children: [
-                      const Expanded(child: Divider()),
-                      Padding(
-                        padding: const EdgeInsets.all(12.0),
-                        child: Text(L10n.of(context)!.or),
                       ),
-                      const Expanded(child: Divider()),
+                      icon: _recoveryKeyInputLoading
-                    ]),
+                          ? const CircularProgressIndicator.adaptive()
+                          : const Icon(Icons.lock_open_outlined),
+                      label: Text(L10n.of(context)!.unlockOldMessages),
+                      onPressed: _recoveryKeyInputLoading
+                          ? null
+                          : () async {
+                              setState(() {
+                                _recoveryKeyInputError = null;
+                                _recoveryKeyInputLoading = true;
+                              });
+                              try {
+                                final key =
+                                    _recoveryKeyTextEditingController.text;
+                                await bootstrap.newSsssKey!.unlock(
+                                  keyOrPassphrase: key,
+                                );
+                                Logs().d('SSSS unlocked');
+                                await bootstrap.client.encryption!.crossSigning
+                                    .selfSign(
+                                  keyOrPassphrase: key,
+                                );
+                                Logs().d('Successful elfsigned');
+                                await bootstrap.openExistingSsss();
+                              } catch (e, s) {
+                                Logs().w('Unable to unlock SSSS', e, s);
+                                setState(
+                                  () => _recoveryKeyInputError =
+                                      L10n.of(context)!.oopsSomethingWentWrong,
+                                );
+                              } finally {
+                                setState(
+                                  () => _recoveryKeyInputLoading = false,
+                                );
+                              }
+                            },
+                    ),
+                    const SizedBox(height: 16),
+                    Row(
+                      children: [
+                        const Expanded(child: Divider()),
+                        Padding(
+                          padding: const EdgeInsets.all(12.0),
+                          child: Text(L10n.of(context)!.or),
+                        ),
+                        const Expanded(child: Divider()),
+                      ],
+                    ),
                     const SizedBox(height: 16),
                     ElevatedButton.icon(
                       icon: const Icon(Icons.cast_connected_outlined),
@@ -401,11 +414,13 @@ class BootstrapDialogState extends State<BootstrapDialog> {
         case BootstrapState.error:
           titleText = L10n.of(context)!.oopsSomethingWentWrong;
           body = const Icon(Icons.error_outline, color: Colors.red, size: 40);
-          buttons.add(AdaptiveFlatButton(
+          buttons.add(
-            label: L10n.of(context)!.close,
+            AdaptiveFlatButton(
-            onPressed: () =>
+              label: L10n.of(context)!.close,
-                Navigator.of(context, rootNavigator: false).pop<bool>(false),
+              onPressed: () =>
-          ));
+                  Navigator.of(context, rootNavigator: false).pop<bool>(false),
+            ),
+          );
           break;
         case BootstrapState.done:
           titleText = L10n.of(context)!.everythingReady;
@@ -416,11 +431,13 @@ class BootstrapDialogState extends State<BootstrapDialog> {
               Text(L10n.of(context)!.yourChatBackupHasBeenSetUp),
             ],
           );
-          buttons.add(AdaptiveFlatButton(
+          buttons.add(
-            label: L10n.of(context)!.close,
+            AdaptiveFlatButton(
-            onPressed: () =>
+              label: L10n.of(context)!.close,
-                Navigator.of(context, rootNavigator: false).pop<bool>(false),
+              onPressed: () =>
-          ));
+                  Navigator.of(context, rootNavigator: false).pop<bool>(false),
+            ),
+          );
           break;
       }
     }

lib/pages/chat/add_widget_tile.dart

@@ -75,7 +75,8 @@ class AddWidgetTileState extends State<AddWidgetTile> {
       Navigator.of(context).pop();
     } catch (e) {
       ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(L10n.of(context)!.errorAddingWidget)));
+        SnackBar(content: Text(L10n.of(context)!.errorAddingWidget)),
+      );
     }
   }
 

lib/pages/chat/add_widget_tile_view.dart

@@ -26,12 +26,15 @@ class AddWidgetTileView extends StatelessWidget {
             'm.jitsi': Text(L10n.of(context)!.widgetJitsi),
             'm.video': Text(L10n.of(context)!.widgetVideo),
             'm.custom': Text(L10n.of(context)!.widgetCustom),
-          }.map((key, value) => MapEntry(
+          }.map(
+            (key, value) => MapEntry(
               key,
               Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 4.0),
                 child: value,
-              ))),
+              ),
+            ),
+          ),
           onValueChanged: controller.setWidgetType,
         ),
         Padding(

lib/pages/chat/chat.dart

@@ -9,7 +9,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:desktop_drop/desktop_drop.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
-import 'package:file_picker_cross/file_picker_cross.dart';
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:image_picker/image_picker.dart';
@@ -23,6 +23,7 @@ import 'package:fluffychat/pages/chat/chat_view.dart';
 import 'package:fluffychat/pages/chat/event_info_dialog.dart';
 import 'package:fluffychat/pages/chat/recording_dialog.dart';
 import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
+import 'package:fluffychat/utils/error_reporter.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/ios_badge_client_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
@@ -35,25 +36,56 @@ import 'send_file_dialog.dart';
 import 'send_location_dialog.dart';
 import 'sticker_picker_dialog.dart';
 
-class Chat extends StatefulWidget {
+class ChatPage extends StatelessWidget {
   final Widget? sideView;
 
-  const Chat({Key? key, this.sideView}) : super(key: key);
+  const ChatPage({Key? key, this.sideView}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final roomId = context.vRouter.pathParameters['roomid'];
+    final room =
+        roomId == null ? null : Matrix.of(context).client.getRoomById(roomId);
+    if (room == null) {
+      return Scaffold(
+        appBar: AppBar(title: Text(L10n.of(context)!.oopsSomethingWentWrong)),
+        body: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(16),
+            child:
+                Text(L10n.of(context)!.youAreNoLongerParticipatingInThisChat),
+          ),
+        ),
+      );
+    }
+    return ChatPageWithRoom(sideView: sideView, room: room);
+  }
+}
+
+class ChatPageWithRoom extends StatefulWidget {
+  final Widget? sideView;
+  final Room room;
+
+  const ChatPageWithRoom({
+    Key? key,
+    required this.sideView,
+    required this.room,
+  }) : super(key: key);
 
   @override
   ChatController createState() => ChatController();
 }
 
-class ChatController extends State<Chat> {
+class ChatController extends State<ChatPageWithRoom> {
-  Room? room;
+  Room get room => sendingClient.getRoomById(roomId) ?? widget.room;
 
-  Client? sendingClient;
+  late Client sendingClient;
 
   Timeline? timeline;
 
-  MatrixState? matrix;
+  String? readMarkerEventId;
 
-  String? get roomId => context.vRouter.pathParameters['roomid'];
+  String get roomId => widget.room.id;
 
   final AutoScrollController scrollController = AutoScrollController();
 
@@ -82,10 +114,12 @@ class ChatController extends State<Chat> {
 
     final matrixFiles = <MatrixFile>[];
     for (var i = 0; i < bytesList.result!.length; i++) {
-      matrixFiles.add(MatrixFile(
+      matrixFiles.add(
-        bytes: bytesList.result![i],
+        MatrixFile(
-        name: details.files[i].name,
+          bytes: bytesList.result![i],
-      ).detectFileType);
+          name: details.files[i].name,
+        ).detectFileType,
+      );
     }
 
     await showDialog(
@@ -93,7 +127,7 @@ class ChatController extends State<Chat> {
       useRootNavigator: false,
       builder: (c) => SendFileDialog(
         files: matrixFiles,
-        room: room!,
+        room: room,
       ),
     );
   }
@@ -118,7 +152,10 @@ class ChatController extends State<Chat> {
 
   Event? editEvent;
 
-  bool showScrollDownButton = false;
+  bool _scrolledUp = false;
+
+  bool get showScrollDownButton =>
+      _scrolledUp || timeline?.allowNewEvent == false;
 
   bool get selectMode => selectedEvents.isNotEmpty;
 
@@ -128,40 +165,33 @@ class ChatController extends State<Chat> {
 
   String pendingText = '';
 
-  bool get canLoadMore =>
-      timeline!.events.isEmpty ||
-      timeline!.events.last.type != EventTypes.RoomCreate;
-
   bool showEmojiPicker = false;
 
   void recreateChat() async {
     final room = this.room;
-    final userId = room?.directChatMatrixID;
+    final userId = room.directChatMatrixID;
-    if (room == null || userId == null) {
+    if (userId == null) {
       throw Exception(
-          'Try to recreate a room with is not a DM room. This should not be possible from the UI!');
+        'Try to recreate a room with is not a DM room. This should not be possible from the UI!',
+      );
     }
     final success = await showFutureLoadingDialog(
-        context: context,
+      context: context,
-        future: () async {
+      future: () async {
-          final client = room.client;
+        final client = room.client;
-          final waitForSync = client.onSync.stream
+        final waitForSync = client.onSync.stream
-              .firstWhere((s) => s.rooms?.leave?.containsKey(room.id) ?? false);
+            .firstWhere((s) => s.rooms?.leave?.containsKey(room.id) ?? false);
-          await room.leave();
+        await room.leave();
-          await waitForSync;
+        await waitForSync;
-          return await client.startDirectChat(userId);
+        return await client.startDirectChat(userId);
-        });
+      },
+    );
     final roomId = success.result;
     if (roomId == null) return;
     VRouter.of(context).toSegments(['rooms', roomId]);
   }
 
   void leaveChat() async {
-    final room = this.room;
-    if (room == null) {
-      throw Exception(
-          'Leave room button clicked while room is null. This should not be possible from the UI!');
-    }
     final success = await showFutureLoadingDialog(
       context: context,
       future: room.leave,
@@ -173,19 +203,40 @@ class ChatController extends State<Chat> {
   EmojiPickerType emojiPickerType = EmojiPickerType.keyboard;
 
   void requestHistory() async {
-    if (canLoadMore) {
+    if (!timeline!.canRequestHistory) return;
-      try {
+    Logs().v('Requesting history...');
-        await timeline!.requestHistory(historyCount: _loadHistoryCount);
+    try {
-      } catch (err) {
+      await timeline!.requestHistory(historyCount: _loadHistoryCount);
-        ScaffoldMessenger.of(context).showSnackBar(
+    } catch (err) {
-          SnackBar(
+      ScaffoldMessenger.of(context).showSnackBar(
-            content: Text(
+        SnackBar(
-              (err).toLocalizedString(context),
+          content: Text(
-            ),
+            (err).toLocalizedString(context),
           ),
-        );
+        ),
-        rethrow;
+      );
-      }
+      rethrow;
+    }
+  }
+
+  void requestFuture() async {
+    final timeline = this.timeline;
+    if (timeline == null) return;
+    if (!timeline.canRequestFuture) return;
+    Logs().v('Requesting future...');
+    try {
+      final mostRecentEventId = timeline.events.first.eventId;
+      await timeline.requestFuture(historyCount: _loadHistoryCount);
+      setReadMarker(eventId: mostRecentEventId);
+    } catch (err) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(
+            (err).toLocalizedString(context),
+          ),
+        ),
+      );
+      rethrow;
     }
   }
 
@@ -195,18 +246,11 @@ class ChatController extends State<Chat> {
     }
     setReadMarker();
     if (!scrollController.hasClients) return;
-    if (scrollController.position.pixels ==
+    if (timeline?.allowNewEvent == false ||
-            scrollController.position.maxScrollExtent &&
+        scrollController.position.pixels > 0 && _scrolledUp == false) {
-        timeline!.events.isNotEmpty &&
+      setState(() => _scrolledUp = true);
-        timeline!.events[timeline!.events.length - 1].type !=
+    } else if (scrollController.position.pixels == 0 && _scrolledUp == true) {
-            EventTypes.RoomCreate) {
+      setState(() => _scrolledUp = false);
-      requestHistory();
-    }
-    if (scrollController.position.pixels > 0 && showScrollDownButton == false) {
-      setState(() => showScrollDownButton = true);
-    } else if (scrollController.position.pixels == 0 &&
-        showScrollDownButton == true) {
-      setState(() => showScrollDownButton = false);
     }
   }
 
@@ -225,6 +269,12 @@ class ChatController extends State<Chat> {
     inputFocus.addListener(_inputFocusListener);
     _loadDraft();
     super.initState();
+    sendingClient = Matrix.of(context).client;
+    readMarkerEventId = room.fullyRead;
+    loadTimelineFuture =
+        _getTimeline(eventContextId: readMarkerEventId).onError(
+      ErrorReporter(context, 'Unable to load timeline').onErrorCallback,
+    );
   }
 
   void updateView() {
@@ -232,48 +282,84 @@ class ChatController extends State<Chat> {
     setState(() {});
   }
 
-  Future<bool> getTimeline() async {
+  Future<void>? loadTimelineFuture;
-    if (timeline == null) {
-      await Matrix.of(context).client.roomsLoading;
-      await Matrix.of(context).client.accountDataLoading;
-      timeline = await room!.getTimeline(onUpdate: updateView);
-      if (timeline!.events.isNotEmpty) {
-        if (room!.markedUnread) room!.markUnread(false);
-        setReadMarker();
-      }
 
-      // when the scroll controller is attached we want to scroll to an event id, if specified
+  Future<void> _getTimeline({
-      // and update the scroll controller...which will trigger a request history, if the
+    String? eventContextId,
-      // "load more" button is visible on the screen
+    Duration timeout = const Duration(seconds: 7),
-      SchedulerBinding.instance.addPostFrameCallback((_) async {
+  }) async {
-        if (mounted) {
+    await Matrix.of(context).client.roomsLoading;
-          final event = VRouter.of(context).queryParameters['event'];
+    await Matrix.of(context).client.accountDataLoading;
-          if (event != null) {
+    if (eventContextId != null &&
-            scrollToEventId(event);
+        (!eventContextId.isValidMatrixId || eventContextId.sigil != '\$')) {
-          }
+      eventContextId = null;
-          _updateScrollController();
+    }
-        }
+    try {
-      });
+      timeline = await room
+          .getTimeline(
+            onUpdate: updateView,
+            eventContextId: eventContextId,
+          )
+          .timeout(timeout);
+    } catch (e, s) {
+      Logs().w('Unable to load timeline on event ID $eventContextId', e, s);
+      if (!mounted) return;
+      timeline = await room.getTimeline(onUpdate: updateView);
+      if (!mounted) return;
+      if (e is TimeoutException || e is IOException) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(L10n.of(context)!.jumpToLastReadMessage),
+            action: SnackBarAction(
+              label: L10n.of(context)!.jump,
+              onPressed: () => scrollToEventId(eventContextId!),
+            ),
+          ),
+        );
+      }
     }
     timeline!.requestKeys(onlineKeyBackupOnly: false);
-    return true;
+    if (timeline!.events.isNotEmpty) {
+      if (room.markedUnread) room.markUnread(false);
+      setReadMarker();
+    }
+
+    // when the scroll controller is attached we want to scroll to an event id, if specified
+    // and update the scroll controller...which will trigger a request history, if the
+    // "load more" button is visible on the screen
+    SchedulerBinding.instance.addPostFrameCallback((_) async {
+      if (mounted) {
+        final event = VRouter.of(context).queryParameters['event'];
+        if (event != null) {
+          scrollToEventId(event);
+        }
+      }
+    });
+
+    return;
   }
 
   Future<void>? _setReadMarkerFuture;
 
-  void setReadMarker([_]) {
+  void setReadMarker({String? eventId}) {
-    if (_setReadMarkerFuture == null &&
+    if (_setReadMarkerFuture != null) return;
-        (room!.hasNewMessages || room!.notificationCount > 0) &&
+    if (eventId == null &&
-        timeline != null &&
+        !room.hasNewMessages &&
-        timeline!.events.isNotEmpty &&
+        room.notificationCount == 0) {
-        Matrix.of(context).webHasFocus) {
+      return;
-      Logs().v('Set read marker...');
-      // ignore: unawaited_futures
-      _setReadMarkerFuture = timeline!.setReadMarker().then((_) {
-        _setReadMarkerFuture = null;
-      });
-      room!.client.updateIosBadge();
     }
+    if (!Matrix.of(context).webHasFocus) return;
+
+    final timeline = this.timeline;
+    if (timeline == null || timeline.events.isEmpty) return;
+
+    eventId ??= timeline.events.first.eventId;
+    Logs().v('Set read marker...', eventId);
+    // ignore: unawaited_futures
+    _setReadMarkerFuture = timeline.setReadMarker(eventId: eventId).then((_) {
+      _setReadMarkerFuture = null;
+    });
+    room.client.updateIosBadge();
   }
 
   @override
@@ -286,15 +372,24 @@ class ChatController extends State<Chat> {
 
   TextEditingController sendController = TextEditingController();
 
-  void setSendingClient(Client? c) {
+  void setSendingClient(Client c) {
-    // first cancle typing with the old sending client
+    // first cancel typing with the old sending client
     if (currentlyTyping) {
       // no need to have the setting typing to false be blocking
       typingCoolDown?.cancel();
       typingCoolDown = null;
-      room!.setTyping(false);
+      room.setTyping(false);
       currentlyTyping = false;
     }
+    // then cancel the old timeline
+    // fixes bug with read reciepts and quick switching
+    loadTimelineFuture = _getTimeline(eventContextId: room.fullyRead).onError(
+      ErrorReporter(
+        context,
+        'Unable to load timeline after changing sending Client',
+      ).onErrorCallback,
+    );
+
     // then set the new sending client
     setState(() => sendingClient = c);
   }
@@ -312,7 +407,7 @@ class ChatController extends State<Chat> {
 
     final commandMatch = RegExp(r'^\/(\w+)').firstMatch(sendController.text);
     if (commandMatch != null &&
-        !room!.client.commands.keys.contains(commandMatch[1]!.toLowerCase())) {
+        !sendingClient.commands.keys.contains(commandMatch[1]!.toLowerCase())) {
       final l10n = L10n.of(context)!;
       final dialogResult = await showOkCancelAlertDialog(
         context: context,
@@ -327,10 +422,12 @@ class ChatController extends State<Chat> {
     }
 
     // ignore: unawaited_futures
-    room!.sendTextEvent(sendController.text,
+    room.sendTextEvent(
-        inReplyTo: replyEvent,
+      sendController.text,
-        editEventId: editEvent?.eventId,
+      inReplyTo: replyEvent,
-        parseCommands: parseCommands);
+      editEventId: editEvent?.eventId,
+      parseCommands: parseCommands,
+    );
     sendController.value = TextEditingValue(
       text: pendingText,
       selection: const TextSelection.collapsed(offset: 0),
@@ -345,42 +442,49 @@ class ChatController extends State<Chat> {
   }
 
   void sendFileAction() async {
-    final result = await FilePickerCross.importMultipleFromStorage(
+    final result = await FilePicker.platform.pickFiles(
-      type: FileTypeCross.any,
+      allowMultiple: true,
+      withData: true,
     );
-    if (result.isEmpty) return;
+    if (result == null || result.files.isEmpty) return;
     await showDialog(
       context: context,
       useRootNavigator: false,
       builder: (c) => SendFileDialog(
-        files: result
+        files: result.files
-            .map((xfile) => MatrixFile(
+            .map(
-                  bytes: xfile.toUint8List(),
+              (xfile) => MatrixFile(
-                  name: xfile.fileName!,
+                bytes: xfile.bytes!,
-                ).detectFileType)
+                name: xfile.name,
+              ).detectFileType,
+            )
             .toList(),
-        room: room!,
+        room: room,
       ),
     );
   }
 
   void sendImageAction() async {
-    final result = await FilePickerCross.importMultipleFromStorage(
+    final result = await FilePicker.platform.pickFiles(
-      type: FileTypeCross.image,
+      type: FileType.image,
+      withData: true,
+      allowMultiple: true,
     );
-    if (result.isEmpty) return;
+    if (result == null || result.files.isEmpty) return;
 
     await showDialog(
       context: context,
       useRootNavigator: false,
       builder: (c) => SendFileDialog(
-        files: result
+        files: result.files
-            .map((xfile) => MatrixFile(
+            .map(
-                  bytes: xfile.toUint8List(),
+              (xfile) => MatrixFile(
-                  name: xfile.fileName!,
+                bytes: xfile.bytes!,
-                ).detectFileType)
+                name: xfile.name,
+              ).detectFileType,
+            )
             .toList(),
-        room: room!,
+        room: room,
       ),
     );
   }
@@ -401,7 +505,7 @@ class ChatController extends State<Chat> {
             name: file.path,
           )
         ],
-        room: room!,
+        room: room,
       ),
     );
   }
@@ -422,7 +526,7 @@ class ChatController extends State<Chat> {
             name: file.path,
           )
         ],
-        room: room!,
+        room: room,
       ),
     );
   }
@@ -430,7 +534,7 @@ class ChatController extends State<Chat> {
   void sendStickerAction() async {
     final sticker = await showAdaptiveBottomSheet<ImagePackImageContent>(
       context: context,
-      builder: (c) => StickerPickerDialog(room: room!),
+      builder: (c) => StickerPickerDialog(room: room),
     );
     if (sticker == null) return;
     final eventContent = <String, dynamic>{
@@ -439,13 +543,14 @@ class ChatController extends State<Chat> {
       'url': sticker.url.toString(),
     };
     // send the sticker
-    await room!.sendEvent(
+    await room.sendEvent(
       eventContent,
       type: EventTypes.Sticker,
     );
   }
 
   void voiceMessageAction() async {
+    final scaffoldMessenger = ScaffoldMessenger.of(context);
     if (PlatformInfos.isAndroid) {
       final info = await DeviceInfoPlugin().androidInfo;
       if (info.version.sdkInt < 19) {
@@ -472,7 +577,7 @@ class ChatController extends State<Chat> {
       bytes: audioFile.readAsBytesSync(),
       name: audioFile.path,
     );
-    await room!.sendFileEvent(
+    await room.sendFileEvent(
       file,
       inReplyTo: replyEvent,
       extraContent: {
@@ -486,7 +591,16 @@ class ChatController extends State<Chat> {
           'waveform': result.waveform,
         },
       },
-    );
+    ).catchError((e) {
+      scaffoldMessenger.showSnackBar(
+        SnackBar(
+          content: Text(
+            (e as Object).toLocalizedString(context),
+          ),
+        ),
+      );
+      return null;
+    });
     setState(() {
       replyEvent = null;
     });
@@ -513,7 +627,7 @@ class ChatController extends State<Chat> {
     await showDialog(
       context: context,
       useRootNavigator: false,
-      builder: (c) => SendLocationDialog(room: room!),
+      builder: (c) => SendLocationDialog(room: room),
     );
   }
 
@@ -527,8 +641,9 @@ class ChatController extends State<Chat> {
     for (final event in selectedEvents) {
       if (copyString.isNotEmpty) copyString += '\n\n';
       copyString += event.getDisplayEvent(timeline!).calcLocalizedBodyFallback(
-          MatrixLocals(L10n.of(context)!),
+            MatrixLocals(L10n.of(context)!),
-          withSenderNamePrefix: true);
+            withSenderNamePrefix: true,
+          );
     }
     return copyString;
   }
@@ -544,33 +659,35 @@ class ChatController extends State<Chat> {
   void reportEventAction() async {
     final event = selectedEvents.single;
     final score = await showConfirmationDialog<int>(
-        context: context,
+      context: context,
-        title: L10n.of(context)!.reportMessage,
+      title: L10n.of(context)!.reportMessage,
-        message: L10n.of(context)!.howOffensiveIsThisContent,
+      message: L10n.of(context)!.howOffensiveIsThisContent,
-        cancelLabel: L10n.of(context)!.cancel,
+      cancelLabel: L10n.of(context)!.cancel,
-        okLabel: L10n.of(context)!.ok,
+      okLabel: L10n.of(context)!.ok,
-        actions: [
+      actions: [
-          AlertDialogAction(
+        AlertDialogAction(
-            key: -100,
+          key: -100,
-            label: L10n.of(context)!.extremeOffensive,
+          label: L10n.of(context)!.extremeOffensive,
-          ),
+        ),
-          AlertDialogAction(
+        AlertDialogAction(
-            key: -50,
+          key: -50,
-            label: L10n.of(context)!.offensive,
+          label: L10n.of(context)!.offensive,
-          ),
+        ),
-          AlertDialogAction(
+        AlertDialogAction(
-            key: 0,
+          key: 0,
-            label: L10n.of(context)!.inoffensive,
+          label: L10n.of(context)!.inoffensive,
-          ),
+        ),
-        ]);
+      ],
+    );
     if (score == null) return;
     final reason = await showTextInputDialog(
-        useRootNavigator: false,
+      useRootNavigator: false,
-        context: context,
+      context: context,
-        title: L10n.of(context)!.whyDoYouWantToReportThis,
+      title: L10n.of(context)!.whyDoYouWantToReportThis,
-        okLabel: L10n.of(context)!.ok,
+      okLabel: L10n.of(context)!.ok,
-        cancelLabel: L10n.of(context)!.cancel,
+      cancelLabel: L10n.of(context)!.cancel,
-        textFields: [DialogTextField(hintText: L10n.of(context)!.reason)]);
+      textFields: [DialogTextField(hintText: L10n.of(context)!.reason)],
+    );
     if (reason == null || reason.single.isEmpty) return;
     final result = await showFutureLoadingDialog(
       context: context,
@@ -587,7 +704,8 @@ class ChatController extends State<Chat> {
       selectedEvents.clear();
     });
     ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(L10n.of(context)!.contentHasBeenReported)));
+      SnackBar(content: Text(L10n.of(context)!.contentHasBeenReported)),
+    );
   }
 
   void redactEventsAction() async {
@@ -602,25 +720,27 @@ class ChatController extends State<Chat> {
     if (!confirmed) return;
     for (final event in selectedEvents) {
       await showFutureLoadingDialog(
-          context: context,
+        context: context,
-          future: () async {
+        future: () async {
-            if (event.status.isSent) {
+          if (event.status.isSent) {
-              if (event.canRedact) {
+            if (event.canRedact) {
-                await event.redactEvent();
+              await event.redactEvent();
-              } else {
-                final client = currentRoomBundle.firstWhere(
-                    (cl) => selectedEvents.first.senderId == cl!.userID,
-                    orElse: () => null);
-                if (client == null) {
-                  return;
-                }
-                final room = client.getRoomById(roomId!)!;
-                await Event.fromJson(event.toJson(), room).redactEvent();
-              }
             } else {
-              await event.remove();
+              final client = currentRoomBundle.firstWhere(
+                (cl) => selectedEvents.first.senderId == cl!.userID,
+                orElse: () => null,
+              );
+              if (client == null) {
+                return;
+              }
+              final room = client.getRoomById(roomId)!;
+              await Event.fromJson(event.toJson(), room).redactEvent();
             }
-          });
+          } else {
+            await event.remove();
+          }
+        },
+      );
     }
     setState(() {
       showEmojiPicker = false;
@@ -629,14 +749,14 @@ class ChatController extends State<Chat> {
   }
 
   List<Client?> get currentRoomBundle {
-    final clients = matrix!.currentBundle!;
+    final clients = Matrix.of(context).currentBundle!;
-    clients.removeWhere((c) => c!.getRoomById(roomId!) == null);
+    clients.removeWhere((c) => c!.getRoomById(roomId) == null);
     return clients;
   }
 
   bool get canRedactSelectedEvents {
     if (isArchived) return false;
-    final clients = matrix!.currentBundle;
+    final clients = Matrix.of(context).currentBundle;
     for (final event in selectedEvents) {
       if (event.canRedact == false &&
           !(clients!.any((cl) => event.senderId == cl!.userID))) return false;
@@ -691,48 +811,23 @@ class ChatController extends State<Chat> {
   }
 
   void scrollToEventId(String eventId) async {
-    var eventIndex = timeline!.events.indexWhere((e) => e.eventId == eventId);
+    final eventIndex = timeline!.events.indexWhere((e) => e.eventId == eventId);
     if (eventIndex == -1) {
-      // event id not found...maybe we can fetch it?
+      setState(() {
-      // the try...finally is here to start and close the loading dialog reliably
+        timeline = null;
-      await showFutureLoadingDialog(
+        _scrolledUp = false;
-          context: context,
+        loadTimelineFuture = _getTimeline(
-          future: () async {
+          eventContextId: eventId,
-            // okay, we first have to fetch if the event is in the room
+          timeout: const Duration(seconds: 30),
-            try {
+        ).onError(
-              final event = await timeline!.getEventById(eventId);
+          ErrorReporter(context, 'Unable to load timeline after scroll to ID')
-              if (event == null) {
+              .onErrorCallback,
-                // event is null...meaning something is off
+        );
-                return;
+      });
-              }
+      await loadTimelineFuture;
-            } catch (err) {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-              if (err is MatrixException && err.errcode == 'M_NOT_FOUND') {
+        scrollToEventId(eventId);
-                // event wasn't found, as the server gave a 404 or something
+      });
-                return;
-              }
-              rethrow;
-            }
-            // okay, we know that the event *is* in the room
-            while (eventIndex == -1) {
-              if (!canLoadMore) {
-                // we can't load any more events but still haven't found ours yet...better stop here
-                return;
-              }
-              try {
-                await timeline!.requestHistory(historyCount: _loadHistoryCount);
-              } catch (err) {
-                if (err is TimeoutException) {
-                  // loading the history timed out...so let's do nothing
-                  return;
-                }
-                rethrow;
-              }
-              eventIndex =
-                  timeline!.events.indexWhere((e) => e.eventId == eventId);
-            }
-          });
-    }
-    if (!mounted) {
       return;
     }
     await scrollController.scrollToIndex(
@@ -742,7 +837,21 @@ class ChatController extends State<Chat> {
     _updateScrollController();
   }
 
-  void scrollDown() => scrollController.jumpTo(0);
+  void scrollDown() async {
+    if (!timeline!.allowNewEvent) {
+      setState(() {
+        timeline = null;
+        _scrolledUp = false;
+        loadTimelineFuture = _getTimeline().onError(
+          ErrorReporter(context, 'Unable to load timeline after scroll down')
+              .onErrorCallback,
+        );
+      });
+      await loadTimelineFuture;
+      setReadMarker(eventId: timeline!.events.first.eventId);
+    }
+    scrollController.jumpTo(0);
+  }
 
   void onEmojiSelected(_, Emoji? emoji) {
     switch (emojiPickerType) {
@@ -760,15 +869,18 @@ class ChatController extends State<Chat> {
     setState(() => showEmojiPicker = false);
     if (emoji == null) return;
     // make sure we don't send the same emoji twice
-    if (_allReactionEvents
+    if (_allReactionEvents.any(
-        .any((e) => e.content['m.relates_to']['key'] == emoji.emoji)) return;
+      (e) => e.content.tryGetMap('m.relates_to')?['key'] == emoji.emoji,
+    )) {
+      return;
+    }
     return sendEmojiAction(emoji.emoji);
   }
 
   void forgetRoom() async {
     final result = await showFutureLoadingDialog(
       context: context,
-      future: room!.forget,
+      future: room.forget,
     );
     if (result.error != null) return;
     VRouter.of(context).to('/archive');
@@ -801,7 +913,8 @@ class ChatController extends State<Chat> {
         sendController
           ..text = sendController.text.characters.skipLast(1).toString()
           ..selection = TextSelection.fromPosition(
-              TextPosition(offset: sendController.text.length));
+            TextPosition(offset: sendController.text.length),
+          );
         break;
     }
   }
@@ -816,7 +929,7 @@ class ChatController extends State<Chat> {
     final events = List<Event>.from(selectedEvents);
     setState(() => selectedEvents.clear());
     for (final event in events) {
-      await room!.sendReaction(
+      await room.sendReaction(
         event.eventId,
         emoji!,
       );
@@ -836,8 +949,9 @@ class ChatController extends State<Chat> {
 
   void editSelectedEventAction() {
     final client = currentRoomBundle.firstWhere(
-        (cl) => selectedEvents.first.senderId == cl!.userID,
+      (cl) => selectedEvents.first.senderId == cl!.userID,
-        orElse: () => null);
+      orElse: () => null,
+    );
     if (client == null) {
       return;
     }
@@ -845,10 +959,12 @@ class ChatController extends State<Chat> {
     setState(() {
       pendingText = sendController.text;
       editEvent = selectedEvents.first;
-      inputText = sendController.text = editEvent!
+      inputText = sendController.text =
-          .getDisplayEvent(timeline!)
+          editEvent!.getDisplayEvent(timeline!).calcLocalizedBodyFallback(
-          .calcLocalizedBodyFallback(MatrixLocals(L10n.of(context)!),
+                MatrixLocals(L10n.of(context)!),
-              withSenderNamePrefix: false, hideReply: true);
+                withSenderNamePrefix: false,
+                hideReply: true,
+              );
       selectedEvents.clear();
     });
     inputFocus.requestFocus();
@@ -860,7 +976,7 @@ class ChatController extends State<Chat> {
           useRootNavigator: false,
           context: context,
           title: L10n.of(context)!.goToTheNewRoom,
-          message: room!
+          message: room
               .getState(EventTypes.RoomTombstone)!
               .parsedTombstoneContent
               .body,
@@ -871,14 +987,16 @@ class ChatController extends State<Chat> {
     }
     final result = await showFutureLoadingDialog(
       context: context,
-      future: () => room!.client.joinRoom(room!
+      future: () => room.client.joinRoom(
-          .getState(EventTypes.RoomTombstone)!
+        room
-          .parsedTombstoneContent
+            .getState(EventTypes.RoomTombstone)!
-          .replacementRoom),
+            .parsedTombstoneContent
+            .replacementRoom,
+      ),
     );
     await showFutureLoadingDialog(
       context: context,
-      future: room!.leave,
+      future: room.leave,
     );
     if (result.error == null) {
       VRouter.of(context).toSegments(['rooms', result.result!]);
@@ -955,18 +1073,16 @@ class ChatController extends State<Chat> {
       cancelLabel: L10n.of(context)!.cancel,
     );
     if (response == OkCancelResult.ok) {
-      final events = room!.pinnedEventIds
+      final events = room.pinnedEventIds
         ..removeWhere((oldEvent) => oldEvent == eventId);
       showFutureLoadingDialog(
         context: context,
-        future: () => room!.setPinnedEvents(events),
+        future: () => room.setPinnedEvents(events),
       );
     }
   }
 
   void pinEvent() {
-    final room = this.room;
-    if (room == null) return;
     final pinnedEventIds = room.pinnedEventIds;
     final selectedEventIds = selectedEvents.map((e) => e.eventId).toSet();
     final unpin = selectedEventIds.length == 1 &&
@@ -992,7 +1108,7 @@ class ChatController extends State<Chat> {
       await prefs.setString('draft_$roomId', text);
     });
     setReadMarker();
-    if (text.endsWith(' ') && matrix!.hasComplexBundles) {
+    if (text.endsWith(' ') && Matrix.of(context).hasComplexBundles) {
       final clients = currentRoomBundle;
       for (final client in clients) {
         final prefix = client!.sendPrefix;
@@ -1011,7 +1127,7 @@ class ChatController extends State<Chat> {
     typingCoolDown = Timer(const Duration(seconds: 2), () {
       typingCoolDown = null;
       currentlyTyping = false;
-      room!.setTyping(false);
+      room.setTyping(false);
     });
     typingTimeout ??= Timer(const Duration(seconds: 30), () {
       typingTimeout = null;
@@ -1019,14 +1135,13 @@ class ChatController extends State<Chat> {
     });
     if (!currentlyTyping) {
       currentlyTyping = true;
-      room!
+      room.setTyping(true, timeout: const Duration(seconds: 30).inMilliseconds);
-          .setTyping(true, timeout: const Duration(seconds: 30).inMilliseconds);
     }
     setState(() => inputText = text);
   }
 
   bool get isArchived =>
-      {Membership.leave, Membership.ban}.contains(room?.membership);
+      {Membership.leave, Membership.ban}.contains(room.membership);
 
   void showEventInfo([Event? event]) =>
       (event ?? selectedEvents.single).showInfoDialog(context);
@@ -1067,13 +1182,14 @@ class ChatController extends State<Chat> {
     if (callType == null) return;
 
     final success = await showFutureLoadingDialog(
-        context: context,
+      context: context,
-        future: () =>
+      future: () =>
-            Matrix.of(context).voipPlugin!.voip.requestTurnServerCredentials());
+          Matrix.of(context).voipPlugin!.voip.requestTurnServerCredentials(),
+    );
     if (success.result != null) {
       final voipPlugin = Matrix.of(context).voipPlugin;
       try {
-        await voipPlugin!.voip.inviteToCall(room!.id, callType);
+        await voipPlugin!.voip.inviteToCall(room.id, callType);
       } catch (e) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text(e.toLocalizedString(context))),

lib/pages/chat/chat_app_bar_title.dart

@@ -16,9 +16,6 @@ class ChatAppBarTitle extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final room = controller.room;
-    if (room == null) {
-      return Container();
-    }
     if (controller.selectedEvents.isNotEmpty) {
       return Text(controller.selectedEvents.length.toString());
     }

lib/pages/chat/chat_event_list.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
 
@@ -48,6 +47,26 @@ class ChatEventList extends StatelessWidget {
         (BuildContext context, int i) {
           // Footer to display typing indicator and read receipts:
           if (i == 0) {
+            if (controller.timeline!.isRequestingFuture) {
+              return const Center(
+                child: CircularProgressIndicator.adaptive(strokeWidth: 2),
+              );
+            }
+            if (controller.timeline!.canRequestFuture) {
+              return Builder(
+                builder: (context) {
+                  WidgetsBinding.instance.addPostFrameCallback(
+                    (_) => controller.requestFuture(),
+                  );
+                  return Center(
+                    child: IconButton(
+                      onPressed: controller.requestFuture,
+                      icon: const Icon(Icons.refresh_outlined),
+                    ),
+                  );
+                },
+              );
+            }
             return Column(
               mainAxisSize: MainAxisSize.min,
               children: [
@@ -64,18 +83,22 @@ class ChatEventList extends StatelessWidget {
                 child: CircularProgressIndicator.adaptive(strokeWidth: 2),
               );
             }
-            if (controller.canLoadMore) {
+            if (controller.timeline!.canRequestHistory) {
-              Center(
+              return Builder(
-                child: OutlinedButton(
+                builder: (context) {
-                  style: OutlinedButton.styleFrom(
+                  WidgetsBinding.instance.addPostFrameCallback(
-                    backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+                    (_) => controller.requestHistory(),
-                  ),
+                  );
-                  onPressed: controller.requestHistory,
+                  return Center(
-                  child: Text(L10n.of(context)!.loadMore),
+                    child: IconButton(
-                ),
+                      onPressed: controller.requestHistory,
+                      icon: const Icon(Icons.refresh_outlined),
+                    ),
+                  );
+                },
               );
             }
-            return Container();
+            return const SizedBox.shrink();
           }
 
           // The message at this index:
@@ -86,19 +109,20 @@ class ChatEventList extends StatelessWidget {
             index: i - 1,
             controller: controller.scrollController,
             child: event.isVisibleInGui
-                ? Message(event,
+                ? Message(
+                    event,
                     onSwipe: (direction) =>
                         controller.replyAction(replyTo: event),
                     onInfoTab: controller.showEventInfo,
                     onAvatarTab: (Event event) => showAdaptiveBottomSheet(
-                          context: context,
+                      context: context,
-                          builder: (c) => UserBottomSheet(
+                      builder: (c) => UserBottomSheet(
-                            user: event.senderFromMemoryOrFallback,
+                        user: event.senderFromMemoryOrFallback,
-                            outerContext: context,
+                        outerContext: context,
-                            onMention: () => controller.sendController.text +=
+                        onMention: () => controller.sendController.text +=
-                                '${event.senderFromMemoryOrFallback.mention} ',
+                            '${event.senderFromMemoryOrFallback.mention} ',
-                          ),
+                      ),
-                        ),
+                    ),
                     onSelect: controller.onSelectMessage,
                     scrollToEventId: (String eventId) =>
                         controller.scrollToEventId(eventId),
@@ -106,10 +130,14 @@ class ChatEventList extends StatelessWidget {
                     selected: controller.selectedEvents
                         .any((e) => e.eventId == event.eventId),
                     timeline: controller.timeline!,
+                    displayReadMarker:
+                        controller.readMarkerEventId == event.eventId &&
+                            controller.timeline?.allowNewEvent == false,
                     nextEvent: i < controller.timeline!.events.length
                         ? controller.timeline!.events[i]
-                        : null)
+                        : null,
-                : Container(),
+                  )
+                : const SizedBox.shrink(),
           );
         },
         childCount: controller.timeline!.events.length + 2,

lib/pages/chat/chat_input_row.dart

@@ -23,7 +23,7 @@ class ChatInputRow extends StatelessWidget {
   Widget build(BuildContext context) {
     if (controller.showEmojiPicker &&
         controller.emojiPickerType == EmojiPickerType.reaction) {
-      return Container();
+      return const SizedBox.shrink();
     }
     return Row(
       crossAxisAlignment: CrossAxisAlignment.end,
@@ -72,7 +72,7 @@ class ChatInputRow extends StatelessWidget {
                             ),
                           ),
                         )
-                  : Container(),
+                  : const SizedBox.shrink(),
             ]
           : <Widget>[
               KeyBoardShortcuts(
@@ -146,7 +146,7 @@ class ChatInputRow extends StatelessWidget {
                             contentPadding: const EdgeInsets.all(0),
                           ),
                         ),
-                      if (controller.room!
+                      if (controller.room
                           .getImagePacks(ImagePackUsage.sticker)
                           .isNotEmpty)
                         PopupMenuItem<String>(
@@ -215,9 +215,9 @@ class ChatInputRow extends StatelessWidget {
                   ),
                 ),
               ),
-              if (controller.matrix!.isMultiAccount &&
+              if (Matrix.of(context).isMultiAccount &&
-                  controller.matrix!.hasComplexBundles &&
+                  Matrix.of(context).hasComplexBundles &&
-                  controller.matrix!.currentBundle!.length > 1)
+                  Matrix.of(context).currentBundle!.length > 1)
                 Container(
                   height: 56,
                   alignment: Alignment.center,
@@ -227,7 +227,7 @@ class ChatInputRow extends StatelessWidget {
                 child: Padding(
                   padding: const EdgeInsets.symmetric(vertical: 4.0),
                   child: InputBar(
-                    room: controller.room!,
+                    room: controller.room,
                     minLines: 1,
                     maxLines: 8,
                     autofocus: !PlatformInfos.isMobile,
@@ -279,8 +279,9 @@ class _ChatAccountPicker extends StatelessWidget {
 
   const _ChatAccountPicker(this.controller, {Key? key}) : super(key: key);
 
-  void _popupMenuButtonSelected(String mxid) {
+  void _popupMenuButtonSelected(String mxid, BuildContext context) {
-    final client = controller.matrix!.currentBundle!
+    final client = Matrix.of(context)
+        .currentBundle!
         .firstWhere((cl) => cl!.userID == mxid, orElse: () => null);
     if (client == null) {
       Logs().w('Attempted to switch to a non-existing client $mxid');
@@ -291,37 +292,37 @@ class _ChatAccountPicker extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    controller.matrix ??= Matrix.of(context);
     final clients = controller.currentRoomBundle;
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: FutureBuilder<Profile>(
-        future: controller.sendingClient!.fetchOwnProfile(),
+        future: controller.sendingClient.fetchOwnProfile(),
         builder: (context, snapshot) => PopupMenuButton<String>(
-          onSelected: _popupMenuButtonSelected,
+          onSelected: (mxid) => _popupMenuButtonSelected(mxid, context),
           itemBuilder: (BuildContext context) => clients
-              .map((client) => PopupMenuItem<String>(
+              .map(
-                    value: client!.userID,
+                (client) => PopupMenuItem<String>(
-                    child: FutureBuilder<Profile>(
+                  value: client!.userID,
-                      future: client.fetchOwnProfile(),
+                  child: FutureBuilder<Profile>(
-                      builder: (context, snapshot) => ListTile(
+                    future: client.fetchOwnProfile(),
-                        leading: Avatar(
+                    builder: (context, snapshot) => ListTile(
-                          mxContent: snapshot.data?.avatarUrl,
+                      leading: Avatar(
-                          name: snapshot.data?.displayName ??
+                        mxContent: snapshot.data?.avatarUrl,
-                              client.userID!.localpart,
+                        name: snapshot.data?.displayName ??
-                          size: 20,
+                            client.userID!.localpart,
-                        ),
+                        size: 20,
-                        title:
-                            Text(snapshot.data?.displayName ?? client.userID!),
-                        contentPadding: const EdgeInsets.all(0),
                       ),
+                      title: Text(snapshot.data?.displayName ?? client.userID!),
+                      contentPadding: const EdgeInsets.all(0),
                     ),
-                  ))
+                  ),
+                ),
+              )
               .toList(),
           child: Avatar(
             mxContent: snapshot.data?.avatarUrl,
             name: snapshot.data?.displayName ??
-                controller.matrix!.client.userID!.localpart,
+                Matrix.of(context).client.userID!.localpart,
             size: 20,
           ),
         ),

lib/pages/chat/chat_view.dart

@@ -49,11 +49,12 @@ class ChatView extends StatelessWidget {
         if (controller.canSaveSelectedEvent)
           // Use builder context to correctly position the share dialog on iPad
           Builder(
-              builder: (context) => IconButton(
+            builder: (context) => IconButton(
-                    icon: Icon(Icons.adaptive.share),
+              icon: Icon(Icons.adaptive.share),
-                    tooltip: L10n.of(context)!.share,
+              tooltip: L10n.of(context)!.share,
-                    onPressed: () => controller.saveSelectedEvent(context),
+              onPressed: () => controller.saveSelectedEvent(context),
-                  )),
+            ),
+          ),
         if (controller.canRedactSelectedEvents)
           IconButton(
             icon: const Icon(Icons.delete_outlined),
@@ -124,41 +125,27 @@ class ChatView extends StatelessWidget {
     } else {
       return [
         if (Matrix.of(context).voipPlugin != null &&
-            controller.room!.isDirectChat)
+            controller.room.isDirectChat)
           IconButton(
             onPressed: controller.onPhoneButtonTap,
             icon: const Icon(Icons.call_outlined),
             tooltip: L10n.of(context)!.placeCall,
           ),
-        EncryptionButton(controller.room!),
+        EncryptionButton(controller.room),
-        ChatSettingsPopupMenu(controller.room!, !controller.room!.isDirectChat),
+        ChatSettingsPopupMenu(controller.room, !controller.room.isDirectChat),
       ];
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    controller.matrix ??= Matrix.of(context);
+    if (controller.room.membership == Membership.invite) {
-    final client = controller.matrix!.client;
+      showFutureLoadingDialog(
-    controller.sendingClient ??= client;
+        context: context,
-    controller.room = controller.sendingClient!.getRoomById(controller.roomId!);
+        future: () => controller.room.join(),
-    if (controller.room == null) {
-      return Scaffold(
-        appBar: AppBar(
-          title: Text(L10n.of(context)!.oopsSomethingWentWrong),
-        ),
-        body: Center(
-          child: Text(L10n.of(context)!.youAreNoLongerParticipatingInThisChat),
-        ),
       );
     }
-
-    if (controller.room!.membership == Membership.invite) {
-      showFutureLoadingDialog(
-          context: context, future: () => controller.room!.join());
-    }
     final bottomSheetPadding = FluffyThemes.isColumnMode(context) ? 16.0 : 8.0;
-    final colorScheme = Theme.of(context).colorScheme;
 
     return VWidgetGuard(
       onSystemPop: (redirector) async {
@@ -171,13 +158,13 @@ class ChatView extends StatelessWidget {
         }
       },
       child: GestureDetector(
-        onTapDown: controller.setReadMarker,
+        onTapDown: (_) => controller.setReadMarker(),
         behavior: HitTestBehavior.opaque,
         child: StreamBuilder(
-          stream: controller.room!.onUpdate.stream
+          stream: controller.room.onUpdate.stream
               .rateLimit(const Duration(seconds: 1)),
-          builder: (context, snapshot) => FutureBuilder<bool>(
+          builder: (context, snapshot) => FutureBuilder(
-            future: controller.getTimeline(),
+            future: controller.loadTimelineFuture,
             builder: (BuildContext context, snapshot) {
               return Scaffold(
                 appBar: AppBar(
@@ -195,7 +182,7 @@ class ChatView extends StatelessWidget {
                           color: Theme.of(context).colorScheme.primary,
                         )
                       : UnreadRoomsBadge(
-                          filter: (r) => r.id != controller.roomId!,
+                          filter: (r) => r.id != controller.roomId,
                           badgePosition: BadgePosition.topEnd(end: 8, top: 4),
                           child: const Center(child: BackButton()),
                         ),
@@ -209,6 +196,7 @@ class ChatView extends StatelessWidget {
                         padding: const EdgeInsets.only(bottom: 56.0),
                         child: FloatingActionButton(
                           onPressed: controller.scrollDown,
+                          heroTag: null,
                           mini: true,
                           child: const Icon(Icons.arrow_downward_outlined),
                         ),
@@ -231,14 +219,9 @@ class ChatView extends StatelessWidget {
                       else
                         Container(
                           decoration: BoxDecoration(
-                            gradient: LinearGradient(
+                            gradient: FluffyThemes.backgroundGradient(
-                              begin: Alignment.topCenter,
+                              context,
-                              colors: [
+                              64,
-                                colorScheme.primaryContainer.withAlpha(64),
-                                colorScheme.secondaryContainer.withAlpha(64),
-                                colorScheme.tertiaryContainer.withAlpha(64),
-                                colorScheme.primaryContainer.withAlpha(64),
-                              ],
                             ),
                           ),
                         ),
@@ -249,24 +232,27 @@ class ChatView extends StatelessWidget {
                             PinnedEvents(controller),
                             Expanded(
                               child: GestureDetector(
-                                  onTap: controller.clearSingleSelectedEvent,
+                                onTap: controller.clearSingleSelectedEvent,
-                                  child: Builder(
+                                child: Builder(
-                                    builder: (context) {
+                                  builder: (context) {
-                                      if (controller.timeline == null) {
+                                    if (controller.timeline == null) {
-                                        return const Center(
+                                      return const Center(
-                                          child: CircularProgressIndicator
+                                        child:
-                                              .adaptive(strokeWidth: 2),
+                                            CircularProgressIndicator.adaptive(
-                                        );
+                                          strokeWidth: 2,
-                                      }
+                                        ),
-
-                                      return ChatEventList(
-                                        controller: controller,
                                       );
-                                    },
+                                    }
-                                  )),
+
+                                    return ChatEventList(
+                                      controller: controller,
+                                    );
+                                  },
+                                ),
+                              ),
                             ),
-                            if (controller.room!.canSendDefaultMessages &&
+                            if (controller.room.canSendDefaultMessages &&
-                                controller.room!.membership == Membership.join)
+                                controller.room.membership == Membership.join)
                               Container(
                                 margin: EdgeInsets.only(
                                   bottom: bottomSheetPadding,
@@ -274,7 +260,8 @@ class ChatView extends StatelessWidget {
                                   right: bottomSheetPadding,
                                 ),
                                 constraints: const BoxConstraints(
-                                    maxWidth: FluffyThemes.columnWidth * 2.5),
+                                  maxWidth: FluffyThemes.columnWidth * 2.5,
+                                ),
                                 alignment: Alignment.center,
                                 child: Material(
                                   borderRadius: const BorderRadius.only(
@@ -290,7 +277,7 @@ class ChatView extends StatelessWidget {
                                           Brightness.light
                                       ? Colors.white
                                       : Colors.black,
-                                  child: controller.room?.isAbandonedDMRoom ==
+                                  child: controller.room.isAbandonedDMRoom ==
                                           true
                                       ? Row(
                                           mainAxisAlignment:
@@ -319,12 +306,13 @@ class ChatView extends StatelessWidget {
                                                     const EdgeInsets.all(16),
                                               ),
                                               icon: const Icon(
-                                                Icons.chat_outlined,
+                                                Icons.forum_outlined,
                                               ),
                                               onPressed:
                                                   controller.recreateChat,
                                               label: Text(
-                                                  L10n.of(context)!.reopenChat),
+                                                L10n.of(context)!.reopenChat,
+                                              ),
                                             ),
                                           ],
                                         )

lib/pages/chat/edit_widgets_dialog.dart

@@ -15,15 +15,18 @@ class EditWidgetsDialog extends StatelessWidget {
     return SimpleDialog(
       title: Text(L10n.of(context)!.editWidgets),
       children: [
-        ...room.widgets.map((e) => ListTile(
+        ...room.widgets.map(
-              title: Text(e.name ?? e.type),
+          (e) => ListTile(
-              leading: IconButton(
+            title: Text(e.name ?? e.type),
-                  onPressed: () {
+            leading: IconButton(
-                    room.deleteWidget(e.id!);
+              onPressed: () {
-                    Navigator.of(context).pop();
+                room.deleteWidget(e.id!);
-                  },
+                Navigator.of(context).pop();
-                  icon: const Icon(Icons.delete)),
+              },
-            )),
+              icon: const Icon(Icons.delete),
+            ),
+          ),
+        ),
         AddWidgetTile(room: room),
       ],
     );

lib/pages/chat/encryption_button.dart

@@ -13,34 +13,36 @@ class EncryptionButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return StreamBuilder<SyncUpdate>(
-        stream: Matrix.of(context)
+      stream: Matrix.of(context)
-            .client
+          .client
-            .onSync
+          .onSync
-            .stream
+          .stream
-            .where((s) => s.deviceLists != null),
+          .where((s) => s.deviceLists != null),
-        builder: (context, snapshot) {
+      builder: (context, snapshot) {
-          return FutureBuilder<EncryptionHealthState>(
+        return FutureBuilder<EncryptionHealthState>(
-              future: room.calcEncryptionHealthState(),
+          future: room.encrypted
-              builder: (BuildContext context, snapshot) => IconButton(
+              ? room.calcEncryptionHealthState()
-                    tooltip: room.encrypted
+              : Future.value(EncryptionHealthState.allVerified),
-                        ? L10n.of(context)!.encrypted
+          builder: (BuildContext context, snapshot) => IconButton(
-                        : L10n.of(context)!.encryptionNotEnabled,
+            tooltip: room.encrypted
-                    icon: Icon(
+                ? L10n.of(context)!.encrypted
-                        room.encrypted
+                : L10n.of(context)!.encryptionNotEnabled,
-                            ? Icons.lock_outlined
+            icon: Icon(
-                            : Icons.lock_open_outlined,
+              room.encrypted ? Icons.lock_outlined : Icons.lock_open_outlined,
-                        size: 20,
+              size: 20,
-                        color: room.joinRules != JoinRules.public &&
+              color: room.joinRules != JoinRules.public && !room.encrypted
-                                !room.encrypted
+                  ? Colors.red
-                            ? Colors.red
+                  : room.joinRules != JoinRules.public &&
-                            : room.joinRules != JoinRules.public &&
+                          snapshot.data ==
-                                    snapshot.data ==
+                              EncryptionHealthState.unverifiedDevices
-                                        EncryptionHealthState.unverifiedDevices
+                      ? Colors.orange
-                                ? Colors.orange
+                      : null,
-                                : null),
+            ),
-                    onPressed: () => VRouter.of(context)
+            onPressed: () => VRouter.of(context)
-                        .toSegments(['rooms', room.id, 'encryption']),
+                .toSegments(['rooms', room.id, 'encryption']),
-                  ));
+          ),
-        });
+        );
+      },
+    );
   }
 }

lib/pages/chat/event_info_dialog.dart

@@ -54,7 +54,8 @@ class EventInfoDialog extends StatelessWidget {
             ),
             title: Text(L10n.of(context)!.sender),
             subtitle: Text(
-                '${event.senderFromMemoryOrFallback.calcDisplayname()} [${event.senderId}]'),
+              '${event.senderFromMemoryOrFallback.calcDisplayname()} [${event.senderId}]',
+            ),
           ),
           ListTile(
             title: Text(L10n.of(context)!.time),

lib/pages/chat/events/audio_player.dart

@@ -1,14 +1,15 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:matrix/matrix.dart';
 import 'package:path_provider/path_provider.dart';
 
 import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/utils/error_reporter.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
 import '../../../utils/matrix_sdk_extensions/event_extension.dart';
 
@@ -31,7 +32,7 @@ enum AudioPlayerStatus { notDownloaded, downloading, downloaded }
 
 class AudioPlayerState extends State<AudioPlayerWidget> {
   AudioPlayerStatus status = AudioPlayerStatus.notDownloaded;
-  final AudioPlayer audioPlayer = AudioPlayer();
+  AudioPlayer? audioPlayer;
 
   StreamSubscription? onAudioPositionChanged;
   StreamSubscription? onDurationChanged;
@@ -42,12 +43,13 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
   int currentPosition = 0;
   double maxPosition = 0;
 
+  MatrixFile? matrixFile;
   File? audioFile;
 
   @override
   void dispose() {
-    if (audioPlayer.playerState.playing) {
+    if (audioPlayer?.playerState.playing == true) {
-      audioPlayer.stop();
+      audioPlayer?.stop();
     }
     onAudioPositionChanged?.cancel();
     onDurationChanged?.cancel();
@@ -62,14 +64,20 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
     setState(() => status = AudioPlayerStatus.downloading);
     try {
       final matrixFile = await widget.event.downloadAndDecryptAttachment();
-      final tempDir = await getTemporaryDirectory();
+      File? file;
-      final fileName = Uri.encodeComponent(
+
-          widget.event.attachmentOrThumbnailMxcUrl()!.pathSegments.last);
+      if (!kIsWeb) {
-      final file = File('${tempDir.path}/${fileName}_${matrixFile.name}');
+        final tempDir = await getTemporaryDirectory();
-      await file.writeAsBytes(matrixFile.bytes);
+        final fileName = Uri.encodeComponent(
+          widget.event.attachmentOrThumbnailMxcUrl()!.pathSegments.last,
+        );
+        file = File('${tempDir.path}/${fileName}_${matrixFile.name}');
+        await file.writeAsBytes(matrixFile.bytes);
+      }
 
       setState(() {
         audioFile = file;
+        this.matrixFile = matrixFile;
         status = AudioPlayerStatus.downloaded;
       });
       _playAction();
@@ -84,6 +92,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
   }
 
   void _playAction() async {
+    final audioPlayer = this.audioPlayer ??= AudioPlayer();
     if (AudioPlayerWidget.currentId != widget.event.eventId) {
       if (AudioPlayerWidget.currentId != null) {
         if (audioPlayer.playerState.playing) {
@@ -117,15 +126,16 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
     });
     onPlayerStateChanged ??=
         audioPlayer.playingStream.listen((_) => setState(() {}));
-    audioPlayer.setFilePath(audioFile!.path);
+    final audioFile = this.audioFile;
-    audioPlayer.play().catchError((e, s) {
+    if (audioFile != null) {
-      ScaffoldMessenger.of(context).showSnackBar(
+      audioPlayer.setFilePath(audioFile.path);
-        SnackBar(
+    } else {
-          content: Text(L10n.of(context)!.oopsSomethingWentWrong),
+      await audioPlayer.setAudioSource(MatrixFileAudioSource(matrixFile!));
-        ),
+    }
-      );
+    audioPlayer.play().onError(
-      Logs().w('Error while playing audio', e, s);
+          ErrorReporter(context, 'Unable to play audio message')
-    });
+              .onErrorCallback,
+        );
   }
 
   static const double buttonSize = 36;
@@ -188,7 +198,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
                       color: widget.color.withAlpha(64),
                       borderRadius: BorderRadius.circular(64),
                       child: Icon(
-                        audioPlayer.playerState.playing
+                        audioPlayer?.playerState.playing == true
                             ? Icons.pause_outlined
                             : Icons.play_arrow_outlined,
                         color: widget.color,
@@ -211,23 +221,27 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
                 for (var i = 0; i < AudioPlayerWidget.wavesCount; i++)
                   Expanded(
                     child: InkWell(
-                      onTap: () => audioPlayer.seek(Duration(
+                      onTap: () => audioPlayer?.seek(
+                        Duration(
                           milliseconds:
                               (maxPosition / AudioPlayerWidget.wavesCount)
                                       .round() *
-                                  i)),
+                                  i,
+                        ),
+                      ),
                       child: Container(
                         height: 32,
                         alignment: Alignment.center,
                         child: Opacity(
                           opacity: currentPosition > i ? 1 : 0.5,
                           child: Container(
-                              margin: const EdgeInsets.symmetric(horizontal: 1),
+                            margin: const EdgeInsets.symmetric(horizontal: 1),
-                              decoration: BoxDecoration(
+                            decoration: BoxDecoration(
-                                color: widget.color,
+                              color: widget.color,
-                                borderRadius: BorderRadius.circular(64),
+                              borderRadius: BorderRadius.circular(64),
-                              ),
+                            ),
-                              height: 32 * (waveform[i] / 1024)),
+                            height: 32 * (waveform[i] / 1024),
+                          ),
                         ),
                       ),
                     ),
@@ -251,3 +265,22 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
     );
   }
 }
+
+/// To use a MatrixFile as an AudioSource for the just_audio package
+class MatrixFileAudioSource extends StreamAudioSource {
+  final MatrixFile file;
+  MatrixFileAudioSource(this.file);
+
+  @override
+  Future<StreamAudioResponse> request([int? start, int? end]) async {
+    start ??= 0;
+    end ??= file.bytes.length;
+    return StreamAudioResponse(
+      sourceLength: file.bytes.length,
+      contentLength: end - start,
+      offset: start,
+      stream: Stream.value(file.bytes.sublist(start, end)),
+      contentType: file.mimeType,
+    );
+  }
+}

lib/pages/chat/events/cute_events.dart

@@ -36,19 +36,16 @@ class _CuteContentState extends State<CuteContent> {
 
         return GestureDetector(
           onTap: addOverlay,
-          child: SizedBox.square(
+          child: Column(
-            dimension: 300,
+            mainAxisSize: MainAxisSize.min,
-            child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
-              mainAxisSize: MainAxisSize.min,
+            children: [
-              mainAxisAlignment: MainAxisAlignment.center,
+              Text(
-              children: [
+                widget.event.text,
-                Text(
+                style: const TextStyle(fontSize: 150),
-                  widget.event.text,
+              ),
-                  style: const TextStyle(fontSize: 150),
+              if (label != null) Text(label)
-                ),
+            ],
-                if (label != null) Text(label)
-              ],
-            ),
           ),
         );
       },
@@ -144,24 +141,26 @@ class _CuteEventOverlayState extends State<CuteEventOverlay>
           return SizedBox(
             height: constraints.maxHeight,
             width: constraints.maxWidth,
-            child: Stack(
+            child: OverflowBox(
-              alignment: Alignment.bottomLeft,
+              child: Stack(
-              fit: StackFit.expand,
+                alignment: Alignment.bottomLeft,
-              children: items
+                fit: StackFit.expand,
-                  .map(
+                children: items
-                    (position) => Positioned(
+                    .map(
-                      left: position.width * width,
+                      (position) => Positioned(
-                      bottom: (height *
+                        left: position.width * width,
-                              .25 *
+                        bottom: (height *
-                              position.height *
+                                .25 *
-                              (controller?.value ?? 0)) -
+                                position.height *
-                          _CuteOverlayContent.size,
+                                (controller?.value ?? 0)) -
-                      child: _CuteOverlayContent(
+                            _CuteOverlayContent.size,
-                        emoji: widget.emoji,
+                        child: _CuteOverlayContent(
+                          emoji: widget.emoji,
+                        ),
                       ),
-                    ),
+                    )
-                  )
+                    .toList(),
-                  .toList(),
+              ),
             ),
           );
         },

lib/pages/chat/events/html_message.dart

@@ -1,32 +1,29 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:collection/collection.dart';
-import 'package:flutter_matrix_html/flutter_html.dart';
+import 'package:flutter_highlighter/flutter_highlighter.dart';
+import 'package:flutter_highlighter/themes/shades-of-purple.dart';
+import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_html_table/flutter_html_table.dart';
+import 'package:flutter_math_fork/flutter_math.dart';
+import 'package:linkify/linkify.dart';
 import 'package:matrix/matrix.dart';
 
-import 'package:fluffychat/widgets/matrix.dart';
+import 'package:fluffychat/config/app_config.dart';
-import '../../../config/app_config.dart';
+import 'package:fluffychat/widgets/avatar.dart';
-import '../../../config/setting_keys.dart';
+import 'package:fluffychat/widgets/mxc_image.dart';
-import '../../../pages/image_viewer/image_viewer.dart';
-import '../../../utils/matrix_sdk_extensions/matrix_locals.dart';
 import '../../../utils/url_launcher.dart';
 
 class HtmlMessage extends StatelessWidget {
   final String html;
-  final int? maxLines;
   final Room room;
-  final TextStyle? defaultTextStyle;
+  final Color textColor;
-  final TextStyle? linkStyle;
-  final double? emoteSize;
 
   const HtmlMessage({
     Key? key,
     required this.html,
-    this.maxLines,
     required this.room,
-    this.defaultTextStyle,
+    this.textColor = Colors.black,
-    this.linkStyle,
-    this.emoteSize,
   }) : super(key: key);
 
   @override
@@ -38,113 +35,470 @@ class HtmlMessage extends StatelessWidget {
     // miss-matching tags, and this way we actually correctly identify what we want to strip and, well,
     // strip it.
     final renderHtml = html.replaceAll(
-        RegExp('<mx-reply>.*</mx-reply>',
+      RegExp(
-            caseSensitive: false, multiLine: false, dotAll: true),
+        '<mx-reply>.*</mx-reply>',
-        '');
+        caseSensitive: false,
+        multiLine: false,
+        dotAll: true,
+      ),
+      '',
+    );
+
+    final fontSize = AppConfig.messageFontSize * AppConfig.fontSizeFactor;
+
+    final linkifiedRenderHtml = linkify(
+      renderHtml,
+      options: const LinkifyOptions(humanize: false),
+    )
+        .map(
+          (element) {
+            if (element is! UrlElement ||
+                element.text.contains('<') ||
+                element.text.contains('>') ||
+                element.text.contains('"')) {
+              return element.text;
+            }
+            return '<a href="${element.url}">${element.text}</a>';
+          },
+        )
+        .join('')
+        .replaceAll('\n', '');
+
+    final linkColor = textColor.withAlpha(150);
 
     // there is no need to pre-validate the html, as we validate it while rendering
-
-    final matrix = Matrix.of(context);
-
-    final themeData = Theme.of(context);
     return Html(
-      data: renderHtml,
+      data: linkifiedRenderHtml,
-      defaultTextStyle: defaultTextStyle,
+      style: {
-      emoteSize: emoteSize,
+        '*': Style(
-      linkStyle: linkStyle ??
+          color: textColor,
-          themeData.textTheme.bodyMedium!.copyWith(
+          margin: Margins.all(0),
-            color: themeData.colorScheme.secondary,
+          fontSize: FontSize(fontSize),
-            decoration: TextDecoration.underline,
+        ),
+        'a': Style(color: linkColor, textDecorationColor: linkColor),
+        'h1': Style(
+          fontSize: FontSize(fontSize * 2),
+          lineHeight: LineHeight.number(1.5),
+          fontWeight: FontWeight.w600,
+        ),
+        'h2': Style(
+          fontSize: FontSize(fontSize * 1.75),
+          lineHeight: LineHeight.number(1.5),
+          fontWeight: FontWeight.w500,
+        ),
+        'h3': Style(
+          fontSize: FontSize(fontSize * 1.5),
+          lineHeight: LineHeight.number(1.5),
+        ),
+        'h4': Style(
+          fontSize: FontSize(fontSize * 1.25),
+          lineHeight: LineHeight.number(1.5),
+        ),
+        'h5': Style(
+          fontSize: FontSize(fontSize * 1.25),
+          lineHeight: LineHeight.number(1.5),
+        ),
+        'h6': Style(
+          fontSize: FontSize(fontSize),
+          lineHeight: LineHeight.number(1.5),
+        ),
+        'blockquote': Style(
+          border: Border(
+            left: BorderSide(
+              width: 3,
+              color: textColor,
+            ),
           ),
-      shrinkToFit: true,
+          padding: HtmlPaddings.only(left: 6, bottom: 0),
-      maxLines: maxLines,
+        ),
-      onLinkTap: (url) => UrlLauncher(context, url).launchUrl(),
+        'hr': Style(
-      onPillTap: (url) => UrlLauncher(context, url).launchUrl(),
+          border: Border.all(color: textColor, width: 0.5),
-      getMxcUrl: (String mxc, double? width, double? height,
+        ),
-          {bool? animated = false}) {
+        'table': Style(
-        final ratio = MediaQuery.of(context).devicePixelRatio;
+          border: Border.all(color: textColor, width: 0.5),
-        return Uri.parse(mxc)
+        ),
-            .getThumbnail(
+        'tr': Style(
-              matrix.client,
+          border: Border.all(color: textColor, width: 0.5),
-              width: (width ?? 800) * ratio,
+        ),
-              height: (height ?? 800) * ratio,
+        'td': Style(
-              method: ThumbnailMethod.scale,
+          border: Border.all(color: textColor, width: 0.5),
-              animated: AppConfig.autoplayImages ? animated : false,
+          padding: HtmlPaddings.all(2),
-            )
+        ),
-            .toString();
+        'th': Style(
+          border: Border.all(color: textColor, width: 0.5),
+        ),
       },
-      onImageTap: (String mxc) => showDialog(
+      extensions: [
-          context: Matrix.of(context).navigatorContext,
+        RoomPillExtension(context, room),
-          useRootNavigator: false,
+        CodeExtension(fontSize: fontSize),
-          builder: (_) => ImageViewer(Event(
+        MatrixMathExtension(
-              type: EventTypes.Message,
+          style: TextStyle(fontSize: fontSize, color: textColor),
-              content: <String, dynamic>{
+        ),
-                'body': mxc,
+        const TableHtmlExtension(),
-                'url': mxc,
+        SpoilerExtension(textColor: textColor),
-                'msgtype': MessageTypes.Image,
+        const ImageExtension(),
-              },
+        FontColorExtension(),
-              senderId: room.client.userID!,
+      ],
-              originServerTs: DateTime.now(),
+      onLinkTap: (url, _, __) => UrlLauncher(context, url).launchUrl(),
-              eventId: 'fake_event',
+      onlyRenderTheseTags: const {
-              room: room))),
+        ...allowedHtmlTags,
-      setCodeLanguage: (String key, String value) async {
+        // Needed to make it work properly
-        await matrix.store.setItem('${SettingKeys.codeLanguage}.$key', value);
+        'body',
-      },
+        'html',
-      getCodeLanguage: (String key) async {
-        return await matrix.store.getItem('${SettingKeys.codeLanguage}.$key');
-      },
-      getPillInfo: (String url) async {
-        final identityParts = url.parseIdentifierIntoParts();
-        final identifier = identityParts?.primaryIdentifier;
-        if (identifier == null) {
-          return {};
-        }
-        if (identifier.sigil == '@') {
-          // we have a user pill
-          final user = room.getState('m.room.member', identifier);
-          if (user != null) {
-            return user.content;
-          }
-          // there might still be a profile...
-          final profile = await room.client.getProfileFromUserId(identifier);
-          return {
-            'displayname': profile.displayName,
-            'avatar_url': profile.avatarUrl.toString(),
-          };
-        }
-        if (identifier.sigil == '#') {
-          // we have an alias pill
-          for (final r in room.client.rooms) {
-            final state = r.getState('m.room.canonical_alias');
-            if (state != null &&
-                ((state.content['alias'] is String &&
-                        state.content['alias'] == identifier) ||
-                    (state.content['alt_aliases'] is List &&
-                        state.content['alt_aliases'].contains(identifier)))) {
-              // we have a room!
-              return {
-                'displayname':
-                    r.getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)),
-                'avatar_url': r.getState('m.room.avatar')?.content['url'],
-              };
-            }
-          }
-          return {};
-        }
-        if (identifier.sigil == '!') {
-          // we have a room ID pill
-          final r = room.client.getRoomById(identifier);
-          if (r == null) {
-            return {};
-          }
-          return {
-            'displayname':
-                r.getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)),
-            'avatar_url': r.getState('m.room.avatar')?.content['url'],
-          };
-        }
-        return {};
       },
+      shrinkWrap: true,
+    );
+  }
+
+  /// Keep in sync with: https://spec.matrix.org/v1.6/client-server-api/#mroommessage-msgtypes
+  static const Set<String> allowedHtmlTags = {
+    'font',
+    'del',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'blockquote',
+    'p',
+    'a',
+    'ul',
+    'ol',
+    'sup',
+    'sub',
+    'li',
+    'b',
+    'i',
+    'u',
+    'strong',
+    'em',
+    'strike',
+    'code',
+    'hr',
+    'br',
+    'div',
+    'table',
+    'thead',
+    'tbody',
+    'tr',
+    'th',
+    'td',
+    'caption',
+    'pre',
+    'span',
+    'img',
+    'details',
+    'summary',
+    // Not in the allowlist of the matrix spec yet but should be harmless:
+    'ruby',
+    'rp',
+    'rt',
+  };
+}
+
+class FontColorExtension extends HtmlExtension {
+  static const String colorAttribute = 'color';
+  static const String mxColorAttribute = 'data-mx-color';
+  static const String bgColorAttribute = 'data-mx-bg-color';
+
+  @override
+  Set<String> get supportedTags => {'font', 'span'};
+
+  @override
+  bool matches(ExtensionContext context) {
+    if (!supportedTags.contains(context.elementName)) return false;
+    return context.element?.attributes.keys.any(
+          {
+            colorAttribute,
+            mxColorAttribute,
+            bgColorAttribute,
+          }.contains,
+        ) ??
+        false;
+  }
+
+  Color? hexToColor(String? hexCode) {
+    if (hexCode == null) return null;
+    if (hexCode.startsWith('#')) hexCode = hexCode.substring(1);
+    if (hexCode.length == 6) hexCode = 'FF$hexCode';
+    final colorValue = int.tryParse(hexCode, radix: 16);
+    return colorValue == null ? null : Color(colorValue);
+  }
+
+  @override
+  InlineSpan build(
+    ExtensionContext context,
+  ) {
+    final colorText = context.element?.attributes[colorAttribute] ??
+        context.element?.attributes[mxColorAttribute];
+    final bgColor = context.element?.attributes[bgColorAttribute];
+    return TextSpan(
+      style: TextStyle(
+        color: hexToColor(colorText),
+        backgroundColor: hexToColor(bgColor),
+      ),
+      text: context.innerHtml,
+    );
+  }
+}
+
+class ImageExtension extends HtmlExtension {
+  final double defaultDimension;
+
+  const ImageExtension({this.defaultDimension = 64});
+
+  @override
+  Set<String> get supportedTags => {'img'};
+
+  @override
+  InlineSpan build(ExtensionContext context) {
+    final mxcUrl = Uri.tryParse(context.attributes['src'] ?? '');
+    if (mxcUrl == null || mxcUrl.scheme != 'mxc') {
+      return TextSpan(text: context.attributes['alt']);
+    }
+
+    final width = double.tryParse(context.attributes['width'] ?? '');
+    final height = double.tryParse(context.attributes['height'] ?? '');
+
+    return WidgetSpan(
+      child: SizedBox(
+        width: width ?? height ?? defaultDimension,
+        height: height ?? width ?? defaultDimension,
+        child: MxcImage(
+          uri: mxcUrl,
+          width: width ?? height ?? defaultDimension,
+          height: height ?? width ?? defaultDimension,
+          cacheKey: mxcUrl.toString(),
+        ),
+      ),
+    );
+  }
+}
+
+class SpoilerExtension extends HtmlExtension {
+  final Color textColor;
+
+  const SpoilerExtension({required this.textColor});
+
+  @override
+  Set<String> get supportedTags => {'span'};
+
+  static const String customDataAttribute = 'data-mx-spoiler';
+
+  @override
+  bool matches(ExtensionContext context) {
+    if (context.elementName != 'span') return false;
+    return context.element?.attributes.containsKey(customDataAttribute) ??
+        false;
+  }
+
+  @override
+  InlineSpan build(ExtensionContext context) {
+    var obscure = true;
+    final children = context.inlineSpanChildren;
+    return WidgetSpan(
+      child: StatefulBuilder(
+        builder: (context, setState) {
+          return InkWell(
+            onTap: () => setState(() {
+              obscure = !obscure;
+            }),
+            child: RichText(
+              text: TextSpan(
+                style: obscure ? TextStyle(backgroundColor: textColor) : null,
+                children: children,
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class MatrixMathExtension extends HtmlExtension {
+  final TextStyle? style;
+
+  MatrixMathExtension({this.style});
+  @override
+  Set<String> get supportedTags => {'div'};
+
+  @override
+  bool matches(ExtensionContext context) {
+    if (context.elementName != 'div') return false;
+    final mathData = context.element?.attributes['data-mx-maths'];
+    return mathData != null;
+  }
+
+  @override
+  InlineSpan build(ExtensionContext context) {
+    final data = context.element?.attributes['data-mx-maths'] ?? '';
+    return WidgetSpan(
+      child: Math.tex(
+        data,
+        textStyle: style,
+        onErrorFallback: (e) {
+          Logs().d('Flutter math parse error', e);
+          return Text(
+            data,
+            style: style,
+          );
+        },
+      ),
+    );
+  }
+}
+
+class CodeExtension extends HtmlExtension {
+  final double fontSize;
+
+  CodeExtension({required this.fontSize});
+  @override
+  Set<String> get supportedTags => {'code'};
+
+  @override
+  InlineSpan build(ExtensionContext context) => WidgetSpan(
+        child: Material(
+          clipBehavior: Clip.hardEdge,
+          borderRadius: BorderRadius.circular(4),
+          child: SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
+            child: HighlightView(
+              context.element?.text ?? '',
+              language: context.element?.className
+                      .split(' ')
+                      .singleWhereOrNull(
+                        (className) => className.startsWith('language-'),
+                      )
+                      ?.split('language-')
+                      .last ??
+                  'md',
+              theme: shadesOfPurpleTheme,
+              padding: EdgeInsets.symmetric(
+                horizontal: 6,
+                vertical: context.element?.parent?.localName == 'pre' ? 6 : 0,
+              ),
+              textStyle: TextStyle(fontSize: fontSize),
+            ),
+          ),
+        ),
+      );
+}
+
+class RoomPillExtension extends HtmlExtension {
+  final Room room;
+  final BuildContext context;
+
+  RoomPillExtension(this.context, this.room);
+  @override
+  Set<String> get supportedTags => {'a'};
+
+  @override
+  bool matches(ExtensionContext context) {
+    if (context.elementName != 'a') return false;
+    final userId = context.element?.attributes['href']
+        ?.parseIdentifierIntoParts()
+        ?.primaryIdentifier;
+    return userId != null;
+  }
+
+  static final _cachedUsers = <String, User?>{};
+
+  Future<User?> _fetchUser(String matrixId) async =>
+      _cachedUsers[room.id + matrixId] ??= await room.requestUser(matrixId);
+
+  @override
+  InlineSpan build(ExtensionContext context) {
+    final href = context.element?.attributes['href'];
+    final matrixId = href?.parseIdentifierIntoParts()?.primaryIdentifier;
+    if (href == null || matrixId == null) {
+      return TextSpan(text: context.innerHtml);
+    }
+    if (matrixId.sigil == '@') {
+      return WidgetSpan(
+        child: FutureBuilder<User?>(
+          future: _fetchUser(matrixId),
+          builder: (context, snapshot) => MatrixPill(
+            key: Key('user_pill_$matrixId'),
+            name: _cachedUsers[room.id + matrixId]?.calcDisplayname() ??
+                matrixId.localpart ??
+                matrixId,
+            avatar: _cachedUsers[room.id + matrixId]?.avatarUrl,
+            uri: href,
+            outerContext: this.context,
+          ),
+        ),
+      );
+    }
+    if (matrixId.sigil == '#' || matrixId.sigil == '!') {
+      final room = matrixId.sigil == '!'
+          ? this.room.client.getRoomById(matrixId)
+          : this.room.client.getRoomByAlias(matrixId);
+      if (room != null) {
+        return WidgetSpan(
+          child: MatrixPill(
+            name: room.getLocalizedDisplayname(),
+            avatar: room.avatar,
+            uri: href,
+            outerContext: this.context,
+          ),
+        );
+      }
+    }
+
+    return TextSpan(text: context.innerHtml);
+  }
+}
+
+class MatrixPill extends StatelessWidget {
+  final String name;
+  final BuildContext outerContext;
+  final Uri? avatar;
+  final String uri;
+
+  const MatrixPill({
+    super.key,
+    required this.name,
+    required this.outerContext,
+    this.avatar,
+    required this.uri,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: UrlLauncher(outerContext, uri).launchUrl,
+      child: Material(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(AppConfig.borderRadius),
+          side: BorderSide(
+            color: Theme.of(outerContext).colorScheme.onPrimaryContainer,
+            width: 0.5,
+          ),
+        ),
+        color: Theme.of(outerContext).colorScheme.primaryContainer,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 6.0),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Avatar(
+                mxContent: avatar,
+                name: name,
+                size: 16,
+              ),
+              const SizedBox(width: 6),
+              Text(
+                name,
+                style: TextStyle(
+                  color: Theme.of(outerContext).colorScheme.onPrimaryContainer,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }

lib/pages/chat/events/message.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 import 'package:swipe_to_action/swipe_to_action.dart';
 
@@ -18,6 +19,7 @@ import 'verification_request_content.dart';
 class Message extends StatelessWidget {
   final Event event;
   final Event? nextEvent;
+  final bool displayReadMarker;
   final void Function(Event)? onSelect;
   final void Function(Event)? onAvatarTab;
   final void Function(Event)? onInfoTab;
@@ -27,18 +29,20 @@ class Message extends StatelessWidget {
   final bool selected;
   final Timeline timeline;
 
-  const Message(this.event,
+  const Message(
-      {this.nextEvent,
+    this.event, {
-      this.longPressSelect = false,
+    this.nextEvent,
-      this.onSelect,
+    this.displayReadMarker = false,
-      this.onInfoTab,
+    this.longPressSelect = false,
-      this.onAvatarTab,
+    this.onSelect,
-      this.scrollToEventId,
+    this.onInfoTab,
-      required this.onSwipe,
+    this.onAvatarTab,
-      this.selected = false,
+    this.scrollToEventId,
-      required this.timeline,
+    required this.onSwipe,
-      Key? key})
+    this.selected = false,
-      : super(key: key);
+    required this.timeline,
+    Key? key,
+  }) : super(key: key);
 
   /// Indicates wheither the user may use a mouse instead
   /// of touchscreen.
@@ -53,7 +57,7 @@ class Message extends StatelessWidget {
       EventTypes.CallInvite
     }.contains(event.type)) {
       if (event.type.startsWith('m.call.')) {
-        return Container();
+        return const SizedBox.shrink();
       }
       return StateMessage(event);
     }
@@ -126,13 +130,15 @@ class Message extends StatelessWidget {
                     height: 16 * AppConfig.bubbleSizeFactor,
                     child: event.status == EventStatus.sending
                         ? const CircularProgressIndicator.adaptive(
-                            strokeWidth: 2)
+                            strokeWidth: 2,
+                          )
                         : event.status == EventStatus.error
                             ? const Icon(Icons.error, color: Colors.red)
                             : null,
                   ),
                 ),
-              ))
+              ),
+            )
           : FutureBuilder<User?>(
               future: event.fetchSenderUser(),
               builder: (context, snapshot) {
@@ -142,7 +148,8 @@ class Message extends StatelessWidget {
                   name: user.calcDisplayname(),
                   onTap: () => onAvatarTab!(event),
                 );
-              }),
+              },
+            ),
       Expanded(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -171,7 +178,8 @@ class Message extends StatelessWidget {
                                   : displayname.lightColorText),
                             ),
                           );
-                        }),
+                        },
+                      ),
               ),
             Container(
               alignment: alignment,
@@ -198,7 +206,8 @@ class Message extends StatelessWidget {
                         ? EdgeInsets.zero
                         : EdgeInsets.all(16 * AppConfig.bubbleSizeFactor),
                     constraints: const BoxConstraints(
-                        maxWidth: FluffyThemes.columnWidth * 1.5),
+                      maxWidth: FluffyThemes.columnWidth * 1.5,
+                    ),
                     child: Stack(
                       children: <Widget>[
                         Column(
@@ -233,11 +242,14 @@ class Message extends StatelessWidget {
                                     child: AbsorbPointer(
                                       child: Container(
                                         margin: EdgeInsets.symmetric(
-                                            vertical: 4.0 *
+                                          vertical:
-                                                AppConfig.bubbleSizeFactor),
+                                              4.0 * AppConfig.bubbleSizeFactor,
-                                        child: ReplyContent(replyEvent,
+                                        ),
-                                            ownMessage: ownMessage,
+                                        child: ReplyContent(
-                                            timeline: timeline),
+                                          replyEvent,
+                                          ownMessage: ownMessage,
+                                          timeline: timeline,
+                                        ),
                                       ),
                                     ),
                                   );
@@ -249,10 +261,13 @@ class Message extends StatelessWidget {
                               onInfoTab: onInfoTab,
                             ),
                             if (event.hasAggregatedEvents(
-                                timeline, RelationshipTypes.edit))
+                              timeline,
+                              RelationshipTypes.edit,
+                            ))
                               Padding(
                                 padding: EdgeInsets.only(
-                                    top: 4.0 * AppConfig.bubbleSizeFactor),
+                                  top: 4.0 * AppConfig.bubbleSizeFactor,
+                                ),
                                 child: Row(
                                   mainAxisSize: MainAxisSize.min,
                                   children: [
@@ -291,7 +306,8 @@ class Message extends StatelessWidget {
     Widget container;
     if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction) ||
         displayTime ||
-        selected) {
+        selected ||
+        displayReadMarker) {
       container = Column(
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment:
@@ -301,26 +317,29 @@ class Message extends StatelessWidget {
             Padding(
               padding: displayTime
                   ? EdgeInsets.symmetric(
-                      vertical: 8.0 * AppConfig.bubbleSizeFactor)
+                      vertical: 8.0 * AppConfig.bubbleSizeFactor,
+                    )
                   : EdgeInsets.zero,
               child: Center(
-                  child: Material(
+                child: Material(
-                color: displayTime
+                  color: displayTime
-                    ? Theme.of(context).colorScheme.background
+                      ? Theme.of(context).colorScheme.background
-                    : Theme.of(context)
+                      : Theme.of(context)
-                        .colorScheme
+                          .colorScheme
-                        .background
+                          .background
-                        .withOpacity(0.33),
+                          .withOpacity(0.33),
-                borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
+                  borderRadius:
-                clipBehavior: Clip.antiAlias,
+                      BorderRadius.circular(AppConfig.borderRadius / 2),
-                child: Padding(
+                  clipBehavior: Clip.antiAlias,
-                  padding: const EdgeInsets.all(6.0),
+                  child: Padding(
-                  child: Text(
+                    padding: const EdgeInsets.all(6.0),
-                    event.originServerTs.localizedTime(context),
+                    child: Text(
-                    style: TextStyle(fontSize: 14 * AppConfig.fontSizeFactor),
+                      event.originServerTs.localizedTime(context),
+                      style: TextStyle(fontSize: 14 * AppConfig.fontSizeFactor),
+                    ),
                   ),
                 ),
-              )),
+              ),
             ),
           row,
           if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction))
@@ -332,6 +351,35 @@ class Message extends StatelessWidget {
               ),
               child: MessageReactions(event, timeline),
             ),
+          if (displayReadMarker)
+            Row(
+              children: [
+                Expanded(
+                  child: Divider(color: Theme.of(context).colorScheme.primary),
+                ),
+                Container(
+                  decoration: BoxDecoration(
+                    border: Border.all(
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
+                    color: Theme.of(context).colorScheme.primaryContainer,
+                    borderRadius: BorderRadius.circular(4),
+                  ),
+                  margin: const EdgeInsets.all(8.0),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 8,
+                  ),
+                  child: Text(
+                    L10n.of(context)!.readUpToHere,
+                    style:
+                        TextStyle(color: Theme.of(context).colorScheme.primary),
+                  ),
+                ),
+                Expanded(
+                  child: Divider(color: Theme.of(context).colorScheme.primary),
+                ),
+              ],
+            ),
         ],
       );
     } else {

lib/pages/chat/events/message_content.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:matrix/matrix.dart';
-import 'package:matrix_link_text/link_text.dart';
 
 import 'package:fluffychat/pages/chat/events/video_player.dart';
 import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
@@ -27,21 +27,27 @@ class MessageContent extends StatelessWidget {
   final Color textColor;
   final void Function(Event)? onInfoTab;
 
-  const MessageContent(this.event,
+  const MessageContent(
-      {this.onInfoTab, Key? key, required this.textColor})
+    this.event, {
-      : super(key: key);
+    this.onInfoTab,
+    Key? key,
+    required this.textColor,
+  }) : super(key: key);
 
   void _verifyOrRequestKey(BuildContext context) async {
     final l10n = L10n.of(context)!;
     if (event.content['can_request_session'] != true) {
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
           content: Text(
-        event.type == EventTypes.Encrypted
+            event.type == EventTypes.Encrypted
-            ? l10n.needPantalaimonWarning
+                ? l10n.needPantalaimonWarning
-            : event.calcLocalizedBodyFallback(
+                : event.calcLocalizedBodyFallback(
-                MatrixLocals(l10n),
+                    MatrixLocals(l10n),
-              ),
+                  ),
-      )));
+          ),
+        ),
+      );
       return;
     }
     final client = Matrix.of(context).client;
@@ -113,11 +119,12 @@ class MessageContent extends StatelessWidget {
           case CuteEventContent.eventType:
             return CuteContent(event);
           case MessageTypes.Audio:
-            if (PlatformInfos.isMobile || PlatformInfos.isMacOS
+            if (PlatformInfos.isMobile ||
-                // || latformInfos.isLinux
+                    PlatformInfos.isMacOS ||
-                // disabled until
+                    PlatformInfos.isWeb
-                // https://github.com/bleonard252/just_audio_mpv/issues/3 is
+                // Disabled until https://github.com/bleonard252/just_audio_mpv/issues/3
-                // fixed
+                // is fixed
+                //   || PlatformInfos.isLinux
                 ) {
               return AudioPlayerWidget(
                 event,
@@ -143,22 +150,10 @@ class MessageContent extends StatelessWidget {
               if (event.messageType == MessageTypes.Emote) {
                 html = '* $html';
               }
-              final bigEmotes = event.onlyEmotes &&
-                  event.numberEmotes > 0 &&
-                  event.numberEmotes <= 10;
               return HtmlMessage(
                 html: html,
-                defaultTextStyle: TextStyle(
+                textColor: textColor,
-                  color: textColor,
-                  fontSize: bigEmotes ? fontSize * 3 : fontSize,
-                ),
-                linkStyle: TextStyle(
-                  color: textColor.withAlpha(150),
-                  fontSize: bigEmotes ? fontSize * 3 : fontSize,
-                  decoration: TextDecoration.underline,
-                ),
                 room: event.room,
-                emoteSize: bigEmotes ? fontSize * 3 : fontSize * 1.5,
               );
             }
             // else we fall through to the normal message rendering
@@ -211,72 +206,84 @@ class MessageContent extends StatelessWidget {
           default:
             if (event.redacted) {
               return FutureBuilder<User?>(
-                  future: event.redactedBecause?.fetchSenderUser(),
+                future: event.redactedBecause?.fetchSenderUser(),
-                  builder: (context, snapshot) {
+                builder: (context, snapshot) {
-                    return _ButtonContent(
+                  return _ButtonContent(
-                      label: L10n.of(context)!.redactedAnEvent(snapshot.data
+                    label: L10n.of(context)!.redactedAnEvent(
-                              ?.calcDisplayname() ??
+                      snapshot.data?.calcDisplayname() ??
-                          event.senderFromMemoryOrFallback.calcDisplayname()),
+                          event.senderFromMemoryOrFallback.calcDisplayname(),
-                      icon: const Icon(Icons.delete_outlined),
+                    ),
-                      textColor: buttonTextColor,
+                    icon: const Icon(Icons.delete_outlined),
-                      onPressed: () => onInfoTab!(event),
+                    textColor: buttonTextColor,
-                    );
+                    onPressed: () => onInfoTab!(event),
-                  });
+                  );
+                },
+              );
             }
             final bigEmotes = event.onlyEmotes &&
                 event.numberEmotes > 0 &&
                 event.numberEmotes <= 10;
             return FutureBuilder<String>(
-                future: event.calcLocalizedBody(MatrixLocals(L10n.of(context)!),
+              future: event.calcLocalizedBody(
-                    hideReply: true),
+                MatrixLocals(L10n.of(context)!),
-                builder: (context, snapshot) {
+                hideReply: true,
-                  return LinkText(
+              ),
-                    text: snapshot.data ??
+              builder: (context, snapshot) {
-                        event.calcLocalizedBodyFallback(
+                return Linkify(
-                            MatrixLocals(L10n.of(context)!),
+                  text: snapshot.data ??
-                            hideReply: true),
+                      event.calcLocalizedBodyFallback(
-                    textStyle: TextStyle(
+                        MatrixLocals(L10n.of(context)!),
-                      color: textColor,
+                        hideReply: true,
-                      fontSize: bigEmotes ? fontSize * 3 : fontSize,
+                      ),
-                      decoration:
+                  style: TextStyle(
-                          event.redacted ? TextDecoration.lineThrough : null,
+                    color: textColor,
-                    ),
+                    fontSize: bigEmotes ? fontSize * 3 : fontSize,
-                    linkStyle: TextStyle(
+                    decoration:
-                      color: textColor.withAlpha(150),
+                        event.redacted ? TextDecoration.lineThrough : null,
-                      fontSize: bigEmotes ? fontSize * 3 : fontSize,
+                  ),
-                      decoration: TextDecoration.underline,
+                  options: const LinkifyOptions(humanize: false),
-                    ),
+                  linkStyle: TextStyle(
-                    onLinkTap: (url) => UrlLauncher(context, url).launchUrl(),
+                    color: textColor.withAlpha(150),
-                  );
+                    fontSize: bigEmotes ? fontSize * 3 : fontSize,
-                });
+                    decoration: TextDecoration.underline,
+                    decorationColor: textColor.withAlpha(150),
+                  ),
+                  onOpen: (url) => UrlLauncher(context, url.url).launchUrl(),
+                );
+              },
+            );
         }
       case EventTypes.CallInvite:
         return FutureBuilder<User?>(
-            future: event.fetchSenderUser(),
+          future: event.fetchSenderUser(),
-            builder: (context, snapshot) {
+          builder: (context, snapshot) {
-              return _ButtonContent(
+            return _ButtonContent(
-                label: L10n.of(context)!.startedACall(
+              label: L10n.of(context)!.startedACall(
-                    snapshot.data?.calcDisplayname() ??
+                snapshot.data?.calcDisplayname() ??
-                        event.senderFromMemoryOrFallback.calcDisplayname()),
+                    event.senderFromMemoryOrFallback.calcDisplayname(),
-                icon: const Icon(Icons.phone_outlined),
+              ),
-                textColor: buttonTextColor,
+              icon: const Icon(Icons.phone_outlined),
-                onPressed: () => onInfoTab!(event),
+              textColor: buttonTextColor,
-              );
+              onPressed: () => onInfoTab!(event),
-            });
+            );
+          },
+        );
       default:
         return FutureBuilder<User?>(
-            future: event.fetchSenderUser(),
+          future: event.fetchSenderUser(),
-            builder: (context, snapshot) {
+          builder: (context, snapshot) {
-              return _ButtonContent(
+            return _ButtonContent(
-                label: L10n.of(context)!.userSentUnknownEvent(
+              label: L10n.of(context)!.userSentUnknownEvent(
-                    snapshot.data?.calcDisplayname() ??
+                snapshot.data?.calcDisplayname() ??
-                        event.senderFromMemoryOrFallback.calcDisplayname(),
+                    event.senderFromMemoryOrFallback.calcDisplayname(),
-                    event.type),
+                event.type,
-                icon: const Icon(Icons.info_outlined),
+              ),
-                textColor: buttonTextColor,
+              icon: const Icon(Icons.info_outlined),
-                onPressed: () => onInfoTab!(event),
+              textColor: buttonTextColor,
-              );
+              onPressed: () => onInfoTab!(event),
-            });
+            );
+          },
+        );
     }
   }
 }

lib/pages/chat/events/message_download_content.dart

@@ -37,14 +37,17 @@ class MessageDownloadContent extends StatelessWidget {
                   color: textColor,
                 ),
                 const SizedBox(width: 16),
-                Text(
+                Flexible(
-                  filename,
+                  child: Text(
-                  maxLines: 1,
+                    filename,
-                  style: TextStyle(
+                    maxLines: 1,
-                    color: textColor,
+                    style: TextStyle(
-                    fontWeight: FontWeight.bold,
+                      color: textColor,
+                      fontWeight: FontWeight.bold,
+                    ),
+                    overflow: TextOverflow.ellipsis,
                   ),
-                ),
+                )
               ],
             ),
           ),