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 |
|
LucasGGamerM
|
d403f4ef01
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
|
2023-05-16 18:26:23 -03:00 |
|
sk
|
961c69b525
|
Merge remote-tracking branch 'upstream/master'
|
2023-05-13 15:15:00 +02:00 |
|
Eugen Rochko
|
5c5989d8c0
|
New translations strings.xml (Chinese Traditional)
|
2023-05-02 18:13:38 +02:00 |
|
Eugen Rochko
|
a4a4632397
|
New translations strings.xml (Chinese Traditional)
|
2023-05-01 21:03:42 +02:00 |
|
Eugen Rochko
|
43600756c0
|
New translations strings.xml (Chinese Traditional)
|
2023-04-25 18:41:49 +02:00 |
|
LucasGGamerM
|
5b391b44d3
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/github/AndroidManifest.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-eu-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/es/changelogs/83.txt
# metadata/fr/short_description.txt
# metadata/gl-ES/changelogs/83.txt
|
2023-04-22 13:53:50 -03:00 |
|
sk
|
b3a9b5824d
|
fix non-positional subtitution in string
|
2023-04-22 16:29:41 +02:00 |
|
LucasGGamerM
|
665a0176b9
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/layout/fragment_splash.xml
|
2023-04-14 14:27:42 -03:00 |
|
sk
|
3ad46926f1
|
Merge remote-tracking branch 'upstream/master'
|
2023-04-13 21:46:45 +02:00 |
|
LucasGGamerM
|
64e681c227
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# metadata/de-DE/changelogs/83.txt
# metadata/en-US/changelogs/83.txt
|
2023-04-12 13:04:31 -03:00 |
|
Eugen Rochko
|
c3702db577
|
New translations strings.xml (Chinese Traditional)
|
2023-04-12 17:36:59 +02:00 |
|
Eugen Rochko
|
94fb676b0c
|
New translations strings.xml (Chinese Traditional)
|
2023-04-09 04:29:35 +02:00 |
|
Eugen Rochko
|
a47106594b
|
New translations strings.xml (Chinese Traditional)
|
2023-04-09 03:10:02 +02:00 |
|
Eugen Rochko
|
2c47d0e9ed
|
New translations strings.xml (Chinese Traditional)
|
2023-04-07 21:47:52 +02:00 |
|
sk
|
8be832239a
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-03-24 20:03:31 +01:00 |
|
Eugen Rochko
|
2e1f273d78
|
New translations strings.xml (Chinese Traditional)
|
2023-03-21 06:38:54 +01:00 |
|
Eugen Rochko
|
35d6800877
|
New translations strings.xml (Chinese Traditional)
|
2023-03-21 05:17:21 +01:00 |
|
sk
|
46fd0be0eb
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-03-17 00:56:38 +01:00 |
|
LucasGGamerM
|
f793bbc711
|
Merge remote-tracking branch 'mastodon/l10n_master'
# Conflicts:
# fastlane/metadata/android/ja-JP/full_description.txt
# fastlane/metadata/android/ru-RU/full_description.txt
# fastlane/metadata/android/ru-RU/short_description.txt
# fastlane/metadata/android/tr-TR/full_description.txt
|
2023-03-09 17:29:40 -03:00 |
|
Eugen Rochko
|
afb396acd8
|
New translations strings.xml (Chinese Traditional)
|
2023-02-22 18:07:34 +01:00 |
|
LucasGGamerM
|
33b62cf9aa
|
Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/values-ca-rES/strings_sk.xml
# mastodon/src/main/res/values-de-rDE/strings.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/strings_sk.xml
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
# mastodon/src/main/res/values-sl-rSI/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# metadata/ca/full_description.txt
# metadata/cy/full_description.txt
# metadata/es/changelogs/65.txt
# metadata/es/changelogs/67.txt
# metadata/es/full_description.txt
# metadata/id/full_description.txt
# metadata/ko/full_description.txt
# metadata/pl/full_description.txt
# metadata/sl/changelogs/65.txt
# metadata/sl/changelogs/67.txt
# metadata/sv/full_description.txt
# metadata/uk/full_description.txt
# metadata/zh-Hans/full_description.txt
|
2023-02-13 15:38:28 -03:00 |
|
sk
|
2271f336b0
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-02-13 17:37:40 +01:00 |
|
Eyre_S
|
7692f587ef
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 23.2% (60 of 258 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hant/
|
2023-02-11 13:13:08 +00:00 |
|
LucasGGamerM
|
b5acaaf369
|
Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
# mastodon/src/main/res/values-ru-rRU/strings_sk.xml
# metadata/ca/full_description.txt
# metadata/cy/full_description.txt
# metadata/es/changelogs/65.txt
# metadata/es/changelogs/67.txt
# metadata/es/full_description.txt
# metadata/id/full_description.txt
# metadata/pl/full_description.txt
# metadata/sv/full_description.txt
# metadata/uk/full_description.txt
# metadata/zh-Hans/full_description.txt
|
2023-02-10 21:02:54 -03:00 |
|
Eyre_S
|
66932ccd4c
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 23.2% (60 of 258 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hant/
|
2023-02-08 11:56:41 +00:00 |
|
Eugen Rochko
|
3505460372
|
New translations strings.xml (Chinese Traditional)
|
2023-02-01 03:56:06 +01:00 |
|
Eugen Rochko
|
eeb91e867e
|
New translations strings.xml (Chinese Traditional)
|
2023-02-01 02:54:48 +01:00 |
|
Eugen Rochko
|
b681c7dfeb
|
New translations strings.xml (Chinese Traditional)
|
2023-01-30 00:02:05 +01:00 |
|
Eugen Rochko
|
ca1cb668f3
|
New translations strings.xml (Chinese Traditional)
|
2023-01-26 06:12:30 +01:00 |
|
Eugen Rochko
|
c6cb992b92
|
New translations strings.xml (Chinese Traditional)
|
2023-01-25 23:45:11 +01:00 |
|
Eugen Rochko
|
548a14ab60
|
New translations strings.xml (Chinese Traditional)
|
2023-01-25 05:20:29 +01:00 |
|
Eugen Rochko
|
40016332ff
|
New translations strings.xml (Chinese Traditional)
|
2023-01-25 04:16:16 +01:00 |
|
Eugen Rochko
|
929218d74c
|
New translations strings.xml (Chinese Traditional)
|
2023-01-24 21:53:19 +01:00 |
|
LucasGGamerM
|
d7004824fb
|
Decoupling moshidon strings from megalodon
|
2023-01-23 18:47:07 -03:00 |
|
Eugen Rochko
|
f3c73a5c8a
|
New translations strings.xml (Chinese Traditional)
|
2022-12-09 03:47:27 +01:00 |
|
Eugen Rochko
|
37502b3747
|
New translations strings.xml (Chinese Traditional)
|
2022-12-09 02:46:30 +01:00 |
|
Eugen Rochko
|
c9fa5b2104
|
New translations strings.xml (Chinese Traditional)
|
2022-12-08 21:25:50 +01:00 |
|
sk
|
1f9611fc3e
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-07 13:55:36 +01:00 |
|
Eugen Rochko
|
ea1ae58e54
|
New translations strings.xml (Chinese Traditional)
|
2022-12-07 12:56:50 +01:00 |
|
Eugen Rochko
|
fe9d119fe2
|
New translations strings.xml (Chinese Traditional)
|
2022-12-07 11:55:33 +01:00 |
|
Eugen Rochko
|
b75d871837
|
New translations strings.xml (Chinese Traditional)
|
2022-12-03 23:52:23 +01:00 |
|
Eugen Rochko
|
a18718ca81
|
New translations strings.xml (Chinese Traditional)
|
2022-12-02 17:34:15 +01:00 |
|
sk
|
2570445133
|
create empty strings_sk files for all languages
|
2022-12-01 00:23:25 +01:00 |
|
Eugen Rochko
|
9017d00541
|
New translations strings.xml (Chinese Traditional)
|
2022-11-21 03:43:50 +01:00 |
|
Eugen Rochko
|
94de724d4e
|
New translations strings.xml (Chinese Traditional)
|
2022-11-16 22:13:56 +01:00 |
|
Eugen Rochko
|
d8e9bbd6b1
|
New translations strings.xml (Chinese Traditional)
|
2022-11-13 17:32:32 +01:00 |
|
Eugen Rochko
|
4422b774b7
|
New translations strings.xml (Chinese Traditional)
|
2022-11-13 08:02:12 +01:00 |
|
Eugen Rochko
|
6447d470f9
|
New translations strings.xml (Chinese Traditional)
|
2022-11-13 07:06:01 +01:00 |
|
Eugen Rochko
|
5ab3ae3d59
|
New translations strings.xml (Chinese Traditional)
|
2022-10-31 07:46:17 +01:00 |
|