filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,259 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

381 Commits

Author SHA1 Message Date
SpiritCroc 8da289a0e7 [merge] Move strings that automatic merge missed 
Change-Id: I5751d23bff3b119b45dcf0c939cf0f513af5e771
 2022-09-11 09:50:18 +02:00
SpiritCroc f1b4db73e4 Automatic SchildiChat string correction 
Change-Id: If64f2437f0ee0cab81023272dbd30cd218992d63
 2022-09-10 15:36:26 +02:00
SpiritCroc bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36 
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	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/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/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/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-09-10 15:24:40 +02:00
Benoit Marty de17c47a7d
Merge pull request #7038 from vector-im/feature/eric/new-layout-labs 
New Layout - Labs Flag (to replace feature flag)
 2022-09-08 14:35:38 +02:00
Maxime NATUREL 6c2bf35d60
Merge pull request #7005 from vector-im/feature/mna/session-overview-screen 
[Devices Management] Session overview screen (PSG-691, PSG-693)
 2022-09-08 09:18:31 +02:00
Benoit Marty 418a48de18 Deleting translations of 2 strings. They will have to be translated again due to the addition of `%s` in the original strings. 2022-09-07 18:24:13 +02:00
Weblate d1776a04c0 Merge branch 'origin/develop' into Weblate. 2022-09-07 12:12:04 +00:00
Przemysław Romanik 36ba1c5491 Translated using Weblate (Polish) 
Currently translated at 99.8% (2358 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-09-07 12:11:54 +00:00
ericdecanini 64c8789ef2 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 10:35:44 +02:00
Maxime NATUREL 682905df25 Fix unused string warning 2022-09-07 09:32:48 +02:00
Maxime NATUREL 6e9b2baf6f Rendering inactive status in SessionInfoView 2022-09-07 09:32:48 +02:00
Maxime NATUREL 0b105e2a7a Adding comment with examples of some parametrized strings 2022-09-07 09:32:48 +02:00
Maxime NATUREL 1ad585e154 Adding last seen details + fix observation of wrong deviceId in ViewModel 2022-09-07 09:32:47 +02:00
Maxime NATUREL f4865df50c Show info in overview screen 2022-09-07 09:32:47 +02:00
Maxime NATUREL ebf707dca9 Navigation from current session 2022-09-07 09:32:45 +02:00
Maxime NATUREL 969663786b Renaming header list view to be consistent 2022-09-07 09:32:09 +02:00
ericdecanini 593a04ea25 Adds missing space list header 2022-09-06 15:41:30 +02:00
ericdecanini 31a3552e26 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2022-09-06 15:32:00 +02:00
Benoit Marty 1c35e5ae9c
Merge pull request #6986 from vector-im/feature/nfe/invites_empty_state 
empty state for new invites screen
 2022-09-06 14:56:06 +02:00
phardyle 250633ec67 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.7% (2356 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-09-06 11:32:54 +00:00
Anonimas fea0c27bdd Translated using Weblate (Lithuanian) 
Currently translated at 25.0% (592 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
 2022-09-06 11:32:53 +00:00
waclaw66 59f8753c6a Translated using Weblate (Czech) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-09-06 11:32:43 +00:00
ericdecanini 24509543b9 Replaces feature flag with labs flag 2022-09-06 12:48:03 +02:00
Nikita Fedrunov 7cc7444bd5
applayout release experience (#7003) 2022-09-06 11:32:11 +02:00
ericdecanini 05f7850a01 Adds space name to expand / collapse chevron content description in space bottom sheet 2022-09-05 20:28:11 +02:00
Nikita Fedrunov efe5eb0501
App layout Home screen empty states (#7007) 2022-09-05 18:11:25 +02:00
Nikita Fedrunov b37996e4c3
space switcher empty spaces (#6988) 2022-09-05 16:11:50 +02:00
NIkita Fedrunov 8314eb71c0 Merge branch 'develop' into feature/nfe/invites_empty_state 2022-09-05 12:32:01 +02:00
Jozef Gaal 511c6a2ae1 Translated using Weblate (Slovak) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-09-04 14:32:50 +00:00
lvre a147d8623b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-09-04 14:32:49 +00:00
random 34a424678d Translated using Weblate (Italian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2022-09-04 14:32:48 +00:00
Linerly b13546b096 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-09-04 14:32:47 +00:00
Emese Tóth db29ebb93d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-09-04 14:32:46 +00:00
Glandos 287e890f60 Translated using Weblate (French) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-09-04 14:32:43 +00:00
Danial Behzadi c3bac2f0cf Translated using Weblate (Persian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-09-04 14:32:42 +00:00
Vri 054802c02b Translated using Weblate (German) 
Currently translated at 99.3% (2346 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-09-04 14:32:41 +00:00
Maxime NATUREL 5791a4d3cd Using plurals when needed 2022-09-02 15:00:53 +02:00
Onuray Sahin 8d378408c5 Code review fixes. 2022-09-02 14:28:28 +02:00
Onuray Sahin ed1244aa8f Fix description of inactive sessions. 2022-09-02 14:28:27 +02:00
Onuray Sahin e6c9409156 Create generic security recommendations view. 2022-09-02 14:28:01 +02:00
Onuray Sahin 7e8bbda856 Create security recommendations view layout. 2022-09-02 14:28:01 +02:00
Onuray Sahin 55d0a06fc1 Create security recommendations section header. 2022-09-02 14:27:59 +02:00
Jeff Huang e0e9fbc820 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2022-09-02 08:38:01 +00:00
phardyle ec260fac16 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.7% (2356 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-09-02 08:38:00 +00:00
Ihor Hordiichuk cad23d1477 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-09-02 08:37:59 +00:00
Priit Jõerüüt 578ff6bd44 Translated using Weblate (Estonian) 
Currently translated at 99.6% (2353 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-09-02 08:37:57 +00:00
Auri B. P 8535e30937 Translated using Weblate (Catalan) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-09-02 08:37:56 +00:00
Adam Brown 22ce829645 moving all the strings to a dedicated libray/strings module 2022-09-01 14:58:07 +01:00
SpiritCroc e6023c6bae Merge tag 'v1.4.34' into sc 
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838

Conflicts:
	vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_room_list.xml
 2022-08-24 10:14:36 +02:00
Onuray Sahin 6c65b0a9e0
Merge pull request #6807 from vector-im/feature/mna/device-management-header-list 
[Devices Management] Header view for sessions lists in new layout (PSG-668)
 2022-08-15 23:09:53 +03:00