LucasGGamerM
|
8f4363a2d8
|
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:34:44 -03:00 |
|
LucasGGamerM
|
1beba48b66
|
Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
|
2023-06-15 14:58:12 -03:00 |
|
ihor_ck
|
7cf01e89b8
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (18 of 18 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-06-15 17:51:30 +00:00 |
|
ihor_ck
|
3b25e367bb
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (17 of 17 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-04-22 14:30:34 +00:00 |
|
LucasGGamerM
|
1d5bf452ab
|
Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
# metadata/es/changelogs/83.txt
|
2023-04-12 14:00:28 -03:00 |
|
ihor_ck
|
c4d8baf8a2
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (17 of 17 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-04-08 20:37:30 +00:00 |
|
ihor_ck
|
aaa88c45f7
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (16 of 16 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-03-16 00:19:11 +00:00 |
|
nitrogenez47ab3e44720c4675
|
3143f28e04
|
Translated using Weblate (Ukrainian)
Currently translated at 13.3% (4 of 30 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/uk/
|
2023-02-23 04:08:21 +00:00 |
|
LucasGGamerM
|
69af790e22
|
Merge remote-tracking branch 'megalodon_weblate/main'
|
2023-02-20 14:04:46 -03:00 |
|
ihor_ck
|
aa554d91f7
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (16 of 16 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-02-18 20:08:21 +00:00 |
|
ihor_ck
|
507fcea646
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (15 of 15 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-02-17 12:27:57 +00:00 |
|
LucasGGamerM
|
d4a377e75f
|
Merge remote-tracking branch 'megalodon_weblate/main'
|
2023-02-16 17:37:12 -03:00 |
|
ihor_ck
|
d2f0c3f7e5
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (15 of 15 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-02-15 20:19:19 +00:00 |
|
ihor_ck
|
1621dbc67a
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-02-11 13:13:08 +00:00 |
|
LucasGGamerM
|
caf07a60ea
|
Removing megalodon naming stuff
|
2023-02-08 19:56:34 -03:00 |
|
sk
|
21d57b25c9
|
bump version and update strings
|
2023-01-26 16:48:36 +01:00 |
|
ihor_ck
|
49fd1aba76
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-01-26 15:21:28 +00:00 |
|
ihor_ck
|
d148883ab2
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (13 of 13 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-01-17 11:26:44 +00:00 |
|
ihor_ck
|
4de4617cf5
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (12 of 12 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-01-17 00:57:45 +00:00 |
|
sk
|
4956543eac
|
update changelog
|
2022-12-31 01:37:39 +01:00 |
|
ihor_ck
|
83a09c4af2
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (12 of 12 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2022-12-30 21:54:40 +00:00 |
|
ihor_ck
|
5b7b022d9f
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (11 of 11 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2022-12-27 20:46:35 +00:00 |
|
nitrogenez
|
c18e1e8456
|
Translated using Weblate (Ukrainian)
Currently translated at 90.0% (9 of 10 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2022-12-23 19:22:28 +00:00 |
|
sk
|
4ba7763de5
|
fix fastlane configs
|
2022-12-20 12:49:01 +01:00 |
|
sk
|
c9f4df3d4e
|
bump version, update changelog
|
2022-12-12 23:35:54 +01:00 |
|
nitrogenez
|
723983dadf
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (8 of 8 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2022-12-12 22:25:44 +00:00 |
|