Commit graph

4851 commits

Author SHA1 Message Date
Onuray Sahin
6a9b496651
Merge pull request #6609 from vector-im/feature/ons/reset_zoom_level_on_user_focus
Live Location Sharing - Reset zoom level while focusing a user (PSG-624)
2022-07-22 14:50:36 +03:00
Benoit Marty
3d7733156e
Merge pull request #6612 from anoadragon453/patch-1
Fix a typo during registration
2022-07-21 14:12:30 +02:00
Benoit Marty
fabdc20887
Merge pull request #6548 from vector-im/feature/bma/realm_migration_bg
Realm migration bg
2022-07-21 14:08:03 +02:00
Valere
fb05ab34d8
Merge pull request #6395 from vector-im/feature/bca/fix_invalid_qr_warning
Display specific message when verif code malformed
2022-07-21 12:36:46 +02:00
Benoit Marty
0bedfc8087 Add a message when migrating the data (after 1 seconds) 2022-07-21 11:19:36 +02:00
Andrew Morgan
d8fa1cb2ed
Fix a typo during registration
terns -> terms
2022-07-21 10:12:43 +01:00
ericdecanini
9e1235d51f 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/MigrateSessionTo034.kt
2022-07-20 16:44:33 +02:00
Onuray Sahin
10322545aa Move pin to center when clicked. 2022-07-20 16:57:48 +03:00
ericdecanini
0ad2051dd3 Improves plural used in strings 2022-07-20 14:48:38 +02:00
Weblate
2792c48a6e Merge branch 'origin/develop' into Weblate. 2022-07-20 12:26:40 +00:00
LinAGKar
3eb590ebe8 Translated using Weblate (Swedish)
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/sv/
2022-07-20 12:26:32 +00:00
Sveinn í Felli
653f699c28 Translated using Weblate (Icelandic)
Currently translated at 82.1% (1861 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2022-07-20 12:26:32 +00:00
Szimszon
b500fcd3d0 Translated using Weblate (Hungarian)
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/hu/
2022-07-20 12:26:32 +00:00
notramo
9a86ae670c Translated using Weblate (Hungarian)
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/hu/
2022-07-20 12:26:30 +00:00
ssnfcmux
79ba60c10d Translated using Weblate (Arabic)
Currently translated at 43.2% (979 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
2022-07-20 12:26:30 +00:00
Onuray Sahin
26a677edc2
Merge branch 'develop' into feature/ons/fix_live_location_sharing_permission 2022-07-20 13:40:55 +03:00
ericdecanini
ee941cf88d 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/MigrateSessionTo033.kt
2022-07-20 10:56:07 +02:00
Maxime NATUREL
b08337e3a7
Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events
[Timeline] - Collapse redacted events (PSG-523)
2022-07-19 16:39:45 +02:00
Onuray Sahin
9976b3b8ac
Merge pull request #6567 from vector-im/feature/ons/share_location_with_other_apps
Share location with other apps (PSG-242)
2022-07-19 17:08:36 +03:00
Benoit Marty
70c62233d0
Merge pull request #6569 from vector-im/feature/adm/ftue-copy-review
FTUE - Copy review
2022-07-19 14:49:28 +02:00
Benoit Marty
70c8703b2b
Merge pull request #6545 from vector-im/feature/adm/ftue-combined-register-copy-review
FTUE - Combined register copy review
2022-07-19 14:44:29 +02:00
Maxime NATUREL
9c619001a5 Updating string value for redacted event to be more consistent 2022-07-19 14:04:09 +02:00
Maxime NATUREL
b412b9f4e9 Merging redacted events by reusing existing mechanism for same type events 2022-07-19 14:04:08 +02:00
Onuray Sahin
c408f824d3 Code review fixes. 2022-07-19 14:58:00 +03:00
Onuray Sahin
493dc57a29 Code review fixes. 2022-07-19 13:41:00 +03:00
Onuray Sahin
e2cd75284f Check user power level before sharing live location. 2022-07-18 18:46:03 +03: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
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
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
Maxime NATUREL
cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02: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
86b0c9cd78 removing display name subtitle 2022-07-15 15:58:11 +01:00
Adam Brown
5f6654b696 removing display name subtitle 2022-07-15 15:42:14 +01:00
Adam Brown
ee5cc19c23 updating login copy 2022-07-15 15:42:14 +01:00