Compare commits

..

No commits in common. "v1.10.13-sc.0.test.2" and "v1.10.11-sc.0.test.2" have entirely different histories.

7 changed files with 6 additions and 10 deletions

View file

@ -67,7 +67,6 @@ web: setup
echo "$(VERSION)" > element-web/webapp/version
desktop-common: web
export SQLCIPHER_STATIC=1
$(YARN) --cwd element-desktop run fetch --cfgdir ''
$(YARN) --cwd element-desktop run build:native

View file

@ -51,7 +51,7 @@ 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_14.x | bash -
# apt update

@ -1 +1 @@
Subproject commit 31b23944dc6f2ae9dee02ad9c91c1d2ada75472d
Subproject commit 64d9fadbbeae8e109d237d185e2c865a63004a83

@ -1 +1 @@
Subproject commit 4ab85f7cfb4570477a63d0c217d723ff73539fc5
Subproject commit 9bd6ec343318a5056bcc4becfdc738d5727a277d

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 4a5ee08063d1e48aa707a2898675168cc3c176db
Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2

@ -1 +1 @@
Subproject commit 8fd244ea3c20c3dc665e21eb1f6e6ede57c80ff7
Subproject commit c1a277047410e74ae24d3737fe514c7579f98878