LucasGGamerM
|
c4b7262e89
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
|
2023-08-29 10:41:09 -03:00 |
0que
|
3a35674ea2
|
Translated using Weblate (Russian)
Currently translated at 77.7% (14 of 18 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2023-08-27 05:53:05 +00:00 |
|
LucasGGamerM
|
afc401c1f2
|
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-ru-rRU/strings_sk.xml
# metadata/ru/full_description.txt
|
2023-08-24 08:17:57 -03:00 |
0eoc
|
fb0391d5cd
|
Translated using Weblate (Russian)
Currently translated at 61.1% (11 of 18 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2023-08-21 22:40:19 +02:00 |
0eoc
|
90bdbefd48
|
Translated using Weblate (Russian)
Currently translated at 61.1% (11 of 18 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2023-08-21 22:40:19 +02:00 |
LucasGGamerM
|
caf07a60ea
|
Removing megalodon naming stuff
|
2023-02-08 19:56:34 -03:00 |
|
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 |
itslameni
|
25e8febc44
|
Translated using Weblate (Russian)
Currently translated at 91.6% (11 of 12 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2023-01-17 00:57:44 +00:00 |
nkufideal
|
594f6d4fc5
|
Translated using Weblate (Russian)
Currently translated at 100.0% (11 of 11 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2022-12-30 21:54:39 +00:00 |
|
LucasGGamerM
|
d957e8f2fc
|
Making changelogs and stuff ready for fdroid release
|
2022-12-26 20:23:31 -03:00 |
|
itslameni
|
239f7eb9e7
|
Translated using Weblate (Russian)
Currently translated at 37.5% (3 of 8 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2022-12-20 13:57:21 -03:00 |
|
itslameni
|
b597cf6e18
|
Translated using Weblate (Russian)
Currently translated at 37.5% (3 of 8 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2022-12-20 11:34:43 +00:00 |
|
itslameni
|
2eccd572c9
|
Translated using Weblate (Russian)
Currently translated at 37.5% (3 of 8 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2022-12-17 21:21:55 -03:00 |
|
itslameni
|
d168794d4e
|
Translated using Weblate (Russian)
Currently translated at 37.5% (3 of 8 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2022-12-16 12:39:36 +00:00 |
wileyfoxyx
|
829bcafcf2
|
Translated using Weblate (Russian)
Currently translated at 20.0% (1 of 5 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ru/
|
2022-12-03 09:28:09 +00:00 |