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
This commit is contained in:
LucasGGamerM
@@ -1,2 +1,44 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources></resources>
|
||||
<resources>
|
||||
<string name="sk_app_name">Megalodon</string>
|
||||
<string name="sk_pinned_posts">Fixado</string>
|
||||
<string name="sk_delete_and_redraft">Apagar e reescrever</string>
|
||||
<string name="sk_confirm_delete_and_redraft">Tem a certeza que pretende apagar e reescrever esta publicação\?</string>
|
||||
<string name="sk_confirm_unpin_post">Tem a certeza que deseja desafixar esta publicação\?</string>
|
||||
<string name="sk_settings_reply_visibility_all">Todas as respostas</string>
|
||||
<string name="sk_settings_load_new_posts">Carregar novas publicações automaticamente</string>
|
||||
<string name="sk_user_post_notifications_off">Desligar as notificações de publicação para %s</string>
|
||||
<string name="sk_federated_timeline_info_banner">Estas são as publicações mais recentes das pessoas na tua federação.</string>
|
||||
<string name="sk_confirm_delete_and_redraft_title">Apagar e reescrever publicação</string>
|
||||
<string name="sk_pin_post">Fixar no perfil</string>
|
||||
<string name="sk_confirm_pin_post_title">Fixar publicação no perfil</string>
|
||||
<string name="sk_confirm_pin_post">Deseja fixar esta publicação ao seu perfil\?</string>
|
||||
<string name="sk_pinning">A fixar a publicação…</string>
|
||||
<string name="sk_unpin_post">Desafixar do perfil</string>
|
||||
<string name="sk_confirm_unpin_post_title">Desafixar publicação do perfil</string>
|
||||
<string name="sk_unpinning">A desafixar publicação…</string>
|
||||
<string name="sk_image_description">Descrição da imagem</string>
|
||||
<string name="sk_visibility_unlisted">Não listado</string>
|
||||
<string name="sk_settings_show_replies">Mostrar respostas</string>
|
||||
<string name="sk_quoting_user">Citação %s</string>
|
||||
<string name="sk_settings_reply_visibility">Visibilidade da resposta</string>
|
||||
<string name="sk_clear_recent_languages">Apagar idiomas usados recentemente</string>
|
||||
<string name="sk_settings_reply_visibility_following">Respostas aos meus comentários</string>
|
||||
<string name="sk_settings_reply_visibility_self">Respostas a mim</string>
|
||||
<string name="sk_settings_show_boosts">Mostrar impulsionamentos</string>
|
||||
<string name="sk_settings_show_interaction_counts">Mostrar contagem de interações</string>
|
||||
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
|
||||
<string name="sk_mark_media_as_sensitive">Marcar conteúdo como sensível</string>
|
||||
<string name="sk_user_post_notifications_on">Ligar as notificações de publicação para %s</string>
|
||||
<string name="sk_federated_timeline">Federação</string>
|
||||
<string name="sk_update_available">Megalodon %s pronto a descarregar.</string>
|
||||
<string name="sk_update_ready">Megalodon %s descarregado e pronto a instalar.</string>
|
||||
<string name="sk_check_for_update">A verificar atualizações</string>
|
||||
<string name="sk_no_update_available">Sem atualizações disponíveis</string>
|
||||
<string name="sk_list_timelines">Listas</string>
|
||||
<string name="sk_follow_requests">Pedidos para seguir</string>
|
||||
<string name="sk_accept_follow_request">Aceitar pedido para seguir</string>
|
||||
<string name="sk_reject_follow_request">Rejeitar pedido para seguir</string>
|
||||
<string name="sk_lists_with_user">Listas com %s</string>
|
||||
<string name="sk_settings_always_reveal_content_warnings">Mostrar sempre avisos de conteúdo</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user