diff --git a/Containerfile.fedora b/Containerfile.fedora index a61578c..279d43f 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM fedora:latest -RUN dnf install -y openssl openssl-devel rust cargo llvm 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,10 +11,10 @@ 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 # There might be remnants of the host which break the build -RUN make fixup +RUN make fixup \ No newline at end of file diff --git a/Makefile b/Makefile index 205cea9..c517e5b 100644 --- a/Makefile +++ b/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 diff --git a/element-desktop b/element-desktop index c221f6c..8f68fc6 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c221f6cf768fbc133c744d4869744d8c12c75e64 +Subproject commit 8f68fc6612d1ca13fe97df744ad2538da1f9ade7 diff --git a/element-web b/element-web index bfa6512..62767ba 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit bfa65127b2f7a68cdb4086a68250bbdade6e3d06 +Subproject commit 62767baf0e17758cce1422614028869d90ba68a4 diff --git a/flake.lock b/flake.lock index d010aa2..271a3d0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1699380656, - "narHash": "sha256-H9kQH3J2Z15Ady3zVQsN/tXv8qnRr+p1B0eUkR1bKfE=", + "lastModified": 1633901457, + "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "03e7a22654c44489a0a70ea0e237de3e512cd8a6", + "rev": "f358794824b4595d77fec93732485d329ed7b0e0", "type": "github" }, "original": { diff --git a/hard_reset_repos.sh b/hard_reset_repos.sh deleted file mode 100755 index 4e17e2a..0000000 --- a/hard_reset_repos.sh +++ /dev/null @@ -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 diff --git a/i18n-helper/index.js b/i18n-helper/index.js index 11e3fc4..f226e47 100644 --- a/i18n-helper/index.js +++ b/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] - .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"); + strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat"); } if (overlayPath) { diff --git a/i18n-overlays/element-desktop/hu.json b/i18n-overlays/element-desktop/hu.json index 8598663..0967ef4 100644 --- a/i18n-overlays/element-desktop/hu.json +++ b/i18n-overlays/element-desktop/hu.json @@ -1,3 +1 @@ -{ - "Show": "Mutat" -} +{} diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index a0816fc..861e944 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -21,8 +21,8 @@ "MXID": "MXID", "In group chats": "Ve skupinových chatech", "In public rooms": "Ve veřejných místnostech", - "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v Úvodu.", - "Show all rooms in Home": "Zobrazit všechny místnosti v Úvodu", + "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v domovském zobrazení.", + "Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení", "Show people in spaces": "Ukázat lidi v prostorech", "Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé v prostorech", "Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru", @@ -50,6 +50,5 @@ "Mixed": "Smíšené", "Sound pack": "Balíček zvuků", "Schildi: Softer sounds for reduced anxiety": "Schildi: Jemnější zvuky pro snížení úzkosti", - "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element", - "React with \"%(reaction)s\"": "Reagovat pomocí \"%(reaction)s\"" + "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element" } diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 2c59706..7732df7 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/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", - "React with \"%(reaction)s\"": "React with \"%(reaction)s\"" + "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element" } diff --git a/i18n-overlays/matrix-react-sdk/hu.json b/i18n-overlays/matrix-react-sdk/hu.json index cde030f..a048d36 100644 --- a/i18n-overlays/matrix-react-sdk/hu.json +++ b/i18n-overlays/matrix-react-sdk/hu.json @@ -3,27 +3,5 @@ "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", - "Show people and rooms in a combined list": "Személyek és szobák megjelenítése egy egyesített listában", - "Update notifications": "Értesítések frissítése", - "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).": "Szeretne csatlakozni olyan szobához, amely értesíti Önt az új megjelenésekről? Ez különösen akkor hasznos, ha az Ön platformja nem támogatja a SchildiChat automatikus frissítéseit (pl. Windows és macOS).", - "System": "Rendszer", - "Show all rooms in Home": "Az összes szoba megjelenítése a kezdőoldalon", - "All rooms you're in will appear in Home.": "Az összes szoba, amelyben tartózkodik, megjelenik a Kezdőlapon.", - "Mark as read": "Olvasottnak jelöl", - "Enable YouTube embed player": "YouTube beágyazott lejátszó engedélyezése", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "A Kezdőlap hasznos ahhoz, hogy mindenről áttekintést kapjunk. Ne feledje, hogy a kikapcsolásával bizonyos szobákat nem fog látni.", - "Schildi: Softer sounds for reduced anxiety": "Schildi: Lágyabb hangok a kevesebb stresszért", - "Sound pack": "Hangcsomag", - "Classic: The same sharp sounds as Element": "Klasszikus: Ugyanazok az éles hangok, mint az Elementnél", - "Don't ask again": "Ne kérdezze újra", - "Light theme": "Világos téma", - "Dark theme": "Sötét téma", - "Mark as unread": "Olvasatlannak jelöl", - "Collapse additional buttons": "További gombok összecsukása", - "Theme": "Téma", - "Room list": "Szobák listája", - "Font size and typeface": "Betűméret és betűtípus", - "Message layout": "Üzenetek elrendezése", - "Modern": "Modern" + "Normal priority": "Normál prioritás" } diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index 3324b6f..c0d5cbb 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -49,6 +49,5 @@ "Mixed": "Campur", "Sound pack": "Paket suara", "Schildi: Softer sounds for reduced anxiety": "Schildi: Suara lebih lembut untuk mengurangi kecemasan", - "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element", - "React with \"%(reaction)s\"": "Reaksi dengan \"%(reaction)s\"" + "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element" } diff --git a/i18n-overlays/matrix-react-sdk/it.json b/i18n-overlays/matrix-react-sdk/it.json index 187e9c4..72a5b3a 100644 --- a/i18n-overlays/matrix-react-sdk/it.json +++ b/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.)", - "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" + "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.)" } diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json index 1b4c8af..5bac536 100644 --- a/i18n-overlays/matrix-react-sdk/pt_BR.json +++ b/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", - "Collapse additional buttons": "Recolher botões adicionais" + "Mark as read": "Markar como lido" } diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json index e3e332a..aef112a 100644 --- a/i18n-overlays/matrix-react-sdk/zh_Hans.json +++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json @@ -42,13 +42,5 @@ "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": "折叠额外的按钮", - "Round": "圆角", - "React with \"%(reaction)s\"": "与 \"%(reaction)s\" 互动", - "Schildi: Softer sounds for reduced anxiety": "Schildi: 舒缓音效以减少焦虑", - "Mixed": "混合", - "Extra round": "超圆角", - "Sound pack": "音频包", - "Classic: The same sharp sounds as Element": "Classic: 与 Element 相同的尖锐声音", - "Corners": "边缘" + "Collapse additional buttons": "折叠额外的按钮" } diff --git a/matrix-js-sdk b/matrix-js-sdk index 255144e..d89e210 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f +Subproject commit d89e210512f102196c66045c69ee69d767468b4b diff --git a/matrix-react-sdk b/matrix-react-sdk index 9994f86..dd020a8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e +Subproject commit dd020a8866e8ee321f4ec403f410dc6ada265171 diff --git a/merge_upstream.sh b/merge_upstream.sh index e772262..cfbea1f 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -23,13 +23,7 @@ automatic_i18n_reversion automatic_packagejson_reversion # Merge upstream - -# Check if specific version to merge passed -if [ -z "$1" ]; then - get_latest_upstream_tag -else - latest_upstream_tag="$1" -fi +get_latest_upstream_tag forelement_repos git merge "$latest_upstream_tag" get_current_mxsdk_tags