Commit Graph

21 Commits

Author SHA1 Message Date
LucasGGamerM f07e0906dd Merge branch 'main'
# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
#	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/notifications/DismissNotification.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.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/SignupFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.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/LinkCardStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.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/ic_fluent_arrow_forward_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_very_filled.xml
#	mastodon/src/main/res/drawable/ic_fluent_chat_24_filled.xml
#	mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular_text.xml
#	mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_translate_24_regular.xml
#	mastodon/src/main/res/layout/compose_action.xml
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/layout/fragment_compose.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	mastodon/src/main/res/layout/header_welcome_custom.xml
#	mastodon/src/main/res/layout/item_list_header_simple.xml
#	mastodon/src/main/res/layout/item_settings_text.xml
#	mastodon/src/main/res/layout/item_settings_update.xml
#	mastodon/src/main/res/layout/item_text.xml
#	mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
#	mastodon/src/main/res/menu/color_palettes.xml
#	mastodon/src/main/res/menu/post.xml
#	mastodon/src/main/res/menu/profile.xml
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-in-rID/strings_sk.xml
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	mastodon/src/main/res/values-v31/colors.xml
#	mastodon/src/main/res/values/attrs.xml
#	mastodon/src/main/res/values/colors.xml
#	mastodon/src/main/res/values/ids.xml
#	mastodon/src/main/res/values/palettes.xml
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/strings_sk.xml
#	mastodon/src/main/res/values/styles.xml
#	metadata/ca/changelogs/50.txt
#	metadata/ca/changelogs/51.txt
#	metadata/ca/full_description.txt
#	metadata/de-DE/full_description.txt
#	metadata/en-US/changelogs/50.txt
#	metadata/en-US/changelogs/51.txt
#	metadata/en-US/changelogs/56.txt
#	metadata/en-US/full_description.txt
#	metadata/en-US/images/phoneScreenshots/1.jpg
#	metadata/en-US/images/phoneScreenshots/2.jpg
#	metadata/en-US/images/phoneScreenshots/3.jpg
#	metadata/en-US/images/phoneScreenshots/4.jpg
#	metadata/en-US/images/phoneScreenshots/5.jpg
#	metadata/en-US/images/phoneScreenshots/6.jpg
#	metadata/en-US/short_description.txt
#	metadata/en-US/title.txt
#	metadata/es/changelogs/50.txt
#	metadata/es/changelogs/51.txt
#	metadata/es/full_description.txt
#	metadata/fr-FR/full_description.txt
#	metadata/gl-ES/short_description.txt
#	metadata/gl-ES/title.txt
#	metadata/id/full_description.txt
#	metadata/nl-NL/short_description.txt
#	metadata/nl-NL/title.txt
#	metadata/pt-BR/full_description.txt
#	metadata/sl/short_description.txt
#	metadata/sl/title.txt
#	metadata/sv/full_description.txt
2023-02-07 16:04:28 -03:00
Choukajohn 7097b5371e Translated using Weblate (French)
Currently translated at 100.0% (14 of 14 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2023-01-27 15:40:10 -03:00
LamaEpik cf1f8e8d1a Translated using Weblate (French)
Currently translated at 15.3% (2 of 13 strings)

Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/fr/
2023-01-26 19:53:02 -03:00
sk 21d57b25c9 bump version and update strings 2023-01-26 16:48:36 +01:00
Choukajohn a70e73a8cb
Translated using Weblate (French)
Currently translated at 100.0% (14 of 14 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2023-01-26 15:21:28 +00:00
Choukajohn e8e8eef42d
Translated using Weblate (French)
Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2023-01-17 00:57:45 +00:00
sk 4956543eac update changelog 2022-12-31 01:37:39 +01:00
Choukajohn ef511349f8
Translated using Weblate (French)
Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-30 21:54:40 +00:00
LucasGGamerM d957e8f2fc Making changelogs and stuff ready for fdroid release 2022-12-26 20:23:31 -03:00
Choukajohn 01cc2a2c67
Translated using Weblate (French)
Currently translated at 100.0% (11 of 11 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-26 09:34:46 +00:00
Choukajohn 1f33237e8a
Translated using Weblate (French)
Currently translated at 100.0% (11 of 11 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-23 22:18:14 +00:00
Choukajohn a1767f0425
Translated using Weblate (French)
Currently translated at 100.0% (10 of 10 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-23 19:22:28 +00:00
Choukajohn 47924dfb61
Translated using Weblate (French)
Currently translated at 100.0% (10 of 10 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-21 21:37:59 +00:00
Choukajohn a7fb66d269
Translated using Weblate (French)
Currently translated at 100.0% (10 of 10 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-21 16:18:19 +00:00
Choukajohn 4171a5d210
Translated using Weblate (French)
Currently translated at 100.0% (8 of 8 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-17 20:46:15 +00:00
Choukajohn 0f95694083 Translated using Weblate (French)
Currently translated at 100.0% (8 of 8 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-13 12:19:47 -03:00
Choukajohn 1701fc71c4 Translated using Weblate (French)
Currently translated at 100.0% (7 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-13 12:18:25 -03:00
sk c9f4df3d4e bump version, update changelog 2022-12-12 23:35:54 +01:00
Choukajohn 1c27fc68ee
Translated using Weblate (French)
Currently translated at 100.0% (8 of 8 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-12 22:25:44 +00:00
Choukajohn abf570d177
Translated using Weblate (French)
Currently translated at 100.0% (7 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-12 22:25:43 +00:00
Choukajohn 7ff0e59f4d
Translated using Weblate (French)
Currently translated at 100.0% (5 of 5 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2022-12-01 11:03:20 +00:00