LucasGGamerM
|
1ba30a4d28
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/res/values-ar/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-ja-rJP/strings_sk.xml
# metadata/ar/short_description.txt
|
2023-09-11 16:47:24 -03:00 |
|
butterflyoffire
|
de5165434d
|
Translated using Weblate (Arabic)
Currently translated at 16.6% (3 of 18 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ar/
|
2023-09-08 15:43:13 +00:00 |
|
butterflyoffire
|
3982fa4835
|
Translated using Weblate (Arabic)
Currently translated at 0.0% (0 of 34 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/ar/
|
2023-09-05 12:09:40 +00:00 |
|
LucasGGamerM
|
e1a262ec5f
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/res/values-it-rIT/strings_sk.xml
# metadata/de-DE/changelogs/83.txt
# metadata/de-DE/changelogs/94.txt
# metadata/en-US/changelogs/94.txt
# metadata/es/changelogs/94.txt
# metadata/fr/title.txt
# metadata/my-MM/title.txt
# metadata/my/short_description.txt
# metadata/pt-PT/changelogs/59.txt
# metadata/pt-PT/changelogs/61.txt
# metadata/pt-PT/full_description.txt
# metadata/pt-PT/short_description.txt
# metadata/pt-PT/title.txt
|
2023-06-13 14:03:50 -03:00 |
|
sk
|
968cde9e4c
|
clean up empty regional locales
|
2023-06-12 18:03:22 +02:00 |
|