Commit Graph

18201 Commits

Author SHA1 Message Date
ericdecanini 7d29fbc68c Fixes post merge errors 2022-07-18 15:06:25 +02:00
ericdecanini c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
2022-07-18 15:05:04 +02:00
ericdecanini 67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-18 15:03:42 +02:00
ericdecanini 1ae5965632 Fixes import order 2022-07-18 14:48:10 +02:00
ericdecanini 13b9b5b5d6 Changes string into plural 2022-07-18 14:47:09 +02:00
Benoit Marty 4ed24b5571
Merge pull request #6478 from vector-im/feature/bma/nightly
Nightly build published on Firebase
2022-07-18 14:22:15 +02:00
Onuray Sahin 55a5752e3b Remove unused import. 2022-07-18 14:40:44 +03:00
Onuray Sahin 82fed20145 Changelog added. 2022-07-18 13:53:18 +03:00
Onuray Sahin ac3285001f Do not log the live location of the user. 2022-07-18 13:50:35 +03:00
Maxime NATUREL 6b403ec224
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text
[Location Share] - Standardise "Stop" texts for live (PSG-622)
2022-07-18 10:43:43 +02:00
Nikita Fedrunov 79762d9133
font scale setting screen (#6453) 2022-07-18 09:49:57 +02:00
Benoit Marty cdbc197426
Merge pull request #6549 from vector-im/feature/bma/fix_6514
Just go back to the timeline if the user is already viewing the DM with the other user.
2022-07-18 09:48:44 +02:00
Maxime NATUREL cedeb8fa50 Adding changelog entry 2022-07-18 09:43:33 +02:00
Maxime NATUREL cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02:00
Linerly 0d63608d6e Translated using Weblate (Indonesian)
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
2022-07-16 20:32:49 +00:00
waclaw66 b820434cea Translated using Weblate (Czech)
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2022-07-16 20:32:46 +00:00
Jeff Huang 982340b6b8 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2022-07-16 20:32:44 +00:00
Danial Behzadi da4e77bca4 Translated using Weblate (Persian)
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2022-07-16 20:32:42 +00:00
random fcc70c7bc8 Translated using Weblate (Italian)
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2022-07-16 20:32:41 +00:00
Priit Jõerüüt 13218365bb Translated using Weblate (Estonian)
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2022-07-16 20:32:38 +00:00
Ihor Hordiichuk b08b4324bc Translated using Weblate (Ukrainian)
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2022-07-16 20:32:36 +00:00
Jozef Gaal c6d272c45e Translated using Weblate (Slovak)
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
2022-07-16 20:32:35 +00:00
Glandos 69979aa761 Translated using Weblate (French)
Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2022-07-16 20:32:33 +00:00
Jeff Huang bd7d3c5563 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2022-07-16 20:32:30 +00:00
Ihor Hordiichuk c38082eb63 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-07-16 20:32:30 +00:00
Jozef Gaal fd6be11b6d Translated using Weblate (Slovak)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-07-16 20:32:29 +00:00
Didek dafbb32b97 Translated using Weblate (Polish)
Currently translated at 98.8% (2239 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
2022-07-16 20:32:29 +00:00
Johan Smits 907dc000ef Translated using Weblate (Dutch)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2022-07-16 20:32:29 +00:00
random 26811c3c39 Translated using Weblate (Italian)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2022-07-16 20:32:28 +00:00
Linerly d4c61c7018 Translated using Weblate (Indonesian)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
2022-07-16 20:32:28 +00:00
Glandos ccdc61d34b Translated using Weblate (French)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2022-07-16 20:32:27 +00:00
Danial Behzadi 5c50a1d15b Translated using Weblate (Persian)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2022-07-16 20:32:27 +00:00
Priit Jõerüüt fcc334dc17 Translated using Weblate (Estonian)
Currently translated at 99.6% (2257 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2022-07-16 20:32:26 +00:00
Lamdarer 663302b582 Translated using Weblate (German)
Currently translated at 99.3% (2250 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-07-16 20:32:25 +00:00
waclaw66 8cc174a5c1 Translated using Weblate (Czech)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
2022-07-16 20:32:25 +00:00
Auri B. P e58652a101 Translated using Weblate (Catalan)
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
2022-07-16 20:32:24 +00:00
Adam Brown 92f8dd971d promoting ftue strings for translation 2022-07-15 18:10:33 +01:00
Adam Brown 42ceb1f7f2 Merge branch 'feature/adm/ftue-combined-register-copy-review' into feature/adm/ftue-copy-review 2022-07-15 18:09:40 +01:00
Adam Brown 0879e1581c adding changelog entry 2022-07-15 18:09:04 +01:00
Adam Brown 347c07ec35 adding changelog entry 2022-07-15 16:02:46 +01:00
Adam Brown 86b0c9cd78 removing display name subtitle 2022-07-15 15:58:11 +01:00
Adam Brown 91a63194ef fixing formatting 2022-07-15 15:42:14 +01:00
Adam Brown 5f6654b696 removing display name subtitle 2022-07-15 15:42:14 +01:00
Adam Brown b1ef4dd60c defaulting the display name to the username segment of the account the user has created 2022-07-15 15:42:14 +01:00
Adam Brown ee5cc19c23 updating login copy 2022-07-15 15:42:14 +01:00
Adam Brown 677818a18e updating reset password copy 2022-07-15 15:42:14 +01:00
Adam Brown c4a1d213b8 updating personalisation complete copy 2022-07-15 15:42:14 +01:00
Adam Brown a6e6f68a1e updating profile picture copy 2022-07-15 15:42:14 +01:00
Adam Brown 2fe1b57297 updating captcha copy and removing subtitle 2022-07-15 15:42:14 +01:00
Adam Brown 8e4e70aaf9 updating terms copy 2022-07-15 15:42:14 +01:00