New test release v1.10.15-sc.0.test.2

Currently translated at 100.0% (48 of 48 strings)

Translation: SchildiChat/matrix-react-sdk
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
+.PHONY: all setup regenerate-i18n 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
@@ -43,7 +43,7 @@ CSC_NAME ?=
 -include release.mk
 
 setup:
-	if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
+	./setup.sh
 
 element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*)
 
@@ -60,19 +60,15 @@ 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 reskindex
+web: setup
 	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
+	SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native
 
 macos-common: web icns
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''

README.md

@@ -3,9 +3,10 @@
 SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop).
 
 The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are:
-- A unified chat list for both direct and group chats
+- Customizable room list style (compact single line, intermediate and roomy with two line preview)
+- Option to show direct and group chats in a combined list
+- Improved theming options
 - Message bubbles
-- Bigger items in the room list
 - … and more!
 
 Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop)  
@@ -15,6 +16,18 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we
 
 <img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
 
+<details>
+<summary>Public key used to sign the Debian packages</summary>
+
+```
+pub   rsa4096 2020-12-08 [SC]
+      560BB70DA86A6633A39CEC6023358905FE294D01
+uid           Super apt repo key <apt@supercable.onl>
+sub   rsa4096 2020-12-08 [E]
+```
+
+</details>
+
 
 ## Building SchildiChat Web/Desktop
 
@@ -36,10 +49,11 @@ Development happens in the `sc` branch, which might be **broken at any time**!
 
 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:
