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
|
4a758bd488
|
New translations strings.xml (Czech)
|
2023-04-12 17:36:31 +02:00 |
|
Eugen Rochko
|
cde22a0945
|
New translations strings.xml (Czech)
|
2023-04-07 21:47:22 +02:00 |
|
Eugen Rochko
|
b0e6805a20
|
New translations strings.xml (Czech)
|
2023-03-28 16:34:35 +02:00 |
|
Eugen Rochko
|
21e7e44c01
|
New translations strings.xml (Czech)
|
2023-03-28 15:36:30 +02:00 |
|
Eugen Rochko
|
825adda664
|
New translations strings.xml (Czech)
|
2023-01-30 00:01:37 +01:00 |
|
Eugen Rochko
|
98dbff38ff
|
New translations strings.xml (Czech)
|
2023-01-25 23:44:40 +01:00 |
|
Eugen Rochko
|
613a9de40e
|
New translations strings.xml (Czech)
|
2023-01-24 21:52:47 +01:00 |
|
Eugen Rochko
|
537242b277
|
New translations strings.xml (Czech)
|
2023-01-13 17:24:51 +01:00 |
|
Eugen Rochko
|
e4d0c4eda5
|
New translations strings.xml (Czech)
|
2023-01-11 12:16:23 +01:00 |
|
Eugen Rochko
|
7f9061d0c8
|
New translations strings.xml (Czech)
|
2022-12-08 21:25:55 +01:00 |
|
Eugen Rochko
|
d696daece3
|
New translations strings.xml (Czech)
|
2022-12-03 23:52:29 +01:00 |
|
Eugen Rochko
|
340990fbd9
|
New translations strings.xml (Czech)
|
2022-11-27 20:34:14 +01:00 |
|
Eugen Rochko
|
a7687f8e35
|
New translations strings.xml (Czech)
|
2022-11-27 19:31:30 +01:00 |
|
Eugen Rochko
|
52aa4a5289
|
New translations strings.xml (Czech)
|
2022-11-27 17:43:12 +01:00 |
|
Eugen Rochko
|
8863446f6a
|
New translations strings.xml (Czech)
|
2022-11-27 15:03:46 +01:00 |
|
Eugen Rochko
|
28a0824f6b
|
New translations strings.xml (Czech)
|
2022-11-27 13:59:12 +01:00 |
|
Eugen Rochko
|
ef37d8afc4
|
New translations strings.xml (Czech)
|
2022-11-14 13:17:06 +01:00 |
|
Eugen Rochko
|
9d390a06bf
|
New translations strings.xml (Czech)
|
2022-11-13 07:06:08 +01:00 |
|
Eugen Rochko
|
49599f48bb
|
New translations strings.xml (Czech)
|
2022-10-31 07:46:11 +01:00 |
|
Eugen Rochko
|
7d12d866ab
|
New translations strings.xml (Czech)
|
2022-10-04 06:41:05 +02:00 |
|
Eugen Rochko
|
07212dba96
|
New translations strings.xml (Czech)
|
2022-09-15 21:09:46 +02:00 |
|
Eugen Rochko
|
51e86b686d
|
New translations strings.xml (Czech)
|
2022-09-15 20:01:46 +02:00 |
|
Eugen Rochko
|
0cee490466
|
New translations strings.xml (Czech)
|
2022-07-24 19:10:27 +02:00 |
|
Eugen Rochko
|
6272797834
|
New translations strings.xml (Czech)
|
2022-07-20 17:22:53 +02:00 |
|
Eugen Rochko
|
c048134ef2
|
New translations strings.xml (Czech)
|
2022-07-20 15:30:06 +02:00 |
|
Eugen Rochko
|
6f57cd9ffe
|
New translations strings.xml (Czech)
|
2022-07-19 12:39:11 +02:00 |
|
Eugen Rochko
|
8d477efc28
|
New translations strings.xml (Czech)
|
2022-05-19 15:32:16 +02:00 |
|
Eugen Rochko
|
4ae21862a5
|
New translations strings.xml (Czech)
|
2022-05-19 14:30:33 +02:00 |
|
Eugen Rochko
|
6e6aebef35
|
New translations strings.xml (Czech)
|
2022-05-19 13:34:29 +02:00 |
|
Eugen Rochko
|
cd138032da
|
New translations strings.xml (Czech)
|
2022-05-18 18:19:40 +02:00 |
|
Eugen Rochko
|
864e6fb9d0
|
New translations strings.xml (Czech)
|
2022-05-18 16:41:35 +02:00 |
|
Eugen Rochko
|
9d356b0635
|
New translations strings.xml (Czech)
|
2022-05-18 15:25:33 +02:00 |
|
Eugen Rochko
|
6c5d720a40
|
New translations strings.xml (Czech)
|
2022-05-18 14:28:15 +02:00 |
|
Eugen Rochko
|
5a42136395
|
New translations strings.xml (Czech)
|
2022-05-17 21:03:40 +02:00 |
|
Eugen Rochko
|
b4677d14e5
|
New translations strings.xml (Czech)
|
2022-05-17 04:16:50 +02:00 |
|