diff --git a/bump_release_version.sh b/bump_release_version.sh index 3fc5346..a322d61 100755 --- a/bump_release_version.sh +++ b/bump_release_version.sh @@ -24,5 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -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 979ed48..847af31 100755 --- a/bump_test_version.sh +++ b/bump_test_version.sh @@ -24,5 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -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 592337d..f9a3d9d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 592337db774fe9fd186243d3eaac1780229b459d +Subproject commit f9a3d9d4d29cc136706888996110591b0d1921df diff --git a/element-web b/element-web index f64fa1e..6c6eba1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030 +Subproject commit 6c6eba1fac8df055c95919fc8caf98a44a4538a3 diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index f9fa215..8f37a96 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -40,5 +40,6 @@ "Hide advanced theme settings": "Skrýt pokročilá nastavení motivu", "Mark rooms as unread": "Povolit označování chatů jako nepřečtených", "Mark as unread": "Označit jako nepřečtené", - "Mark as read": "Označit jako přečtené" + "Mark as read": "Označit jako přečtené", + "Enable YouTube embed player": "Povolí vložený přehrávač YouTube" } diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 3fbe2a8..dda71e0 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -40,5 +40,6 @@ "Mark rooms as unread": "Allow marking chats as unread", "Mark as unread": "Mark as unread", "Mark as read": "Mark as read", - "Enable YouTube embed player": "Enable YouTube embed player" + "Enable YouTube embed player": "Enable YouTube embed player", + "Collapse additional buttons": "Collapse additional buttons" } diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index 1e42805..cd66942 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -39,5 +39,6 @@ "Intermediate: medium sized avatar with single-line preview": "Sedang: avatar sedang dengan tampilan satu baris", "Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca", "Mark as unread": "Tandai sebagai belum dibaca", - "Mark as read": "Tandai sebagai dibaca" + "Mark as read": "Tandai sebagai dibaca", + "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat" } diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 8990c52..94b8219 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -39,5 +39,6 @@ "Room list style": "Rumslista stil", "Mark as unread": "markera som oläst", "Mark as read": "markera som läst", - "Mark rooms as unread": "Tillåt att chattar markeras som olästa" + "Mark rooms as unread": "Tillåt att chattar markeras som olästa", + "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare" } diff --git a/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD index ffa8052..ff49e1f 100644 --- a/local-pkgbuild-template/PKGBUILD +++ b/local-pkgbuild-template/PKGBUILD @@ -10,7 +10,7 @@ pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional arch=('x86_64') url="https://schildi.chat" license=('Apache') -depends=('sqlcipher') +depends=() provides=('---appName---') conflicts=('---appName---') source=("---debName---" diff --git a/matrix-js-sdk b/matrix-js-sdk index 07619ca..8502dd1 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a +Subproject commit 8502dd1647e5058d59f68fa235ca65d0ef2dad30 diff --git a/matrix-react-sdk b/matrix-react-sdk index b616808..4387b1f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb +Subproject commit 4387b1f0f443af9e5ed664b026391a9016213914