mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-06-17 15:52:44 +02:00
Compare commits
18 Commits
v1.11.0-sc
...
v1.11.6-sc
Author | SHA1 | Date | |
---|---|---|---|
95d46b08b4 | |||
a7c084d6f8 | |||
6c5136d844 | |||
fc8900cf13 | |||
e886c4c135 | |||
30dc3ba5b9 | |||
dfa7921f9a | |||
cd8998da62 | |||
05ff60b4c3 | |||
04cb55d6c3 | |||
a2a87f04ca | |||
7f80df5ca6 | |||
3757d1d7d6 | |||
2bccbdbe57 | |||
5ce4f71da2 | |||
0f691d4dc6 | |||
97d058da1b | |||
a96278bc44 |
10
Makefile
10
Makefile
@ -1,7 +1,7 @@
|
|||||||
.PHONY: all setup regenerate-i18n 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: 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: macos-common macos macos-mas macos-release macos-mas-release icns
|
||||||
.PHONY: clean
|
.PHONY: clean undo_setup fixup
|
||||||
|
|
||||||
CFGDIR ?= configs/sc
|
CFGDIR ?= configs/sc
|
||||||
|
|
||||||
@ -166,3 +166,11 @@ clean:
|
|||||||
rm -rf element-web/dist
|
rm -rf element-web/dist
|
||||||
rm -rf local-pkgbuild
|
rm -rf local-pkgbuild
|
||||||
rm -f bom.lock
|
rm -f bom.lock
|
||||||
|
|
||||||
|
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
|
||||||
|
make setup
|
||||||
|
make clean
|
||||||
|
make setup
|
||||||
|
@ -54,7 +54,7 @@ The following are the dependencies required to build SchildiChat Web/Desktop on
|
|||||||
```
|
```
|
||||||
# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl
|
# 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 -
|
# curl -sL https://deb.nodesource.com/setup_16.x | bash -
|
||||||
# apt update
|
# apt update
|
||||||
# apt install nodejs
|
# apt install nodejs
|
||||||
|
|
||||||
|
Submodule element-desktop updated: b0bfb5c2d3...cbcbe7ff68
Submodule element-web updated: d9f614624b...8a4c07f245
61
generate_changelog.sh
Executable file
61
generate_changelog.sh
Executable file
@ -0,0 +1,61 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
mydir="$(dirname "$(realpath "$0")")"
|
||||||
|
|
||||||
|
pushd "$mydir" > /dev/null
|
||||||
|
|
||||||
|
source ./merge_helpers.sh
|
||||||
|
|
||||||
|
# Check branch
|
||||||
|
check_branch $branch
|
||||||
|
forall_repos check_branch $branch
|
||||||
|
|
||||||
|
# Ensure clean git state
|
||||||
|
forall_repos check_clean_git
|
||||||
|
|
||||||
|
# Fetch upstream
|
||||||
|
forall_repos git fetch origin > /dev/null
|
||||||
|
forall_repos git fetch upstream > /dev/null
|
||||||
|
|
||||||
|
(
|
||||||
|
# Add new line below git log: https://unix.stackexchange.com/a/345558
|
||||||
|
|
||||||
|
get_latest_upstream_tag
|
||||||
|
forelement_repos git log --pretty=format:"- %s" "sc" "^$latest_upstream_tag" "^master" \
|
||||||
|
| printf '%s\n' "$(cat)" \
|
||||||
|
| sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \
|
||||||
|
| sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|"
|
||||||
|
|
||||||
|
get_current_mxsdk_tags
|
||||||
|
|
||||||
|
pushd "matrix-js-sdk" > /dev/null
|
||||||
|
git log --pretty=format:"- %s" "sc" "^$current_mxjssdk_tag" "^master" \
|
||||||
|
| printf '%s\n' "$(cat)" \
|
||||||
|
| grep -v "Merge .*tag"
|
||||||
|
popd > /dev/null
|
||||||
|
|
||||||
|
pushd "matrix-react-sdk" > /dev/null
|
||||||
|
git log --pretty=format:"- %s" "sc" "^$current_mxreactsdk_tag" "^master" \
|
||||||
|
| printf '%s\n' "$(cat)" \
|
||||||
|
| grep -v "Merge .*tag"
|
||||||
|
popd > /dev/null
|
||||||
|
) \
|
||||||
|
| grep -v "Automatic i18n reversion" \
|
||||||
|
| grep -v "Automatic package.json reversion" \
|
||||||
|
| grep -v "Merge .*branch" \
|
||||||
|
| grep -v "Automatic theme update" \
|
||||||
|
| grep -v "Automatic package.json adjustment" \
|
||||||
|
| grep -v "Automatic i18n adjustment" \
|
||||||
|
| grep -v "Update version to .*-sc\\..*" \
|
||||||
|
| grep -v "\\.sh" \
|
||||||
|
| grep -v "\\.md" \
|
||||||
|
| grep -v "Added translation using Weblate" \
|
||||||
|
| grep -v "Translated using Weblate" \
|
||||||
|
| grep -v "weblate/sc" \
|
||||||
|
| grep -v "\\[.*merge.*\\]" \
|
||||||
|
| awk '!seen[$0]++' `# https://stackoverflow.com/a/1444448` \
|
||||||
|
|| echo "No significant changes since the last stable release"
|
||||||
|
|
||||||
|
popd > /dev/null
|
@ -47,5 +47,8 @@
|
|||||||
"Corners": "Rohy",
|
"Corners": "Rohy",
|
||||||
"Round": "Oblé",
|
"Round": "Oblé",
|
||||||
"Extra round": "Kulaté",
|
"Extra round": "Kulaté",
|
||||||
"Mixed": "Smíšené"
|
"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"
|
||||||
}
|
}
|
||||||
|
@ -148,5 +148,8 @@
|
|||||||
"Mixed": "Gemischt",
|
"Mixed": "Gemischt",
|
||||||
"Corners": "Ecken",
|
"Corners": "Ecken",
|
||||||
"Extra round": "Extra rund",
|
"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."
|
"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.",
|
||||||
|
"Classic: The same sharp sounds as Element": "Klassisch: Die gleichen scharfen Geräusche wie in Element",
|
||||||
|
"Sound pack": "Geräuschpaket",
|
||||||
|
"Schildi: Softer sounds for reduced anxiety": "Schildi: Sanftere Klänge für weniger Angstgefühle"
|
||||||
}
|
}
|
||||||
|
@ -46,5 +46,8 @@
|
|||||||
"Corners": "Sudut",
|
"Corners": "Sudut",
|
||||||
"Round": "Bulat",
|
"Round": "Bulat",
|
||||||
"Extra round": "Ekstra bulat",
|
"Extra round": "Ekstra bulat",
|
||||||
"Mixed": "Campur"
|
"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"
|
||||||
}
|
}
|
||||||
|
@ -17,5 +17,37 @@
|
|||||||
"In group chats": "Pokalbių grupėse",
|
"In group chats": "Pokalbių grupėse",
|
||||||
"In public rooms": "Viešuose kambariuose",
|
"In public rooms": "Viešuose kambariuose",
|
||||||
"Show all rooms in Home": "Rodyti visus kambarius Pradžioje",
|
"Show all rooms in Home": "Rodyti visus kambarius Pradžioje",
|
||||||
"All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje."
|
"All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje.",
|
||||||
|
"Hide advanced theme settings": "Slėpti išplėstinius temos nustatymus",
|
||||||
|
"Show advanced theme settings": "Rodyti išplėstinius temos nustatymus",
|
||||||
|
"Theme": "Tema",
|
||||||
|
"Font size and typeface": "Šrifto dydis ir raštas",
|
||||||
|
"Show message bubbles depending on the width either on both sides or only on one side": "Rodyti žinučių burbulus, priklausomai nuo pločio, abiejose pusėse arba tik vienoje pusėje",
|
||||||
|
"Sound pack": "Garso paketas",
|
||||||
|
"Schildi: Softer sounds for reduced anxiety": "Schildi: švelnesni garsai sumažintam nerimui",
|
||||||
|
"Classic: The same sharp sounds as Element": "Klasikiniai: Tie patys aštrūs garsai kaip ir Element",
|
||||||
|
"Enable YouTube embed player": "Įgalinti YouTube įterptą grotuvą",
|
||||||
|
"Add custom theme": "Pridėti pasirinktinę temą",
|
||||||
|
"Mark as unread": "Žymėti kaip neskaitytą",
|
||||||
|
"Mark as read": "Žymėti kaip perskaitytą",
|
||||||
|
"User name color mode": "Naudotojo vardo spalvų režimas",
|
||||||
|
"Uniform": "Vienodi",
|
||||||
|
"Show notification badges for People in Spaces": "Rodyti pranešimų ženkliukus žmonėms erdvėse",
|
||||||
|
"Return to the room previously opened in a space": "Grįžti į anksčiau atidarytą kambarį erdvėje",
|
||||||
|
"If disabled, the space overview will be shown when switching to another space.": "Jei išjungta, perjungiant į kitą erdvę bus rodoma erdvės apžvalga.",
|
||||||
|
"Room list style": "Kambarių sąrašo stilius",
|
||||||
|
"Compact: tiny avatar together with name and preview in one line": "Kompaktiška: mažytis avataras kartu su vardu ir peržiūra vienoje eilutėje",
|
||||||
|
"Intermediate: medium sized avatar with single-line preview": "Vidutinis: vidutinio dydžio avataras su vienos eilutės peržiūra",
|
||||||
|
"Roomy: big avatar with two-line preview": "Erdvus: didelis avataras su dviejų eilučių peržiūra",
|
||||||
|
"PowerLevel": "Galios lygis",
|
||||||
|
"For people": "Žmonėms",
|
||||||
|
"Show people in spaces": "Rodyti žmones erdvėse",
|
||||||
|
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Jei išjungta, vis tiek galite pridėti tiesioginius pokalbius į asmenines erdves. Jei ši funkcija įjungta, automatiškai matysite visus, kurie yra erdvės nariai.",
|
||||||
|
"Mark rooms as unread": "Leisti žymėti pokalbius kaip neskaitytus",
|
||||||
|
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Pradžia yra naudinga, kad galėtumėte viską apžvelgti. Turėkite omenyje, kad ją išjungę galite nematyti tam tikrų kambarių.",
|
||||||
|
"Collapse additional buttons": "Sulankstyti papildomus mygtukus",
|
||||||
|
"Corners": "Kampai",
|
||||||
|
"Round": "Apvalus",
|
||||||
|
"Extra round": "Ypač apvalus",
|
||||||
|
"Mixed": "Mišrus"
|
||||||
}
|
}
|
||||||
|
@ -8,5 +8,29 @@
|
|||||||
"Show message bubbles on one side only": "Vis meldingsbobler kun på én side",
|
"Show message bubbles on one side only": "Vis meldingsbobler kun på én side",
|
||||||
"Show message bubbles depending on the width either on both sides or only on one side": "Vis meldingsbobler avhengig av bredden enten på begge sider eller kun på én side",
|
"Show message bubbles depending on the width either on both sides or only on one side": "Vis meldingsbobler avhengig av bredden enten på begge sider eller kun på én side",
|
||||||
"Don't ask again": "Ikke spør igjen",
|
"Don't ask again": "Ikke spør igjen",
|
||||||
"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).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og 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).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og macOS).",
|
||||||
|
"Hide advanced theme settings": "Skjul avanserte draktinnstillinger",
|
||||||
|
"Show advanced theme settings": "Vis avanserte draktinnstillinger",
|
||||||
|
"Theme": "Drakt",
|
||||||
|
"Room list": "Romliste",
|
||||||
|
"Font size and typeface": "Størrelse på og type skrift",
|
||||||
|
"Sound pack": "Lydpakke",
|
||||||
|
"Schildi: Softer sounds for reduced anxiety": "Schildi: Mykere lyder for mindre angst",
|
||||||
|
"System": "System",
|
||||||
|
"Add custom theme": "Legg til egendefinert drakt",
|
||||||
|
"Theme in use": "Drakt i bruk",
|
||||||
|
"Light theme": "Lys drakt",
|
||||||
|
"Dark theme": "Mørk drakt",
|
||||||
|
"Mark as read": "Marker som lest",
|
||||||
|
"Mark rooms as unread": "Tillat markering av sludringer som uleste",
|
||||||
|
"Mark as unread": "Marker som ulest",
|
||||||
|
"In group chats": "I gruppesludringer",
|
||||||
|
"In public rooms": "I offentlige rom",
|
||||||
|
"For people": "For folk",
|
||||||
|
"Classic: The same sharp sounds as Element": "Klassisk: Samme skarpe lyder som Element",
|
||||||
|
"Collapse additional buttons": "Fold sammen ytterligere knapper",
|
||||||
|
"Corners": "Hjørner",
|
||||||
|
"Round": "Runde",
|
||||||
|
"Extra round": "Ekstra runde",
|
||||||
|
"Mixed": "Blandet"
|
||||||
}
|
}
|
||||||
|
@ -46,5 +46,8 @@
|
|||||||
"Round": "Runda",
|
"Round": "Runda",
|
||||||
"Extra round": "Extrarunda",
|
"Extra round": "Extrarunda",
|
||||||
"Mixed": "Blandad",
|
"Mixed": "Blandad",
|
||||||
"Corners": "Hörn"
|
"Corners": "Hörn",
|
||||||
|
"Sound pack": "Ljudpaket",
|
||||||
|
"Schildi: Softer sounds for reduced anxiety": "Schildi: Mjukare ljud för minskad ångest",
|
||||||
|
"Classic: The same sharp sounds as Element": "Klassisk: Samma skarpa ljud som Element"
|
||||||
}
|
}
|
||||||
|
Submodule matrix-js-sdk updated: dd3932fcb7...cb81a65097
Submodule matrix-react-sdk updated: 71fe48a9ce...eb6b8d0b87
Reference in New Issue
Block a user