Yuito-app-android/app/src/main/res
kyori19 e5d9b56dd0
Merge remote-tracking branch 'tuskyapp/develop'
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
#	app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
#	app/src/main/res/values-be/strings.xml
#	app/src/main/res/values-cy/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-gd/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-lv/strings.xml
#	app/src/main/res/values-oc/strings.xml
#	app/src/main/res/values-sv/strings.xml
#	app/src/main/res/values-tr/strings.xml
#	app/src/main/res/values-vi/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	app/src/main/res/values/donottranslate.xml
#	fastlane/metadata/android/en-US/images/phoneScreenshots/01_timeline.png
#	fastlane/metadata/android/en-US/images/phoneScreenshots/03_profile.png
#	fastlane/metadata/android/en-US/images/phoneScreenshots/04_favourites.png
#	fastlane/metadata/android/fa/full_description.txt
#	fastlane/metadata/android/sv/changelogs/58.txt
#	fastlane/metadata/android/sv/changelogs/67.txt
#	fastlane/metadata/android/sv/changelogs/72.txt
#	fastlane/metadata/android/sv/changelogs/77.txt
#	gradle/libs.versions.toml
2023-07-19 21:14:48 +09:00
..
anim
color
color-v24 Fix crash on startup on Api levels 25 and lower (#2422) 2022-04-07 20:04:39 +02:00
drawable Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
drawable-v24 new app icon (#2695) 2022-09-13 19:48:09 +02:00
drawable-xxxhdpi Merge remote-tracking branch 'tuskyapp/develop' 2022-04-13 00:59:06 +09:00
layout Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
layout-land Fix trending tags being cut off (#3745) 2023-06-15 11:27:57 +02:00
layout-sw640dp 3503: SwipeRefreshLayout must be higher level (#3504) 2023-04-20 19:36:29 +02:00
menu Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
mipmap-anydpi-v26 new app icon (#2695) 2022-09-13 19:48:09 +02:00
mipmap-hdpi
mipmap-mdpi
mipmap-xhdpi
mipmap-xxhdpi
mipmap-xxxhdpi
raw Merge remote-tracking branch 'tuskyapp/develop' 2022-03-04 17:51:25 +09:00
values Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-ar Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-be Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09: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 remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-bn-rBD Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-bn-rIN Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-ca Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-ckb Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-cs Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-cy Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-de Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-el Update translation files 2022-08-05 16:55:17 +00:00
values-en-rGB revert en-gb string update 2023-02-11 13:07:14 +01:00
values-eo Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-es Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-eu Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-fa Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-fi Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-fr Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-fy Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-ga Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-gd Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-gl Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-hi Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-hu Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-in Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-is Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-it Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-ja Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-kab Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-ko Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-large
values-large-land fix compose field on landscape tablets (#2747) 2022-11-07 19:56:28 +01:00
values-lv Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-ml Spelling (#2771) 2022-11-09 19:32:39 +01:00
values-nb-rNO Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-night Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-nl Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-oc Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-or Translated using Weblate (Odia) 2023-05-09 15:44:10 +00:00
values-pl Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-pt-rBR Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-pt-rPT Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-ru Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-sa Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-si Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-sk Spelling (#2771) 2022-11-09 19:32:39 +01:00
values-sl Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-small
values-sv Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-sw380dp
values-ta Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-th Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-tr Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-uk Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-v27 Android 12 support, update AndroidX libraries (#2367) 2022-03-09 20:50:23 +01:00
values-vi Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-w640dp Add trending tags (#3149) 2023-02-14 19:52:11 +01:00
values-zh-rCN Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
values-zh-rHK Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-zh-rMO Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-zh-rSG Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
values-zh-rTW Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
xml Add entry for "or" to locales_config.xml and donottranslate.xml (#3584) 2023-05-11 12:54:51 +02:00