diff --git a/Makefile b/Makefile index 21c3bf4..e2f261b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable +.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns -.PHONY: clean undo_setup fixup +.PHONY: clean CFGDIR ?= configs/sc @@ -60,15 +60,19 @@ icns: element-desktop/build/icon.icns element-desktop/build/dmg.icns regenerate-i18n: setup ./regenerate_i18n.sh +reskindex: setup + $(YARN) --cwd matrix-react-sdk reskindex + $(YARN) --cwd element-web reskindex + web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION) -web: setup +web: setup reskindex cp $(CFGDIR)/config.json element-web/ $(YARN) --cwd element-web dist echo "$(VERSION)" > element-web/webapp/version desktop-common: web $(YARN) --cwd element-desktop run fetch --cfgdir '' - SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native + $(YARN) --cwd element-desktop run build:native macos-common: web icns $(YARN) --cwd element-desktop run fetch --cfgdir '' @@ -166,11 +170,3 @@ clean: rm -rf element-web/dist rm -rf local-pkgbuild rm -f bom.lock - -undo_setup: - rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak - -fixup: undo_setup - make setup - make clean - make setup diff --git a/README.md b/README.md index 9b1ea85..12a7bb2 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,9 @@ SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop). The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are: -- Customizable room list style (compact single line, intermediate and roomy with two line preview) -- Option to show direct and group chats in a combined list -- Improved theming options +- A unified chat list for both direct and group chats - Message bubbles +- Bigger items in the room list - … and more! Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop) @@ -52,9 +51,9 @@ some dependencies might not be recent enough to build SchildiChat. The following are the dependencies required to build SchildiChat Web/Desktop on Debian 11 (bullseye): ``` -# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl +# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools -# curl -sL https://deb.nodesource.com/setup_16.x | bash - +# curl -sL https://deb.nodesource.com/setup_14.x | bash - # apt update # apt install nodejs diff --git a/element-desktop b/element-desktop index 6649063..0ee1a2a 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 66490633aab37e120a68c8e0e895dfdb6a583f29 +Subproject commit 0ee1a2ad165615e6c3e15a2bbde7f3895977cef8 diff --git a/element-web b/element-web index 8ed0e54..b4f26a6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8ed0e546a9cdae94b58e154d8d3fbd404220bf72 +Subproject commit b4f26a6c52c76b4a6139051470820b41066ff289 diff --git a/generate_changelog.sh b/generate_changelog.sh deleted file mode 100755 index 3bca794..0000000 --- a/generate_changelog.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -set -e - -mydir="$(dirname "$(realpath "$0")")" - -pushd "$mydir" > /dev/null - -source ./merge_helpers.sh - -# Check branch -check_branch $branch -forall_repos check_branch $branch - -# Ensure clean git state -forall_repos check_clean_git - -# Fetch upstream -forall_repos git fetch origin > /dev/null -forall_repos git fetch upstream > /dev/null - -( - # Add new line below git log: https://unix.stackexchange.com/a/345558 - - get_latest_upstream_tag - forelement_repos git log --pretty=format:"- %s" "sc" "^$latest_upstream_tag" "^master" \ - | printf '%s\n' "$(cat)" \ - | sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \ - | sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|" - - get_current_mxsdk_tags - - pushd "matrix-js-sdk" > /dev/null - git log --pretty=format:"- %s" "sc" "^$current_mxjssdk_tag" "^master" \ - | printf '%s\n' "$(cat)" \ - | grep -v "Merge .*tag" - popd > /dev/null - - pushd "matrix-react-sdk" > /dev/null - git log --pretty=format:"- %s" "sc" "^$current_mxreactsdk_tag" "^master" \ - | printf '%s\n' "$(cat)" \ - | grep -v "Merge .*tag" - popd > /dev/null -) \ - | grep -v "Automatic i18n reversion" \ - | grep -v "Automatic package.json reversion" \ - | grep -v "Merge .*branch" \ - | grep -v "Automatic theme update" \ - | grep -v "Automatic package.json adjustment" \ - | grep -v "Automatic i18n adjustment" \ - | grep -v "Update version to .*-sc\\..*" \ - | grep -v "\\.sh" \ - | grep -v "\\.md" \ - | grep -v "Added translation using Weblate" \ - | grep -v "Translated using Weblate" \ - | grep -v "weblate/sc" \ - | grep -v "\\[.*merge.*\\]" \ - | awk '!seen[$0]++' `# https://stackoverflow.com/a/1444448` \ - || echo "No significant changes since the last stable release" - -popd > /dev/null diff --git a/i18n-overlays/element-desktop/tr.json b/i18n-overlays/element-desktop/tr.json deleted file mode 100644 index f1a952b..0000000 --- a/i18n-overlays/element-desktop/tr.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Show": "Göster" -} diff --git a/i18n-overlays/element-web/tr.json b/i18n-overlays/element-web/tr.json deleted file mode 100644 index 0967ef4..0000000 --- a/i18n-overlays/element-web/tr.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index 861e944..f4e03bb 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -43,12 +43,5 @@ "Mark as read": "Označit jako přečtené", "Enable YouTube embed player": "Povolí vložený přehrávač YouTube", "Collapse additional buttons": "Sbalit další tlačítka", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti.", - "Corners": "Rohy", - "Round": "Oblé", - "Extra round": "Kulaté", - "Mixed": "Smíšené", - "Sound pack": "Balíček zvuků", - "Schildi: Softer sounds for reduced anxiety": "Schildi: Jemnější zvuky pro snížení úzkosti", - "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element" + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti." } diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index d7d2ed2..02c1ee5 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -143,13 +143,5 @@ "Mark as read": "Als gelesen markieren", "Mark as unread": "Als ungelesen markieren", "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren", - "Collapse additional buttons": "Zusätzliche Buttons einklappen", - "Round": "Rund", - "Mixed": "Gemischt", - "Corners": "Ecken", - "Extra round": "Extra rund", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst.", - "Classic: The same sharp sounds as Element": "Klassisch: Die gleichen scharfen Geräusche wie in Element", - "Sound pack": "Geräuschpaket", - "Schildi: Softer sounds for reduced anxiety": "Schildi: Sanftere Klänge für weniger Angstgefühle" + "Collapse additional buttons": "Zusätzliche Buttons einklappen" } diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 7732df7..8d07295 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -42,12 +42,5 @@ "Mark as read": "Mark as read", "Enable YouTube embed player": "Enable YouTube embed player", "Collapse additional buttons": "Collapse additional buttons", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.", - "Corners": "Corners", - "Round": "Round", - "Extra round": "Extra round", - "Mixed": "Mixed", - "Sound pack": "Sound pack", - "Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety", - "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element" + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms." } diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index c0d5cbb..a986a4d 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -42,12 +42,5 @@ "Mark as read": "Tandai sebagai dibaca", "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat", "Collapse additional buttons": "Sembunyikan tombol tambahan", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan.", - "Corners": "Sudut", - "Round": "Bulat", - "Extra round": "Ekstra bulat", - "Mixed": "Campur", - "Sound pack": "Paket suara", - "Schildi: Softer sounds for reduced anxiety": "Schildi: Suara lebih lembut untuk mengurangi kecemasan", - "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element" + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan." } diff --git a/i18n-overlays/matrix-react-sdk/lt.json b/i18n-overlays/matrix-react-sdk/lt.json index 7013517..2b32484 100644 --- a/i18n-overlays/matrix-react-sdk/lt.json +++ b/i18n-overlays/matrix-react-sdk/lt.json @@ -17,37 +17,5 @@ "In group chats": "Pokalbių grupėse", "In public rooms": "Viešuose kambariuose", "Show all rooms in Home": "Rodyti visus kambarius Pradžioje", - "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje.", - "Hide advanced theme settings": "Slėpti išplėstinius temos nustatymus", - "Show advanced theme settings": "Rodyti išplėstinius temos nustatymus", - "Theme": "Tema", - "Font size and typeface": "Šrifto dydis ir raštas", - "Show message bubbles depending on the width either on both sides or only on one side": "Rodyti žinučių burbulus, priklausomai nuo pločio, abiejose pusėse arba tik vienoje pusėje", - "Sound pack": "Garso paketas", - "Schildi: Softer sounds for reduced anxiety": "Schildi: švelnesni garsai sumažintam nerimui", - "Classic: The same sharp sounds as Element": "Klasikiniai: Tie patys aštrūs garsai kaip ir Element", - "Enable YouTube embed player": "Įgalinti YouTube įterptą grotuvą", - "Add custom theme": "Pridėti pasirinktinę temą", - "Mark as unread": "Žymėti kaip neskaitytą", - "Mark as read": "Žymėti kaip perskaitytą", - "User name color mode": "Naudotojo vardo spalvų režimas", - "Uniform": "Vienodi", - "Show notification badges for People in Spaces": "Rodyti pranešimų ženkliukus žmonėms erdvėse", - "Return to the room previously opened in a space": "Grįžti į anksčiau atidarytą kambarį erdvėje", - "If disabled, the space overview will be shown when switching to another space.": "Jei išjungta, perjungiant į kitą erdvę bus rodoma erdvės apžvalga.", - "Room list style": "Kambarių sąrašo stilius", - "Compact: tiny avatar together with name and preview in one line": "Kompaktiška: mažytis avataras kartu su vardu ir peržiūra vienoje eilutėje", - "Intermediate: medium sized avatar with single-line preview": "Vidutinis: vidutinio dydžio avataras su vienos eilutės peržiūra", - "Roomy: big avatar with two-line preview": "Erdvus: didelis avataras su dviejų eilučių peržiūra", - "PowerLevel": "Galios lygis", - "For people": "Žmonėms", - "Show people in spaces": "Rodyti žmones erdvėse", - "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Jei išjungta, vis tiek galite pridėti tiesioginius pokalbius į asmenines erdves. Jei ši funkcija įjungta, automatiškai matysite visus, kurie yra erdvės nariai.", - "Mark rooms as unread": "Leisti žymėti pokalbius kaip neskaitytus", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Pradžia yra naudinga, kad galėtumėte viską apžvelgti. Turėkite omenyje, kad ją išjungę galite nematyti tam tikrų kambarių.", - "Collapse additional buttons": "Sulankstyti papildomus mygtukus", - "Corners": "Kampai", - "Round": "Apvalus", - "Extra round": "Ypač apvalus", - "Mixed": "Mišrus" + "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje." } diff --git a/i18n-overlays/matrix-react-sdk/nb_NO.json b/i18n-overlays/matrix-react-sdk/nb_NO.json index e3eb1c6..cd11a91 100644 --- a/i18n-overlays/matrix-react-sdk/nb_NO.json +++ b/i18n-overlays/matrix-react-sdk/nb_NO.json @@ -8,29 +8,5 @@ "Show message bubbles on one side only": "Vis meldingsbobler kun på én side", "Show message bubbles depending on the width either on both sides or only on one side": "Vis meldingsbobler avhengig av bredden enten på begge sider eller kun på én side", "Don't ask again": "Ikke spør igjen", - "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og macOS).", - "Hide advanced theme settings": "Skjul avanserte draktinnstillinger", - "Show advanced theme settings": "Vis avanserte draktinnstillinger", - "Theme": "Drakt", - "Room list": "Romliste", - "Font size and typeface": "Størrelse på og type skrift", - "Sound pack": "Lydpakke", - "Schildi: Softer sounds for reduced anxiety": "Schildi: Mykere lyder for mindre angst", - "System": "System", - "Add custom theme": "Legg til egendefinert drakt", - "Theme in use": "Drakt i bruk", - "Light theme": "Lys drakt", - "Dark theme": "Mørk drakt", - "Mark as read": "Marker som lest", - "Mark rooms as unread": "Tillat markering av sludringer som uleste", - "Mark as unread": "Marker som ulest", - "In group chats": "I gruppesludringer", - "In public rooms": "I offentlige rom", - "For people": "For folk", - "Classic: The same sharp sounds as Element": "Klassisk: Samme skarpe lyder som Element", - "Collapse additional buttons": "Fold sammen ytterligere knapper", - "Corners": "Hjørner", - "Round": "Runde", - "Extra round": "Ekstra runde", - "Mixed": "Blandet" + "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og macOS)." } diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 9facd06..7282f7f 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -42,12 +42,5 @@ "Mark rooms as unread": "Tillåt att chattar markeras som olästa", "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare", "Collapse additional buttons": "Dölj ytterligare knappar", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum.", - "Round": "Runda", - "Extra round": "Extrarunda", - "Mixed": "Blandad", - "Corners": "Hörn", - "Sound pack": "Ljudpaket", - "Schildi: Softer sounds for reduced anxiety": "Schildi: Mjukare ljud för minskad ångest", - "Classic: The same sharp sounds as Element": "Klassisk: Samma skarpa ljud som Element" + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum." } diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json deleted file mode 100644 index 0856dee..0000000 --- a/i18n-overlays/matrix-react-sdk/tr.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "Show message bubbles on one side only": "Mesaj baloncuklarını yalnızca bir tarafta göster", - "Show message bubbles depending on the width either on both sides or only on one side": "Genişliğe bağlı olarak mesaj baloncuklarını her iki tarafta veya sadece bir tarafta göster", - "Message bubbles": "Mesaj baloncukları", - "Normal priority": "Normal öncelik", - "Message layout": "Mesaj düzeni", - "Modern": "Modern", - "Update notifications": "Güncelleme bildirimleri", - "Don't ask again": "Bir daha sorma", - "System": "Sistem", - "Add custom theme": "Özel tema ekle", - "Theme in use": "Tema kullanımda", - "Light theme": "Açık tema", - "Dark theme": "Koyu tema", - "Uniform": "Düzenli", - "For people": "İnsanlar için", - "In group chats": "Grup sohbetlerinde", - "In public rooms": "Halka açık odalarda", - "Show people and rooms in a combined list": "Kişileri ve odaları birleşik bir listede göster", - "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır.", - "If disabled, the space overview will be shown when switching to another space.": "Devre dışı bırakılırsa, başka bir alana geçerken alana ilişkin genel görünüm gösterilir.", - "Mark as unread": "Okunmadı olarak işaretle", - "User name color mode": "Kullanıcı adı renk modu", - "Show people in spaces": "İnsanları alanlarda göster", - "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Devre dışı bırakılmışsa, kişisel alanlara direkt mesajlar eklemeye devam edebilirsiniz. Etkinleştirilirse, alana üye olan herkesi otomatik olarak görürsünüz.", - "Show notification badges for People in Spaces": "Alanlardaki Kişiler için bildirim rozetlerini göster", - "Return to the room previously opened in a space": "Bir alanda daha önce açılmış olan odaya geri dön", - "Compact: tiny avatar together with name and preview in one line": "Sıkıştırılmış: tek satırda isim ve önizleme ile birlikte küçük avatar", - "Intermediate: medium sized avatar with single-line preview": "Orta: tek satır önizlemeli orta boy avatar", - "Roomy: big avatar with two-line preview": "Ferah: iki satırlık önizleme ile büyük avatar", - "Room list style": "Oda listesi tarzı", - "Hide advanced theme settings": "Gelişmiş tema ayarlarını gizle", - "Show all rooms in Home": "Ana sayfadaki tüm odaları göster", - "All rooms you're in will appear in Home.": "Bulunduğunuz tüm odalar ana sayfada görünecektir.", - "Show advanced theme settings": "Gelişmiş tema ayarlarını göster", - "Theme": "Tema", - "Font size and typeface": "Yazı tipi boyutu ve yazı karakteri", - "Room list": "Oda sıralaması", - "Mark rooms as unread": "Sohbetleri okunmamış olarak işaretlemeye izin ver", - "Mark as read": "Okundu olarak işaretle", - "Enable YouTube embed player": "YouTube gömülü oynatıcıyı etkinleştir", - "Collapse additional buttons": "Ek düğmeleri daralt", - "Corners": "Köşeler", - "Round": "Yuvarlak", - "Extra round": "Fazladan yuvarlak", - "Mixed": "Karışık", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Ana sayfa, her şeye genel bir bakış elde etmek için kullanışlıdır. Devre dışı bırakıldığında belirli odaları göremeyebileceğinizi unutmayın." -} diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json index aef112a..6702566 100644 --- a/i18n-overlays/matrix-react-sdk/zh_Hans.json +++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json @@ -39,8 +39,5 @@ "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "您想加入一个用来通知版本更新的房间吗？如果您的平台不支持自动更新 SchildiChat（例如 Windows 和 macOS），这将非常有用。", "Mark as read": "标记为已读", "Mark rooms as unread": "允许将聊天记录标记为未读", - "Mark as unread": "标记为未读", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意：禁用主页可能会让您无法看到某些房间。", - "Enable YouTube embed player": "启用 YouTube 嵌入式播放器", - "Collapse additional buttons": "折叠额外的按钮" + "Mark as unread": "标记为未读" } diff --git a/matrix-js-sdk b/matrix-js-sdk index cb81a65..e82be9f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58 +Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5 diff --git a/matrix-react-sdk b/matrix-react-sdk index d140a7a..cea7c0e 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d140a7a09455dc85f837080fd778d24c9166968f +Subproject commit cea7c0e1006b859a3fdebe2e32423319c1986d74