diff --git a/README.md b/README.md index 12a7bb2..20b0099 100644 --- a/README.md +++ b/README.md @@ -15,18 +15,6 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we -
-Public key used to sign the Debian packages - -``` -pub rsa4096 2020-12-08 [SC] - 560BB70DA86A6633A39CEC6023358905FE294D01 -uid Super apt repo key -sub rsa4096 2020-12-08 [E] -``` - -
- ## Building SchildiChat Web/Desktop diff --git a/bump_release_version.sh b/bump_release_version.sh index 92b5cac..a322d61 100755 --- a/bump_release_version.sh +++ b/bump_release_version.sh @@ -24,6 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -m "New release v$versions_string" -git tag -s "v$versions_string" -m "New release v$versions_string" +git tag -a "v$versions_string" -m "New release v$versions_string" popd > /dev/null diff --git a/bump_test_version.sh b/bump_test_version.sh index bffb851..847af31 100755 --- a/bump_test_version.sh +++ b/bump_test_version.sh @@ -24,6 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -m "New test release v$versions_string" -git tag -s "v$versions_string" -m "New test release v$versions_string" +git tag -a "v$versions_string" -m "New test release v$versions_string" popd > /dev/null diff --git a/element-desktop b/element-desktop index 0ee1a2a..c9dd12d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 0ee1a2ad165615e6c3e15a2bbde7f3895977cef8 +Subproject commit c9dd12d9c3140f6a64f1b0ded8d6cf71d9f49b1b diff --git a/element-web b/element-web index b4f26a6..abdb370 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit b4f26a6c52c76b4a6139051470820b41066ff289 +Subproject commit abdb37049f0a464e6b78f41aee3e0f83601d0755 diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index f4e03bb..34ebcbb 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -42,6 +42,5 @@ "Mark as unread": "Označit jako nepřečtené", "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." + "Collapse additional buttons": "Sbalit další tlačítka" } diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index a986a4d..210a093 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -41,6 +41,5 @@ "Mark as unread": "Tandai sebagai belum dibaca", "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." + "Collapse additional buttons": "Sembunyikan tombol tambahan" } diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 7282f7f..b1616fb 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -41,6 +41,5 @@ "Mark as read": "markera som läst", "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." + "Collapse additional buttons": "Dölj ytterligare knappar" } diff --git a/matrix-js-sdk b/matrix-js-sdk index e82be9f..9faf862 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5 +Subproject commit 9faf86220bff4224c2189225580c1e7efec636dd diff --git a/matrix-react-sdk b/matrix-react-sdk index cea7c0e..0d1b0bc 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit cea7c0e1006b859a3fdebe2e32423319c1986d74 +Subproject commit 0d1b0bc5b73a2099e2a0aa2dc32b878aa2fb27cb