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 |
|
AiOO
|
e0b6ed7103
|
Translated using Weblate (Korean)
Currently translated at 100.0% (272 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-04-22 14:30:34 +00:00 |
|
AiOO
|
ba85d18574
|
Translated using Weblate (Korean)
Currently translated at 100.0% (272 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-04-22 14:30:34 +00:00 |
|
sk
|
b3a9b5824d
|
fix non-positional subtitution in string
|
2023-04-22 16:29:41 +02:00 |
|
AiOO
|
b0b497ed46
|
Translated using Weblate (Korean)
Currently translated at 100.0% (262 of 262 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-03-16 00:19:11 +00:00 |
|
AiOO
|
e0aba23e80
|
Translated using Weblate (Korean)
Currently translated at 100.0% (259 of 259 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-02-17 12:27:57 +00:00 |
|
AiOO
|
f2f48fce79
|
Translated using Weblate (Korean)
Currently translated at 100.0% (259 of 259 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-02-12 16:56:41 +00:00 |
|
AiOO
|
1d44875a65
|
Translated using Weblate (Korean)
Currently translated at 98.0% (246 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-02-11 13:13:08 +00:00 |
|
Tribela
|
230a59266d
|
Translated using Weblate (Korean)
Currently translated at 93.6% (235 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-02-11 13:13:08 +00:00 |
|
AiOO
|
441686740a
|
Translated using Weblate (Korean)
Currently translated at 100.0% (235 of 235 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-25 17:32:56 +00:00 |
|
AiOO
|
9d67337913
|
Translated using Weblate (Korean)
Currently translated at 66.9% (152 of 227 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-25 17:32:54 +00:00 |
|
Jippang
|
42faa62a5f
|
Translated using Weblate (Korean)
Currently translated at 100.0% (149 of 149 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-19 12:53:13 +00:00 |
|
AiOO
|
dd5f352f5e
|
Translated using Weblate (Korean)
Currently translated at 100.0% (149 of 149 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-18 08:32:07 +00:00 |
|
AiOO
|
ae838fe4d7
|
Translated using Weblate (Korean)
Currently translated at 100.0% (149 of 149 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-17 11:26:43 +00:00 |
|
AiOO
|
1e730df767
|
Translated using Weblate (Korean)
Currently translated at 100.0% (143 of 143 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-17 00:57:45 +00:00 |
|
AiOO
|
2048a49f9b
|
Translated using Weblate (Korean)
Currently translated at 100.0% (125 of 125 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-17 00:57:45 +00:00 |
|
AiOO
|
2b0b612191
|
Translated using Weblate (Korean)
Currently translated at 100.0% (125 of 125 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-17 00:57:44 +00:00 |
|
AiOO
|
79b74a1960
|
Translated using Weblate (Korean)
Currently translated at 100.0% (124 of 124 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-01-17 00:57:44 +00:00 |
|
AiOO
|
1a783d4faf
|
Translated using Weblate (Korean)
Currently translated at 100.0% (102 of 102 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2022-12-30 21:54:39 +00:00 |
|
sk
|
b1006d2a14
|
rename string
|
2022-12-27 21:46:21 +01:00 |
|
AiOO
|
7299d947f7
|
Translated using Weblate (Korean)
Currently translated at 100.0% (83 of 83 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2022-12-22 14:59:35 +00:00 |
|
sk
|
b486542e7b
|
update strings
|
2022-12-20 12:43:56 +01:00 |
|
AiOO
|
d96b6f0100
|
Translated using Weblate (Korean)
Currently translated at 100.0% (62 of 62 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2022-12-20 11:34:42 +00:00 |
|
AiOO
|
d2a4ae8f59
|
Translated using Weblate (Korean)
Currently translated at 100.0% (59 of 59 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2022-12-16 12:39:36 +00:00 |
|
AiOO
|
2c50c38d82
|
Translated using Weblate (Korean)
Currently translated at 100.0% (56 of 56 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2022-12-12 22:25:44 +00:00 |
|
AiOO
|
c27f5aaf30
|
Translated using Weblate (Korean)
Currently translated at 100.0% (47 of 47 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2022-12-12 22:25:43 +00:00 |
|
sk
|
6c5bb69ba9
|
move custom strings into separate files
|
2022-11-30 23:16:14 +01:00 |
|