New release v1.10.4-sc.1

Add string for YouTube embed player option
Merge remote-tracking branch 'weblate/sc' into sc
2025-06-23 02:23:03 +02:00 · 2022-02-27 19:45:35 +01:00 · 2022-02-27 19:37:37 +01:00 · 2022-02-27 19:35:03 +01:00 · 2022-02-27 19:24:46 +01:00 · 2022-02-26 11:39:22 +01:00
12 changed files with 18 additions and 10 deletions
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@ -26,5 +26,6 @@
            "url": "https://schildi.chat/desktop/privacy",
            "text": "Privacy Policy"
        }
-    ]
+    ],
+    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
--- a/deploy/update-aur-bin.sh
+++ b/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
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@ -39,5 +39,6 @@
    "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"
 }
--- a/i18n-overlays/matrix-react-sdk/pt_BR.json
+++ b/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"
 }
--- a/local-pkgbuild-template/PKGBUILD
+++ b/local-pkgbuild-template/PKGBUILD
@ -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
 }
--- a/local-pkgbuild-template/schildichat-desktop.sh
+++ b/local-pkgbuild-template/schildichat-desktop.sh
@ -1,3 +1,3 @@
 #!/bin/sh

-LD_PRELOAD=/usr/lib/libsqlcipher.so exec "/opt/---productName---/---appName---" "$@"
+exec "/opt/---productName---/---appName---" "$@"
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/merge_helpers.sh
+++ b/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
 }
--- a/merge_upstream.sh
+++ b/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
Author	SHA1	Message	Date
su-ex	c655803783	New release v1.10.4-sc.1	2022-02-27 19:45:35 +01:00
su-ex	cf10ad7893	Add string for YouTube embed player option	2022-02-27 19:37:37 +01:00
su-ex	edb8bd0a58	Merge remote-tracking branch 'weblate/sc' into sc	2022-02-27 19:35:03 +01:00
su-ex	605966fc32	Revert "Try Element nightly AUR search in encrypted rooms fix" This reverts commit `fd8bca4d20`.	2022-02-27 19:24:46 +01:00
su-ex	db1d3e4e8a	Reset AUR bin pkgrel	2022-02-26 11:39:22 +01:00
mezysinc	74bb708796	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (41 of 41 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/pt_BR/	2022-02-17 21:39:01 +01:00
su-ex	3a8eecb023	New test release v1.10.3-sc.0.test.1	2022-02-15 01:36:47 +01:00
su-ex	a689c01b0e	Add map_style_url to sc config	2022-02-15 00:50:29 +01:00
su-ex	7a96f32c3f	New test release v1.10.1-sc.0.test.1	2022-02-01 19:52:34 +01:00
su-ex	867ca2ceaa	local-pkgbuild: Actually fix search in encrypted rooms	2022-01-31 23:52:13 +01:00
su-ex	57be42182b	New test release v1.10.0-sc.0.test.1	2022-01-31 23:19:40 +01:00
su-ex	47e56badc4	New test release v1.9.9-sc.0.test.1	2022-01-26 23:47:55 +01:00
su-ex	9d595d6087	Allow react sdk theme.sh being run without commit	2022-01-26 23:47:11 +01:00
su-ex	c4e17a1bc4	Let sc.0.test.0 be the initial version after a merge	2022-01-17 21:27:44 +01:00