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 |
|
LucasGGamerM
|
665a0176b9
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/layout/fragment_splash.xml
|
2023-04-14 14:27:42 -03:00 |
|
sk
|
3ad46926f1
|
Merge remote-tracking branch 'upstream/master'
|
2023-04-13 21:46:45 +02:00 |
|
Eugen Rochko
|
e18567dd82
|
New translations strings.xml (Filipino)
|
2023-04-12 17:37:06 +02:00 |
|
Eugen Rochko
|
adb7df3c71
|
New translations strings.xml (Filipino)
|
2023-04-07 21:48:00 +02:00 |
|
LucasGGamerM
|
33b62cf9aa
|
Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/values-ca-rES/strings_sk.xml
# mastodon/src/main/res/values-de-rDE/strings.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/strings_sk.xml
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
# mastodon/src/main/res/values-sl-rSI/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# metadata/ca/full_description.txt
# metadata/cy/full_description.txt
# metadata/es/changelogs/65.txt
# metadata/es/changelogs/67.txt
# metadata/es/full_description.txt
# metadata/id/full_description.txt
# metadata/ko/full_description.txt
# metadata/pl/full_description.txt
# metadata/sl/changelogs/65.txt
# metadata/sl/changelogs/67.txt
# metadata/sv/full_description.txt
# metadata/uk/full_description.txt
# metadata/zh-Hans/full_description.txt
|
2023-02-13 15:38:28 -03:00 |
|
sk
|
2271f336b0
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-02-13 17:37:40 +01:00 |
|
Eugen Rochko
|
e160a05411
|
New translations strings.xml (Filipino)
|
2023-01-30 00:02:14 +01:00 |
|
Eugen Rochko
|
b3a88c4a7c
|
New translations strings.xml (Filipino)
|
2023-01-25 23:45:21 +01:00 |
|
Eugen Rochko
|
5cae41a500
|
New translations strings.xml (Filipino)
|
2023-01-24 21:53:29 +01:00 |
|
LucasGGamerM
|
d7004824fb
|
Decoupling moshidon strings from megalodon
|
2023-01-23 18:47:07 -03:00 |
|
Eugen Rochko
|
09b4aff9f5
|
New translations strings.xml (Filipino)
|
2023-01-06 11:31:21 +01:00 |
|
Eugen Rochko
|
f7b8ed519c
|
New translations strings.xml (Filipino)
|
2023-01-02 20:56:03 +01:00 |
|
Eugen Rochko
|
eba88f2c0a
|
New translations strings.xml (Filipino)
|
2023-01-02 20:00:36 +01:00 |
|
Eugen Rochko
|
5db91627a1
|
New translations strings.xml (Filipino)
|
2023-01-01 17:18:39 +01:00 |
|
Eugen Rochko
|
7e473aa8a8
|
New translations strings.xml (Filipino)
|
2023-01-01 16:17:30 +01:00 |
|
Eugen Rochko
|
aa42a0a4c4
|
New translations strings.xml (Filipino)
|
2022-12-29 06:02:04 +01:00 |
|
Eugen Rochko
|
ad61596f66
|
New translations strings.xml (Filipino)
|
2022-12-29 05:04:36 +01:00 |
|
Eugen Rochko
|
bd518b3038
|
New translations strings.xml (Filipino)
|
2022-12-28 14:31:07 +01:00 |
|
Eugen Rochko
|
c6e29c9ce4
|
New translations strings.xml (Filipino)
|
2022-12-23 14:24:05 +01:00 |
|
Eugen Rochko
|
35e8f5eddf
|
New translations strings.xml (Filipino)
|
2022-12-23 11:33:45 +01:00 |
|
Eugen Rochko
|
309e84d14c
|
New translations strings.xml (Filipino)
|
2022-12-08 21:26:30 +01:00 |
|
sk
|
e35794ef7d
|
add new languages
|
2022-12-07 14:01:20 +01:00 |
|
Eugen Rochko
|
519d8b887d
|
New translations strings.xml (Filipino)
|
2022-12-03 23:52:40 +01:00 |
|
Eugen Rochko
|
bab1d40038
|
New translations strings.xml (Filipino)
|
2022-12-01 18:41:53 +01:00 |
|
Eugen Rochko
|
268accea14
|
New translations strings.xml (Filipino)
|
2022-11-27 16:43:39 +01:00 |
|
Eugen Rochko
|
5b21747d5d
|
New translations strings.xml (Filipino)
|
2022-11-27 10:01:36 +01:00 |
|
Eugen Rochko
|
9fda48cff0
|
New translations strings.xml (Filipino)
|
2022-11-27 09:04:16 +01:00 |
|
Eugen Rochko
|
09e2224596
|
New translations strings.xml (Filipino)
|
2022-11-26 22:17:51 +01:00 |
|