diff --git a/Makefile b/Makefile index 5a897e6..95fd274 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ web: setup desktop-common: web $(YARN) --cwd element-desktop run fetch --cfgdir '' - $(YARN) --cwd element-desktop run build:native + SQLCIPHER_STATIC=1 $(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 12a7bb2..f4d437d 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,10 @@ 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: -- A unified chat list for both direct and group chats +- 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 - 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) @@ -51,7 +52,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 +# 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 - # apt update diff --git a/element-desktop b/element-desktop index 686a02c..b0bfb5c 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 686a02cc404525713d1815b9662b19d83e637c85 +Subproject commit b0bfb5c2d37288edd7b814fc7ac97a96622a00fc diff --git a/element-web b/element-web index 863bae4..d9f6146 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 863bae40dd9bd5a70818269b13e28009b549a7a3 +Subproject commit d9f614624be0600c8c308b526577864087e95d97 diff --git a/i18n-overlays/element-desktop/tr.json b/i18n-overlays/element-desktop/tr.json new file mode 100644 index 0000000..f1a952b --- /dev/null +++ b/i18n-overlays/element-desktop/tr.json @@ -0,0 +1,3 @@ +{ + "Show": "Göster" +} diff --git a/i18n-overlays/element-web/tr.json b/i18n-overlays/element-web/tr.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-web/tr.json @@ -0,0 +1 @@ +{} diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index f4e03bb..a8b9501 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -43,5 +43,9 @@ "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." + "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é" } diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index 02c1ee5..3bb30e2 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -143,5 +143,10 @@ "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" + "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." } diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 8d07295..7732df7 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -42,5 +42,12 @@ "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." + "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" } diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index a986a4d..0b8d8a5 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -42,5 +42,9 @@ "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." + "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" } diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 7282f7f..284a43a 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -42,5 +42,9 @@ "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." + "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" } diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json new file mode 100644 index 0000000..0856dee --- /dev/null +++ b/i18n-overlays/matrix-react-sdk/tr.json @@ -0,0 +1,48 @@ +{ + "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/matrix-js-sdk b/matrix-js-sdk index a7e6126..dd3932f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit a7e612697579ac57a3a80ab9809d891919f652b8 +Subproject commit dd3932fcb705f445e8368855b27db95eb1f173b6 diff --git a/matrix-react-sdk b/matrix-react-sdk index 7038265..71fe48a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7038265fa5357e89d562f96d14d37b497fad10dc +Subproject commit 71fe48a9cea7b2c73e0b778aa8ed594e6755b4f8