Commit graph

1336 commits

Author SHA1 Message Date
DarkCoder15
49d91fb9e6 Translated using Weblate (Russian)
Currently translated at 100.0% (171 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/ru/
2023-03-05 08:21:27 +00:00
Felipe Nogueira
d9e633a7cc Translated using Weblate (Portuguese (Brazil))
Currently translated at 66.6% (114 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/pt_BR/
2023-03-03 19:00:15 +00:00
SpiritCroc
5c0fdcc1ea Merge remote-tracking branch 'origin/sc' into sc
Change-Id: Ib4721241870755528a702faac74523a92584ad36
2023-02-28 14:59:27 +01:00
SteffoSpieler
828ab89765 Translated using Weblate (German)
Currently translated at 96.4% (165 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
2023-02-24 09:59:58 +00:00
SpiritCroc
65a1a6e90f Automatic SchildiChat string correction
Change-Id: I979fcf00b93efd23fffa3f9ee7a53fd13882c5e2
2023-02-23 11:55:24 +01:00
SpiritCroc
38c8e30541 Merge tag 'v1.5.26' into sc
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
	vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
	vector/src/main/res/drawable/ic_rich_composer_add.xml
	vector/src/main/res/drawable/ic_rich_composer_send.xml
2023-02-23 11:55:21 +01:00
SpiritCroc
fd0f4e733c Automatic revert to unchanged upstream strings, pt.1
Change-Id: I4d960c3207cfa802fcea0c6659478f848955a7c2
2023-02-23 11:39:52 +01:00
Jorge Martin Espinosa
a358644354
Fix ktlint issue that was accidentally merged (#8139) 2023-02-16 11:14:15 +00:00
Benoit Marty
2453f2cee0
Merge pull request #8115 from luixxiul/localization-3
Replace 'Use Bots' with 'Use bots' for localization experience on Weblate
2023-02-16 10:16:23 +01:00
SpiritCroc
db0c0e8400 Automatic SchildiChat string correction
Change-Id: I0b757f54364d5c205bdbd8e438b0ae449d6c2675
2023-02-15 15:53:07 +01:00
SpiritCroc
daacdd038c Merge tag 'v1.5.25' into sc
Change-Id: I45d2198b25e7ebee157f4836596ef59ddb1fbe8e
2023-02-15 15:53:00 +01:00
SpiritCroc
387e73b379 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I92d9aa8f50be6a2ec94755c3fc35a7d8211aa300
2023-02-15 15:52:50 +01:00
Benoit Marty
3a25743ded Merge hotfix 1.5.25 2023-02-15 15:25:40 +01:00
Benoit Marty
4cf78795bd Add extra cases. 2023-02-15 15:06:34 +01:00
Benoit Marty
f6711a3d16 Fix issue on timer when recording/playing voice message or voice broadcast. All the seconds were not properly displayed. 2023-02-15 12:23:12 +01:00
Florian Renaud
225f51d3fd Update comment wording 2023-02-14 12:27:39 +01:00
Florian Renaud
68712513b3 Fix StackOverFlow exception when stop action is called within the tick event 2023-02-14 12:16:24 +01:00
Maxime NATUREL
552af673ff
Merge pull request #8069 from vector-im/feature/mna/poll-history-details
[Poll] History list: details screen of a poll (PSG-1041, PSG-1151)
2023-02-13 17:47:54 +01:00
Linerly
3704d9de3b Translated using Weblate (Indonesian)
Currently translated at 100.0% (171 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/id/
2023-02-12 11:57:31 +00:00
waclaw66
2da0610b68 Translated using Weblate (Czech)
Currently translated at 100.0% (171 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
2023-02-12 11:57:31 +00:00
waclaw66
ee67027484 Translated using Weblate (Czech)
Currently translated at 100.0% (170 of 170 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
2023-02-11 07:38:28 +00:00
Suguru Hirahara
6cc089a774
Replace 'Use Bots' with 'Use bots'
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2023-02-11 02:25:51 +09:00
SpiritCroc
a48ce4b18c [TESTING] Fight duplicate read markers in main timeline, pt.2
- Make my read-marker experiments backwards-compatible, by introducing a
  new artificial marker
- Fix sometimes the marker going missing, by not deduplicating read
  markers, then filtering out the other one because duplicates didn't
  respect the thread id
Needs an initial sync to fully apply.

Change-Id: Id02ae19d03077016cbeb8d9a8fd5130d77931b2d
2023-02-10 16:04:26 +01:00
SpiritCroc
a52dd364f6 Automatic SchildiChat string correction
Change-Id: I8c3103b8011ba7275c50f7a8b9b5d77296bc6bc1
2023-02-10 12:08:33 +01:00
Hugh Nimmo-Smith
10a1ea033b Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-02-09 09:53:26 +00:00
jonnyandrew
d922126f4b
[Rich text editor] Add code block, quote and list indentation actions (#8045)
* Add remaining rich text editor actions

* Render code blocks in the timeline

* Hide indentation buttons when not in a list
2023-02-08 17:47:22 +00:00
SpiritCroc
51274af2fe Merge tag 'v1.5.24' into sc
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
SpiritCroc
9f3939e216 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I2cfeacd73519abd5309a7ae69a4d1886af2e6be5
2023-02-08 11:28:22 +01:00
Benoit Marty
0971a28532
Merge pull request #8057 from vector-im/yostyle/vb_utd
Let the user know when we are not able to decrypt the voice broadcast…
2023-02-07 18:16:34 +01:00
Benoit Marty
ba7ee68b24
Merge pull request #8032 from vector-im/jmartinesp/fix/rte-cant-select-text-in-plain-text-mode
Fix: cannot select text in plain text mode in Rich Text Editor
2023-02-07 14:33:11 +01:00
Linerly
3b57c6c5f6 Translated using Weblate (Indonesian)
Currently translated at 100.0% (170 of 170 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/id/
2023-02-07 01:57:31 +00:00
Weblate
29dcac9b3c Merge branch 'origin/develop' into Weblate. 2023-02-06 19:43:59 +00:00
LinAGKar
a226385ed3 Translated using Weblate (Swedish)
Currently translated at 100.0% (2598 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2023-02-06 19:43:58 +00:00
Suguru Hirahara
84010d03f1 Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-06 19:43:58 +00:00
keda82
54030bdd57 Translated using Weblate (Swedish)
Currently translated at 100.0% (2598 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2023-02-06 19:43:55 +00:00
Florian Renaud
fb4cceb476
Merge pull request #8058 from vector-im/misc/fre/count_up_timer
Improve CountUpTimer ticks precision
2023-02-06 12:15:12 +01:00
Florian Renaud
912c37e3ff Reset elapsed time on stop action and add a start method to the CountUpTimer 2023-02-06 10:36:40 +01:00
Suguru Hirahara
033316eec3 Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:39:20 +00:00
oksya8and8
85bff0e786 Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:39:20 +00:00
Suguru Hirahara
a88937b2f9 Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:37:00 +00:00
oksya8and8
4d228a9c18 Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:37:00 +00:00
Suguru Hirahara
a7c1c4381b Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:32:50 +00:00
Joe Sagawa
d190ebfbcd Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:32:50 +00:00
phardyle
24b6c407ee Translated using Weblate (Chinese (Simplified))
Currently translated at 98.7% (2566 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2023-02-04 18:30:12 +00:00
Suguru Hirahara
d798a83b4e Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:30:12 +00:00
Sveinn í Felli
91db521ca9 Translated using Weblate (Icelandic)
Currently translated at 86.0% (2236 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2023-02-04 18:30:11 +00:00
Tuomas Hietala
222262e75a Translated using Weblate (Finnish)
Currently translated at 80.4% (2090 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
2023-02-04 18:30:09 +00:00
Suguru Hirahara
e1a2851803 Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:30:04 +00:00
oksya8and8
8a1f1a3756 Translated using Weblate (Japanese)
Currently translated at 99.7% (2592 of 2598 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2023-02-04 18:29:57 +00:00
SpiritCroc
3cff12c9b1 Fix Schildi variants causing unnecessary long verification text
Change-Id: I03dcf865f7f3db7cd40ab3a79cea7b7200f47a1a
2023-02-04 14:44:28 +01:00