Update submodules

Merge pull request #92 from nyantec/makefile-mac-universal
fix macOS dmg output file in Make
2025-06-20 17:18:02 +02:00 · 2021-09-13 23:02:11 +02:00 · 2021-09-13 19:33:29 +02:00 · 2021-09-13 19:26:52 +02:00 · 2021-09-13 19:14:56 +02:00 · 2021-09-13 19:14:27 +02:00
79 changed files with 1401 additions and 62 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,4 @@
 release.mk
 /release
+/local-pkgbuild
+bom.lock
--- a/201
+++ b/201
@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/114
+++ b/114
@ -1,79 +1,141 @@
-.PHONY: all setup web desktop desktop-common linux windows windows-portable
-.PHONY: web-release debian-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release release
+.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

 CFGDIR ?= configs/sc

-all: release
+all: web

 YARN ?= yarnpkg

 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
-APP_NAME :=  $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
+WEB_APP_NAME :=  $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
+DESKTOP_APP_NAME :=  $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
 PRODUCT_NAME :=  $(shell grep '"productName"' element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')

 WEB_OUT := element-web/dist
-WEB_OUT_DIST_VERSION := web
-OUT_WEB := $(WEB_OUT)/riot-$(WEB_OUT_DIST_VERSION).tar.gz
-OUT_WEB_BETTER_NAME := schildichat-web-$(VERSION).tar.gz
+WEB_OUT_DIST_VERSION := $(VERSION)
+OUT_WEB := $(WEB_OUT)/$(WEB_APP_NAME)-$(WEB_OUT_DIST_VERSION).tar.gz

 DESKTOP_OUT := element-desktop/dist
-OUT_DEB64 := $(DESKTOP_OUT)/$(APP_NAME)_$(VERSION)_amd64.deb
-OUT_PAC64 := $(DESKTOP_OUT)/$(APP_NAME)-$(VERSION).pacman
-OUT_TARXZ64 := $(DESKTOP_OUT)/$(APP_NAME)-$(VERSION).tar.xz
+OUT_DEB64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)_$(VERSION)_amd64.deb
+OUT_RPM64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).x86_64.rpm
+OUT_PAC64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).pacman
+OUT_APPIMAGE64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION).AppImage
+OUT_TARXZ64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).tar.xz
 OUT_WIN64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ Setup\ $(VERSION).exe
 OUT_WIN64_PORTABLE := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ $(VERSION).exe
 OUT_WIN64_BETTER_NAME := $(PRODUCT_NAME)_Setup_v$(VERSION).exe
 OUT_WIN64_UNPACKED_BETTER_NAME := $(PRODUCT_NAME)_win-unpacked_v$(VERSION).zip
 OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
+OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
+OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app

 RELEASE_DIR := release
 CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)

+# macOS Codesigning
+CSC_IDENTITY_AUTO_DISCOVERY ?= false
+NOTARIZE_APPLE_ID ?=
+CSC_NAME ?=

 -include release.mk

 setup:
 	if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
