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
..
anim	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
color	First pass at re-theming to match Chinwag	2020-12-15 12:53:03 +11:00
drawable	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
drawable-xhdpi	Merge tag 'v20.0' into develop	2023-07-30 18:04:03 +10:00
drawable-xxhdpi	Merge tag 'v20.0' into develop	2023-07-30 18:04:03 +10:00
drawable-xxxhdpi	Merge tag 'v17.0' into develop	2022-06-06 16:57:59 +10:00
layout	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
layout-land	v23.0	2023-08-06 16:25:50 +10:00
layout-sw640dp	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
menu	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
mipmap-anydpi-v26	Fix some object colours, splash screen	2023-08-03 21:47:47 +10:00
raw	Update gradle, kotlin and other dependencies (#2291)	2022-01-20 21:10:32 +01:00
values	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ar	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-be	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ber	Replace “status” by “post” in strings name and source values (#2405)	2022-03-27 12:23:25 +02:00
values-bg	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-bn-rBD	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-bn-rIN	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ca	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ckb	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-cs	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-cy	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-de	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-el	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-en-rAU	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-en-rGB	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-eo	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-es	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-eu	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-fa	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-fi	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-fr	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-fr-rBE	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-fy	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ga	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-gd	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-gl	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-hi	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-hu	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-in	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-is	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-it	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-iw	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ja	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-kab	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ko	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-large	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
values-large-land	fix compose field on landscape tablets (#2747)	2022-11-07 19:56:28 +01:00
values-lb	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-lv	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ml	Spelling (#2771)	2022-11-09 19:32:39 +01:00
values-nb-rNO	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-night	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-nl	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-oc	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-or	Translated using Weblate (Odia)	2023-05-09 15:44:10 +00:00
values-pa	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-pl	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-pt-rBR	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-pt-rPT	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-ru	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-sa	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-si	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-sk	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-sl	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-small
values-sv	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-sw380dp	ComposeActivity refactor (#1541)	2019-12-19 19:09:40 +01:00
values-ta	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-te	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-th	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-tr	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-uk	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-v27	Android 12 support, update AndroidX libraries (#2367)	2022-03-09 20:50:23 +01:00
values-vi	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-w640dp	Add trending tags (#3149)	2023-02-14 19:52:11 +01:00
values-zh-rCN	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-zh-rHK	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-zh-rMO	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-zh-rSG	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
values-zh-rTW	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
xml	Add entry for "or" to locales_config.xml and donottranslate.xml (#3584)	2023-05-11 12:54:51 +02:00