LucasGGamerM 8f4363a2d8 Merge remote-tracking branch 'megalodon_main/main' into m3-merger ... # Conflicts: # README.md # build.gradle # mastodon/build.gradle # mastodon/src/main/AndroidManifest.xml # mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java # mastodon/src/main/java/org/joinmastodon/android/MainActivity.java # mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java # mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java # mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java # mastodon/src/main/java/org/joinmastodon/android/model/Status.java # mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java # mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java # mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml # mastodon/src/main/res/color/button_text_primary_light_on_dark.xml # mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml # mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml # mastodon/src/main/res/drawable/bg_search_field.xml # mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml # mastodon/src/main/res/layout/compose_action.xml # mastodon/src/main/res/layout/compose_media_thumb.xml # mastodon/src/main/res/layout/compose_poll_option.xml # mastodon/src/main/res/layout/display_item_footer.xml # mastodon/src/main/res/layout/display_item_header.xml # mastodon/src/main/res/layout/display_item_text.xml # mastodon/src/main/res/layout/fragment_compose.xml # mastodon/src/main/res/layout/fragment_profile.xml # mastodon/src/main/res/layout/item_instance_category.xml # mastodon/src/main/res/layout/item_report_choice.xml # mastodon/src/main/res/layout/item_settings_footer.xml # mastodon/src/main/res/layout/item_settings_switch.xml # mastodon/src/main/res/layout/item_settings_theme.xml # mastodon/src/main/res/layout/item_settings_theme_subitem.xml # mastodon/src/main/res/layout/item_settings_update.xml # mastodon/src/main/res/layout/tab_bar.xml # mastodon/src/main/res/menu/mute_duration.xml # mastodon/src/main/res/values-de-rDE/strings_sk.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-fa/strings_sk.xml # mastodon/src/main/res/values-night/colors.xml # mastodon/src/main/res/values-nl-rNL/strings_sk.xml # mastodon/src/main/res/values-uk-rUA/strings_sk.xml # mastodon/src/main/res/values-zh-rCN/strings_sk.xml # mastodon/src/main/res/values/attrs.xml # mastodon/src/main/res/values/ids.xml # mastodon/src/main/res/values/styles.xml # metadata/es/changelogs/83.txt		2023-08-20 11:34:44 -03:00
..
ar	Merge remote-tracking branch 'megalodon_main/main'	2023-06-13 14:03:50 -03:00
ca	Merge remote-tracking branch 'megalodon_weblate/main'	2023-02-13 15:38:28 -03:00
cy/changelogs	Merge remote-tracking branch 'megalodon_weblate/main'	2023-02-13 15:38:28 -03:00
de-DE	boop version	2023-06-13 10:19:13 +02:00
en-US	docs: add 101 changelog	2023-06-16 13:16:16 -03:00
es	Translated using Weblate (Spanish)	2023-07-07 14:57:12 +00:00
es-ES	Translated using Weblate (Spanish)	2023-04-02 11:39:55 +00:00
fr	Merge remote-tracking branch 'megalodon_main/main'	2023-04-22 13:53:50 -03:00
fr-FR	Merge remote-tracking branch 'megalodon_main/main' into m3-merger	2023-08-20 11:34:44 -03:00
gl-ES	Merge remote-tracking branch 'megalodon_main/main' into m3-merger	2023-08-20 11:34:44 -03:00
hr	Translated using Weblate (Croatian)	2023-04-22 14:30:34 +00:00
id	Translated using Weblate (Indonesian)	2023-05-20 13:26:05 +00:00
it-IT	Merge remote-tracking branch 'megalodon_main/main' into m3-merger	2023-08-20 11:34:44 -03:00
ja-JP	Translated using Weblate (Japanese)	2023-07-07 14:57:12 +00:00
kab	Translated using Weblate (Kabyle)	2023-06-11 19:15:25 +00:00
ko/changelogs	Merge remote-tracking branch 'megalodon_main/main' into m3-merger	2023-08-20 11:34:44 -03:00
my	Merge remote-tracking branch 'megalodon_main/main'	2023-06-13 14:03:50 -03:00
nl-NL	Translated using Weblate (Dutch)	2023-02-01 22:00:12 -03:00
oc	Translated using Weblate (Occitan)	2023-06-11 19:15:26 +00:00
pl	Translated using Weblate (Polish)	2023-05-26 00:16:39 +00:00
pl-PL	Translated using Weblate (Polish)	2023-01-30 19:04:45 +00:00
pt-BR	Translated using Weblate (Portuguese (Brazil))	2023-06-16 15:57:31 +00:00
pt-PT	Merge remote-tracking branch 'megalodon_main/main'	2023-06-13 14:03:50 -03:00
ro	Merge remote-tracking branch 'megalodon_main/main' into m3-merger	2023-08-20 11:34:44 -03:00
ru-RU	Translated using Weblate (Russian)	2023-06-11 15:37:38 +00:00
sl	Merge remote-tracking branch 'megalodon_weblate/main'	2023-02-13 15:38:28 -03:00
sv	Translated using Weblate (Swedish)	2023-04-02 11:39:55 +00:00
sv-SE	Translated using Weblate (Swedish)	2023-02-01 22:00:12 -03:00
uk	Merge remote-tracking branch 'megalodon_main/main' into m3-merger	2023-08-20 11:34:44 -03:00
vi	Translated using Weblate (Vietnamese)	2023-07-07 14:57:12 +00:00
zh-CN	Translated using Weblate (Chinese (Simplified))	2023-05-30 22:01:22 +00:00
zh-Hans/changelogs	Translated using Weblate (Chinese (Simplified))	2023-03-16 00:19:12 +00:00
zh-TW	Translated using Weblate (Chinese (Traditional))	2023-02-11 13:13:08 +00:00