mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-06-18 16:22:47 +02:00
Compare commits
12 Commits
v1.11.26-s
...
v1.11.29-s
Author | SHA1 | Date | |
---|---|---|---|
1a485faf72 | |||
64557e1da9 | |||
5122f0e870 | |||
0eb99a6a60 | |||
979be00158 | |||
10a5112285 | |||
40c598e91b | |||
1e0e3b718c | |||
219c0e3cf7 | |||
0ecdbb1bb8 | |||
c5042532eb | |||
b3516d1621 |
@ -1,6 +1,6 @@
|
||||
FROM fedora:latest
|
||||
|
||||
RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
|
||||
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
|
||||
|
||||
# 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 --ignore-dependencies --no-user-install --no-document fpm
|
||||
RUN gem install --no-user-install --no-document fpm
|
||||
|
||||
COPY . /project
|
||||
WORKDIR /project
|
||||
|
6
Makefile
6
Makefile
@ -4,6 +4,7 @@
|
||||
.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
|
||||
|
||||
@ -182,6 +183,9 @@ 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
|
||||
@ -195,7 +199,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
|
||||
fixup: undo_setup fix_yarn_cache
|
||||
make setup
|
||||
make clean
|
||||
make setup
|
||||
|
Submodule element-desktop updated: 1c4c88b459...ca3c38e98d
Submodule element-web updated: 5bcb0a17dd...d8643e4983
15
hard_reset_repos.sh
Executable file
15
hard_reset_repos.sh
Executable file
@ -0,0 +1,15 @@
|
||||
#!/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
|
@ -35,7 +35,13 @@ 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");
|
||||
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");
|
||||
}
|
||||
|
||||
if (overlayPath) {
|
||||
|
@ -1 +1,3 @@
|
||||
{}
|
||||
{
|
||||
"Show": "Mutat"
|
||||
}
|
||||
|
@ -49,5 +49,6 @@
|
||||
"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\""
|
||||
}
|
||||
|
@ -9,5 +9,26 @@
|
||||
"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"
|
||||
}
|
||||
|
Submodule matrix-js-sdk updated: 738c29c7c3...af4413b7a6
Submodule matrix-react-sdk updated: 916a4d6275...21ecba2346
Reference in New Issue
Block a user