From 84be27839c85d02fd6a226d3471f1baae86ed7ab Mon Sep 17 00:00:00 2001 From: joshua Date: Mon, 28 Feb 2022 08:24:29 +0000 Subject: [PATCH 01/14] Translated using Weblate (Swedish) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" } From 7228bf7fee70a2c6cf4f47e2d8052a53ba6b1140 Mon Sep 17 00:00:00 2001 From: Linerly Date: Sun, 27 Feb 2022 23:02:27 +0000 Subject: [PATCH 02/14] Translated using Weblate (Indonesian) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/id/ --- i18n-overlays/matrix-react-sdk/id.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" } From 909043215f1ff684785e158f33b6273268c2d75a Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Tue, 1 Mar 2022 16:14:25 +0000 Subject: [PATCH 03/14] Translated using Weblate (Czech) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/ --- i18n-overlays/matrix-react-sdk/cs.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" } From 768b6489816a027e664f0a44b954051a2d08d9cb Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:32:50 +0100 Subject: [PATCH 04/14] New test release v1.10.6-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 592337d..1dad2e2 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 592337db774fe9fd186243d3eaac1780229b459d +Subproject commit 1dad2e24579cb6eccae8a22442b94ce5159f0e28 diff --git a/element-web b/element-web index f64fa1e..9c949f1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030 +Subproject commit 9c949f13f26c695342c5d229c265d6081f62c1e5 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 From 602d6bcc91baafb1c53b879ad66ac814197094aa Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:36:42 +0100 Subject: [PATCH 05/14] Add string --- i18n-overlays/matrix-react-sdk/en_EN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" } From 5a232a27db80ff8bb1a225ccf67ba902b680ac65 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:40:52 +0100 Subject: [PATCH 06/14] New test release v1.10.6-sc.0.test.2 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 1dad2e2..1544670 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 1dad2e24579cb6eccae8a22442b94ce5159f0e28 +Subproject commit 15446708d8bd2e5dff1a0b5c967020e8502ce533 diff --git a/element-web b/element-web index 9c949f1..9fd930c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9c949f13f26c695342c5d229c265d6081f62c1e5 +Subproject commit 9fd930c6c6161da79afb7b6e6433f8b2dbaa1532 From 40694fb207745e5780b229de967dd35f18da0816 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:34:07 +0100 Subject: [PATCH 07/14] sqlcipher now statically linked --- local-pkgbuild-template/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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---" From d0b9a59e5923fd8db9f94755f87b0d538381dec9 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:55:58 +0100 Subject: [PATCH 08/14] Let version bump scripts add tags --- bump_release_version.sh | 1 + bump_test_version.sh | 1 + 2 files changed, 2 insertions(+) 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 From 3957463f72c7f0d5481ea93859da2a370f146e88 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:57:07 +0100 Subject: [PATCH 09/14] New test release v1.10.6-sc.0.test.3 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 1544670..f9a3d9d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 15446708d8bd2e5dff1a0b5c967020e8502ce533 +Subproject commit f9a3d9d4d29cc136706888996110591b0d1921df diff --git a/element-web b/element-web index 9fd930c..6c6eba1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9fd930c6c6161da79afb7b6e6433f8b2dbaa1532 +Subproject commit 6c6eba1fac8df055c95919fc8caf98a44a4538a3 From c07881ba34ef034b1e363d000b5e6ae60f5c791b Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Sun, 6 Mar 2022 10:14:38 +0000 Subject: [PATCH 10/14] Translated using Weblate (Czech) Currently translated at 100.0% (43 of 43 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/ --- i18n-overlays/matrix-react-sdk/cs.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index 8f37a96..34ebcbb 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -41,5 +41,6 @@ "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é", - "Enable YouTube embed player": "Povolí vložený přehrávač YouTube" + "Enable YouTube embed player": "Povolí vložený přehrávač YouTube", + "Collapse additional buttons": "Sbalit další tlačítka" } From dd75a20e7a9bdbc514b9d704072d12befde71eeb Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 6 Mar 2022 00:10:06 +0000 Subject: [PATCH 11/14] Translated using Weblate (German) Currently translated at 100.0% (43 of 43 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/ --- i18n-overlays/matrix-react-sdk/de_DE.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index e65cb3d..02c1ee5 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -141,5 +141,7 @@ "Show advanced theme settings": "Erweiterte Designeinstellungen anzeigen", "Mark rooms as unread": "Erlaube Chats als ungelesen zu markieren", "Mark as read": "Als gelesen markieren", - "Mark as unread": "Als ungelesen markieren" + "Mark as unread": "Als ungelesen markieren", + "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren", + "Collapse additional buttons": "Zusätzliche Buttons einklappen" } From bcf9db8b8ffb7ca96000f6cd2fd8aa92e18e386c Mon Sep 17 00:00:00 2001 From: joshua Date: Sat, 5 Mar 2022 01:30:24 +0000 Subject: [PATCH 12/14] Translated using Weblate (Swedish) Currently translated at 100.0% (43 of 43 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 94b8219..b1616fb 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -40,5 +40,6 @@ "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", - "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare" + "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare", + "Collapse additional buttons": "Dölj ytterligare knappar" } From 79ac866bedd9a0cfc3ac14b8bfa13c6853d68d51 Mon Sep 17 00:00:00 2001 From: Linerly Date: Tue, 15 Mar 2022 22:28:51 +0000 Subject: [PATCH 13/14] Translated using Weblate (Indonesian) Currently translated at 100.0% (43 of 43 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/id/ --- i18n-overlays/matrix-react-sdk/id.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index cd66942..210a093 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -40,5 +40,6 @@ "Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca", "Mark as unread": "Tandai sebagai belum dibaca", "Mark as read": "Tandai sebagai dibaca", - "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat" + "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat", + "Collapse additional buttons": "Sembunyikan tombol tambahan" } From 0bc5275d147ed7f833f96bdbbbd7110e7c1af097 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 17 Mar 2022 11:14:21 +0100 Subject: [PATCH 14/14] New test release v1.10.7-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index f9a3d9d..fb4e155 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit f9a3d9d4d29cc136706888996110591b0d1921df +Subproject commit fb4e155ecc661ca9e1408ffb218841ef689042e2 diff --git a/element-web b/element-web index 6c6eba1..6cabb1b 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 6c6eba1fac8df055c95919fc8caf98a44a4538a3 +Subproject commit 6cabb1b65b4c94a8e0195458d116fa34544037ba diff --git a/matrix-js-sdk b/matrix-js-sdk index 8502dd1..8daa03b 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 8502dd1647e5058d59f68fa235ca65d0ef2dad30 +Subproject commit 8daa03be33856b030d5a53f1f91238459ef9acfa diff --git a/matrix-react-sdk b/matrix-react-sdk index 4387b1f..247bfd9 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 4387b1f0f443af9e5ed664b026391a9016213914 +Subproject commit 247bfd9fa5b5340d457ed387921c70a99f64dc14