LucasGGamerM
|
93818903c8
|
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:36:16 -03:00 |
|
Eugen Rochko
|
dffa4e4594
|
New translations strings.xml (Portuguese)
|
2023-04-07 21:47:46 +02:00 |
|
Eugen Rochko
|
f418a5a2c4
|
New translations strings.xml (Portuguese)
|
2023-01-30 00:01:57 +01:00 |
|
Eugen Rochko
|
3be04343b8
|
New translations strings.xml (Portuguese)
|
2023-01-25 23:45:04 +01:00 |
|
Eugen Rochko
|
f7410a510f
|
New translations strings.xml (Portuguese)
|
2023-01-24 21:53:13 +01:00 |
|
Eugen Rochko
|
5cbebe7ec6
|
New translations strings.xml (Portuguese)
|
2022-12-13 13:29:44 +01:00 |
|
Eugen Rochko
|
fbd550228b
|
New translations strings.xml (Portuguese)
|
2022-12-08 21:26:04 +01:00 |
|
Eugen Rochko
|
b7a4364a28
|
New translations strings.xml (Portuguese)
|
2022-12-03 23:52:37 +01:00 |
|
Eugen Rochko
|
3f0ae887b8
|
New translations strings.xml (Portuguese)
|
2022-10-31 07:46:00 +01:00 |
|
Eugen Rochko
|
9b389b346f
|
New translations strings.xml (Portuguese)
|
2022-10-04 06:40:55 +02:00 |
|
Eugen Rochko
|
267a6a75ef
|
New translations strings.xml (Portuguese)
|
2022-05-17 18:03:43 +02:00 |
|
Eugen Rochko
|
2eb01ed477
|
New translations strings.xml (Portuguese)
|
2022-05-02 05:00:46 +02:00 |
|
Eugen Rochko
|
144efdffee
|
New translations strings.xml (Portuguese)
|
2022-04-30 23:48:17 +02:00 |
|
Eugen Rochko
|
7819f10b8b
|
New translations strings.xml (Portuguese)
|
2022-04-30 22:50:21 +02:00 |
|
Eugen Rochko
|
2b7d9e5536
|
New translations strings.xml (Portuguese)
|
2022-04-22 11:59:25 +02:00 |
|
Eugen Rochko
|
15d73ab9a2
|
New translations strings.xml (Portuguese)
|
2022-04-22 11:03:22 +02:00 |
|
Eugen Rochko
|
2f4568f59e
|
New translations strings.xml (Portuguese)
|
2022-04-20 20:18:51 +02:00 |
|
Eugen Rochko
|
fb050c5c20
|
New translations strings.xml (Portuguese)
|
2022-04-20 18:01:53 +02:00 |
|