Compare commits

..

No commits in common. "v1.10.12-sc.1" and "v1.10.10-sc.0.test.3" have entirely different histories.

6 changed files with 11 additions and 10 deletions

View file

@ -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

@ -1 +1 @@
Subproject commit 686a02cc404525713d1815b9662b19d83e637c85
Subproject commit 2fac82bd009bf520bb0abdabaea1721a266f52ce

@ -1 +1 @@
Subproject commit 863bae40dd9bd5a70818269b13e28009b549a7a3
Subproject commit 8394c417728e728ff641a1691e5c4bc40d13f866

View file

@ -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": "标记为未读"
}

@ -1 +1 @@
Subproject commit a7e612697579ac57a3a80ab9809d891919f652b8
Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5

@ -1 +1 @@
Subproject commit 7038265fa5357e89d562f96d14d37b497fad10dc
Subproject commit 1f9e6c81fbc183ced62f8567babafe4d42b1660d