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 |
|
tuongdai252
|
d190775700
|
Translated using Weblate (Vietnamese)
Currently translated at 68.4% (50 of 73 strings)
Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/vi/
|
2023-07-07 14:57:12 +00:00 |
|
LucasGGamerM
|
14175a9140
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.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/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.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/ListTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.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/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.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/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/item_account_switcher.xml
# mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-pt-rPT/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/styles.xml
|
2023-06-03 19:56:16 -03:00 |
|
sk
|
1facb07c28
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-05-29 13:01:24 +02: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 |
|
Eugen Rochko
|
806c264686
|
New translations strings.xml (Vietnamese)
|
2023-05-13 17:46:17 +02:00 |
|
Eugen Rochko
|
64fad2e871
|
New translations strings.xml (Vietnamese)
|
2023-05-13 16:36:00 +02:00 |
|
sk
|
961c69b525
|
Merge remote-tracking branch 'upstream/master'
|
2023-05-13 15:15:00 +02:00 |
|
Eugen Rochko
|
387499ae49
|
New translations strings.xml (Vietnamese)
|
2023-05-05 08:49:53 +02:00 |
|
Eugen Rochko
|
4ca1e0d5db
|
New translations strings.xml (Vietnamese)
|
2023-05-01 21:04:01 +02:00 |
|
Eugen Rochko
|
4f9248d040
|
New translations strings.xml (Vietnamese)
|
2023-04-15 05:15:40 +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
|
ebc37eac75
|
New translations strings.xml (Vietnamese)
|
2023-04-12 17:36:59 +02:00 |
|
Eugen Rochko
|
20dc9bb8b9
|
New translations strings.xml (Vietnamese)
|
2023-04-07 21:47:53 +02:00 |
|
sk
|
8be832239a
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-03-24 20:03:31 +01:00 |
|
Eugen Rochko
|
793dec98b2
|
New translations strings.xml (Vietnamese)
|
2023-03-23 07:36:02 +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 |
|
Eugen Rochko
|
5d1cd0f4f6
|
New translations strings.xml (Vietnamese)
|
2023-02-02 07:01:44 +01:00 |
|
Eugen Rochko
|
858195f813
|
New translations strings.xml (Vietnamese)
|
2023-01-30 00:02:06 +01:00 |
|
Eugen Rochko
|
1def56057a
|
New translations strings.xml (Vietnamese)
|
2023-01-28 15:42:21 +01:00 |
|
Eugen Rochko
|
d99f6c7167
|
New translations strings.xml (Vietnamese)
|
2023-01-28 14:39:22 +01:00 |
|
Eugen Rochko
|
4cfd0db899
|
New translations strings.xml (Vietnamese)
|
2023-01-25 23:45:12 +01:00 |
|
Eugen Rochko
|
a7dfb671ce
|
New translations strings.xml (Vietnamese)
|
2023-01-24 21:53:20 +01:00 |
|
LucasGGamerM
|
d7004824fb
|
Decoupling moshidon strings from megalodon
|
2023-01-23 18:47:07 -03:00 |
|
Eugen Rochko
|
1e1edd698d
|
New translations strings.xml (Vietnamese)
|
2023-01-01 09:16:11 +01:00 |
|
Eugen Rochko
|
c0de43e2f3
|
New translations strings.xml (Vietnamese)
|
2022-12-24 06:25:12 +01:00 |
|
Eugen Rochko
|
23d72346b3
|
New translations strings.xml (Vietnamese)
|
2022-12-11 06:15:05 +01:00 |
|
Eugen Rochko
|
e9510875ea
|
New translations strings.xml (Vietnamese)
|
2022-12-11 05:13:59 +01:00 |
|
Eugen Rochko
|
f9f6c879e0
|
New translations strings.xml (Vietnamese)
|
2022-12-08 21:26:11 +01:00 |
|
sk
|
1f9611fc3e
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-07 13:55:36 +01:00 |
|
Eugen Rochko
|
a2726f5b61
|
New translations strings.xml (Vietnamese)
|
2022-12-05 15:50:39 +01:00 |
|
Eugen Rochko
|
351ec89207
|
New translations strings.xml (Vietnamese)
|
2022-12-03 23:52:19 +01:00 |
|
sk
|
2570445133
|
create empty strings_sk files for all languages
|
2022-12-01 00:23:25 +01:00 |
|
sk
|
6c5bb69ba9
|
move custom strings into separate files
|
2022-11-30 23:16:14 +01:00 |
|
Eugen Rochko
|
afe8f6cf6a
|
New translations strings.xml (Vietnamese)
|
2022-11-29 14:58:28 +01:00 |
|
Eugen Rochko
|
1d60031f4c
|
New translations strings.xml (Vietnamese)
|
2022-11-20 15:03:02 +01:00 |
|
Eugen Rochko
|
03e68ba56c
|
New translations strings.xml (Vietnamese)
|
2022-11-14 16:16:56 +01:00 |
|
Eugen Rochko
|
32f6a5664f
|
New translations strings.xml (Vietnamese)
|
2022-11-13 07:05:48 +01:00 |
|
Eugen Rochko
|
ea7aa6c52f
|
New translations strings.xml (Vietnamese)
|
2022-11-01 18:21:15 +01:00 |
|
Eugen Rochko
|
39a0c6d08a
|
New translations strings.xml (Vietnamese)
|
2022-11-01 11:03:52 +01:00 |
|
Eugen Rochko
|
cbd6e668dc
|
New translations strings.xml (Vietnamese)
|
2022-10-31 07:45:53 +01:00 |
|
Eugen Rochko
|
7daa2d63e6
|
New translations strings.xml (Vietnamese)
|
2022-10-04 18:08:26 +02:00 |
|
Eugen Rochko
|
95fc2bef9e
|
New translations strings.xml (Vietnamese)
|
2022-10-04 06:40:49 +02:00 |
|
Eugen Rochko
|
beded04579
|
New translations strings.xml (Vietnamese)
|
2022-09-09 19:55:30 +02:00 |
|
Eugen Rochko
|
5dcd41170c
|
New translations strings.xml (Vietnamese)
|
2022-09-09 16:55:37 +02:00 |
|
Eugen Rochko
|
c15f6519c0
|
New translations strings.xml (Vietnamese)
|
2022-08-01 08:15:42 +02:00 |
|
Eugen Rochko
|
005ddfb651
|
New translations strings.xml (Vietnamese)
|
2022-05-17 18:03:32 +02:00 |
|