Containerfile.fedora

@@ -1,6 +1,6 @@
 FROM fedora:latest
 
-RUN dnf install -y openssl openssl-devel rust cargo llvm15 libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
+RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
 
 # node setup
 ARG NODE_VERSION
@@ -11,7 +11,7 @@ RUN bash n ${NODE_VERSION}
 RUN npm install -g n
 RUN npm install -g yarn
 RUN npm install -g node-gyp
-RUN gem install --no-user-install --no-document fpm
+RUN gem install --ignore-dependencies --no-user-install --no-document fpm
 
 COPY . /project
 WORKDIR /project

Makefile

@@ -4,7 +4,6 @@
 .PHONY: container-build-debian container-build-fedora
 .PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
 .PHONY: clean undo_setup fixup
-.PHONY: fix_yarn_cache
 
 CFGDIR ?= configs/sc
 
@@ -183,9 +182,6 @@ bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.loc
 	./build-bom.sh
 bom: bom.lock
 
-fix_yarn_cache:
-	$(YARN) cache list || $(YARN) cache clean
-
 clean:
 	$(YARN) --cwd matrix-js-sdk clean
 	$(YARN) --cwd matrix-react-sdk clean
@@ -199,7 +195,7 @@ clean:
 undo_setup:
 	rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
 
-fixup: undo_setup fix_yarn_cache
+fixup: undo_setup
 	make setup
 	make clean
 	make setup

element-desktop

@@ -1 +1 @@
-Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca
+Subproject commit b4a7f5eb21fcc5e4efc8616f819f382b8fd72195

element-web

@@ -1 +1 @@
-Subproject commit d8643e4983b11a87831af1729037976d14641454
+Subproject commit 8aee83a35cba668b65a02460cd10a5f614c931d5

hard_reset_repos.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mydir="$(dirname "$(realpath "$0")")"
-
-cd "$mydir"
-
-source ./merge_helpers.sh
-
-# Note: this doesn't delete files starting with a dot,
-# and in particular not the '.git' directory, which we
-# want to keep
-forall_repos bash -c 'rm -rf *'
-forall_repos git reset HEAD --hard

i18n-helper/index.js

@@ -35,13 +35,7 @@ function writeStrings(p, strings) {
 		let strings = readStrings(p);
 
 		for (const key of Object.keys(strings)) {
-			strings[key] = strings[key]
+			strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat");
-				.replace(/Element/g, "SchildiChat")
-				.replace(/element\.io/g, "schildi.chat")
-				
-				// It's still Element Call
-				.replace(/SchildiChat Call/g, "Element Call")
-				.replace(/SchildiChat-Call/g, "Element-Call");
 		}
 
 		if (overlayPath) {

i18n-overlays/element-desktop/hu.json

@@ -1,3 +1 @@
-{
+{}
-    "Show": "Mutat"
-}

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

@@ -49,6 +49,5 @@
     "Mixed": "Mixed",
     "Sound pack": "Sound pack",
     "Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety",
-    "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element",
+    "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element"
-    "React with \"%(reaction)s\"": "React with \"%(reaction)s\""
 }

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

@@ -9,26 +9,5 @@
     "Light theme": "Tema chiaro",
     "Dark theme": "Tema scuro",
     "Normal priority": "Priorità normale",
-    "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).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o 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).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)"
-    "Show message bubbles on one side only": "Visualizza bolle messaggi su un lato solo",
-    "Show message bubbles depending on the width either on both sides or only on one side": "Visualizza bolle messaggi in base alla lunghezza di entrambi i lati o di uno solo",
-    "User name color mode": "Modalità colore nome utente",
-    "Room list style": "Stile lista stanze",
-    "Theme": "Tema",
-    "Show all rooms in Home": "Visualizza tutte le stanze nella Home",
-    "All rooms you're in will appear in Home.": "Tutte le stanze in cui partecipi appariranno nella Home.",
-    "For people": "Per le persone",
-    "Room list": "Lista stanze",
-    "Show advanced theme settings": "Visualizza impostazioni avanzate tema",
-    "Mark rooms as unread": "Permetti di segnare le chat come non lette",
-    "Message bubbles": "Bolle messaggi",
-    "Message layout": "Impaginazione messaggi",
-    "Mark as unread": "Segna come non letto",
-    "Uniform": "Uniforme",
-    "Show people in spaces": "Visualizza persone negli spazi",
-    "MXID": "MXID",
-    "In public rooms": "Nelle stanze pubbliche",
-    "In group chats": "Nelle chat di gruppo",
-    "Font size and typeface": "Dimensione e tipo carattere",
-    "Hide advanced theme settings": "Nascondi impostazioni avanzate tema"
 }

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

@@ -40,6 +40,5 @@
     "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",
+    "Mark as read": "Markar como lido"
-    "Collapse additional buttons": "Recolher botões adicionais"
 }

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit af4413b7a681d5f590b7674d87b3a103086705d1
+Subproject commit f94634a6dce0e08530c39bcc0c824d093dc93ba7

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341
+Subproject commit 4bf0df2b3dfadda74a33a566b1a99f9c2b98184a