Mike Barnes a66f7bb515 Merge tag 'v28.0' into develop ... # Conflicts: # README.md # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt # app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java # app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt # app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/filters/FiltersActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingTagsFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt # app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt # app/src/main/res/color/compound_button_color.xml # app/src/main/res/color/text_input_layout_box_stroke_color.xml # app/src/main/res/drawable/ic_check_circle.xml # app/src/main/res/drawable/ic_flag_24dp.xml # app/src/main/res/drawable/ic_person_add_24dp.xml # app/src/main/res/drawable/ic_play_indicator.xml # app/src/main/res/drawable/ic_poll_24dp.xml # app/src/main/res/drawable/ic_reblog_active_24dp.xml # app/src/main/res/drawable/ic_reblog_private_active_24dp.xml # app/src/main/res/drawable/report_success_background.xml # app/src/main/res/layout-land/item_trending_cell.xml # app/src/main/res/layout/activity_account.xml # app/src/main/res/layout/activity_edit_filter.xml # app/src/main/res/layout/card_license.xml # app/src/main/res/layout/item_announcement.xml # app/src/main/res/layout/item_status.xml # app/src/main/res/layout/item_status_detailed.xml # app/src/main/res/layout/item_tab_preference.xml # app/src/main/res/layout/item_trending_cell.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-eu/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-kab/strings.xml # app/src/main/res/values-lv/strings.xml # app/src/main/res/values-nb-rNO/strings.xml # app/src/main/res/values-night/theme_colors.xml # app/src/main/res/values/colors.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # app/src/main/res/values/theme_colors.xml		2026-01-03 09:57:39 +11:00
..
58.txt	Translated using Weblate (Persian)	2023-04-25 19:16:21 +00:00
61.txt	Translated using Weblate (Persian)	2019-10-16 15:34:54 +00:00
67.txt	Translated using Weblate (Persian)	2019-10-16 15:34:54 +00:00
68.txt	Translated using Weblate (Persian)	2019-10-16 15:34:54 +00:00
70.txt	Translated using Weblate (Persian)	2020-05-17 13:35:02 +00:00
72.txt	Translated using Weblate (Persian)	2020-05-02 14:30:24 +00:00
74.txt	Translated using Weblate (Persian)	2020-08-15 11:54:18 +00:00
77.txt	Translated using Weblate (Persian)	2021-04-06 15:19:13 +00:00
80.txt	Translated using Weblate (Persian)	2021-04-06 15:19:13 +00:00
82.txt	Translated using Weblate (Persian)	2021-05-06 05:33:18 +00:00
83.txt	Translated using Weblate (Persian)	2021-09-17 19:54:56 +00:00
87.txt	Translated using Weblate (Persian)	2022-12-28 18:05:00 +00:00
89.txt	Translations update from Weblate (#3729)	2023-06-10 16:17:51 +02:00
91.txt	Translated using Weblate (Persian)	2022-06-06 14:04:38 +00:00
94.txt	Translated using Weblate (Persian)	2023-07-05 00:41:53 +02:00
97.txt	Translated using Weblate (Persian)	2022-12-06 18:27:39 +00:00
100.txt	Translated using Weblate (Persian)	2023-02-14 20:31:25 +00:00
103.txt	Translations update from Weblate (#3630)	2023-05-08 13:32:17 +02:00
104.txt	Translations update from Weblate (#3630)	2023-05-08 13:32:17 +02:00
105.txt	Translated using Weblate (Persian)	2023-05-19 11:17:33 +00:00
106.txt	Translated using Weblate (Persian)	2023-05-19 11:17:33 +00:00
107.txt	Translations update from Weblate (#3729)	2023-06-10 16:17:51 +02:00
108.txt	Translated using Weblate (Persian)	2023-05-27 17:44:29 +02:00
109.txt	Translated using Weblate (Persian)	2023-06-07 11:10:12 +02:00
110.txt	Translations update from Weblate (#3729)	2023-06-10 16:17:51 +02:00
111.txt	Translated using Weblate (Persian)	2023-07-05 00:41:53 +02:00
112.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
113.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
115.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
117.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
119.txt	Merge tag 'v28.0' into develop	2026-01-03 09:57:39 +11:00
123.txt	Merge tag 'v28.0' into develop	2026-01-03 09:57:39 +11:00
124.txt	Merge tag 'v28.0' into develop	2026-01-03 09:57:39 +11:00
127.txt	Merge tag 'v28.0' into develop	2026-01-03 09:57:39 +11:00
131.txt	Merge tag 'v28.0' into develop	2026-01-03 09:57:39 +11:00