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
1beba48b66
Merge remote-tracking branch 'megalodon_weblate/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
2023-06-15 14:58:12 -03:00
a_mento
77734e8e0c
Translated using Weblate (Basque)
...
Currently translated at 94.0% (287 of 305 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-06-15 17:51:30 +00: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
a_mento
b0b2daa5d5
Translated using Weblate (Basque)
...
Currently translated at 100.0% (272 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-04-22 14:30:34 +00:00
sk
b3a9b5824d
fix non-positional subtitution in string
2023-04-22 16:29:41 +02:00
a_mento
6d06c4d740
Translated using Weblate (Basque)
...
Currently translated at 100.0% (273 of 273 strings)
Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/eu/
2023-04-21 13:51:50 +00: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
Eugen Rochko
e0c2c208ae
New translations strings.xml (Basque)
2023-04-12 17:36:44 +02:00
Eugen Rochko
0e677f8ce7
New translations strings.xml (Basque)
2023-04-07 21:47:36 +02:00
a_mento
4591731cdc
Translated using Weblate (Basque)
...
Currently translated at 100.0% (262 of 262 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-03-16 00:19:11 +00:00
LucasGGamerM
69af790e22
Merge remote-tracking branch 'megalodon_weblate/main'
2023-02-20 14:04:46 -03:00
a_mento
ef1965a41b
Translated using Weblate (Basque)
...
Currently translated at 100.0% (262 of 262 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-02-19 23:08:20 +00: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
5f902d25a9
New translations strings.xml (Basque)
2023-02-03 12:29:06 +01:00
Eugen Rochko
d3575b60fe
New translations strings.xml (Basque)
2023-01-30 00:01:49 +01:00
irure
a9899e8f9a
Translated using Weblate (Basque)
...
Currently translated at 93.5% (233 of 249 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-27 15:37:56 -03:00
irure
e1f7feb875
Translated using Weblate (Basque)
...
Currently translated at 99.1% (233 of 235 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-27 15:34:44 -03:00
irure
9a7d149dae
Translated using Weblate (Basque)
...
Currently translated at 93.5% (233 of 249 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-26 00:09:36 +00:00
Eugen Rochko
ab5dfe6f62
New translations strings.xml (Basque)
2023-01-25 23:44:55 +01:00
irure
a7283cbed8
Translated using Weblate (Basque)
...
Currently translated at 99.1% (233 of 235 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-25 17:32:56 +00:00
Eugen Rochko
7cbae9c0a9
New translations strings.xml (Basque)
2023-01-24 21:53:04 +01:00
LucasGGamerM
c11863388d
Putting stuff back to sk_ instead of mo_ on sk strings.
...
Relevant command: find values*/strings_sk.xml -type f -exec sed -i 's/mo_/sk_/g' {} \;
2023-01-24 17:47:12 -03:00
LucasGGamerM
d7004824fb
Decoupling moshidon strings from megalodon
2023-01-23 18:47:07 -03:00
sk
1a79bc0b61
Changing Megalodon to Moshidon in the strings.
...
The command I use for automating this is "find values* -type f -exec sed -i 's/Megalodon/Moshidon/g' {} \;". Run this in the resources folder and it should all be changed
2023-01-18 14:10:38 -03:00
irure
168ae80743
Translated using Weblate (Basque)
...
Currently translated at 100.0% (125 of 125 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-18 14:06:06 -03:00
irure
bf35161c9f
Translated using Weblate (Basque)
...
Currently translated at 93.6% (117 of 125 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-18 14:05:59 -03:00
irure
120ab8ca54
Translated using Weblate (Basque)
...
Currently translated at 100.0% (125 of 125 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-18 14:04:53 -03:00
irure
ec1fe07fea
Translated using Weblate (Basque)
...
Currently translated at 93.6% (117 of 125 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-18 14:04:51 -03:00
irure
bf9f859827
Translated using Weblate (Basque)
...
Currently translated at 100.0% (125 of 125 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-17 00:57:45 +00:00
irure
ea00117844
Translated using Weblate (Basque)
...
Currently translated at 93.6% (117 of 125 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-01-17 00:57:45 +00:00
LucasGGamerM
6ed3a57c58
Rebranding Megalodon to Moshidon.
...
Here is the command in case anyone is interested
find values* -type f -exec sed -i 's/Megalodon/Moshidon/g' {} \;
2023-01-01 17:16:45 -03:00
irure
7331a5a0cd
Translated using Weblate (Basque)
...
Currently translated at 100.0% (102 of 102 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2022-12-31 19:57:41 -03:00
irure
90c2e45be2
Translated using Weblate (Basque)
...
Currently translated at 100.0% (102 of 102 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2022-12-30 21:54:39 +00:00
Eugen Rochko
25f302f62f
New translations strings.xml (Basque)
2022-12-14 13:39:14 +01:00
Eugen Rochko
d54eb6ed73
New translations strings.xml (Basque)
2022-12-14 12:41:52 +01:00
Eugen Rochko
7bd602cd45
New translations strings.xml (Basque)
2022-12-08 21:25:57 +01:00
sk
1f9611fc3e
Merge remote-tracking branch 'upstream/master'
2022-12-07 13:55:36 +01:00
Eugen Rochko
c72f93b990
New translations strings.xml (Basque)
2022-12-03 23:52:22 +01:00
Eugen Rochko
e63d04cea9
New translations strings.xml (Basque)
2022-12-01 22:01:17 +01:00
Eugen Rochko
542e53cf6a
New translations strings.xml (Basque)
2022-12-01 19:43:18 +01:00
sk
2570445133
create empty strings_sk files for all languages
2022-12-01 00:23:25 +01:00
Eugen Rochko
9182bd1a15
New translations strings.xml (Basque)
2022-11-21 02:38:55 +01:00
Eugen Rochko
365fac5efe
New translations strings.xml (Basque)
2022-11-20 17:31:49 +01:00
Eugen Rochko
b50161dc8f
New translations strings.xml (Basque)
2022-11-13 07:06:10 +01:00
Eugen Rochko
00897e7388
New translations strings.xml (Basque)
2022-10-31 07:46:08 +01:00
Eugen Rochko
fd2031ccf5
New translations strings.xml (Basque)
2022-10-04 06:41:02 +02:00
Eugen Rochko
c851f666b3
New translations strings.xml (Basque)
2022-05-17 18:03:38 +02:00
