diff --git a/Makefile b/Makefile index 95fd274..5a897e6 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ web: setup desktop-common: web $(YARN) --cwd element-desktop run fetch --cfgdir '' - SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native + $(YARN) --cwd element-desktop run build:native macos-common: web icns $(YARN) --cwd element-desktop run fetch --cfgdir '' diff --git a/README.md b/README.md index f4d437d..12a7bb2 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,9 @@ SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop). The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are: -- Customizable room list style (compact single line, intermediate and roomy with two line preview) -- Option to show direct and group chats in a combined list -- Improved theming options +- A unified chat list for both direct and group chats - Message bubbles +- Bigger items in the room list - … and more! Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop) @@ -52,7 +51,7 @@ some dependencies might not be recent enough to build SchildiChat. The following are the dependencies required to build SchildiChat Web/Desktop on Debian 11 (bullseye): ``` -# 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 # curl -sL https://deb.nodesource.com/setup_14.x | bash - # apt update diff --git a/element-desktop b/element-desktop index ba6b8bf..e8271ec 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ba6b8bf283a92c3f80539eab5b1c62e396b6e93e +Subproject commit e8271ec368dea7b706f072b83171f8db1bc548c9 diff --git a/element-web b/element-web index 1203f15..f87ee44 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1203f1530d67863a4cb27d25851d46eecebf5685 +Subproject commit f87ee443e4be1d496a6034137660f53e6778d918 diff --git a/i18n-overlays/element-desktop/tr.json b/i18n-overlays/element-desktop/tr.json deleted file mode 100644 index f1a952b..0000000 --- a/i18n-overlays/element-desktop/tr.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Show": "Göster" -} diff --git a/i18n-overlays/element-web/tr.json b/i18n-overlays/element-web/tr.json deleted file mode 100644 index 0967ef4..0000000 --- a/i18n-overlays/element-web/tr.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index 861e944..f4e03bb 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -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." } diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index d7d2ed2..02c1ee5 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -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" } diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 7732df7..8d07295 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -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." } diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index c0d5cbb..a986a4d 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -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." } diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 9facd06..7282f7f 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -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." } diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json deleted file mode 100644 index 0856dee..0000000 --- a/i18n-overlays/matrix-react-sdk/tr.json +++ /dev/null @@ -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." -} diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json index aef112a..6702566 100644 --- a/i18n-overlays/matrix-react-sdk/zh_Hans.json +++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json @@ -39,8 +39,5 @@ "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).": "您想加入一个用来通知版本更新的房间吗？如果您的平台不支持自动更新 SchildiChat（例如 Windows 和 macOS），这将非常有用。", "Mark as read": "标记为已读", "Mark rooms as unread": "允许将聊天记录标记为未读", - "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": "折叠额外的按钮" + "Mark as unread": "标记为未读" } diff --git a/matrix-js-sdk b/matrix-js-sdk index d0951b8..c696abf 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit d0951b83471f5fcabdfe14b5df497dc54acbeda4 +Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2 diff --git a/matrix-react-sdk b/matrix-react-sdk index f05b786..8245acd 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f05b786171f1d6997076a59764f359ed5d0fdc27 +Subproject commit 8245acd053cb8fcbe8789d43afe70204a15a1deb