mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 20:38:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
13255 commits 7 branches 124 tags 230 MiB
Commit graph

7716 commits

Author SHA1 Message Date
Benoit Marty
d501447544 Remove unused string 2022-01-25 18:33:06 +01:00
Benoit Marty
58b2050baf Rename string 2022-01-25 18:18:47 +01:00
Benoit Marty
f4f0b36b05 Remove unused string 2022-01-25 18:18:11 +01:00
Benoit Marty
fa07271074 Rename some resource: kick -> remove 2022-01-25 18:15:22 +01:00
Benoit Marty
210ef74f62 Remove unused string 2022-01-25 18:13:03 +01:00
Benoit Marty
ece93caae3 Rename some resource: kick -> remove 2022-01-25 18:10:59 +01:00
Benoit Marty
41628ea511
Merge pull request #5057 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-01-25 18:07:01 +01:00
Benoit Marty
f14bf0dd50
Merge pull request #4817 from vector-im/feature/ons/static_location 
Static Location Sharing
 2022-01-25 18:03:17 +01:00
Benoit Marty
f83c2b32bc Add summary to location sharing setting 2022-01-25 17:59:22 +01:00
Benoit Marty
823ece9582 Add licence mention as per https://github.com/maplibre/maplibre-gl-native/blob/master/LICENSE.md 2022-01-25 17:51:17 +01:00
ariskotsomitopoulos
c19b52cded Enhance thread summary 
Fix deleted root thread messages when show deleted messages are enabled/disabled
 2022-01-25 18:21:42 +02:00
Benoit Marty
871b05b641
Merge pull request #5019 from vector-im/feature/bca/auto_uisi_update 
Quick fixes on auto uisi RS
 2022-01-25 16:41:01 +01:00
