LucasGGamerM 14175a9140 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.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/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.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/ListTimelinesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.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/ThreadFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java # mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java # mastodon/src/main/res/layout/item_account_switcher.xml # mastodon/src/main/res/values-ar-rDZ/strings_sk.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-nl-rNL/strings_sk.xml # mastodon/src/main/res/values-pt-rPT/strings_sk.xml # mastodon/src/main/res/values-v31/colors.xml # mastodon/src/main/res/values/colors.xml # mastodon/src/main/res/values/styles.xml		2023-06-03 19:56:16 -03:00
..
ar_DZ
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	Translated using Weblate (German)	2023-05-21 13:25:16 +00:00
en-US	rename version	2023-03-24 20:05:42 +01:00
es	Translated using Weblate (Spanish)	2023-04-22 14:30:34 +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 branch 'main'	2023-02-07 16:04:28 -03:00
gl-ES	Translated using Weblate (Galician)	2023-04-22 14:30:34 +00: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/changelogs	Translated using Weblate (Italian)	2023-05-26 00:16:39 +00:00
kab
ko/changelogs	Merge remote-tracking branch 'megalodon_main/main'	2023-04-22 13:53:50 -03:00
nl-NL	Translated using Weblate (Dutch)	2023-02-01 22:00:12 -03:00
oc
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	Translated using Weblate (Portuguese)	2023-05-28 20:19:30 +00:00
pt-BR	Translated using Weblate (Portuguese (Brazil))	2023-03-07 17:52:01 +00:00
pt-PT	Translated using Weblate (Portuguese (Portugal))	2023-05-29 18:37:36 +00:00
ru-RU	Translated using Weblate (Russian)	2023-05-29 18:37:37 +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	Translated using Weblate (Ukrainian)	2023-04-22 14:30:34 +00:00
zh-CN	Translated using Weblate (Chinese (Simplified))	2023-05-28 12:27:27 +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