forked from github/schildichat-desktop
Compare commits
No commits in common. "v1.11.8-sc.1" and "v1.10.15-sc.0.test.1" have entirely different histories.
v1.11.8-sc
...
v1.10.15-s
17 changed files with 13 additions and 226 deletions
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: 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: clean undo_setup fixup
|
||||
.PHONY: clean
|
||||
|
||||
CFGDIR ?= configs/sc
|
||||
|
||||
|
|
@ -166,11 +166,3 @@ clean:
|
|||
rm -rf element-web/dist
|
||||
rm -rf local-pkgbuild
|
||||
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
|
||||
|
||||
# curl -sL https://deb.nodesource.com/setup_16.x | bash -
|
||||
# curl -sL https://deb.nodesource.com/setup_14.x | bash -
|
||||
# apt update
|
||||
# apt install nodejs
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461
|
||||
Subproject commit 1d3a14db9c017d935085611c3259f386e19a366b
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca
|
||||
Subproject commit 11fedf60a5067b7139a90b70b0e672acd4e8f82a
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
#!/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 2>/dev/null
|
||||
forall_repos git fetch upstream > /dev/null 2>/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
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"Show": "Göster"
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -43,12 +43,5 @@
|
|||
"Mark as read": "Označit jako přečtené",
|
||||
"Enable YouTube embed player": "Povolí vložený přehrávač YouTube",
|
||||
"Collapse additional buttons": "Sbalit další tlačítka",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti.",
|
||||
"Corners": "Rohy",
|
||||
"Round": "Oblé",
|
||||
"Extra round": "Kulaté",
|
||||
"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"
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,13 +143,5 @@
|
|||
"Mark as read": "Als gelesen markieren",
|
||||
"Mark as unread": "Als ungelesen markieren",
|
||||
"Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren",
|
||||
"Collapse additional buttons": "Zusätzliche Buttons einklappen",
|
||||
"Round": "Rund",
|
||||
"Mixed": "Gemischt",
|
||||
"Corners": "Ecken",
|
||||
"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.",
|
||||
"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"
|
||||
"Collapse additional buttons": "Zusätzliche Buttons einklappen"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,12 +42,5 @@
|
|||
"Mark as read": "Mark as read",
|
||||
"Enable YouTube embed player": "Enable YouTube embed player",
|
||||
"Collapse additional buttons": "Collapse additional buttons",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.",
|
||||
"Corners": "Corners",
|
||||
"Round": "Round",
|
||||
"Extra round": "Extra round",
|
||||
"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"
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,12 +42,5 @@
|
|||
"Mark as read": "Tandai sebagai dibaca",
|
||||
"Enable YouTube embed player": "Aktifkan pemain YouTube tersemat",
|
||||
"Collapse additional buttons": "Sembunyikan tombol tambahan",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan.",
|
||||
"Corners": "Sudut",
|
||||
"Round": "Bulat",
|
||||
"Extra round": "Ekstra bulat",
|
||||
"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"
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,37 +17,5 @@
|
|||
"In group chats": "Pokalbių grupėse",
|
||||
"In public rooms": "Viešuose kambariuose",
|
||||
"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.",
|
||||
"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"
|
||||
"All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,29 +8,5 @@
|
|||
"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",
|
||||
"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).",
|
||||
"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"
|
||||
"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)."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,12 +42,5 @@
|
|||
"Mark rooms as unread": "Tillåt att chattar markeras som olästa",
|
||||
"Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare",
|
||||
"Collapse additional buttons": "Dölj ytterligare knappar",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum.",
|
||||
"Round": "Runda",
|
||||
"Extra round": "Extrarunda",
|
||||
"Mixed": "Blandad",
|
||||
"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"
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
{
|
||||
"Show message bubbles on one side only": "Mesaj baloncuklarını yalnızca bir tarafta göster",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Genişliğe bağlı olarak mesaj baloncuklarını her iki tarafta veya sadece bir tarafta göster",
|
||||
"Message bubbles": "Mesaj baloncukları",
|
||||
"Normal priority": "Normal öncelik",
|
||||
"Message layout": "Mesaj düzeni",
|
||||
"Modern": "Modern",
|
||||
"Update notifications": "Güncelleme bildirimleri",
|
||||
"Don't ask again": "Bir daha sorma",
|
||||
"System": "Sistem",
|
||||
"Add custom theme": "Özel tema ekle",
|
||||
"Theme in use": "Tema kullanımda",
|
||||
"Light theme": "Açık tema",
|
||||
"Dark theme": "Koyu tema",
|
||||
"Uniform": "Düzenli",
|
||||
"For people": "İnsanlar için",
|
||||
"In group chats": "Grup sohbetlerinde",
|
||||
"In public rooms": "Halka açık odalarda",
|
||||
"Show people and rooms in a combined list": "Kişileri ve odaları birleşik bir listede göster",
|
||||
"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).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır.",
|
||||
"If disabled, the space overview will be shown when switching to another space.": "Devre dışı bırakılırsa, başka bir alana geçerken alana ilişkin genel görünüm gösterilir.",
|
||||
"Mark as unread": "Okunmadı olarak işaretle",
|
||||
"User name color mode": "Kullanıcı adı renk modu",
|
||||
"Show people in spaces": "İnsanları alanlarda göster",
|
||||
"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.": "Devre dışı bırakılmışsa, kişisel alanlara direkt mesajlar eklemeye devam edebilirsiniz. Etkinleştirilirse, alana üye olan herkesi otomatik olarak görürsünüz.",
|
||||
"Show notification badges for People in Spaces": "Alanlardaki Kişiler için bildirim rozetlerini göster",
|
||||
"Return to the room previously opened in a space": "Bir alanda daha önce açılmış olan odaya geri dön",
|
||||
"Compact: tiny avatar together with name and preview in one line": "Sıkıştırılmış: tek satırda isim ve önizleme ile birlikte küçük avatar",
|
||||
"Intermediate: medium sized avatar with single-line preview": "Orta: tek satır önizlemeli orta boy avatar",
|
||||
"Roomy: big avatar with two-line preview": "Ferah: iki satırlık önizleme ile büyük avatar",
|
||||
"Room list style": "Oda listesi tarzı",
|
||||
"Hide advanced theme settings": "Gelişmiş tema ayarlarını gizle",
|
||||
"Show all rooms in Home": "Ana sayfadaki tüm odaları göster",
|
||||
"All rooms you're in will appear in Home.": "Bulunduğunuz tüm odalar ana sayfada görünecektir.",
|
||||
"Show advanced theme settings": "Gelişmiş tema ayarlarını göster",
|
||||
"Theme": "Tema",
|
||||
"Font size and typeface": "Yazı tipi boyutu ve yazı karakteri",
|
||||
"Room list": "Oda sıralaması",
|
||||
"Mark rooms as unread": "Sohbetleri okunmamış olarak işaretlemeye izin ver",
|
||||
"Mark as read": "Okundu olarak işaretle",
|
||||
"Enable YouTube embed player": "YouTube gömülü oynatıcıyı etkinleştir",
|
||||
"Collapse additional buttons": "Ek düğmeleri daralt",
|
||||
"Corners": "Köşeler",
|
||||
"Round": "Yuvarlak",
|
||||
"Extra round": "Fazladan yuvarlak",
|
||||
"Mixed": "Karışık",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Ana sayfa, her şeye genel bir bakış elde etmek için kullanışlıdır. Devre dışı bırakıldığında belirli odaları göremeyebileceğinizi unutmayın."
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db
|
||||
Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b
|
||||
Subproject commit f1676885198c4544e73a103571c0d14dcfcadeef
|
||||
Loading…
Add table
Add a link
Reference in a new issue