Valere
14da9806e2 Put bug report app names in config 2022-01-25 16:35:16 +01:00
Weblate
c5a213ff68 Merge branch 'origin/develop' into Weblate. 2022-01-25 15:30:46 +00:00
Baxtiyor M
43bccb1d42 Translated using Weblate (Kara-Kalpak) 
Currently translated at 0.3% (10 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/kaa/
 2022-01-25 15:30:39 +00:00
kingoflove819
eca20b2441 Translated using Weblate (Tamil) 
Currently translated at 0.1% (1 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ta/
 2022-01-25 15:30:37 +00:00
Baxtiyor M
c0c66acad0 Translated using Weblate (Uzbek) 
Currently translated at 3.8% (106 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uz/
 2022-01-25 15:30:37 +00:00
Ihor Hordiichuk
7c96ab27e0 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-01-25 15:30:37 +00:00
LinAGKar
a634987d1b Translated using Weblate (Swedish) 
Currently translated at 99.9% (2728 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2022-01-25 15:30:36 +00:00
Peter Vágner
d6f62bc2a5 Translated using Weblate (Slovak) 
Currently translated at 69.9% (1910 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-01-25 15:30:35 +00:00
Jozef Gaal
206f69e3dd Translated using Weblate (Slovak) 
Currently translated at 69.9% (1910 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-01-25 15:30:29 +00:00
lvre
a2e25205e6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-01-25 15:30:29 +00:00
m1chj
8b5542216e Translated using Weblate (Polish) 
Currently translated at 97.6% (2665 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-01-25 15:30:28 +00:00
maciejek997
b3414d6534 Translated using Weblate (Polish) 
Currently translated at 97.6% (2665 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-01-25 15:30:28 +00:00
Johan Smits
b4f77d314e Translated using Weblate (Dutch) 
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2022-01-25 15:30:26 +00:00
Linerly
500ffa0d1d Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-01-25 15:30:12 +00:00
Szimszon
0e081a1c90 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-01-25 15:30:11 +00:00
libexus
56a1cd7b41 Translated using Weblate (German) 
Currently translated at 99.7% (2723 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-01-25 15:30:10 +00:00
waclaw66
65f54c854f Translated using Weblate (Czech) 
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-01-25 15:30:09 +00:00
Benoit Marty
bca65281b6
Merge pull request #5025 from vector-im/feature/adm/use-case-dark-mode 
Updating use case icons to match designs
 2022-01-25 16:06:40 +01:00
Benoit Marty
1ee29555c6 Merge branch 'develop' into feature/ons/static_location 2022-01-25 16:01:16 +01:00
Benoit Marty
7aba03c60a
Merge pull request #5056 from vector-im/feature/bma/fix_toolbar_title 
Fix toolbar title
 2022-01-25 15:55:34 +01:00
Benoit Marty
9f4deabe08
Merge pull request #5043 from vector-im/feature/bma/track_performance 
Track performance
 2022-01-25 15:54:57 +01:00
Benoit Marty
ed52aed432 i18n and format 2022-01-25 15:41:04 +01:00
Benoit Marty
34a703910b Set title and subtitle to the supportActionBar else on some circumstances it has no effect 
https://stackoverflow.com/questions/26486730/in-android-app-toolbar-settitle-method-has-no-effect-application-name-is-shown
 2022-01-25 15:36:18 +01:00
Benoit Marty
b728e062e3 Cleanup layout 2022-01-25 15:15:47 +01:00
Onuray Sahin
e0ec294c1b Hide undisclosed poll option for now. 2022-01-25 16:42:57 +03:00
Benoit Marty
460f39176c Fix compilation issues after merge of develop 2022-01-25 14:36:32 +01:00
Benoit Marty
b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
Adam Brown
0713877baf fixing line length 2022-01-25 13:14:32 +00:00
Benoit Marty
5bb06158c7
Merge pull request #5020 from vector-im/feature/ons/edit_polls 
Edit Polls and Allow Undisclosed Polls
 2022-01-25 13:47:49 +01:00
Onuray Sahin
43c8624b33 Code review fixes. 2022-01-25 15:31:59 +03:00
ariskotsomitopoulos
b1b27bdd0e Enhance edit to support new threads fallback 2022-01-25 14:12:13 +02:00
Onuray Sahin
04ffb951c3 Code review fixes. 2022-01-25 12:38:11 +03:00
Benoit Marty
cf86fe34d5 Improve SDK API (self review) 2022-01-24 22:37:07 +01:00
Onuray Sahin
d65899ef88 Fix sharing location action in timeline. 2022-01-24 21:55:32 +03:00
Benoit Marty
3bc7b0acee Small issue 2022-01-24 18:57:53 +01:00
Adam Brown
203c7e0cd7 adding tools preview for the use case option icons 
- this is only the background layer though as the real image is programatically constructed
 2022-01-24 17:55:46 +00:00
Adam Brown
57be0ba913 making use of roundToInt to avoid separate rounding and toInt 2022-01-24 17:50:22 +00:00
Benoit Marty
d24a51ce67 tiny rework 2022-01-24 18:49:50 +01:00
Benoit Marty
6c560679a5 Hide the button to make the loading wheel centered 2022-01-24 18:49:20 +01:00
Benoit Marty
3a8c788657 Add a Flow to ba able to hide one of the button 2022-01-24 18:47:26 +01:00
Adam Brown
f8e65f5872 avoiding nullable param and supplying a range for the tint alpha 2022-01-24 17:47:15 +00:00
Onuray Sahin
9516e379ea Keep build settings to enable location sharing for possible use cases of forks. 2022-01-24 18:49:49 +03:00
ariskotsomitopoulos
fe88e81d4a - Refactor thread awareness (handle decrypted rooms, images, stickers etc) 
- Enable/disable threads functionality
- New fallback thread implementation
 2022-01-24 16:55:15 +02:00
Onuray Sahin
12bfece89e Prevent anr in timeline. 2022-01-24 17:36:26 +03:00
fedrunov
b6eb27f8a1 qr scanner fragments merged into one 2022-01-24 15:27:22 +01:00
Onuray Sahin
8bf39c3127 Inform mapview when fragment is stopped. 2022-01-24 17:12:17 +03:00
Onuray Sahin
c81654d769 Fix native crash (need more testing). 2022-01-24 16:07:11 +03:00
Onuray Sahin
3994373387 Delabs location sharing. 2022-01-24 15:27:20 +03:00
Valere
553e55b4d1 quick cleaning / code review 2022-01-24 13:08:47 +01:00
Onuray Sahin
749194b27c Delabs polls. 2022-01-24 14:32:27 +03:00
Onuray Sahin
b0b92c062e Undisclosed poll implementation. 2022-01-24 14:31:50 +03:00
Onuray Sahin
7f97e78ba3 Merge branch 'develop' into feature/ons/edit_polls 
* develop: (66 commits)
  toolbar management  (#4887)
  adding changelog entry
  adding back periodic flag when scheduling automatic background workers
  Fix enum class warning
  Split long lines Done by https://github.com/matrix-org/matrix-analytics-events/pull/16
  Add new class in analytics plan
  Fix conditional for Delight issue automation
  Add missing import in kdoc
  Update kdoc
  Enable Delight issue automation
  Fix an error in string resource (#4997)
  Changelog
  Add some unit test for the command parser. Not all commands are covered, could add more tests later.
  data class.
  use sealed interface
  Small cleanup
  Command parser is not a static object anymore
  Add changelog
  Use Throwable.isLimitExceededError extension
  Do not automatically retry 429 with a too long delay
  ...
 2022-01-23 22:15:36 +03:00
Onuray Sahin
9dd48045f6 Invalidate previous votes for edited polls. 2022-01-23 19:32:13 +03:00
libexus
bae0c2593a Translated using Weblate (German) 
Currently translated at 99.1% (2707 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-01-22 18:23:06 +00:00
Nart Tlisha
92ef78a9d5 Added translation using Weblate (Abkhazian) 2022-01-22 17:11:33 +00:00
Adam Brown
023409d8cf updating use case icons to match designs 
- programmatically creates a layer drawable to avoid introducing new colours into the palette
 2022-01-21 17:16:49 +00:00
Benoit Marty
f6d856d828 Analytics: report performance event about sync request - send number of joined rooms 2022-01-21 17:42:40 +01:00
Benoit Marty
cab06c4b52 Analytics: report performance event about sync request 2022-01-21 16:44:19 +01:00
Onuray Sahin
5d07c71dcf Open edit poll screen with the last edited content if exists. 2022-01-21 18:23:05 +03:00
fedrunov
f7aedff418
toolbar management (#4887) 
Toolbar management rework and toolbar style alignment
 2022-01-21 13:38:27 +01:00
Valere
4d7e46b751 Quick fixes on auto uisi RS 2022-01-21 10:27:41 +01:00
Baxtiyor M
c9f19be25d Added translation using Weblate (Kara-Kalpak) 2022-01-20 17:56:14 +00:00
Benoit Marty
9bfeb6f814
Merge pull request #4734 from vector-im/feature/bma/analytics_next 
Implement analytics plan
 2022-01-20 18:12:46 +01:00
Benoit Marty
af43890fab
Merge pull request #4041 from vector-im/feature/bca/fix_switch_space_on_tap_notif 
Fix switch to best space when tapping notification
 2022-01-20 16:54:06 +01:00
Onuray Sahin
c3d7a253e4 Allow editing polls. 2022-01-20 17:41:03 +03:00
Benoit Marty
000806550a Split long lines 
Done by https://github.com/matrix-org/matrix-analytics-events/pull/16
 2022-01-20 15:36:16 +01:00
Benoit Marty
81b8260eb2 Add new class in analytics plan 2022-01-20 14:42:10 +01:00
Benoit Marty
d82743eeab
Merge pull request #4995 from vector-im/feature/fre/fix_retry_delay_on_429 
Do not auto-retry on 429 in case of too long retry delay
 2022-01-20 14:31:29 +01:00
ariskotsomitopoulos
e0630ceac0 Fix mentions UI within threads 2022-01-20 13:02:35 +02:00
Benoit Marty
c40fc52ef5
Merge pull request #4999 from vector-im/feature/bma/zero_vote 
Fix an error in string resource (#4997)
 2022-01-20 10:38:33 +01:00
ariskotsomitopoulos
35ee72aac0 Add typealias for TimelineEvent 2022-01-20 00:50:44 +02:00
Benoit Marty
953f34f5e3 Fix an error in string resource (#4997) 2022-01-19 21:40:26 +01:00
Benoit Marty
c7dc08ef5d data class. 2022-01-19 20:40:40 +01:00
Benoit Marty
87adaee549 use sealed interface 2022-01-19 19:05:05 +01:00
Benoit Marty
4f1de34d4c Small cleanup 2022-01-19 19:03:25 +01:00
Benoit Marty
eb4475b4d9 Command parser is not a static object anymore 2022-01-19 18:43:48 +01:00
ariskotsomitopoulos
38f193fbd5 Add LightweightSettingsStorage in sdk 
Enable thread awareness when threads are disabled
Enhance enable/disable thread messages to app & sdk
Add Shared PReferences to sdk
 2022-01-19 18:52:02 +02:00
Florian Renaud
83c961e255 Use Throwable.isLimitExceededError extension 2022-01-19 16:56:00 +01:00
Adam Brown
491044b0c5
Merge pull request #4964 from vector-im/feature/adm/splash-carousel-review 
Enabling FTUE splash carousel
 2022-01-19 15:52:25 +00:00
Tiago Loureiro
4dea7131b1 Fix #4991: lifecycle should be at least started 2022-01-19 11:57:12 -03:00
Benoit Marty
c0aa0cef62 Analytics: inject analyticsTracker, it has a better scope 2022-01-19 15:24:25 +01:00
Benoit Marty
880b97cc5c Analytics: import latest plan 2022-01-19 15:21:25 +01:00
Benoit Marty
c4046990f0 Analytics: track call start and call end 2022-01-19 15:19:19 +01:00
Benoit Marty
69a9643894 Analytics: forgot password screen 2022-01-19 15:19:19 +01:00
Benoit Marty
e3c70d1bb1 Analytics: splashscreen 2022-01-19 15:19:19 +01:00
Benoit Marty
1e3733fe8e Analytics: login/register screens 2022-01-19 15:19:19 +01:00
Benoit Marty
54108b8f8d Analytics: Track some screen (#4715) 2022-01-19 15:19:19 +01:00
Benoit Marty
db3353feb5 Analytics: Track some screen (#4715) 2022-01-19 15:19:19 +01:00
Benoit Marty
13b4a58eaf Analytics: Add more screen 
https://github.com/matrix-org/matrix-analytics-events/pull/11
 2022-01-19 15:19:19 +01:00
Benoit Marty
67f43550ac Analytics: Fix issue with the drawer 2022-01-19 15:19:19 +01:00
Benoit Marty
f307c48dd4 Analytics: Track some screen (#4715) 2022-01-19 15:19:19 +01:00
Benoit Marty
ebd4dc0c5e Analytics: Import the plan again 2022-01-19 15:19:19 +01:00
Benoit Marty
dfb807506b Analytics: Track some screen (#4715) 2022-01-19 15:19:19 +01:00
Benoit Marty
0a08a50e11 Analytics: Framework to send screen event 2022-01-19 15:19:19 +01:00
Benoit Marty
a8c29f55f5 Analytics: Send JoinedRoom event - room preview (#4716) 2022-01-19 15:19:19 +01:00
Benoit Marty
55a6257cee Analytics: Send JoinedRoom event (#4716) 2022-01-19 15:17:54 +01:00
Benoit Marty
11f176e079 Analytics: Create extension to compute JoinedRoom.RoomSize (#4716) 2022-01-19 15:16:08 +01:00
Benoit Marty
3e125bcccf Analytics: Send the Event CreatedRoom() (#4716) 2022-01-19 15:16:08 +01:00
Benoit Marty
7a6f3cbcf7 Analytics: Send the Event Click(name = Click.Name.SendMessageButton) (#4717) 2022-01-19 15:12:41 +01:00
Benoit Marty
e487621075 Analytics: create AnalyticsTracker interface 2022-01-19 15:12:41 +01:00
Benoit Marty
e416f1024a Reformat code using AS 2022-01-19 15:12:41 +01:00
Adam Brown
3c7f2c5bdf adding tools:text for dynamically set text 2022-01-19 11:18:54 +00:00
Adam Brown
211f184066 updating splash submit copy to use Create account when the I already have an account feature is enabled 2022-01-19 10:38:28 +00:00
ariskotsomitopoulos
8cc96e27bc - Add threads to lab settings 
- Disable thread awareness due to the new fallback mechanism
 2022-01-19 12:28:00 +02:00
Adam Brown
8f98f3e6d0 promoting wip carousel strings 2022-01-19 10:17:04 +00:00
Adam Brown
00f2947636 enabling the splash carousel feature by default 2022-01-19 10:17:04 +00:00
Onuray Sahin
381dd5343a Show edit action for poll messages if it is not voted and closed. 2022-01-19 13:00:21 +03:00
Adam Brown
69c05e63d4 only reverting to the combined sign in/sign up screen when the currently login mode isn't supported 
- eg for a SSO only flow or unknown/unsupported
 2022-01-18 16:20:33 +00:00
ariskotsomitopoulos
4cff3938e7 - Hide read receipts from thread timeline 
- Enhance FetchThreadTimelineTask
 2022-01-18 16:05:41 +02:00
Benoit Marty
1c42df7752 Move the file to the new module. 2022-01-18 14:39:02 +01:00
Benoit Marty
ffad479dad Move the file to the new module. 2022-01-18 14:30:59 +01:00
ariskotsomitopoulos
707397cb9d cleanup 2022-01-18 15:28:44 +02:00
Benoit Marty
194a584e4c Merge branch hotfix/1.3.15 2022-01-18 14:21:09 +01:00
Benoit Marty
2a7719cdf6 ktlint 2022-01-18 12:12:36 +01:00
ariskotsomitopoulos
10599aa728 ktlint format 2022-01-18 13:11:52 +02:00
Adam Brown
114c60cfed fixing onboarding crash when signing in/up with sso - 
handles the sso flows by not forwarding to the signin/signup pages and instead using the previous onLoginFlowRetrieved when the selected server type is other
 2022-01-18 10:51:54 +00:00
Onuray Sahin
ede1fe39fc Disable location sharing from build settings. 2022-01-18 13:41:40 +03:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-18 12:41:40 +02:00
Benoit Marty
961f821ab9 Create and use removeIfCompat (#4961) 2022-01-18 09:19:52 +01:00
Benoit Marty
a083047888 Fix typo 2022-01-18 09:12:39 +01:00
ganfra
cc89a8fc77 Timeline : fix 4959 2022-01-18 09:11:55 +01:00
Bui Minh Duc
19a3eef137 Translated using Weblate (Vietnamese) 
Currently translated at 99.1% (2707 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2022-01-17 19:26:47 +00:00
Johan Smits
039e1dd6ad Translated using Weblate (Dutch) 
Currently translated at 93.5% (2553 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2022-01-17 19:26:47 +00:00
Linerly
67b2e8378a Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-01-17 19:26:11 +00:00
Priit Jõerüüt
cce8234c6f Translated using Weblate (Estonian) 
Currently translated at 99.9% (2727 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-01-17 19:26:11 +00:00
Felix
5ce2d4bcd3 Translated using Weblate (German) 
Currently translated at 98.9% (2700 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-01-17 19:26:10 +00:00
ariskotsomitopoulos
5e23947419 Enhance filtering to support threads 2022-01-17 19:22:22 +02:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Adam Brown
256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update 
Updated splash carousel images and copy
 2022-01-17 15:11:08 +00:00
Benoit Marty
e2e3f72564 Merge branch 'develop' into feature/bca/fix_switch_space_on_tap_notif 2022-01-17 15:28:56 +01:00
Benoit Marty
ab29a15572
Merge pull request #4942 from vector-im/feature/bma/delete_rx 
Remove unused module matrix-sdk-android-rx and do some cleanup
 2022-01-17 11:59:23 +01:00
Adam Brown
7d0b833aa5 using app name template for the carousel content which contains the app name 
- also marks the now unused strings for deletion
 2022-01-17 09:24:53 +00:00
Adam Brown
be319f596d fixing pixel rounding to 451x451, image should be 450x450 2022-01-17 09:24:53 +00:00
Adam Brown
f4cacb2d16 applying percentage based heights to the carousel hero image and paddings 2022-01-17 09:24:53 +00:00
Adam Brown
43acc7a6f8 adding dark variants of the carousel images 2022-01-17 09:24:53 +00:00
Adam Brown
c0b855e7c7 adding non light mode carousel background which uses a vertical gradient 2022-01-17 09:24:53 +00:00
Adam Brown
982b480613 including updated copy for the carousel 
- marked as donottranslate whilst waiting for sign off
- removed the positioning from the naming schema in favour of location of context
 2022-01-17 09:24:53 +00:00