Mike Barnes 875013e47f Merge tag 'v25.2' into develop ... # Conflicts: # README.md # app/build.gradle # app/lint-baseline.xml # app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt # app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt # app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.kt # app/src/main/res/layout/activity_about.xml # app/src/main/res/layout/item_emoji_pref.xml # app/src/main/res/values-ar/strings.xml # app/src/main/res/values-bg/strings.xml # app/src/main/res/values-cy/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-fa/strings.xml # app/src/main/res/values-gd/strings.xml # app/src/main/res/values-gl/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-is/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-pt-rPT/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-si/strings.xml # app/src/main/res/values-sv/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-uk/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values/strings.xml # fastlane/metadata/android/ru/full_description.txt # fastlane/metadata/android/zh-Hans/full_description.txt		2026-01-02 18:27:41 +11:00
..
58.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
61.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
67.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
68.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
70.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
72.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
74.txt	rename fastlane language directories to use bcp47 format	2021-03-04 19:36:39 +01:00
77.txt	rename fastlane language directories to use bcp47 format	2021-03-04 19:36:39 +01:00
80.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
82.txt	Translated using Weblate (Chinese (Simplified))	2021-05-16 16:34:14 +00:00
83.txt	Translated using Weblate (Chinese (Simplified))	2022-05-17 17:16:27 +00:00
87.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
89.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
91.txt	Translated using Weblate (Chinese (Simplified))	2022-11-25 16:35:54 +00:00
94.txt	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
97.txt	Release 96	2022-11-25 19:11:54 +01:00
100.txt	Release 99	2023-01-28 13:08:42 +01:00