diff --git a/Makefile b/Makefile index 5a897e6..e2f261b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.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 @@ -60,8 +60,12 @@ 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 diff --git a/element-desktop b/element-desktop index 6ca4d90..0ee1a2a 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 6ca4d9024f8b761f850415f92fb3b5f2302c3c50 +Subproject commit 0ee1a2ad165615e6c3e15a2bbde7f3895977cef8 diff --git a/element-web b/element-web index 10daba3..b4f26a6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 10daba321703efac427421ee1331cea42aed2b70 +Subproject commit b4f26a6c52c76b4a6139051470820b41066ff289 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 a7e6126..e82be9f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit a7e612697579ac57a3a80ab9809d891919f652b8 +Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5 diff --git a/matrix-react-sdk b/matrix-react-sdk index 93096bd..cea7c0e 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 93096bdad64c9136bacfd6dae5b93939cb05afc4 +Subproject commit cea7c0e1006b859a3fdebe2e32423319c1986d74