-	cp $(CFGDIR)/config.json element-web/
+
+element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*)
+
+element-desktop/build/icon.icns: element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset
+	iconutil -c icns -o $@ $<
+
+element-desktop/build/SchildiChat.xcassets/SchildiChatDMG.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChatDMG.iconset/*)
+
+element-desktop/build/dmg.icns: element-desktop/build/SchildiChat.xcassets/SchildiChatDMG.iconset
+	iconutil -c icns -o $@ $<
+
+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 ''
 	$(YARN) --cwd element-desktop run build:native

-desktop: windows linux
+macos-common: web icns
+	$(YARN) --cwd element-desktop run fetch --cfgdir ''
+	$(YARN) --cwd element-desktop run build:native:universal

 linux: desktop-common
-	$(YARN) --cwd element-desktop run build64linux
+	$(YARN) --cwd element-desktop run build:64 --linux deb pacman tar.xz

 debian: desktop-common
-	$(YARN) --cwd element-desktop run build64deb
+	$(YARN) --cwd element-desktop run build:64 --linux deb
+
+rpm: desktop-common
+	$(YARN) --cwd element-desktop run build:64 --linux rpm

 pacman: desktop-common
-	$(YARN) --cwd element-desktop run build64pacman
+	$(YARN) --cwd element-desktop run build:64 --linux pacman
+
+appimage: desktop-common
+	$(YARN) --cwd element-desktop run build:64 --linux AppImage

 windows: desktop-common
-	$(YARN) --cwd element-desktop run build64windows
+	$(YARN) --cwd element-desktop run build:64 --windows nsis

 windows-portable: desktop-common
-	$(YARN) --cwd element-desktop run build64windows-portable
+	$(YARN) --cwd element-desktop run build:64 --windows portable
+
+macos: macos-common
+	export CSC_IDENTITY_AUTO_DISCOVERY
+	export NOTARIZE_APPLE_ID
+	export CSC_NAME
+	$(YARN) --cwd element-desktop run build:universal --mac dmg
+
+macos-mas: macos-common
+	export NOTARIZE_APPLE_ID
+	export CSC_NAME
+	$(YARN) --cwd element-desktop run build:universal --mac mas
+
+local-pkgbuild: debian
+	./create_local_pkgbuild.sh $(VERSION) $(DESKTOP_APP_NAME) $(PRODUCT_NAME) $(OUT_DEB64)
+
+local-pkgbuild-install: local-pkgbuild
+	cd local-pkgbuild; makepkg --install

 web-release: web
 	mkdir -p $(CURRENT_RELEASE_DIR)
-	cp $(OUT_WEB) $(CURRENT_RELEASE_DIR)/$(OUT_WEB_BETTER_NAME)
+	cp $(OUT_WEB) $(CURRENT_RELEASE_DIR)

 debian-release: debian
 	mkdir -p $(CURRENT_RELEASE_DIR)
 	cp $(OUT_DEB64) $(CURRENT_RELEASE_DIR)

+rpm-release: rpm
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_RPM64) $(CURRENT_RELEASE_DIR)
+
 pacman-release: pacman
 	mkdir -p $(CURRENT_RELEASE_DIR)
 	cp $(OUT_PAC64) $(CURRENT_RELEASE_DIR)

+appimage-release: appimage
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_APPIMAGE64) $(CURRENT_RELEASE_DIR)
+
 windows-setup-release: windows
 	mkdir -p $(CURRENT_RELEASE_DIR)
 	cp $(OUT_WIN64) $(CURRENT_RELEASE_DIR)/$(OUT_WIN64_BETTER_NAME)
@ -87,7 +149,17 @@ windows-portable-release: windows-portable

 windows-release: windows-setup-release windows-unpacked-release windows-portable-release

-release: web-release debian-release pacman-release windows-release
+macos-release: macos
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_MACOS) $(CURRENT_RELEASE_DIR)
+
+macos-mas-release: macos-mas
+	mkdir -p $(CURRENT_RELEASE_DIR)
+	cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
+
+bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
+	./build-bom.sh
+bom: bom.lock

 clean:
 	$(YARN) --cwd matrix-js-sdk clean
@ -96,3 +168,5 @@ clean:
 	$(YARN) --cwd element-desktop clean
 	rm -f element-desktop/webapp
 	rm -rf element-web/dist
+	rm -rf local-pkgbuild
+	rm -f bom.lock
--- a/README.md
+++ b/README.md
@ -1,37 +1,39 @@
-# SchildiChat-Desktop
+# SchildiChat Web/Desktop

-SchildiChat-Desktop is a fork of [Element-Web](https://github.com/vector-im/element-web)/[-Desktop](https://github.com/vector-im/element-desktop).
+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-Desktop compared to Element are:
-
- A unifed chat list for both direct and group chats
+The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are:
+- A unified chat list for both direct and group chats
 - Message bubbles
 - Bigger items in the room list
+- &hellip; and more!

-While SchildiChat-Desktop should be already usable as is, it's still better seen as a
-proof-of-concept rather than a finished product, as there are still a few UX bugs
-remaining, and no ways to configure Schildi's features.
-Furthermore, I don't know how much more work I'm going to put into this, but
-if anybody wants to help improving it, contributions are welcome!
-
-Downloads for Desktop: https://github.com/SchildiChat/schildichat-desktop/releases <br/>
-Hosted web variant: https://schildiweb.spiritcroc.de/
+Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop)  
+Hosted web variant: [https://app.schildi.chat/](https://app.schildi.chat/)

 Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org).

 <img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>


-# Building SchildiChat-Desktop
+## Building SchildiChat Web/Desktop

-This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk, in order to build SchildiChat-Desktop.
+This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk. It's the recommended starting point to build SchildiChat for Web **and** Desktop.

+<pre><code><b>schildichat-desktop</b> <i>&lt;-- this repo</i> (recommended starting point to build SchildiChat for Web <b>and</b> Desktop)
+|-- <a href="https://github.com/SchildiChat/element-desktop">element-desktop</a> (electron wrapper)
+|-- <a href="https://github.com/SchildiChat/element-web">element-web</a> ("skin" for matrix-react-sdk)
+|-- <a href="https://github.com/SchildiChat/matrix-react-sdk">matrix-react-sdk</a> (most of the development happens here)
+`-- <a href="https://github.com/SchildiChat/matrix-js-sdk">matrix-js-sdk</a> (Matrix client js sdk)
+</code></pre>

-## Debian compilation dependencies
+### Install dependencies

-Since Debian is usually slow to update packages on its stable releases, some dependencies
-might not be recent enough to building Schildi.
-Here are the dependencies which I had to install for compilation on Debian 10:
+#### Debian build dependencies
+
+Since Debian is usually slow to update packages on its stable releases,
+some dependencies might not be recent enough to build SchildiChat.  
+The following are the dependencies required to build SchildiChat Web/Desktop on Debian 10:

 ```
 # apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar
@ -49,7 +51,29 @@ $ echo 'export PATH="$PATH:$HOME/.cargo/bin"' >> .bashrc
 $ source .bashrc
 ```

-## Initial setup
+#### macOS build dependencies
+
+##### Install brew package manager
+```
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+```
+
+##### Install packages
+
+```
+brew install tcl rust node gpg vim curl git yarn git make gcc
+```
+
+#### Signed macOS builds
+
+To sign a macOS build set the environment or make variable `CSC_IDENTITY_AUTO_DISCOVERY` to true
+or set `CSC_NAME` to your certificate name or id.
+
+To notarize a build with Apple set `NOTARIZE_APPLE_ID` to your AppleID and set the keychain item
+`NOTARIZE_CREDS` to an App specific AppleID password.  
+
+
+### Initial setup

 ```
 git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
@ -57,10 +81,37 @@ cd schildichat-desktop
 make setup # optional step if using the other make targets
 ```

-## Build
+### Create release builds

-`make [{web|debian|pacman|windows}-release]`
+Those are the builds distributed via GitHub releases.

-## Install
+```
+# The single make targets are explained below
+make [{web|debian|windows-setup|windows-portable|macos}-release]
+```

-Installable packages should appear in release/.
+After that these packages which belong to to their respective make target should appear in release/\<version\>/:
+- `web`: _schildichat-web-\<version\>.tar.gz_: archive that can be unpacked and served by a **web** server (copy `config.sample.json` to `config.json` and adjust the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) to your likings)
+- `debian`: file ready for installation on a **Debian Linux** (based) system via `dpkg -i schildichat-desktop_<version>_amd64.deb`
+- `windows-setup`: _SchildiChat_Setup_v\<version\>.exe_: file ready for **installation** on a **Windows** system
+- `windows-portable`: _SchildiChat_win-portable_v\<version\>.zip_: **portable** version for a **Windows** system – take SchildiChat together with your login data around with you (the archive contains a readme with **instructions** and **notes**)
+- `macos`: Build a *.dmg for macOS
+- `macos-mas`: Build a *.pkg for release in the Mac App Store
+
+#### Additional make targets not used for GitHub releases
+- `pacman`: file ready for installation on an **Arch Linux** (based) system via `pacman -U schildichat-desktop-<version>.pacman`
+- `windows-unpacked`: _SchildiChat_win-unpacked_v\<version\>.zip_: **unpacked** archive for a **Windows** system
+
+### Build SchildiChat Web and deploy it directly to your web server
+
+Put the `config.json` with the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) you want for your hosted instance in a subfolder of the `configs` folder.  
+Then create a file named `release.mk` and fill it similar to that:
+```
+.PHONY: your-deploy-web
+
+YOUR_CFGDIR := configs/your_subfolder
+your-deploy-%: CFGDIR := $(YOUR_CFGDIR)
+
+your-deploy-web: web
+	rsync --info=progress2 -rup --del element-web/webapp/ you@yourwebserver:/the/folder/served/for/schildi/
+```
--- a/build-bom.sh
+++ b/build-bom.sh
@ -0,0 +1,46 @@
+# /usr/bin/env bash
+cat element-desktop/yarn.lock > bom.lock
+echo "" >> bom.lock
+cat element-web/yarn.lock >> bom.lock
+echo "" >> bom.lock
+cat matrix-js-sdk/yarn.lock >> bom.lock
+echo "" >> bom.lock
+cat matrix-react-sdk/yarn.lock >> bom.lock
+echo "" >> bom.lock
+
+# matrix-seshat
+cat << EOF >> bom.lock
+matrix-seshat@2.3.0:
+  version "2.3.0"
+  resolved "https://github.com/matrix-org/seshat/archive/refs/heads/master.tar.gz"
+  integrity sha512-y4xtZViRX/h0zczl5hiqWyFNK7np0vVujQ/l47g1Mm7B7mDTHAneSSy/d5GADeUIsezZyvT3qKhSCwSSyqS8Xw==
+  dependencies:
+    sqlcipher "~m1"
+    openssl "~1.1.1f"
+
+sqlcipher@m1:
+  version "m1"
+  resolved "https://github.com/SchildiChat/sqlcipher/archive/refs/heads/m1.tar.gz"
+  integrity sha512-1Nk7J0dQyVedFLqnxUJQWrf/VBsUsfC5vAYaHDH3LRbWarfKDGYduZrhdBuzgAF+kMA237HaDt9Tq+CcXV0EJA==
+
+openssl@1.1.1f:
+  version "1.1.1f"
+  resolved "https://www.openssl.org/source/openssl-1.1.1f.tar.gz"
+  integrity sha512-sAvZta1SmPvO7sa7GcGrDBBspc+zEXhJfFi/fg4M8w/MGcIPhOI68xzBJr8kR9Pk+EYduXuvp7149pVhky8ADA==
+EOF
+echo "" >> bom.lock
+
+# keytar
+cat << EOF >> bom.lock
+keytar@^5.6.0:
+  version "5.6.0"
+  resolved "https://github.com/atom/node-keytar/archive/refs/tags/v5.6.0.tar.gz"
+  integrity sha512-dPdXLrm8AlqooT0ZS7y/mYif0DmQXoGGrqomwfl6ugIEHlpL1D+hJYhjyMC00TK924vOGD1a6OhDS2+RKEffXA==
+  dependencies:
+    libsecret "~0.20.3"
+
+libsecret@0.20.3:
+  version "0.20.3"
+  resolved "https://gitlab.gnome.org/GNOME/libsecret/-/archive/0.20.3/libsecret-0.20.3.tar.gz"
+  integrity sha512-tbD1jNKEEW9bPWuyd5YZ68eQjHhXOsy5PseVwleWYMEXgrrPPGnGGrLzSFUXRzNulFceLMeUG49Qr1rnyvfa1A==
+EOF
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@ -11,30 +11,27 @@
        "https://scalar-staging.vector.im/api",
        "https://scalar-staging.riot.im/scalar/api"
    ],
-    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "showLabsSettings": true,
    "roomDirectory": {
        "servers": [
            "matrix.org"
        ]
    },
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "siteId": 1,
-        "policyUrl": "https://element.io/cookie-policy"
-    },
    "enable_presence_by_hs_url": {
        "https://matrix.org": false,
        "https://matrix-client.matrix.org": false
    },
    "terms_and_conditions_links": [
        {
-            "url": "https://element.io/privacy",
+            "url": "https://schildi.chat/desktop/privacy",
            "text": "Privacy Policy"
-        },
-        {
-            "url": "https://element.io/cookie-policy",
-            "text": "Cookie Policy"
        }
-    ]
+    ],
+    "sc_update_announcement_room": {
+        "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org",
+        "via_servers": [
+            "supercable.onl",
+            "spiritcroc.de"
+        ]
+    }
 }
--- a/create_local_pkgbuild.sh
+++ b/create_local_pkgbuild.sh
@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+mydir="$(dirname "$(realpath "$0")")"
+cd "$mydir"
+
+version="$1"
+appName="$2"
+productName="$3"
+debOut="$4"
+
+template_dir="local-pkgbuild-template"
+out_dir="local-pkgbuild"
+
+if [ -z "$version" ] || [ -z "$appName" ] || [ -z "$productName" ] || [ -z "$debOut" ]; then
+    echo "Usage: $0 version appName productName debOut"
+    exit 1
+fi
+
+debName="$(basename "$debOut")"
+
+rm -rf "$out_dir"
+mkdir "$out_dir"
+
+setup_file() {
+    local file="$1"
+    local outfile="$2"
+    if [ -z "$outfile" ]; then
+        local outfile="$file"
+    fi
+    cat "$template_dir/$file" \
+        | sed "s|---version---|$version|g" \
+        | sed "s|---appName---|$appName|g" \
+        | sed "s|---productName---|$productName|g" \
+        | sed "s|---debName---|$debName|g" \
+        > "$out_dir/$outfile"
+}
+
+setup_file PKGBUILD
+setup_file schildichat-desktop.sh "$appName.sh"
+ln -r -s "$debOut" "$out_dir/$debName"
--- a/deploy/.gitignore
+++ b/deploy/.gitignore
@ -0,0 +1 @@
+repos/*
--- a/deploy/create-github-release.sh
+++ b/deploy/create-github-release.sh
@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+#
+# Based upon https://hinty.io/ivictbor/publish-and-upload-release-to-github-with-bash-and-curl/
+# and https://gist.github.com/stefanbuck/ce788fee19ab6eb0b4447a85fc99f447
+#
+
+set -e
+# set -x
+
+version="$1"
+releasepath="$2"
+
+github_api_token=`cat ~/githubtoken`
+release_notes_file="/tmp/scrn.md"
+
+owner=SchildiChat
+repo=schildichat-desktop
+target=master
+
+# Define variables
+GH_API="https://api.github.com"
+GH_REPO="$GH_API/repos/$owner/$repo"
+AUTH="Authorization: token $github_api_token"
+
+# Validate token
+curl -o /dev/null -sH "$AUTH" $GH_REPO || { echo "Error: Invalid repo, token or network issue!";  exit 1; }
+
+# Get release notes
+$EDITOR "$release_notes_file"
+release_notes=`cat "$release_notes_file"`
+
+# Create draft release
+echo "Create GitHub draft release ..."
+json_string=`jq -n --arg tag "v$version" --arg target "$target" --arg body "$release_notes" '{
+  tag_name: $tag,
+  target_commitish: $target,
+  name: $tag,
+  body: $body,
+  draft: true,
+  prerelease: false
+}'`
+# echo "$json_string"
+res=`echo "$json_string" | curl -sH "$AUTH" $GH_REPO/releases -d @-`
+# echo "$res" | jq "."
+
+# Get release id
+id=`echo $res | jq ".id"`
+# echo "id: $id"
+
+# Upload assets
+find "$releasepath" -type f | while read filename; do
+    echo ""
+    echo "Uploading $filename ..."
+
+    # Construct url
+    GH_ASSET="https://uploads.github.com/repos/$owner/$repo/releases/$id/assets?name=$(basename $filename)"
+
+    # Upload
+    res=`curl --progress-bar --data-binary @"$filename" -H "$AUTH" -H "Content-Type: application/octet-stream" $GH_ASSET`
+    state=`echo $res | jq ".state"`
+    if [ "$state" == "\"uploaded\"" ]; then
+        echo "Success!"
+    else
+        echo "Error:"
+        echo $res | jq "."
+        exit -1
+    fi
+done
+
+# Publish draft
+res=`curl -sH "$AUTH" $GH_REPO/releases/$id -d '{"draft": false}'`
+draft=`echo $res | jq ".draft"`
+echo ""
+if [ "$draft" == "false" ]; then
+    echo "Release v$version published on GitHub!"
+else
+    echo "Error:"
+    echo $res | jq "."
+    exit -1
+fi
--- a/deploy/update-aur-bin.sh
+++ b/deploy/update-aur-bin.sh
@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+# set -x
+
+DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
+
+version="$1"
+debpath="$2"
+
+repopath="$DEPLOY_ROOT/repos/aur-bin"
+repourl="ssh://aur@aur.archlinux.org/schildichat-desktop-bin.git"
+
+sha256sum=($(sha256sum $debpath))
+
+[ -d "$repopath" ] || git clone $repourl $repopath
+
+pushd "$repopath" > /dev/null
+
+git fetch
+git reset --hard origin/master
+
+sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD
+sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD
+
+makepkg --printsrcinfo > .SRCINFO
+
+git add .SRCINFO PKGBUILD
+git commit -m "Bump version to v$version"
+
+git push
+
+popd > /dev/null
+
+echo "Release v$version published on AUR!"
--- a/deploy/update-flathub.sh
+++ b/deploy/update-flathub.sh
@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+# set -x
+
+DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
+
+version="$1"
+debpath="$2"
+
+repopath="$DEPLOY_ROOT/repos/flathub"
+repourl="git@github.com:flathub/chat.schildi.desktop.git"
+
+downloadurl="https://github.com/SchildiChat/schildichat-desktop/releases/download/v${version}/schildichat-desktop_${version}_amd64.deb"
+sha256sum=($(sha256sum $debpath))
+debdate=$(date +%Y-%m-%d -r $debpath)
+
+[ -d "$repopath" ] || git clone $repourl $repopath
+
+pushd "$repopath" > /dev/null
+
+git fetch
+git reset --hard origin/master
+
+yamlFile="chat.schildi.desktop.yaml"
+xmlFile="chat.schildi.desktop.appdata.xml"
+
+sed -i "s|url: .* #SC:url|url: $downloadurl #SC:url|" "$yamlFile"
+sed -i "s|sha256: .* #SC:sha256|sha256: $sha256sum #SC:sha256|" "$yamlFile"
+
+sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=\"$debdate\"/>|" "$xmlFile"
+
+git add $yamlFile $xmlFile
+git commit -m "Bump version to v$version"
+
+git push
+
+popd > /dev/null
+
+echo "Release v$version published on flathub!"
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/flake.lock
+++ b/flake.lock
@ -0,0 +1,26 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1630504215,
+        "narHash": "sha256-H5pzwo7z3e7ZatwuwWY25oZSejchO+ZH/XtMi8/PXLw=",
+        "owner": "yu-re-ka",
+        "repo": "nixpkgs",
+        "rev": "979e5916df0e6830a2b1ee999632de9a9d2beb23",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake.nix
+++ b/flake.nix
@ -0,0 +1,29 @@
+{
+  description = "The SchildiChat Matrix client";
+
+  inputs.nixpkgs.url = github:NixOS/nixpkgs;
+
+  outputs = { self, nixpkgs }: let
+    systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
+
+    overlay = import ./nix/overlay.nix;
+
+    # Memoize nixpkgs for different platforms for efficiency.
+    nixpkgsFor = forAllSystems (system:
+      import nixpkgs {
+        inherit system;
+        overlays = [ overlay ];
+      });
+  in {
+    inherit overlay;
+
+    packages = builtins.mapAttrs (system: pkgs: {
+      inherit (pkgs)
+        schildichat-web
+        schildichat-desktop
+        schildichat-desktop-wayland
+      ;
+    }) nixpkgsFor;
+  };
+}
--- a/i18n-helper/.gitignore
+++ b/i18n-helper/.gitignore
@ -0,0 +1,3 @@
+yarn.lock
+yarn-error.log
+node_modules/
--- a/i18n-helper/index.js
+++ b/i18n-helper/index.js
@ -0,0 +1,52 @@
+const fs = require('fs');
+const path = require('path');
+const globby = require('globby');
+
+function readStrings(p) {
+	return JSON.parse(fs.readFileSync(p).toString());
+}
+
+function writeStrings(p, strings) {
+	fs.writeFileSync(p, JSON.stringify(strings, null, 4) + "\n");
+}
+
+(async () => {
+	console.log(process.argv.length);
+	console.log(process.argv[0]);
+	console.log(process.argv[1]);
+	console.log(process.argv[2]);
+	console.log(process.argv[3]);
+	if (process.argv.length < 3) {
+		console.log("No path with the original strings given!");
+		process.exit(-1);
+	}
+	originalPath = process.argv[2];
+
+	overlayPath = null;
+	if (process.argv.length > 3) {
+		overlayPath = process.argv[3];
+	} else {
+		console.log("Continue without overlays ...")
+	}
+
+	const paths = await globby(path.join(originalPath, "*.json"));
+
+	paths.forEach(p => {
+		let strings = readStrings(p);
+
+		for (const key of Object.keys(strings)) {
+			strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat");
+		}
+
+		if (overlayPath) {
+			op = path.join(overlayPath, path.basename(p)); 
+			
+			if (fs.existsSync(op)) {
+				overlayStrings = readStrings(op);
+				Object.assign(strings, overlayStrings);
+			}
+		}
+
+		writeStrings(p, strings);
+	});
+})();
--- a/i18n-helper/package.json
+++ b/i18n-helper/package.json
@ -0,0 +1,8 @@
+{
+  "name": "i18n-helper",
+  "version": "0.0.1",
+  "main": "index.js",
+  "dependencies": {
+    "globby": "^11.0.3"
+  }
+}
--- a/i18n-overlays/element-desktop/cs.json
+++ b/i18n-overlays/element-desktop/cs.json
@ -0,0 +1,3 @@
+{
+    "Show": "Zobrazit"
+}
--- a/i18n-overlays/element-desktop/de.json
+++ b/i18n-overlays/element-desktop/de.json
@ -0,0 +1,3 @@
+{
+    "Show": "Anzeigen"
+}
--- a/i18n-overlays/element-desktop/en_EN.json
+++ b/i18n-overlays/element-desktop/en_EN.json
@ -0,0 +1,3 @@
+{
+    "Show": "Show"
+}
--- a/i18n-overlays/element-desktop/es.json
+++ b/i18n-overlays/element-desktop/es.json
@ -0,0 +1,3 @@
+{
+    "Show": "Mostrar"
+}
--- a/i18n-overlays/element-desktop/et.json
+++ b/i18n-overlays/element-desktop/et.json
@ -0,0 +1,3 @@
+{
+    "Show": "Näita"
+}
--- a/i18n-overlays/element-desktop/eu.json
+++ b/i18n-overlays/element-desktop/eu.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-desktop/fa.json
+++ b/i18n-overlays/element-desktop/fa.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-desktop/fr.json
+++ b/i18n-overlays/element-desktop/fr.json
@ -0,0 +1,3 @@
+{
+    "Show": "Afficher"
+}
--- a/i18n-overlays/element-desktop/hu.json
+++ b/i18n-overlays/element-desktop/hu.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-desktop/lt.json
+++ b/i18n-overlays/element-desktop/lt.json
@ -0,0 +1,3 @@
+{
+    "Show": "Rodyti"
+}
--- a/i18n-overlays/element-desktop/nb_NO.json
+++ b/i18n-overlays/element-desktop/nb_NO.json
@ -0,0 +1,3 @@
+{
+    "Show": "Vis"
+}
--- a/i18n-overlays/element-desktop/nl.json
+++ b/i18n-overlays/element-desktop/nl.json
@ -0,0 +1,3 @@
+{
+    "Show": "Tonen"
+}
--- a/i18n-overlays/element-desktop/pl.json
+++ b/i18n-overlays/element-desktop/pl.json
@ -0,0 +1,3 @@
+{
+    "Show": "Pokaż"
+}
--- a/i18n-overlays/element-desktop/pt_BR.json
+++ b/i18n-overlays/element-desktop/pt_BR.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-desktop/ru.json
+++ b/i18n-overlays/element-desktop/ru.json
@ -0,0 +1,3 @@
+{
+    "Show": "Показать"
+}
--- a/i18n-overlays/element-desktop/sk.json
+++ b/i18n-overlays/element-desktop/sk.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/cs.json
+++ b/i18n-overlays/element-web/cs.json
@ -0,0 +1,5 @@
+{
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurace SchildiChatu obsahuje neplatný JSON. Opravte problém a načtěte stránku znovu.",
+    "Download Completed": "Stahování dokončeno",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používá pokročilé funkce prohlížeče, které váš prohlížeč nepodporuje."
+}
--- a/i18n-overlays/element-web/de_DE.json
+++ b/i18n-overlays/element-web/de_DE.json
@ -0,0 +1,5 @@
+{
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine SchildiChat-Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",
+    "Download Completed": "Download abgeschlossen",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem aktuellen Browser nicht unterstützt werden."
+}
--- a/i18n-overlays/element-web/en_EN.json
+++ b/i18n-overlays/element-web/en_EN.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/es.json
+++ b/i18n-overlays/element-web/es.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/et.json
+++ b/i18n-overlays/element-web/et.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/eu.json
+++ b/i18n-overlays/element-web/eu.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/fa.json
+++ b/i18n-overlays/element-web/fa.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/fr.json
+++ b/i18n-overlays/element-web/fr.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/hu.json
+++ b/i18n-overlays/element-web/hu.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/lt.json
+++ b/i18n-overlays/element-web/lt.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/nb_NO.json
+++ b/i18n-overlays/element-web/nb_NO.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/nl.json
+++ b/i18n-overlays/element-web/nl.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/pl.json
+++ b/i18n-overlays/element-web/pl.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/pt_BR.json
+++ b/i18n-overlays/element-web/pt_BR.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/ru.json
+++ b/i18n-overlays/element-web/ru.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/element-web/sk.json
+++ b/i18n-overlays/element-web/sk.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/matrix-react-sdk/cs.json
+++ b/i18n-overlays/matrix-react-sdk/cs.json
@ -0,0 +1,13 @@
+{
+    "Enable layout with message bubbles": "Povolit bubliny zpráv",
+    "Show message bubbles on one side only": "Bubliny zpráv zobrazit pouze na jedné straně",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Bubliny zpráv zobrazit v závislosti na šířce stránky buď na obou stranách, nebo pouze na jedné straně",
+    "Message bubbles": "Bubliny zpráv",
+    "Normal priority": "Normální priorita",
+    "Message layout": "Vzhled zpráv",
+    "Modern": "Moderní",
+    "Show people and rooms in a combined list": "Zobrazit lidi a místnosti v kombinovaném seznamu",
+    "Update notifications": "Aktualizace oznámení",
+    "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).": "Chcete se připojit k místnosti, která vás bude informovat o nových verzích? To je užitečné zejména v případě, že vaše platforma nepodporuje automatické aktualizace SchildiChatu (např. Windows a macOS).",
+    "Don't ask again": "Neptat se znovu"
+}
--- a/i18n-overlays/matrix-react-sdk/de_DE.json
+++ b/i18n-overlays/matrix-react-sdk/de_DE.json
@ -0,0 +1,113 @@
+{
+    "Normal priority": "Normale Priorität",
+    "Deops user with given id": "Setzt das Berechtigungslevel des Benutzers mit der angegebenen ID zurück",
+    "No users have specific privileges in this room": "Keine Benutzer haben in diesem Raum privilegierte Berechtigungen",
+    "Only people who have been invited": "Nur Personen, die eingeladen wurden",
+    "Upload file": "Datei hochladen",
+    "You cannot place VoIP calls in this browser.": "VoIP-Gespräche werden von diesem Browser nicht unterstützt.",
+    "Failed to mute user": "Stummschalten des Benutzers fehlgeschlagen",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der Benutzer dieselbe Berechtigungsstufe wie du selbst erhalten wird.",
+    "Incorrect username and/or password.": "Inkorrekter Benutzername und/oder Passwort.",
+    "Create new room": "Neuen Raum erstellen",
+    "Define the power level of a user": "Berechtigungsstufe eines Benutzers setzen",
+    "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntaxhervorhebung aktivieren",
+    "To get started, please pick a username!": "Um zu starten, wähle bitte einen Benutzernamen!",
+    "Ignores a user, hiding their messages from you": "Benutzer blockieren und dessen Nachrichten ausblenden",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Benutzer mit Berechtigungen bist, wird es unmöglich sein, die Privilegien zurückzubekommen.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum-, Benutzer- oder Gruppen-ID enthält, werden diese Daten entfernt, bevor sie an den Server gesendet werden.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen, um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Benutzernamen, Raum- und Gruppen-IDs, Aliase, die du besucht hast, und Benutzernamen anderer Benutzer. Sie enthalten keine Nachrichten.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Änderungen am <bold1>Namen</bold1> und <bold2>Bild</bold2> deiner Community werden evtl. erst nach 30 Minuten von anderen Benutzern gesehen werden.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Fehlerberichte enthalten Anwendungsdaten wie deinen Benutzernamen, Raum- und Gruppen-IDs und Aliase, die du besucht hast, sowie Benutzernamen anderer Benutzer. Sie enthalten keine Nachrichten.",
+    "Enable widget screenshots on supported widgets": "Bildschirmfotos bei unterstützten Widgets aktivieren",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Die Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen, heißt das, dass diese nicht mit neuen oder nicht registrierten Benutzern geteilt werden, aber registrierte Benutzer, die bereits zugriff haben, den Zugriff auf ihre Kopie behalten.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Konto deaktiviert wird. (<b>Warnung:</b> Zukünftige Benutzer werden eine unvollständige Konversation sehen)",
+    "Share Link to User": "Link zum Benutzer teilen",
+    "This homeserver has hit its Monthly Active User limit.": "Dieser Heimserver hat sein Limit an monatlich aktiven Benutzern erreicht.",
+    "This homeserver has exceeded one of its resource limits.": "Dieser Heimserver hat eines seiner Ressourcen-Limits überschritten.",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Benutzern verbieten in dem Raum mit der alten Version zu schreiben und eine Nachricht senden, die den Benutzern rät in den neuen Raum zu wechseln",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Bevor du Protokolldateien übermittelst, musst du <a>auf GitHub ein \"Issue\" erstellen</a> um dein Problem zu beschreiben.",
+    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Benutzer erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
+    "Custom user status messages": "Angepasste Benutzerstatusnachrichten",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Warnen, bevor du Einladungen zu möglicherweise ungültigen Matrix-IDs sendest",
+    "Verify this user by confirming the following number appears on their screen.": "Verifiziere diesen Benutzer, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.",
+    "For help with using %(brand)s, click <a>here</a>.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke <a>hier</a>.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diesen Benutzer, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.",
+    "User %(userId)s is already in the room": "Benutzer %(userId)s ist bereits im Raum",
+    "The user must be unbanned before they can be invited.": "Die Verbannung des Benutzers muss aufgehoben werden, bevor er eingeladen werden kann.",
+    "Could not load user profile": "Konnte Benutzerprofil nicht laden",
+    "Unbans user with given ID": "Hebt die Verbannung des Benutzers mit der angegebenen ID auf",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Die Verwendung eines Identitätsserver ist optional. Solltest du dich dazu entschließen, keinen Identitätsserver zu verwenden, kannst du von anderen Benutzern nicht gefunden werden und andere nicht per E-Mail oder Telefonnummer einladen.",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzern und Servern, die du blockiert hast - verlasse diesen Raum nicht!",
+    "Show info about bridges in room settings": "Information über Brücken in den Raumeinstellungen anzeigen",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von <verify>unbekanntem</verify> Benutzer mit ID %(deviceId)s",
+    "User rules": "Benutzerregeln",
+    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Benutzer gedacht.",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem Touch die primäre Eingabemethode ist",
+    "Your user agent": "Dein User-Agent",
+    "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Benutzers nicht beenden können.",
+    "Encryption upgrade available": "Verschlüsselungsupgrade verfügbar",
+    "Unknown (user, session) pair:": "Unbekanntes Benutzer-/Sitzungspaar:",
+    "You have verified this user. This user has verified all of their sessions.": "Du hast diesen Benutzer verifiziert. Dieser Benutzer hat alle seine Sitzungen verifiziert.",
+    "Displays information about a user": "Zeigt Informationen über einen Benutzer an",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschlussregel für Benutzer, die aufgrund %(reason)s %(glob)s entsprechen",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschlussregel für Räume, die %(glob)s aufgrund von %(reason)s entsprechen",
+    "Reject & Ignore user": "Ablehnen und Benutzer blockieren",
+    "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
+    "Ask this user to verify their session, or manually verify it below.": "Bitte diesen Benutzer, seine Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
+    "Error adding ignored user/server": "Fehler beim Blockieren eines Benutzers/Servers",
+    "None": "Keine",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Füge hier Benutzer und Server hinzu, die du blockieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde <code>@bot:*</code> alle Benutzer ignorieren, die auf einem Server den Namen 'bot' haben.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Das Blockieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die darin aufgeführten Benutzer und Server ausgeblendet.",
+    "Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste zu abonnieren bedeutet ihr beizutreten!",
+    "Your keys are <b>not being backed up from this session</b>.": "Deine Schlüssel werden <b>nicht von dieser Sitzung gesichert</b>.",
+    "You have not verified this user.": "Du hast diesen Benutzer nicht verifiziert.",
+    "Send a reply…": "Antwort senden …",
+    "Send a message…": "Nachricht senden …",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s wurde, beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, <issueLink>erstelle bitte einen Fehlerbericht</issueLink>.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der Empfänger können sie lesen.",
+    "Verify User": "Benutzer verifizieren",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit verifiziere diesen Benutzer durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.",
+    "The homeserver the user you’re verifying is connected to": "Der Heimserver, an dem der zu verifizierende Benutzer angemeldet ist",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obigen Code nicht scannen kannst, verifiziere stattdessen durch den Emoji-Vergleich.",
+    "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer in einem Raum, um die vollständige Sicherheit zu gewährleisten.",
+    "Your user ID": "Deine Benutzer-ID",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Einladen der folgenden Benutzer fehlgeschlagen: %(csvUsers)s",
+    "Something went wrong trying to invite the users.": "Beim Einladen der Benutzer lief etwas schief.",
+    "Failed to find the following users": "Folgende Benutzer konnten nicht gefunden werden",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Folgende Benutzer konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
+    "Automatically invite users": "Benutzer automatisch einladen",
+    "User Status": "Benutzerstatus",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst, werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
+    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Benutzer-ID überprüfen, jedoch keine Aktionen in deinem Namen ausführen.",
+    "User Autocomplete": "Benutzer-Auto-Vervollständigung",
+    "Jump to start/end of the composer": "Springe zum Anfang/Ende der Nachrichteneingabe",
+    "Message bubbles": "Sprechblasen",
+    "Enable advanced debugging for the room list": "Erweiterte Fehlersuche für die Raumliste aktivieren",
+    "Enable experimental, compact IRC style layout": "Kompaktes, experimentelles Layout im IRC-Stil aktivieren",
+    "Enable layout with message bubbles": "Layout mit Sprechblasen aktivieren",
+    "Show message bubbles on one side only": "Sprechblasen nur auf einer Seite anzeigen",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Sprechblasen abhänging von der Breite auf beiden Seiten oder nur einer Seite anzeigen",
+    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s kann verschlüsselte Nachrichten nicht sicher während der Ausführung im Browser durchsuchen. Benutze <desktopLink>%(brand)s Desktop</desktopLink>, um verschlüsselte Nachrichten in den Suchergebnissen angezeigt zu bekommen.",
+    "Use default": "Standardeinstellungen benutzen",
+    "Your firewall or anti-virus is blocking the request.": "Deine Firewall oder dein Antivirenprogramm blockiert die Anfrage.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Betreten nur für Benutzer von %(serverName)s erlauben.",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address. This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>.": "Starte ein Gespräch mit jemandem unter Verwendung seines/ihres Namens, Benutzernamens (wie <userId/>) oder E-Mail-Adresse. Dadurch werden sie nicht zu %(communityName)s eingeladen. Klicke hier <a>hier</a>, um jemanden zu %(communityName)s einzuladen.",
+    "User settings": "Benutzer-Einstellungen",
+    "Community and user menu": "Community- und Benutzer-Menü",
+    "Render LaTeX maths in messages": "LaTeX-Matheformeln in Nachrichten anzeigen",
+    "Use email to optionally be discoverable by existing contacts.": "Nutze optional eine E-Mail-Adresse, um von Benutzern gefunden werden zu können.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Nutze optional eine E-Mail-Adresse oder Telefonnummer, um von Benutzern gefunden werden zu können.",
+    "Host account on": "Benutzerkonto betreiben auf",
+    "A call can only be transferred to a single user.": "Ein Anruf kann nur auf einen einzelnen Benutzer übertragen werden.",
+    "Change which room, message, or user you're viewing": "Ändere, welchen Raum, welche Nachricht oder welchen Benutzer du siehst",
+    "Unable to look up phone number": "Telefonnummer kann nicht gefunden werden",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Das Widget überprüft deine Benutzer-ID, kann jedoch keine Aktionen für dich ausführen:",
+    "Abort": "Abbrechen",
+    "Add existing room": "Existierenden Raum hinzufügen",
+    "Message layout": "Nachrichtenlayout",
+    "Modern": "Modern",
+    "Show people and rooms in a combined list": "Personen und Räume in einer gemeinsamen Liste anzeigen",
+    "Update notifications": "Updatebenachrichtigungen",
+    "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).": "Möchtest du einem Raum beitreten, der dich über neue Updates informiert? Das ist besonders nützlich, wenn deine Plattform keine automatischen Updates für SchildiChat unterstützt (z. B. Windows und macOS).",
+    "Don't ask again": "Nicht erneut fragen"
+}
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@ -0,0 +1,18 @@
+{
+    "Show message bubbles on one side only": "Show message bubbles on one side only",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Show message bubbles depending on the width either on both sides or only on one side",
+    "Message bubbles": "Message bubbles",
+    "Normal priority": "Normal priority",
+    "Message layout": "Message layout",
+    "Modern": "Modern",
+    "Show people and rooms in a combined list": "Show people and rooms in a combined list",
+    "Update notifications": "Update notifications",
+    "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).": "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).",
+    "Don't ask again": "Don't ask again",
+    "System": "System",
+    "Add custom theme": "Add custom theme",
+    "Add theme": "Add theme",
+    "Theme in use": "Theme in use",
+    "Light theme": "Light theme",
+    "Dark theme": "Dark theme"
+}
--- a/i18n-overlays/matrix-react-sdk/es.json
+++ b/i18n-overlays/matrix-react-sdk/es.json
@ -0,0 +1,7 @@
+{
+    "Show message bubbles on one side only": "mostrar las burbujas de mensajes en un solo lado",
+    "Message bubbles": "Burbujas de mensajes",
+    "Normal priority": "Prioridad normal",
+    "Enable layout with message bubbles": "Activar diseño con mensajes de burbujas",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Mostrar mensajes de burbuja dependiendo del tamaño tanto en ambos lados o solo en un lado"
+}
--- a/i18n-overlays/matrix-react-sdk/et.json
+++ b/i18n-overlays/matrix-react-sdk/et.json
@ -0,0 +1,7 @@
+{
+    "Enable layout with message bubbles": "Sõnumimullidega paigutuse lubamine",
+    "Show message bubbles on one side only": "Näita sõnumimulle ainult ühel poolel",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Näita sõnumimullid sõltuvalt laiusest kas mõlemal või ainult ühel küljel",
+    "Normal priority": "Tavaline prioriteet",
+    "Message bubbles": "Sõnumimullid"
+}
--- a/i18n-overlays/matrix-react-sdk/eu.json
+++ b/i18n-overlays/matrix-react-sdk/eu.json
@ -0,0 +1,7 @@
+{
+    "Show message bubbles on one side only": "Erakutsi mezu burbuilak alde batetik bakarrik",
+    "Message bubbles": "Mezu burbuilak",
+    "Normal priority": "Normala lehentasuna",
+    "Enable layout with message bubbles": "Gaitu diseinua batera mezua burbuilak",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Erakutsi mezu burbuilak arabera zabalera bai, bi aldeetatik edo alde batetik bakarrik"
+}
--- a/i18n-overlays/matrix-react-sdk/fa.json
+++ b/i18n-overlays/matrix-react-sdk/fa.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/matrix-react-sdk/fr.json
+++ b/i18n-overlays/matrix-react-sdk/fr.json
@ -0,0 +1,9 @@
+{
+    "Show message bubbles on one side only": "Afficher les bulles de message sur un seul côté",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Afficher les bulles de message selon la largeur soit sur un seul côté, soit sur les deux",
+    "Message bubbles": "Bulles de message",
+    "Normal priority": "Priorité normale",
+    "Message layout": "Disposition des messages",
+    "Modern": "Moderne",
+    "Show people and rooms in a combined list": "Afficher les personnes et les salons dans une liste combinée"
+}
--- a/i18n-overlays/matrix-react-sdk/hu.json
+++ b/i18n-overlays/matrix-react-sdk/hu.json
@ -0,0 +1,7 @@
+{
+    "Enable layout with message bubbles": "Üzenetbuborékos elrendezés engedélyezése",
+    "Show message bubbles on one side only": "Üzenetbuborékok megjelenítése csak az egyik oldalon",
+    "Message bubbles": "Üzenet buborékok",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Üzenetbuborékok megjelenítése a szélességtől függően mindkét oldalon vagy csak az egyik oldalon",
+    "Normal priority": "Normál prioritás"
+}
--- a/i18n-overlays/matrix-react-sdk/lt.json
+++ b/i18n-overlays/matrix-react-sdk/lt.json
@ -0,0 +1,7 @@
+{
+    "Normal priority": "Normalaus prioriteto",
+    "Modern": "Modernus",
+    "Message bubbles": "Žinučių burbulai",
+    "Message layout": "Žinučių išdėstymas",
+    "Show people and rooms in a combined list": "Asmenų ir kambarių rodymas bendrame sąraše"
+}
--- a/i18n-overlays/matrix-react-sdk/nb_NO.json
+++ b/i18n-overlays/matrix-react-sdk/nb_NO.json
@ -0,0 +1,12 @@
+{
+    "Message bubbles": "Meldingsbobler",
+    "Normal priority": "Normal prioritet",
+    "Message layout": "Meldingsvisning",
+    "Modern": "Moderne",
+    "Show people and rooms in a combined list": "Vis folk og rom i kombinert liste",
+    "Update notifications": "Oppdater merknader",
+    "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)."
+}
--- a/i18n-overlays/matrix-react-sdk/nl.json
+++ b/i18n-overlays/matrix-react-sdk/nl.json
@ -0,0 +1,13 @@
+{
+    "Show message bubbles on one side only": "Boodschappenbubbels slechts aan één kant tonen",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Toon berichtbubbels, afhankelijk van de breedte, aan beide zijden of slechts aan één zijde",
+    "Message bubbles": "Boodschap bellen",
+    "Normal priority": "Normale prioriteit",
+    "Enable layout with message bubbles": "Schakel lay-out in met tekstballonnen",
+    "Update notifications": "Update meldingen",
+    "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).": "Wilt u lid worden van een kamer waarin u wordt geïnformeerd over nieuwe releases? Dit is vooral handig als uw platform geen automatische updates voor SchildiChat ondersteunt (bijv. Windows en macOS).",
+    "Don't ask again": "Niet nogmaals vragen",
+    "Modern": "Modern",
+    "Message layout": "Berichtlayout",
+    "Show people and rooms in a combined list": "Toon personen en kamers in een gecombineerde lijst"
+}
--- a/i18n-overlays/matrix-react-sdk/pl.json
+++ b/i18n-overlays/matrix-react-sdk/pl.json
@ -0,0 +1 @@
+{}
--- a/i18n-overlays/matrix-react-sdk/pt_BR.json
+++ b/i18n-overlays/matrix-react-sdk/pt_BR.json
@ -0,0 +1,7 @@
+{
+    "Enable layout with message bubbles": "Habilitar layout com bolhas de mensagem",
+    "Message bubbles": "Bolhas de mensagens",
+    "Normal priority": "Prioridade normal",
+    "Show message bubbles on one side only": "Mostrar bolhas de mensagem em apenas um lado",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Mostrar bolhas de mensagem dependendo da largura de ambos os lados ou somente de um lado"
+}
--- a/i18n-overlays/matrix-react-sdk/ru.json
+++ b/i18n-overlays/matrix-react-sdk/ru.json
@ -0,0 +1,13 @@
+{
+    "Message bubbles": "Пузырьки сообщений",
+    "Normal priority": "Нормальный приоритет",
+    "Enable layout with message bubbles": "Включение макета с пузырьками сообщений",
+    "Show message bubbles on one side only": "Показывайте пузырьки с сообщениями только на одной стороне",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Показывать пузырьки сообщений в зависимости от ширины либо с обеих сторон, либо только с одной стороны",
+    "Modern": "Современное",
+    "Message layout": "Оформление сообщений",
+    "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).",
+    "Show people and rooms in a combined list": "Показать людей и комнаты в объединенном списке",
+    "Update notifications": "Уведомления об обновлениях",
+    "Don't ask again": "Не спрашивать больше"
+}
--- a/i18n-overlays/matrix-react-sdk/sk.json
+++ b/i18n-overlays/matrix-react-sdk/sk.json
@ -0,0 +1,7 @@
+{
+    "Enable layout with message bubbles": "Povolenie rozloženia s bublinami správ",
+    "Show message bubbles on one side only": "Zobrazenie bublín správ len na jednej strane",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Zobrazenie bublín správ v závislosti od šírky buď na oboch stranách, alebo len na jednej strane",
+    "Message bubbles": "Bubliny správ",
+    "Normal priority": "Normálna priorita"
+}
--- a/local-pkgbuild-template/PKGBUILD
+++ b/local-pkgbuild-template/PKGBUILD
@ -0,0 +1,25 @@
+# Maintainer: su-ex <codeworks@supercable.onl>
+# Maintainer: SpiritCroc <aur@spiritcroc.de>
+# Contributor: David Mehren <david.mehren@udo.edu>
+
+pkgname=---appName----git
+_pkgver=---version---
+pkgver=${_pkgver//-/.}
+pkgrel=1
+pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional instant messaging experience."
+arch=('x86_64')
+url="https://schildi.chat"
+license=('Apache')
+depends=('sqlcipher')
+provides=('---appName---')
+conflicts=('---appName---')
+source=("---debName---"
+        "---appName---.sh")
+sha256sums=('SKIP'
+            'SKIP')
+
+package() {
+  msg2 "Extracting the data.tar.xz..."
+  bsdtar -xf data.tar.xz -C "$pkgdir/"
+  install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName---
+}
--- a/local-pkgbuild-template/schildichat-desktop.sh
+++ b/local-pkgbuild-template/schildichat-desktop.sh
@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec "/opt/---productName---/---appName---" "$@"
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@ -2,6 +2,12 @@

 SCHILDI_ROOT="$(dirname "$(realpath "$0")")"

+i18n_helper_path="$SCHILDI_ROOT/i18n-helper/index.js"
+i18n_path="src/i18n/strings"
+i18n_overlay_path="$SCHILDI_ROOT/i18n-overlays"
+
+yarn=yarnpkg
+
 add_upstream() {
    if git remote | grep -q upstream; then
        echo "Remote named upstream already exists!"
@ -52,3 +58,69 @@ check_branch() {
        ensure_yes "$repo_name not in branch $1. Continue?"
    fi
 }
+
+check_clean_git() {
+    # Require clean git state
+    uncommitted=`git status --porcelain`
+    if [ ! -z "$uncommitted" ]; then
+        echo "Uncommitted changes are present, please commit first!"
+        exit 1
+    fi
+}
+
+revert_i18n_changes() {
+    local i18n_path="$1"
+    local skip_commit="$2"
+
+    git checkout upstream/master -- "$i18n_path"
+
+    if [[ "$skip_commit" != [Yy]* ]]; then
+        git commit -m "Automatic i18n reversion" || true
+    fi
+}
+
+apply_i18n_changes() {
+    local i18n_path="$1"
+
+    git add "$i18n_path"
+    git commit -m "Automatic i18n adjustment" || true
+}
+
+automatic_i18n_reversion() {
+    local skip_commit="$1"
+
+    pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
+    revert_i18n_changes "$i18n_path" $skip_commit
+    popd > /dev/null
+
+    pushd "$SCHILDI_ROOT/element-web" > /dev/null
+    revert_i18n_changes "$i18n_path" $skip_commit
+    popd > /dev/null
+
+    pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
+    revert_i18n_changes "$i18n_path" $skip_commit
+    popd > /dev/null
+}
+
+automatic_i18n_adjustment() {
+    # matrix-react-sdk
+    pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/matrix-react-sdk/$i18n_path" "$i18n_overlay_path/matrix-react-sdk"
+    apply_i18n_changes "$i18n_path"
+    popd > /dev/null
+
+    # element-web
+    pushd "$SCHILDI_ROOT/element-web" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/element-web/$i18n_path" "$i18n_overlay_path/element-web"
+    apply_i18n_changes "$i18n_path"
+    popd > /dev/null
+
+    # element-desktop
+    pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/element-desktop/$i18n_path" "$i18n_overlay_path/element-desktop"
+    apply_i18n_changes "$i18n_path"
+    popd > /dev/null
+}
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@ -9,12 +9,30 @@ 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
+
+# Automatic i18n reversion
+automatic_i18n_reversion
+
+# Merge
 forall_repos git fetch upstream
 forall_repos git merge upstream/master

-./setup.sh
+# Refresh environment
+make clean
+make setup
+
+# Automatic i18n adjustment
+automatic_i18n_adjustment
+
+# Automatic theme update
+pushd "matrix-react-sdk" > /dev/null
+./theme.sh
+popd > /dev/null

 popd > /dev/null
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@ -0,0 +1,17 @@
+final: prev: {
+  cleanSchildichatDesktopSource = src: with final.lib; cleanSourceWith {
+    filter = name: type: cleanSourceFilter name type
+      && !(hasInfix "/node_modules/" name)
+      && !(hasInfix "/nix/" name && hasSuffix ".nix" name)
+    ;
+    inherit src;
+  };
+  schildichat-web = final.callPackage ./schildichat-web.nix {};
+  schildichat-desktop = final.callPackage ./schildichat-desktop.nix {
+    inherit (final.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
+  };
+  schildichat-desktop-wayland = final.callPackage ./schildichat-desktop.nix {
+    inherit (final.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
+    useWayland = true;
+  };
+}
--- a/nix/schildichat-desktop.nix
+++ b/nix/schildichat-desktop.nix
@ -0,0 +1,109 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, makeDesktopItem
+, mkYarnPackage
+, electron
+, element-desktop # for native modules
+, schildichat-web
+, callPackage
+, Security
+, AppKit
+, CoreServices
+
+, useWayland ? false
+
+, cleanSchildichatDesktopSource
+, schildichat-desktop-src ? ../.
+}:
+
+let
+  packageJSON = schildichat-desktop-src + "/element-desktop/package.json";
+  yarnLock = schildichat-desktop-src + "/element-desktop/yarn.lock";
+
+  package = builtins.fromJSON (builtins.readFile packageJSON);
+
+  pname = "schildichat-desktop";
+  version = package.version;
+
+  executableName = pname;
+
+  electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
+
+in mkYarnPackage rec {
+  inherit pname version packageJSON;
+
+  src = cleanSchildichatDesktopSource (schildichat-desktop-src + "/element-desktop");
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  inherit (element-desktop) seshat keytar;
+
+  buildPhase = ''
+    runHook preBuild
+
+    export HOME=$(mktemp -d)
+    pushd deps/schildichat-desktop/
+    npx tsc
+    yarn run i18n
+    node ./scripts/copy-res.js
+    popd
+    rm -rf node_modules/matrix-seshat node_modules/keytar
+    ln -s $keytar node_modules/keytar
+    ln -s $seshat node_modules/matrix-seshat
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # resources
+    mkdir -p "$out/share/element"
+    ln -s '${schildichat-web}' "$out/share/element/webapp"
+    cp -r './deps/schildichat-desktop' "$out/share/element/electron"
+    cp -r './deps/schildichat-desktop/res/img' "$out/share/element"
+    rm "$out/share/element/electron/node_modules"
+    cp -r './node_modules' "$out/share/element/electron"
+    cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
+    ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
+
+    # icons
+    for icon in $out/share/element/electron/build/icons/*.png; do
+      mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
+      ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"
+    done
+
+    # desktop item
+    mkdir -p "$out/share"
+    ln -s "${desktopItem}/share/applications" "$out/share/applications"
+
+    # executable wrapper
+    makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
+      --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"
+
+    runHook postInstall
+  '';
+
+  # Do not attempt generating a tarball for element-web again.
+  # note: `doDist = false;` does not work.
+  distPhase = ''
+    true
+  '';
+
+  # The desktop item properties should be kept in sync with data from upstream:
+  # https://github.com/vector-im/element-desktop/blob/develop/package.json
+  desktopItem = makeDesktopItem {
+    name = "schildichat-desktop";
+    exec = "${executableName} %u";
+    icon = "schildichat";
+    desktopName = "SchildiChat";
+    genericName = "Matrix Client";
+    categories = "Network;InstantMessaging;Chat;";
+    extraEntries = ''
+      StartupWMClass=schildichat
+      MimeType=x-scheme-handler/element;
+    '';
+  };
+}
--- a/nix/schildichat-web.nix
+++ b/nix/schildichat-web.nix
@ -0,0 +1,75 @@
+{ stdenv
+, mkYarnModules
+, nodejs
+, cleanSchildichatDesktopSource
+, schildichat-desktop-src ? ../.
+, ...
+}:
+
+let
+  packageJSON = schildichat-desktop-src + "/element-web/package.json";
+  yarnLock = schildichat-desktop-src + "/element-web/yarn.lock";
+
+  package = builtins.fromJSON (builtins.readFile packageJSON);
+
+  pname = "schildichat-web";
+  version = package.version;
+
+  modules = mkYarnModules {
+    name = "${pname}-modules-${version}";
+    inherit pname version packageJSON yarnLock;
+  };
+
+in stdenv.mkDerivation {
+  inherit pname version;
+
+  src = cleanSchildichatDesktopSource schildichat-desktop-src;
+
+  buildInputs = [ nodejs ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cp configs/sc/config.json element-web/
+    cp -r ${modules}/node_modules node_modules
+    chmod u+rwX -R node_modules
+    rm -rf node_modules/matrix-react-sdk
+    ln -s $PWD/matrix-react-sdk node_modules/
+    ln -s $PWD/node_modules matrix-react-sdk/
+    ln -s $PWD/node_modules element-web/
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    pushd matrix-react-sdk
+    node_modules/.bin/reskindex -h ../element-web/src/header
+    popd
+
+    pushd element-web
+    node scripts/copy-res.js
+    node_modules/.bin/reskindex -h ../element-web/src/header
+    node_modules/.bin/webpack --progress --mode production
+    popd
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r element-web/webapp $out
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit modules;
+  };
+}
--- a/regenerate_i18n.sh
+++ b/regenerate_i18n.sh
@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+mydir="$(dirname "$(realpath "$0")")"
+branch=${BRANCH:-"sc"}
+
+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
+
+# Automatic i18n reversion
+automatic_i18n_reversion y
+
+# Automatic i18n adjustment
+automatic_i18n_adjustment
+
+popd > /dev/null
--- a/screenshots/1.png
+++ b/screenshots/1.png
--- a/screenshots/2.png
+++ b/screenshots/2.png
--- a/setup.sh
+++ b/setup.sh
@ -27,3 +27,7 @@ pushd element-desktop
 $yarn install
 ln -s ../element-web/webapp ./ || true
 popd
+
+pushd i18n-helper
+$yarn install
+popd
Author	SHA1	Message	Date
su-ex	e45b9c2479	Update submodules	2021-09-13 23:02:11 +02:00
su-ex	d39696f776	Merge pull request #92 from nyantec/makefile-mac-universal fix macOS dmg output file in Make	2021-09-13 19:33:29 +02:00
Finn Behrens	1bf339dcb1	fix macOS dmg output file in Make Signed-off-by: Finn Behrens <me@kloenk.dev>	2021-09-13 19:26:52 +02:00
su-ex	d730a87a59	New release v1.8.4-sc1	2021-09-13 19:14:56 +02:00
su-ex	e900562d5e	Fix flathub deploy script	2021-09-13 19:14:27 +02:00
su-ex	c827d5af18	readme: Correct typo	2021-09-13 16:13:20 +02:00
su-ex	d8af01d36a	Makefile: Add rpm targets	2021-09-13 16:09:53 +02:00
su-ex	519801c059	Add some new sc specific strings	2021-09-13 15:04:18 +02:00
su-ex	cf2ba283e8	Makefile: Add -f to bom.lock clean	2021-09-13 08:49:34 +02:00
su-ex	898ba1215e	Merge pull request #89 from nyantec/bom add bom.lock makefile target	2021-09-12 10:51:55 +02:00
Finn Behrens	29abb3e567	add bom.lock makefile target Signed-off-by: Finn Behrens <me@kloenk.dev>	2021-09-11 17:50:28 +02:00
su-ex	2294770442	Merge pull request #87 from yu-re-ka/feature-nix-flake add Nix flake	2021-09-07 19:54:18 +02:00
Yureka	ab496bbf96	add Nix flake	2021-09-07 18:44:33 +02:00
Niels Bouma	8bcb23f52f	Translated using Weblate (Dutch) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/nl/	2021-09-07 13:06:15 +02:00
Niels Bouma	f9a9e091d3	Translated using Weblate (Dutch) Currently translated at 100.0% (10 of 10 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/nl/	2021-09-07 13:06:14 +02:00
Nikita Epifanov	99d6a3790c	Translated using Weblate (Russian) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/ru/	2021-08-17 17:18:14 +02:00
Nikita Epifanov	2aedca9fb7	Translated using Weblate (Russian) Currently translated at 100.0% (10 of 10 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/ru/	2021-08-17 17:18:14 +02:00
waclaw66	1a305bab96	Translated using Weblate (Czech) Currently translated at 100.0% (10 of 10 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/	2021-08-17 17:18:14 +02:00
su-ex	0206873c18	Change github release target to master	2021-08-17 17:16:52 +02:00
su-ex	7a61dc1da8	Merge pull request #83 from nyantec/makefile add icns and mas target to makefile	2021-08-13 18:36:31 +02:00
Finn Behrens	98c8da3c34	add macOS signing info to README.md	2021-08-13 18:26:05 +02:00
su-ex	a4436f462a	Update submodules	2021-08-13 17:03:20 +02:00
Finn Behrens	17ae7bf98b	add icns and mas target to makefile	2021-08-12 22:09:59 +02:00
su-ex	4aa0bbec25	Makefile: Let debian target only build Debian	2021-07-20 20:31:29 +02:00
su-ex	bdac1e4334	Update submodules	2021-07-20 20:25:36 +02:00
su-ex	b447e3f45d	Makefile: Fix renamed yarn script	2021-07-20 20:14:38 +02:00
su-ex	552ab5913f	i18n: Run yarn i18n in submodules for each before overlaying	2021-07-20 19:54:18 +02:00
Allan Nordhøy	046b7c02fd	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (10 of 10 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/nb_NO/	2021-07-20 17:55:16 +02:00
Allan Nordhøy	4a68ab4f94	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/nb_NO/	2021-07-20 17:55:16 +02:00
Weblate	90195daa63	Added translation using Weblate (Norwegian Bokmål)	2021-07-20 03:32:41 +02:00
Weblate	54eaabde39	Added translation using Weblate (Norwegian Bokmål)	2021-07-20 03:32:39 +02:00
Allan Nordhøy	fa9153bbca	Added translation using Weblate (Norwegian Bokmål)	2021-07-20 03:32:38 +02:00
Weblate	ca8629d4e5	Added translation using Weblate (Persian)	2021-07-12 11:25:42 +02:00
Weblate	b64bd20b15	Added translation using Weblate (Persian)	2021-07-12 11:25:39 +02:00
Weblate	e72dfceb12	Added translation using Weblate (Persian)	2021-07-12 11:25:37 +02:00
Frisk	9cc3cdc3dc	Translated using Weblate (Polish) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/pl/	2021-07-11 07:08:47 +02:00
Weblate	460458ca0a	Added translation using Weblate (Polish)	2021-07-10 17:18:21 +02:00
Weblate	d56fac4ea7	Added translation using Weblate (Polish)	2021-07-10 17:18:20 +02:00
Frisk	2b06a6cbd8	Added translation using Weblate (Polish)	2021-07-10 17:18:11 +02:00
su-ex	cdf5812221	New release v1.7.32-sc1	2021-07-09 04:30:25 +02:00
su-ex	25148ec273	... and remove matrix.org	2021-07-08 17:40:58 +02:00
su-ex	2248eebef0	... and back to id but keep reordered server list	2021-07-08 17:36:12 +02:00
su-ex	505a21a022	Change update room id to alias	2021-07-08 17:24:03 +02:00
su-ex	89d385b7d4	Translated using Weblate (German) Currently translated at 100.0% (10 of 10 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/	2021-07-08 11:21:20 +02:00
su-ex	4e01e1d57a	Translated using Weblate (German) Currently translated at 100.0% (9 of 9 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/	2021-07-08 11:21:20 +02:00
su-ex	7e2d84fc1c	Explain better what the different repos are for Close #72	2021-07-08 11:21:16 +02:00
su-ex	c000ee1445	Allow "Don't ask again" being translated	2021-07-08 00:08:55 +02:00
su-ex	be3bb16e06	regenerate_i18n: Run yarn i18n in all repos	2021-07-07 18:06:57 +02:00
su-ex	817bdaf65b	Offer Windows and Apple users to join an update notification room	2021-07-07 17:29:30 +02:00
su-ex	d5fa475e8d	Move electron-builder args directly to the Makefile to avoid friction	2021-07-06 11:17:42 +02:00
SpiritCroc	7c4500e95f	Deleted translation using Weblate (English (United States))	2021-07-04 13:24:55 +02:00
SpiritCroc	e69c5bfb10	Deleted translation using Weblate (English (United States))	2021-07-04 13:24:38 +02:00
SpiritCroc	ee760ab980	Deleted translation using Weblate (English (United States))	2021-07-04 13:24:22 +02:00
Weblate	f82619b4cd	Added translation using Weblate (English (United States))	2021-07-04 12:59:50 +02:00
Weblate	7c2ad6457d	Added translation using Weblate (English (United States))	2021-07-04 12:59:49 +02:00
Weblate	ea528bb30d	Added translation using Weblate (English (United States))	2021-07-04 12:59:47 +02:00
J. Lavoie	8186dd8b40	Translated using Weblate (French) Currently translated at 100.0% (7 of 7 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/fr/	2021-07-04 02:05:59 +02:00
J. Lavoie	9389687646	Translated using Weblate (French) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/fr/	2021-07-04 02:05:59 +02:00
Govindas	91f8982678	Translated using Weblate (Lithuanian) Currently translated at 71.4% (5 of 7 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/lt/	2021-07-01 15:05:52 +02:00
Govindas	28e4695a22	Translated using Weblate (Lithuanian) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/lt/	2021-06-30 13:05:52 +02:00
Govindas	a808f3d496	Translated using Weblate (Lithuanian) Currently translated at 42.8% (3 of 7 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/lt/	2021-06-30 13:05:52 +02:00
Weblate	343c2d79a2	Added translation using Weblate (French)	2021-06-27 18:02:50 +02:00
Weblate	f7c1d254c3	Added translation using Weblate (French)	2021-06-27 18:02:47 +02:00
Weblate	e95a8442b0	Added translation using Weblate (French)	2021-06-27 18:02:45 +02:00
su-ex	d631fa21eb	Translated using Weblate (German) Currently translated at 100.0% (7 of 7 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/	2021-06-25 23:05:50 +02:00
waclaw66	80e873dd66	Translated using Weblate (Czech) Currently translated at 100.0% (7 of 7 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/	2021-06-25 23:05:50 +02:00
su-ex	9bffd5bea9	Merge remote-tracking branch 'weblate/sc' into sc	2021-06-24 16:15:43 +02:00
su-ex	539a43b311	Add new string for unified room list	2021-06-24 16:13:56 +02:00
su-ex	047c95b578	Translated using Weblate (German) Currently translated at 100.0% (6 of 6 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/	2021-06-14 23:33:46 +02:00
waclaw66	05f21f1707	Translated using Weblate (Czech) Currently translated at 100.0% (6 of 6 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/	2021-06-14 23:33:46 +02:00
su-ex	af4e841134	Revert "Translated using Weblate (Dutch)" This reverts commit `a7ef620132`.	2021-06-12 22:33:36 +02:00
su-ex	6a2eb7e256	Remove unused string	2021-06-12 22:30:46 +02:00
su-ex	7163a74d24	Add some missing strings	2021-06-12 22:30:00 +02:00
Marcus	a7ef620132	Translated using Weblate (Dutch) Currently translated at 0.0% (0 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/nl/	2021-06-10 15:33:44 +02:00
su-ex	8ad4a5e054	Translated using Weblate (Czech) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/	2021-06-08 23:33:43 +02:00
mondstern	df24897b75	Translated using Weblate (Estonian) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/et/	2021-06-06 12:56:35 +02:00
mondstern	6b6fc8aba2	Translated using Weblate (Slovak) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sk/	2021-06-06 12:56:34 +02:00
mondstern	6bcf555b6a	Translated using Weblate (Russian) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/ru/	2021-06-06 12:56:34 +02:00
mondstern	7f78d7c5a0	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/pt_BR/	2021-06-06 12:56:34 +02:00
mondstern	8783aad7fe	Translated using Weblate (Dutch) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/nl/	2021-06-06 12:56:34 +02:00
mondstern	a0b87afbd2	Translated using Weblate (Hungarian) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/hu/	2021-06-06 12:56:34 +02:00
mondstern	e8f02cb065	Translated using Weblate (Basque) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/eu/	2021-06-06 12:56:33 +02:00
mondstern	031c657ccb	Translated using Weblate (Estonian) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/et/	2021-06-06 12:56:33 +02:00
germe-fur	905374543d	Translated using Weblate (Spanish) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/es/	2021-06-05 14:27:52 +02:00
germe-fur	21c1a4d55a	Translated using Weblate (Spanish) Currently translated at 100.0% (5 of 5 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/es/	2021-06-05 14:27:52 +02:00
Weblate	17e988aac9	Added translation using Weblate (Slovak)	2021-06-05 11:14:31 +02:00
Weblate	6da7785919	Added translation using Weblate (Russian)	2021-06-05 11:14:30 +02:00
Weblate	b75788acf8	Added translation using Weblate (Portuguese (Brazil))	2021-06-05 11:14:30 +02:00
Weblate	dbaf203a9d	Added translation using Weblate (Dutch)	2021-06-05 11:14:29 +02:00
Weblate	3671fb2509	Added translation using Weblate (Lithuanian)	2021-06-05 11:14:29 +02:00
Weblate	d288d59851	Added translation using Weblate (Hungarian)	2021-06-05 11:14:28 +02:00
Weblate	f896a5cf9b	Added translation using Weblate (Basque)	2021-06-05 11:14:28 +02:00
Weblate	013115c4b7	Added translation using Weblate (Estonian)	2021-06-05 11:14:28 +02:00
Weblate	54692fd5d5	Added translation using Weblate (Spanish)	2021-06-05 11:14:27 +02:00
Weblate	31626be179	Added translation using Weblate (Slovak)	2021-06-05 11:14:27 +02:00
Weblate	68c7fb216e	Added translation using Weblate (Russian)	2021-06-05 11:14:26 +02:00
Weblate	1e063b4c45	Added translation using Weblate (Portuguese (Brazil))	2021-06-05 11:14:26 +02:00
Weblate	0587d470ec	Added translation using Weblate (Dutch)	2021-06-05 11:14:26 +02:00
Weblate	4162a4b0bb	Added translation using Weblate (Lithuanian)	2021-06-05 11:14:25 +02:00
Weblate	1e65e1d6c2	Added translation using Weblate (Hungarian)	2021-06-05 11:14:25 +02:00
Weblate	ecf2ca9c95	Added translation using Weblate (Basque)	2021-06-05 11:14:24 +02:00
Weblate	ee9030b25e	Added translation using Weblate (Estonian)	2021-06-05 11:14:24 +02:00
Weblate	c92de08179	Added translation using Weblate (Spanish)	2021-06-05 11:14:23 +02:00
Weblate	68f8de90a8	Added translation using Weblate (Slovak)	2021-06-05 11:14:22 +02:00
Weblate	b58ec71fab	Added translation using Weblate (Russian)	2021-06-05 11:14:21 +02:00
Weblate	7d936b5dd6	Added translation using Weblate (Portuguese (Brazil))	2021-06-05 11:14:19 +02:00
Weblate	245acd8666	Added translation using Weblate (Dutch)	2021-06-05 11:14:18 +02:00
Weblate	5ae89a1930	Added translation using Weblate (Lithuanian)	2021-06-05 11:14:17 +02:00
Weblate	75ce7c462b	Added translation using Weblate (Hungarian)	2021-06-05 11:14:17 +02:00
Weblate	3c98777e16	Added translation using Weblate (Basque)	2021-06-05 11:14:16 +02:00
Weblate	d617678f3d	Added translation using Weblate (Estonian)	2021-06-05 11:14:15 +02:00
Weblate	37e2a48648	Added translation using Weblate (Spanish)	2021-06-05 11:14:15 +02:00
su-ex	80a92a3c30	Add empty element-web en_EN.json base overlay file	2021-06-05 11:05:05 +02:00
su-ex	f2ef0465a9	New release v1.7.29-sc1	2021-06-03 03:04:38 +02:00
su-ex	8cb68add15	Update cs.json	2021-05-31 17:03:21 +02:00
su-ex	303041011a	Merge pull request #69 from waclaw66/sc Added Czech translation	2021-05-31 11:49:26 +02:00
waclaw66	27949ef626	Added Czech translation	2021-05-31 11:08:37 +02:00
su-ex	f980cef006	Add option to regenerate i18n, add make target for it, move stuff around, cleanup	2021-05-29 15:07:59 +02:00
su-ex	c18cc22db7	Add stuff for automatic i18n adjustment	2021-05-29 03:51:36 +02:00
su-ex	ac9cf5e2d6	Update screenshots	2021-05-01 18:01:49 +02:00
su-ex	8424d864e5	Update submodules	2021-04-01 20:05:59 +02:00
su-ex	496d74e810	New release v1.7.24-sc1	2021-04-01 19:52:01 +02:00
su-ex	d8e3854033	New release v1.7.22-sc1	2021-03-03 20:19:10 +01:00
su-ex	8d8a5044f1	make: Remove old macos reskindex leftover	2021-02-19 14:52:35 +01:00
su-ex	2654090ccc	Update README.md	2021-02-16 13:35:35 +01:00
su-ex	e31047073f	make: Fix for reskindex	2021-02-16 13:32:30 +01:00
su-ex	1f5be68a19	Add macOS build dependencies to readme Thanks to @michi7801	2021-02-16 13:10:09 +01:00
su-ex	e2465f6176	Add option to build for macos	2021-02-05 22:16:12 +01:00
su-ex	4efaa0782b	New release v1.7.20-sc1	2021-02-05 19:30:47 +01:00
su-ex	a95770fb49	Add LICENSE	2021-01-28 11:54:46 +01:00
SpiritCroc	e417f25130	Add target to create a local PKGBUILD to install .deb on Arch pacman target is somewhat broken, so let's do it similarly like the official AUR package for local installs.	2021-01-28 10:59:38 +01:00
su-ex	80e65529bb	Change GitHub branch for release	2021-01-14 21:17:56 +01:00
su-ex	263a269da9	Adapt AUR bin deploy script to _pkgver for hyphens	2021-01-14 21:04:47 +01:00
su-ex	3d4259827d	New release v1.7.17-sc1	2021-01-14 20:46:00 +01:00
su-ex	52a7dfcd82	Let AUR and flathub deploy scripts push	2021-01-13 21:50:36 +01:00
su-ex	ed9740a4c2	Add script to deploy a release on GitHub	2021-01-13 21:47:11 +01:00
su-ex	cdd8ec775c	Enable labs settings with the default config Close #19	2020-12-26 18:39:36 +01:00
su-ex	88ef11d716	deploy: Fix flathub releases	2020-12-26 15:28:12 +01:00
su-ex	acd5e71f6c	New release v1.7.16	2020-12-24 15:48:27 +01:00
su-ex	412cbad76b	Automatic theme update and make clean on upstream merge	2020-12-21 19:49:51 +01:00
su-ex	dfef402e7f	Update screenshots	2020-12-16 13:18:43 +01:00
su-ex	651ffc13df	[WIP] Deploy scripts	2020-12-16 00:38:28 +01:00
su-ex	f0b142e996	New release v1.7.15	2020-12-15 23:09:30 +01:00
su-ex	9896d3718d	Add target to build AppImage	2020-12-15 14:47:08 +01:00
su-ex	3b93d5e2c6	Update readme Close #24	2020-12-12 18:57:12 +01:00
su-ex	d3c91d680b	web-release: explicit versioning, name from element-web/package.json	2020-12-12 10:48:10 +01:00
su-ex	d0b44c9f96	Update README.md	2020-11-30 20:11:20 +01:00
su-ex	32f684a88a	New version v1.7.14	2020-11-30 19:09:21 +01:00
su-ex	26a25f1f34	Fix unknown version inside settings » about	2020-11-30 00:25:00 +01:00
su-ex	b6e2375d57	Adjust default config - Disable anonymous usage data prompt: Close #5 - Disable bug reports - No hosting signup link - Link to own privacy policy	2020-11-30 00:06:20 +01:00
su-ex	f455ac64c3	Merge upstream v1.7.14	2020-11-26 14:00:13 +01:00