+The following are the dependencies required to build SchildiChat Web/Desktop on Debian 11 (bullseye):
 
 ```
-# apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar
+# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl
+
 # curl -sL https://deb.nodesource.com/setup_14.x | bash -
 # apt update
 # apt install nodejs

bump_release_version.sh

@@ -17,4 +17,13 @@ forall_repos check_clean_git
 
 bump_release_version
 
+# Get version string
+get_current_versions
+get_versions_string
+
+# Add everything
+git add -A
+git commit --allow-empty -m "New release v$versions_string"
+git tag -s "v$versions_string" -m "New release v$versions_string"
+
 popd > /dev/null

bump_test_version.sh

@@ -17,4 +17,13 @@ forall_repos check_clean_git
 
 bump_test_version
 
+# Get version string
+get_current_versions
+get_versions_string
+
+# Add everything
+git add -A
+git commit --allow-empty -m "New test release v$versions_string"
+git tag -s "v$versions_string" -m "New test release v$versions_string"
+
 popd > /dev/null

configs/sc/config.json

@@ -27,11 +27,5 @@
             "text": "Privacy Policy"
         }
     ],
-    "sc_update_announcement_room": {
-        "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org",
-        "via_servers": [
-            "supercable.onl",
-            "spiritcroc.de"
-        ]
-    }
+    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

deploy/update-aur-bin.sh

@@ -21,6 +21,7 @@ git fetch
 git reset --hard origin/master
 
 sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD
+sed -i "s|^pkgrel=.*$|pkgrel=1|" PKGBUILD
 sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD
 
 makepkg --printsrcinfo > .SRCINFO

i18n-overlays/element-desktop/fa.json

@@ -1 +1,3 @@
-{}
+{
+    "Show": "نشان دادن"
+}

i18n-overlays/matrix-react-sdk/cs.json

@@ -40,5 +40,8 @@
     "Hide advanced theme settings": "Skrýt pokročilá nastavení motivu",
     "Mark rooms as unread": "Povolit označování chatů jako nepřečtených",
     "Mark as unread": "Označit jako nepřečtené",
-    "Mark as read": "Označit jako přečtené"
+    "Mark as read": "Označit jako přečtené",
+    "Enable YouTube embed player": "Povolí vložený přehrávač YouTube",
+    "Collapse additional buttons": "Sbalit další tlačítka",
+    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti."
 }

i18n-overlays/matrix-react-sdk/de_DE.json

@@ -141,5 +141,12 @@
     "Show advanced theme settings": "Erweiterte Designeinstellungen anzeigen",
     "Mark rooms as unread": "Erlaube Chats als ungelesen zu markieren",
     "Mark as read": "Als gelesen markieren",
-    "Mark as unread": "Als ungelesen markieren"
+    "Mark as unread": "Als ungelesen markieren",
+    "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren",
+    "Collapse additional buttons": "Zusätzliche Buttons einklappen",
+    "Round": "Rund",
+    "Mixed": "Gemischt",
+    "Corners": "Ecken",
+    "Extra round": "Extra rund",
+    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst."
 }

i18n-overlays/matrix-react-sdk/en_EN.json

@@ -39,5 +39,12 @@
     "Font size and typeface": "Font size and typeface",
     "Mark rooms as unread": "Allow marking chats as unread",
     "Mark as unread": "Mark as unread",
-    "Mark as read": "Mark as read"
+    "Mark as read": "Mark as read",
+    "Enable YouTube embed player": "Enable YouTube embed player",
+    "Collapse additional buttons": "Collapse additional buttons",
+    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.",
+    "Corners": "Corners",
+    "Round": "Round",
+    "Extra round": "Extra round",
+    "Mixed": "Mixed"
 }

i18n-overlays/matrix-react-sdk/id.json

@@ -39,5 +39,8 @@
     "Intermediate: medium sized avatar with single-line preview": "Sedang: avatar sedang dengan tampilan satu baris",
     "Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca",
     "Mark as unread": "Tandai sebagai belum dibaca",
-    "Mark as read": "Tandai sebagai dibaca"
+    "Mark as read": "Tandai sebagai dibaca",
+    "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat",
+    "Collapse additional buttons": "Sembunyikan tombol tambahan",
+    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan."
 }

i18n-overlays/matrix-react-sdk/pt_BR.json

@@ -37,5 +37,8 @@
     "Compact: tiny avatar together with name and preview in one line": "Compacto: avatar minúsculo junto com o nome e visualização em uma linha",
     "Intermediate: medium sized avatar with single-line preview": "Intermédio: avatar de tamanho médio com visualização de uma linha",
     "Roomy: big avatar with two-line preview": "Amplo: grande avatar com visualização em duas linhas",
-    "Room list style": "Estilo da lista de salas"
+    "Room list style": "Estilo da lista de salas",
+    "Mark rooms as unread": "Permitir markar conversas como não lidos",
+    "Mark as unread": "Markar como não lido",
+    "Mark as read": "Markar como lido"
 }

i18n-overlays/matrix-react-sdk/sv.json

@@ -39,5 +39,8 @@
     "Room list style": "Rumslista stil",
     "Mark as unread": "markera som oläst",
     "Mark as read": "markera som läst",
-    "Mark rooms as unread": "Tillåt att chattar markeras som olästa"
+    "Mark rooms as unread": "Tillåt att chattar markeras som olästa",
+    "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare",
+    "Collapse additional buttons": "Dölj ytterligare knappar",
+    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum."
 }

i18n-overlays/matrix-react-sdk/zh_Hans.json

@@ -36,5 +36,11 @@
     "Show message bubbles on one side only": "仅在一侧显示消息气泡",
     "Room list style": "聊天室列表样式",
     "Show message bubbles depending on the width either on both sides or only on one side": "根据窗口大小智能切换消息气泡的显示样式",
-    "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），这将非常有用。"
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "您想加入一个用来通知版本更新的房间吗？如果您的平台不支持自动更新 SchildiChat（例如 Windows 和 macOS），这将非常有用。",
+    "Mark as read": "标记为已读",
+    "Mark rooms as unread": "允许将聊天记录标记为未读",
+    "Mark as unread": "标记为未读",
+    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意：禁用主页可能会让您无法看到某些房间。",
+    "Enable YouTube embed player": "启用 YouTube 嵌入式播放器",
+    "Collapse additional buttons": "折叠额外的按钮"
 }

local-pkgbuild-template/PKGBUILD

@@ -10,7 +10,7 @@ pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional
 arch=('x86_64')
 url="https://schildi.chat"
 license=('Apache')
-depends=('sqlcipher')
+depends=()
 provides=('---appName---')
 conflicts=('---appName---')
 source=("---debName---"
@@ -22,4 +22,5 @@ package() {
   msg2 "Extracting the data.tar.xz..."
   bsdtar -xf data.tar.xz -C "$pkgdir/"
   install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName---
+  sed -i 's|^Exec=.*|Exec=/usr/bin/---appName--- %u|' "${pkgdir}"/usr/share/applications/---appName---.desktop
 }

merge_helpers.sh

@@ -162,7 +162,8 @@ get_current_versions() {
 get_versions_string() {
     versions_string="${versions[0]}-sc.${versions[1]}"
 
-    if [[ ${versions[2]} -gt 0 ]]; then
+    # both zero means the initial version after a merge
+    if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then
         versions_string+=".test.${versions[2]}"
     fi
 }
@@ -238,9 +239,6 @@ automatic_packagejson_reversion() {
 automatic_packagejson_adjustment() {
     local versions
     get_current_versions
-    
-    # every build after a merge is a new test build
-    versions[2]=$((versions[2] + 1))
 
     forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json"
     forelement_repos write_version "package.json"

merge_upstream.sh

@@ -46,7 +46,7 @@ automatic_packagejson_adjustment
 
 # Automatic theme update
 pushd "matrix-react-sdk" > /dev/null
-./theme.sh
+./theme.sh y
 popd > /dev/null
 
 popd > /dev/null