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
This commit is contained in:
LucasGGamerM
@@ -6,7 +6,6 @@
|
||||
<string name="ok">D’acòrdi</string>
|
||||
<string name="in_reply_to">En responsa a %s</string>
|
||||
<string name="notifications">Notificacions</string>
|
||||
<string name="user_followed_you">vos sèc</string>
|
||||
<string name="share_toot_title">Partejar</string>
|
||||
<string name="settings">Paramètres</string>
|
||||
<string name="publish">Publicar</string>
|
||||
@@ -21,18 +20,12 @@
|
||||
<item quantity="one">abonament</item>
|
||||
<item quantity="other">abonaments</item>
|
||||
</plurals>
|
||||
<plurals name="posts">
|
||||
<item quantity="one">publicacion</item>
|
||||
<item quantity="other">publicacions</item>
|
||||
</plurals>
|
||||
<string name="posts">Publicacions</string>
|
||||
<string name="posts_and_replies">Publicacions e responsas</string>
|
||||
<string name="media">Mèdias</string>
|
||||
<string name="profile_about">A prepaus</string>
|
||||
<string name="button_follow">Seguir</string>
|
||||
<string name="edit_profile">Modificar lo perfil</string>
|
||||
<string name="mention_user">Mencionar %s</string>
|
||||
<string name="share_user">Partejar %s</string>
|
||||
<string name="mute_user">Amudar %s</string>
|
||||
<string name="block_domain">Blocar %s</string>
|
||||
<string name="search_hint">Recercar</string>
|
||||
@@ -40,32 +33,22 @@
|
||||
<string name="news">Novèls</string>
|
||||
<string name="mentions">Mencions</string>
|
||||
<string name="back">Tornar</string>
|
||||
<string name="edit_photo">modificar</string>
|
||||
<string name="category_music">Musica</string>
|
||||
<string name="category_tech">Tecnologia</string>
|
||||
<!-- %s is the email address -->
|
||||
<string name="resend">Tornar enviar</string>
|
||||
<string name="content_warning">Avís de contengut</string>
|
||||
<string name="add_image_description">Apondre una descripcion d’imatge…</string>
|
||||
<string name="save">Enregistrar</string>
|
||||
<string name="skip">Sautar</string>
|
||||
<string name="notification_type_favorite">Favorits</string>
|
||||
<string name="notification_type_mention">Mencions</string>
|
||||
<string name="notification_type_poll">Sondatge</string>
|
||||
<string name="choose_account">Seleccionar un compte</string>
|
||||
<string name="theme_auto">Automatic</string>
|
||||
<string name="theme_light">Clar</string>
|
||||
<string name="theme_dark">Escur</string>
|
||||
<string name="settings_behavior">Compòrtament</string>
|
||||
<string name="settings_notifications">Notificacions</string>
|
||||
<string name="notify_me_when">Me notificar quand</string>
|
||||
<string name="settings_account">Paramètres de compte</string>
|
||||
<string name="sensitive_content">Contengut sensible</string>
|
||||
<string name="media_hidden">Tocar per afichar</string>
|
||||
<string name="avatar_description">Anar al perfil de %s</string>
|
||||
<string name="more_options">Mai d\'opcions</string>
|
||||
<string name="reveal_content">Afichar lo contengut</string>
|
||||
<string name="hide_content">Amagar lo contengut</string>
|
||||
<string name="new_post">Publicacion novèla</string>
|
||||
<string name="button_reply">Respondre</string>
|
||||
<string name="button_favorite">Aimar</string>
|
||||
@@ -77,6 +60,7 @@
|
||||
<string name="error_saving_file">Error en enregistrant lo fichièr</string>
|
||||
<string name="file_saved">Fichièr salvagardat</string>
|
||||
<string name="downloading">Telecargament…</string>
|
||||
<!-- %s is the server domain -->
|
||||
<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
|
||||
<!-- %s is version like 1.2.3 -->
|
||||
<!-- %s is version like 1.2.3 -->
|
||||
@@ -84,4 +68,15 @@
|
||||
<!-- %s is server domain -->
|
||||
<!-- Shown in a progress dialog when you tap "follow all" -->
|
||||
<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
|
||||
<!-- %s is formatted file size ("467 KB image") -->
|
||||
<!-- %s is the server domain -->
|
||||
<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
|
||||
<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
|
||||
<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
|
||||
<!-- %s is the timestamp ("tomorrow at 12:34") -->
|
||||
<!-- %s is the timestamp ("tomorrow at 12:34") -->
|
||||
<!-- %s is the username -->
|
||||
<!-- %s is the timestamp ("tomorrow at 12:34") -->
|
||||
<!-- Shown like a content warning, %s is the name of the filter -->
|
||||
<!-- Shown in the post header. Please keep it short -->
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user