Commit Graph

362 Commits

Author SHA1 Message Date
Sven Grewe 72dcf5c65e Translated using Weblate (German)
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2021-05-03 08:04:35 +00:00
LinAGKar ee8ef585ce Translated using Weblate (Swedish)
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2021-05-03 08:04:30 +00:00
random ebfb4b4b9a Translated using Weblate (Italian)
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-05-03 08:04:01 +00:00
Jeff Huang 278738a9d4 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-05-03 08:03:46 +00:00
Priit Jõerüüt 01d0201852 Translated using Weblate (Estonian)
Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-05-03 08:03:40 +00:00
SpiritCroc ca21a3fc43 Increment version
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
2021-05-02 10:03:17 +02:00
Weblate 79f125cccd Merge branch 'origin/develop' into Weblate. 2021-04-29 13:38:14 +00:00
Deleted User 63f1efd320 Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nb_NO/
2021-04-24 19:34:24 +00:00
SpiritCroc 3b94ea72d3 Automatic upstream merge postprocessing
Change-Id: I18bd4c7615bc18926f0a5aafc0011d1b8d0f47eb
2021-04-16 15:32:21 +02:00
SpiritCroc 2ae0fb8886 Merge tag 'v1.1.6' into sc
Change-Id: I80d2ce9bdcb22c2fcc9795d3a5c727cb5ba772a6
2021-04-16 15:32:18 +02:00
SpiritCroc 7a7cad9bb6 [TMP] Automatic upstream merge preparation
Change-Id: I74d0a4cf0fdddf3339958b21f0ceefceaec0fd47
2021-04-16 15:29:14 +02:00
Benoit Marty 19427fbfec merge hotfix to develop 2021-04-16 14:36:15 +02:00
Benoit Marty 72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
LinAGKar 14e80855b4 Translated using Weblate (Swedish)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2021-04-15 17:34:23 +00:00
oksya8and8 80e67281c6 Translated using Weblate (Japanese)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ja/
2021-04-15 17:34:22 +00:00
Sven Grewe b683c45bd8 Translated using Weblate (German)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2021-04-15 17:34:21 +00:00
SpiritCroc 5757d1894c Automatic upstream merge postprocessing
Change-Id: Ia39d86869d7d2a16e2408838d5a3c5b0f80f3711
2021-04-15 12:30:02 +02:00
SpiritCroc 28c5f036c8 Merge tag 'v1.1.5' into sc
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
2021-04-15 12:29:59 +02:00
SpiritCroc ad8e9380b6 [TMP] Automatic upstream merge preparation
Change-Id: Ib8637486c2a7e77402e356605603e6577ecd88e6
2021-04-15 12:29:55 +02:00
Benoit Marty 9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty ccf7dd9583 Add changelog file 2021-04-14 22:41:57 +02:00
SpiritCroc 5749e31508 Automatic upstream merge postprocessing
Change-Id: Ic88df521a426bfe12b6fbbbcbdca534722ce7a6c
2021-04-14 14:02:43 +02:00
Moo 2116ff91cc Added translation using Weblate (Lithuanian) 2021-04-13 19:52:50 +00:00
Salamandar f23eb425a1 Translated using Weblate (French)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2021-04-13 08:34:24 +00:00
SpiritCroc 0e601aa8f0 Merge tag 'v1.1.4' into sc
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
2021-04-13 09:28:13 +02:00
SpiritCroc 79daede4f5 [TMP] Automatic upstream merge preparation
Change-Id: Ic73bcab6bcb749b183f47ab8cf6ee647239822b7
2021-04-12 15:58:23 +02:00
SpiritCroc d329f08162 Increment version
Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5
2021-04-12 10:57:35 +02:00
Thibault Martin 4fcbf718ca Translated using Weblate (French)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2021-04-11 17:34:20 +00:00
Thibault Martin fad3a60bc4 Translated using Weblate (French)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2021-04-10 08:02:18 +00:00
Jeff Huang a7be6a61ef Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-04-10 08:02:17 +00:00
Nikita Epifanov ceca81f0ab Translated using Weblate (Russian)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
2021-04-10 08:02:13 +00:00
Auri B. P 931bd1042b Translated using Weblate (Catalan)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
2021-04-10 08:02:11 +00:00
Ihor Hordiichuk f4959ba553 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-04-10 08:02:10 +00:00
Priit Jõerüüt e0a79af93a Translated using Weblate (Estonian)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-04-10 08:02:10 +00:00
random 166817411c Translated using Weblate (Italian)
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-04-10 08:02:09 +00:00
Benoit Marty a1209c83bb New store descriptions 2021-04-09 19:58:29 +02:00
Benoit Marty 5ee8cf7ebf Prepare release 1.1.4 2021-04-09 12:40:11 +02:00
SpiritCroc 235cfa48ee Automatic upstream merge postprocessing
Change-Id: I4b019ba99e9d48b57791e1bf33ccca553ae40483
2021-04-09 11:57:22 +02:00
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
2021-04-09 11:57:11 +02:00
SpiritCroc 5bfc106a33 [TMP] Automatic upstream merge preparation
Change-Id: I8850efdce1c1c8d1b1ff08471634d012810d95a4
2021-04-09 11:55:41 +02:00
Weblate eff560f8f0 Merge branch 'origin/develop' into Weblate. 2021-04-07 15:37:02 +00:00
Danial Behzadi 5971edee14 Translated using Weblate (Persian)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2021-04-07 15:36:56 +00:00
Nikita Epifanov 57d94c5494 Translated using Weblate (Russian)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
2021-04-07 15:36:55 +00:00
Samu Voutilainen 5a988d6f4a Translated using Weblate (Finnish)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
2021-04-07 15:36:55 +00:00
Safa Alfulaij 77fb8de71f Translated using Weblate (Arabic)
Currently translated at 92.3% (12 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ar/
2021-04-02 19:34:39 +00:00
RainSlide fa3ccda3f4 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
2021-03-26 06:34:32 +00:00
Benoit Marty 1eda7fa5bb Prepare release 1.1.3 2021-03-18 10:35:03 +01:00
Graeme Power 64bdd894d6 Translated using Weblate (Irish)
Currently translated at 7.6% (1 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ga/
2021-03-18 07:34:32 +00:00
GokdenizK 3ceee8302a Translated using Weblate (Turkish)
Currently translated at 76.9% (10 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/tr/
2021-03-18 07:34:23 +00:00
KAHINA ab12c641a8 Translated using Weblate (Kabyle)
Currently translated at 23.0% (3 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/kab/
2021-03-18 07:34:22 +00:00
Thibault Martin 33306bf218 Translated using Weblate (French)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2021-03-18 07:34:22 +00:00
Sven Grewe a5b2083f1b Translated using Weblate (German)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2021-03-18 07:34:22 +00:00
Benoit Marty 2d64fe96c1 Prepare release 1.1.2 2021-03-16 22:08:29 +01:00
Auri B. P 256ddc1831 Translated using Weblate (Catalan)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
2021-03-14 10:34:15 +00:00
SpiritCroc bfb7fe5938 Automatic upstream merge postprocessing 2021-03-14 10:59:10 +01:00
SpiritCroc 699ad4eaeb Merge tag 'v1.1.1' into sc
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2021-03-14 10:58:57 +01:00
SpiritCroc 1aed52e291 [TMP] Automatic upstream merge preparation 2021-03-14 10:13:06 +01:00
zeritti 8f0319a138 Translated using Weblate (Czech)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-03-12 23:34:25 +00:00
Jeff Huang 7edb45d9b7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-03-12 23:34:24 +00:00
random 3ad6c7a18b Translated using Weblate (Italian)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-03-12 23:34:24 +00:00
Priit Jõerüüt 7651df1228 Translated using Weblate (Estonian)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-03-12 23:34:23 +00:00
Ihor Hordiichuk 6148b2647f Translated using Weblate (Ukrainian)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-03-12 23:34:23 +00:00
LinAGKar e7d7886397 Translated using Weblate (Swedish)
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2021-03-12 23:34:22 +00:00
Marcelo Filho 6e757f88b6 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2021-03-12 23:34:22 +00:00
Benoit Marty ac02d1d48a Prepare release 1.1.1 2021-03-10 22:03:57 +01:00
Benoit Marty 2536452220
Merge pull request #2964 from vector-im/matthew/zh
rename zh-Hans and zh-Hant - TO BE MERGED DURING WEBLATE SYNC
2021-03-10 18:32:22 +01:00
Ihor Hordiichuk f7abda5d1f Translated using Weblate (Ukrainian)
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-03-10 11:29:18 +00:00
@a2sc:matrix.org b373957b6b Translated using Weblate (German)
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2021-03-10 11:29:18 +00:00
zeritti cd9718b7ef Translated using Weblate (Czech)
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-03-06 21:34:16 +00:00
Auri B. P fda8ac1f51 Translated using Weblate (Catalan)
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
2021-03-06 21:34:16 +00:00
Priit Jõerüüt 427a3d1be3 Translated using Weblate (Estonian)
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-03-06 21:34:15 +00:00
Matthew Hodgson 42ef81cf40 apparently the others shouldn't have underscores either 2021-03-05 14:07:39 +00:00
Matthew Hodgson aaeb9a0fd7 rename zh as per https://github.com/vector-im/element-android/issues/2752 2021-03-05 13:56:43 +00:00
Jeff Huang 8bd62dddc8 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-03-04 12:23:23 +00:00
LinAGKar f24159504d Translated using Weblate (Swedish)
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2021-03-04 12:23:23 +00:00
Weblate 3b9adbf5c8 Merge branch 'origin/develop' into Weblate. 2021-03-03 09:29:37 +00:00
HelaBasa 755fad7808 Translated using Weblate (Sinhala)
Currently translated at 9.0% (1 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/si/
2021-03-03 09:28:50 +00:00
Marcelo Filho ba74faa562 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2021-02-27 17:34:21 +00:00
SpiritCroc ff08370cd7 Increment version
Change-Id: I8bf35900b2ab99c1cacd7d360ce653918cea200b
2021-02-26 12:59:31 +01:00
Argetlami 20c692fddf Translated using Weblate (Finnish)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
2021-02-24 19:34:13 +00:00
zeritti ab52395d1a Translated using Weblate (Czech)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-02-23 07:34:32 +00:00
waclaw66 b37505112b Translated using Weblate (Czech)
Currently translated at 63.6% (7 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-02-21 07:34:06 +00:00
Nikita Epifanov 60dad59025 Translated using Weblate (Russian)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
2021-02-21 07:34:05 +00:00
SpiritCroc 1e1a974678 Automatic upstream merge postprocessing
Change-Id: Ia57cedc2fce20341f97c4612adf9e46df93f7cf3
2021-02-20 15:41:40 +01:00
SpiritCroc ca0b360875 Merge tag 'v1.1.0' into sc
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
2021-02-20 15:41:01 +01:00
SpiritCroc 7eb3b7e9cd [TMP] Automatic upstream merge preparation
Change-Id: I813dbf150890acbef690dca516b2e8369aa860da
2021-02-20 15:03:24 +01:00
Benoit Marty 809c0e720e Prepare release 1.1.0 2021-02-19 19:30:38 +01:00
SpiritCroc 4418821058 Increment version
Change-Id: I0a0b686aa4cdbaa636bf06286c8a108ac8d8079b
2021-02-19 14:39:57 +01:00
waclaw66 4267e33d19 Translated using Weblate (Czech)
Currently translated at 63.6% (7 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-02-18 03:34:09 +00:00
Jeff Huang 85a053838e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-02-18 03:34:08 +00:00
LinAGKar be1febef41 Translated using Weblate (Swedish)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2021-02-18 03:34:08 +00:00
zer0-x e01899ce8f Translated using Weblate (Arabic)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ar/
2021-02-15 12:08:01 +00:00
Slobodan Simić 68ef369adc Translated using Weblate (Serbian)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sr/
2021-02-15 12:08:00 +00:00
Auri B. P 11e5df1007 Translated using Weblate (Catalan)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
2021-02-15 12:08:00 +00:00
random a86405fb01 Translated using Weblate (Italian)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-02-15 12:07:59 +00:00
Priit Jõerüüt 1d0eb1e926 Translated using Weblate (Estonian)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-02-15 12:07:59 +00:00
Ihor Hordiichuk f3cbc18b50 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-02-15 12:07:59 +00:00
Miroslav Šedivý 30e5e15245 Translated using Weblate (Slovak)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
2021-02-15 12:07:59 +00:00
@a2sc:matrix.org 6fdbb91ccb Translated using Weblate (German)
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2021-02-15 12:07:58 +00:00
Weblate 2ac1287924 Merge branch 'origin/develop' into Weblate. 2021-02-12 10:30:37 +00:00
Nikita Epifanov 3b93b28a37 Translated using Weblate (Russian)
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
2021-02-12 10:30:26 +00:00
Marcelo Filho 1b04f5f540 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2021-02-11 15:33:33 +00:00
SpiritCroc 02371a9604 Automatic upstream merge postprocessing
Change-Id: I0a6c3834776a655427847e52bbe6b71928d3c2dc
2021-02-10 11:25:32 +01:00
SpiritCroc 04f4e13230 Merge tag 'v1.0.17' into sc
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
2021-02-10 11:05:22 +01:00
SpiritCroc b0a6e4cd28 [TMP] Automatic upstream merge preparation
Change-Id: I978bc20a50c282cba36660444d754cd4a4a3f1fa
2021-02-10 10:07:21 +01:00
LinAGKar 5386271398 Translated using Weblate (Swedish)
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2021-02-09 20:33:55 +00:00
Benoit Marty a8086ceb43 Prepare release 1.0.17 2021-02-09 21:07:25 +01:00
Auri B. P c46ab4ff29 Translated using Weblate (Catalan)
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
2021-02-08 07:33:39 +00:00
Slobodan Simić 9cf0e1bde7 Translated using Weblate (Serbian)
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sr/
2021-02-06 10:33:37 +00:00
Jeff Huang 32b42b46e4 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-02-06 10:33:37 +00:00
Priit Jõerüüt 8b4fd7fdc0 Translated using Weblate (Estonian)
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-02-06 10:33:37 +00:00
Ihor Hordiichuk a17c662465 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-02-06 10:33:36 +00:00
@a2sc:matrix.org e1fdbaee40 Translated using Weblate (German)
Currently translated at 100.0% (10 of 10 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2021-02-06 10:33:36 +00:00
Benoit Marty c4a89a5da1
Merge pull request #2769 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-02-04 17:55:18 +01:00
SpiritCroc 8e32c041db Automatic upstream merge postprocessing
Change-Id: Id3446b2b984430aa7f1fd6cba36410ee80a21c4c
2021-02-04 17:10:24 +01:00
SpiritCroc c2ce787310 Merge tag 'v1.0.16' into sc
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
2021-02-04 17:10:15 +01:00
SpiritCroc ad4ba631b9 [TMP] Automatic upstream merge preparation
Change-Id: I2ae1f63d762d0366be303ba08778a35673f5a3d3
2021-02-04 17:00:40 +01:00
Benoit Marty e51f2b8bc1 Prepare release 1.0.16 2021-02-04 13:25:12 +01:00
Weblate 63fb5809bf Merge branch 'origin/develop' into Weblate. 2021-02-03 16:36:51 +00:00
Benoit Marty 061f3c6919 Prepare release 1.0.15 2021-02-03 17:07:49 +01:00
Weblate cbda0ad37b Merge branch 'origin/develop' into Weblate. 2021-02-03 08:53:37 +00:00
Danial Behzadi 2e68c48752 Translated using Weblate (Persian)
Currently translated at 71.4% (5 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2021-02-02 11:21:09 +00:00
Auri B. P 15aeccac24 Translated using Weblate (Catalan)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
2021-01-24 19:36:39 +00:00
random fea86d5885 Translated using Weblate (Italian)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-01-24 19:36:39 +00:00
Ihor Hordiichuk 2df26ee931 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-01-24 19:36:39 +00:00
Marcelo Filho 8f7c4283ad Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2021-01-24 19:36:39 +00:00
Mitja Sorsa 221bdc112d Translated using Weblate (Finnish)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
2021-01-24 19:36:39 +00:00
@a2sc:matrix.org d2544fdd20 Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2021-01-24 19:36:39 +00:00
SpiritCroc 417bf48dd1 Increment version
Change-Id: Ic68c2a792c589c03f6fe274e937ebfa18a69b47a
2021-01-23 11:58:10 +01:00
Flat Earth Israel Association 226a547f09 Translated using Weblate (Hebrew)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/he/
2021-01-19 18:35:56 +00:00
Priit Jõerüüt 17e2aa91b5 Translated using Weblate (Estonian)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-01-19 18:35:55 +00:00
Nikita Epifanov 81da03d168 Translated using Weblate (Russian)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
2021-01-19 18:35:55 +00:00
Slobodan Simić 72b9ba4a27 Translated using Weblate (Serbian)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sr/
2021-01-17 15:36:06 +00:00
zeritti e7e6893920 Translated using Weblate (Czech)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-01-17 15:36:06 +00:00
GokdenizK 5c4f713463 Translated using Weblate (Turkish)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/tr/
2021-01-17 15:36:04 +00:00
LinAGKar f1961b710c Translated using Weblate (Swedish)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2021-01-17 15:36:04 +00:00
notramo 16a7b0bbdb Translated using Weblate (Hungarian)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
2021-01-17 15:36:04 +00:00
Daniel Le Berre db95e7b0cd Translated using Weblate (French)
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2021-01-17 15:36:04 +00:00
SpiritCroc c87627bb5e Automatic upstream merge postprocessing
Change-Id: I0da2864255e9d91599bc42ffccf7c9d345f5edc1
2021-01-16 11:21:50 +01:00
SpiritCroc 53c498b728 Merge tag 'v1.0.14' into sc
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2021-01-16 11:21:09 +01:00
zeritti d7e4fd555c Added translation using Weblate (Czech) 2021-01-15 16:50:42 +00:00
SpiritCroc f0e83813e9 [TMP] Automatic upstream merge preparation
Change-Id: Iaa07f187ded58fa745830596edd27e324ca8339e
2021-01-15 17:33:22 +01:00
Benoit Marty f0f0aafa1b Prepare release 1.0.14 2021-01-15 11:13:36 +01:00
Jeff Huang e91dbfbf2c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-01-14 09:57:14 +00:00
Weblate de73539d2b Merge branch 'origin/develop' into Weblate. 2021-01-13 15:00:03 +00:00
SpiritCroc dbda95afd7 fastlane: Fix source code link
Change-Id: I356e7fd2eb0293a73400bc4609f83af15ca77b5e
2020-12-29 10:57:15 +01:00
SpiritCroc 7ecf8073ef Increment version
Change-Id: Icd9bbfe6db69fc8a7b2de5626f4292d3664f4c5e
2020-12-27 11:29:47 +01:00
Ngô Ngọc Đức Huy 855e7e02ce Translated using Weblate (Vietnamese)
Currently translated at 60.0% (3 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/vi/
2020-12-26 11:35:38 +00:00
Ngô Ngọc Đức Huy 83584fab44 Added translation using Weblate (Vietnamese) 2020-12-25 10:30:07 +00:00
Thomas Jensen 4645a8c633 Translated using Weblate (Norwegian Bokmål)
Currently translated at 80.0% (4 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nb_NO/
2020-12-24 19:35:58 +00:00
LinAGKar cfb54f7608 Translated using Weblate (Swedish)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2020-12-24 19:35:58 +00:00
reg4xp 94aa0a02fe Translated using Weblate (Persian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2020-12-22 10:36:04 +00:00
SpiritCroc c775fa73ea Automatic upstream merge postprocessing
Change-Id: I3093ec9e4f74fe91ef1894b130b3cd188e5670d5
2020-12-22 09:24:46 +01:00
SpiritCroc 8da4044de6 Merge tag 'v1.0.13' into sc
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
2020-12-22 09:24:31 +01:00
SpiritCroc d0936d2b25 [TMP] Automatic upstream merge preparation
Change-Id: Ic52efb1677b303fc001ee2c63a912d2a3db63c45
2020-12-22 09:18:49 +01:00
reg4xp 8c68126ed9 Translated using Weblate (Persian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2020-12-20 19:35:43 +00:00
notramo 3c37d4c1b0 Translated using Weblate (Hungarian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
2020-12-20 19:35:42 +00:00
The one with the braid a9316b2f7e Translated using Weblate (German)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2020-12-20 19:35:42 +00:00
Benoit Marty d53650c8ae Prepare release 1.0.13 2020-12-18 10:59:43 +01:00
Jeff Huang 9a69bb9656 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2020-12-17 06:35:49 +00:00
random 28aef1067b Translated using Weblate (Italian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2020-12-17 06:35:49 +00:00
Ihor Hordiichuk 690a9eaa21 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2020-12-17 06:35:48 +00:00
Marcelo Filho 24d76b1d32 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2020-12-17 06:35:48 +00:00
Tuomas Hietala 173458ed6c Translated using Weblate (Finnish)
Currently translated at 100.0% (5 of 5 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
2020-12-17 06:35:48 +00:00
SpiritCroc b0d09313e7 Automatic upstream merge postprocessing
Change-Id: I9fbeeeaaf8ad10e2d7dfd585c6f73cd07e361dd0
2020-12-15 15:55:57 +01:00
SpiritCroc 38b82fb823 Merge tag 'v1.0.12' into sc
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values-v23/theme_status.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/values/theme_status.xml

Note to self: need to check if URL preview works with wrap_content

Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
2020-12-15 15:55:14 +01:00
SpiritCroc 299902feed [TMP] Automatic upstream merge preparation
Change-Id: I5ffadd9f7366002c522bb2ed126f9eb9878ca197
2020-12-15 15:00:31 +01:00
Benoit Marty e230cd8ee3 Prepare release 1.0.12 2020-12-15 14:16:08 +01:00
Weblate 3813f6d659 Merge branch 'origin/develop' into Weblate. 2020-12-14 15:45:20 +00:00
Mitja Sorsa 5186ee6e43 Translated using Weblate (Finnish)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
2020-12-09 16:15:50 +00:00
random 555bf1f0ae Translated using Weblate (Italian)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2020-12-06 14:50:09 +00:00
SpiritCroc 3defe44eff Increment version
Change-Id: Ic7a599e412c312fb5489500d2eb7ee1808a0b6bb
2020-12-05 11:02:41 +01:00
LinAGKar bd926fa74b Translated using Weblate (Swedish)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2020-12-03 14:50:05 +00:00
Jeff Huang 04914be442 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2020-12-01 12:50:16 +00:00
strix aluco 3133935063 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2020-12-01 12:50:15 +00:00
SpiritCroc 0469beab1c Automatic upstream merge postprocessing
Change-Id: Ib47b978128f8c6c0b243410591a1f9566ba08c6b
2020-11-29 12:52:25 +01:00
SpiritCroc 0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
2020-11-29 12:51:43 +01:00
SpiritCroc b283ba3b0a [TMP] Automatic upstream merge preparation
Change-Id: I4824f735104a794acc944d39d52b61463a6fe17f
2020-11-29 12:32:30 +01:00
Marcelo Filho f14b390849 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2020-11-28 17:50:18 +00:00
Benoit Marty 9a8f45fc6f Prepare version 1.0.11 2020-11-27 13:59:23 +01:00
Weblate d80927a8f9 Merge branch 'origin/develop' into Weblate. 2020-11-27 07:37:32 +00:00
SpiritCroc ac89fb97f8 Increment version
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
2020-11-24 16:13:49 +01:00
Daniel Løvbrøtte Olsen 62b703ca88 Added translation using Weblate (Norwegian Bokmål) 2020-11-24 07:08:01 +00:00
Victor Cuadrado Juan c81c5c4801 Translated using Weblate (Spanish)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/es/
2020-11-16 23:50:03 +00:00
Thomas sivertsen 8e9e4215ce Translated using Weblate (Norwegian Bokmål)
Currently translated at 50.0% (2 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nb/
2020-11-11 18:19:15 +00:00
Thomas sivertsen 4dd83c29fe Added translation using Weblate (Norwegian Bokmål) 2020-11-11 18:03:06 +00:00
SpiritCroc 164848e0aa Increment version
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
2020-11-07 11:37:55 +01:00
Jeff Huang ffd3b9a7a7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2020-11-06 02:50:00 +00:00
Auri B. P 428062e1e4 Translated using Weblate (Catalan)
Currently translated at 100.0% (4 of 4 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
2020-11-06 02:50:00 +00:00
SpiritCroc c3f62cf80d Automatic upstream merge postprocessing
Change-Id: Ib14a077c026657aff23ffbc42ade1e4524b0b8c2
2020-11-05 13:16:02 +01:00
SpiritCroc 58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
2020-11-05 13:15:55 +01:00
SpiritCroc fc33d50c61 [TMP] Automatic upstream merge preparation
Change-Id: Idd7894614eec671dcce0eecda95e2b7cf31ee7a6
2020-11-05 13:14:16 +01:00
Benoit Marty 619ec4faa4 Prepare release v1.0.10 2020-11-04 15:57:56 +01:00
Weblate f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
SpiritCroc 07e6cf2a8d Increment version
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
2020-11-02 13:20:05 +01:00
SpiritCroc ce77b5f827 Update direct chat screenshots
Change-Id: I4dfe7452d8195d81938887872ef903eb2c5862da
2020-11-02 12:25:10 +01:00
notramo 812181c435 Translated using Weblate (Hungarian)
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
2020-10-31 12:50:08 +00:00
ynerant 9f3d59711f Translated using Weblate (French)
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2020-10-31 12:50:08 +00:00
Benoit Marty 588c2cad15 Add graphic resources for F-Droid (#812, #2220) 2020-10-30 12:25:08 +01:00
Benoit Marty 4b2fbd4344 Prepare changelog for F-Droid (#2296) 2020-10-30 12:16:52 +01:00