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
|
c9efc2cb2b
|
New translations strings.xml (Korean)
|
2023-04-12 17:36:50 +02:00 |
|
Eugen Rochko
|
d1f90eb231
|
New translations strings.xml (Korean)
|
2023-04-07 21:47:42 +02:00 |
|
Eugen Rochko
|
8dd3343906
|
New translations strings.xml (Korean)
|
2023-01-30 00:01:55 +01:00 |
|
Eugen Rochko
|
0d5d169e5f
|
New translations strings.xml (Korean)
|
2023-01-28 01:46:35 +01:00 |
|
Eugen Rochko
|
90e55c1043
|
New translations strings.xml (Korean)
|
2023-01-28 00:36:07 +01:00 |
|
Eugen Rochko
|
b4d7b34767
|
New translations strings.xml (Korean)
|
2023-01-25 23:45:02 +01:00 |
|
Eugen Rochko
|
dbacbe0341
|
New translations strings.xml (Korean)
|
2023-01-24 21:53:11 +01:00 |
|
Eugen Rochko
|
752d0b5ca9
|
New translations strings.xml (Korean)
|
2022-12-13 02:15:40 +01:00 |
|
Eugen Rochko
|
ab50e7861a
|
New translations strings.xml (Korean)
|
2022-12-10 05:29:13 +01:00 |
|
Eugen Rochko
|
d52b88c816
|
New translations strings.xml (Korean)
|
2022-12-10 03:51:49 +01:00 |
|
Eugen Rochko
|
11e9db7ded
|
New translations strings.xml (Korean)
|
2022-12-10 02:44:44 +01:00 |
|
Eugen Rochko
|
238758fc0b
|
New translations strings.xml (Korean)
|
2022-12-08 21:26:03 +01:00 |
|
Eugen Rochko
|
3f075aff7b
|
New translations strings.xml (Korean)
|
2022-12-03 23:52:37 +01:00 |
|
Eugen Rochko
|
6e8542e33b
|
New translations strings.xml (Korean)
|
2022-11-21 14:56:20 +01:00 |
|
Eugen Rochko
|
f04df2d2c4
|
New translations strings.xml (Korean)
|
2022-11-17 13:16:17 +01:00 |
|
Eugen Rochko
|
c71bc55e95
|
New translations strings.xml (Korean)
|
2022-11-13 07:06:18 +01:00 |
|
Eugen Rochko
|
ca29cee586
|
New translations strings.xml (Korean)
|
2022-10-31 07:45:46 +01:00 |
|
Eugen Rochko
|
89ec6acac9
|
New translations strings.xml (Korean)
|
2022-10-04 06:40:56 +02:00 |
|
Eugen Rochko
|
d1b1cb2082
|
New translations strings.xml (Korean)
|
2022-05-25 08:21:34 +02:00 |
|
Eugen Rochko
|
15b4d46ea1
|
New translations strings.xml (Korean)
|
2022-05-17 18:03:41 +02:00 |
|
Eugen Rochko
|
f6333de4e6
|
New translations strings.xml (Korean)
|
2022-05-07 17:17:59 +02:00 |
|
Eugen Rochko
|
5af22f1bab
|
New translations strings.xml (Korean)
|
2022-05-07 16:19:40 +02:00 |
|
Eugen Rochko
|
ed84ea6162
|
New translations strings.xml (Korean)
|
2022-05-05 06:07:06 +02:00 |
|
Eugen Rochko
|
e99ffc0d4c
|
New translations strings.xml (Korean)
|
2022-05-05 05:05:13 +02:00 |
|
Eugen Rochko
|
347d90ad14
|
New translations strings.xml (Korean)
|
2022-05-04 07:48:13 +02:00 |
|
Eugen Rochko
|
6d78a43bfe
|
New translations strings.xml (Korean)
|
2022-05-02 05:00:48 +02:00 |
|
Eugen Rochko
|
abb6d4bcc4
|
New translations strings.xml (Korean)
|
2022-04-20 20:18:42 +02:00 |
|