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
|
871dfda79e
|
New translations strings.xml (Hungarian)
|
2023-04-12 17:36:47 +02:00 |
|
Eugen Rochko
|
de2654def3
|
New translations strings.xml (Hungarian)
|
2023-04-07 21:47:39 +02:00 |
|
Eugen Rochko
|
4475bd039a
|
New translations strings.xml (Hungarian)
|
2023-02-05 10:32:04 +01:00 |
|
Eugen Rochko
|
98dc7d0524
|
New translations strings.xml (Hungarian)
|
2023-02-05 09:17:45 +01:00 |
|
Eugen Rochko
|
9407bd9e86
|
New translations strings.xml (Hungarian)
|
2023-01-30 00:01:38 +01:00 |
|
Eugen Rochko
|
c7b5b41128
|
New translations strings.xml (Hungarian)
|
2023-01-25 23:44:41 +01:00 |
|
Eugen Rochko
|
f7f56c7a9b
|
New translations strings.xml (Hungarian)
|
2023-01-24 21:52:48 +01:00 |
|
Eugen Rochko
|
b90fc55b3f
|
New translations strings.xml (Hungarian)
|
2022-12-19 11:42:42 +01:00 |
|
Eugen Rochko
|
8decd66e26
|
New translations strings.xml (Hungarian)
|
2022-12-11 14:42:31 +01:00 |
|
Eugen Rochko
|
14054b2198
|
New translations strings.xml (Hungarian)
|
2022-12-11 13:46:42 +01:00 |
|
Eugen Rochko
|
ff464bef9f
|
New translations strings.xml (Hungarian)
|
2022-12-08 21:26:29 +01:00 |
|
Eugen Rochko
|
7db7bf0220
|
New translations strings.xml (Hungarian)
|
2022-12-03 23:52:18 +01:00 |
|
Eugen Rochko
|
0da4f79413
|
New translations strings.xml (Hungarian)
|
2022-12-02 14:17:58 +01:00 |
|
Eugen Rochko
|
2bdef776a2
|
New translations strings.xml (Hungarian)
|
2022-12-02 13:08:55 +01:00 |
|
Eugen Rochko
|
cf48cb6f75
|
New translations strings.xml (Hungarian)
|
2022-12-01 19:43:19 +01:00 |
|
Eugen Rochko
|
3ce8aa7894
|
New translations strings.xml (Hungarian)
|
2022-11-29 21:05:04 +01:00 |
|
Eugen Rochko
|
f9fe7819f9
|
New translations strings.xml (Hungarian)
|
2022-11-28 00:06:00 +01:00 |
|
Eugen Rochko
|
f3d13545e7
|
New translations strings.xml (Hungarian)
|
2022-11-27 23:06:27 +01:00 |
|
Eugen Rochko
|
9a12be88da
|
New translations strings.xml (Hungarian)
|
2022-11-26 22:17:47 +01:00 |
|