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
This commit is contained in:
LucasGGamerM
2023-04-22 13:53:50 -03:00
41 changed files with 319 additions and 221 deletions

View File

@@ -69,7 +69,7 @@
<string name="sk_translated_using">Traduït amb %s</string>
<string name="sk_post_language">Llengua: %s</string>
<string name="sk_available_languages">Llengües disponibles</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_confirm_clear_recent_languages">Segur que vols esborrar les llengües recents\?</string>
<string name="sk_welcome_text">El tauró et saluda! Per a començar, introdueix el domini de la instància a continuació.</string>
<string name="sk_tabs_disable_swipe">Desactiva el desplaçament entre pestanyes</string>

View File

@@ -40,7 +40,7 @@
<string name="sk_no_update_available">Dim diweddariad ar gael</string>
<string name="sk_check_for_update">Gwirio am ddiweddariad</string>
<string name="sk_poll_allow_multiple">Caniatáu mwy nag un dewis</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_tabs_disable_swipe">Analluogi llusgo rhwng tabiau</string>
<string name="sk_settings_posting">Dewisiadau postio</string>
<string name="sk_settings_rules">Rheolau</string>

View File

@@ -38,7 +38,7 @@
<string name="sk_disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
<string name="sk_settings_contribute">Zu Megalodon beitragen</string>
<string name="sk_settings_show_federated_timeline">Föderierte Timeline anzeigen</string>
<string name="sk_notify_posts">Beitrags-Benachrichtigungen</string>
<string name="sk_notify_posts">Beitrags-Benachrichtigungen</string>
<string name="sk_settings_color_palette">Farbschema</string>
<string name="sk_color_palette_pink">Pink</string>
<string name="sk_color_palette_purple">Violett</string>
@@ -50,7 +50,7 @@
<string name="sk_poll_allow_multiple">Mehrfachantworten erlauben</string>
<string name="sk_translated_using">Übersetzt mit %s</string>
<string name="sk_post_language">Sprache: %s</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_confirm_clear_recent_languages">Sicher, dass du die Liste der zuletzt verwendeten Sprachen leeren willst\?</string>
<string name="sk_translate_post">Übersetzen</string>
<string name="sk_translate_show_original">Original anzeigen</string>
@@ -164,7 +164,7 @@
<string name="sk_alt_text_missing_title">Fehlende Bildbeschreibung</string>
<string name="sk_settings_disable_alt_text_reminder">Erinnerung zum Hinzufügen von Bildbeschreibungen ausschalten</string>
<string name="sk_alt_button">ALT</string>
<string name="sk_notify_update">Bearbeitet einen geteilten Beitrag</string>
<string name="sk_notify_update">einen geteilten Beitrag bearbeitet</string>
<string name="sk_timelines">Timelines</string>
<string name="sk_timeline">Timeline</string>
<string name="sk_hashtag">Hashtag</string>
@@ -271,6 +271,5 @@
<string name="sk_show_thread">Thread öffnen</string>
<string name="sk_compact_reblog_reply_line">Kompakte Geteilt/Geantwortet-Zeile</string>
<string name="sk_reply_line_above_avatar">“Als Antwort auf”-Zeile über Profilbild</string>
<string name="sk_settings_confirm_before_reblog">Vor dem Rebloggen bestätigen</string>
<string name="sk_settings_show_new_posts_button">Schaltfläche \"Neue Beiträge anzeigen\"</string>
<string name="sk_settings_confirm_before_reblog">Vor dem Teilen bestätigen</string>
</resources>

View File

@@ -53,7 +53,7 @@
<string name="sk_translated_using">Traducido mediante %s</string>
<string name="sk_post_language">Idioma: %s</string>
<string name="sk_available_languages">Idiomas disponibles</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_confirm_clear_recent_languages">¿Seguro que quieres borrar los idiomas usados recientemente\?</string>
<string name="sk_clear_recent_languages">Borrar idiomas usados recientemente</string>
<string name="sk_welcome_text">¡El tiburón te saluda! Para empezar, introduce a continuación el nombre del dominio de tu instancia.</string>
@@ -272,6 +272,5 @@
<string name="sk_reply_line_above_avatar">\"En respuesta a\" línea sobre el avatar</string>
<string name="sk_show_thread">Mostrar hilo</string>
<string name="sk_compact_reblog_reply_line">Línea compacta de reblog/respuesta</string>
<string name="sk_settings_show_new_posts_button">Botón “Mostrar nuevas publicaciones”</string>
<string name="sk_settings_confirm_before_reblog">Confirmar antes de impulsar</string>
<string name="sk_settings_confirm_before_reblog">Confirmar antes de volver a publicar</string>
</resources>

View File

@@ -35,7 +35,7 @@
<string name="sk_settings_contribute">Lagundu Megalodon</string>
<string name="sk_translated_using">%s-ekin itzulia</string>
<string name="sk_post_language">Hizkuntza: %s</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_bookmark_as">Beste kontu baten laster-marka</string>
<string name="sk_bookmarked_as">%s bezala laster-markara eramana</string>
<string name="sk_already_bookmarked">Dagoeneko laster-marka da</string>
@@ -261,16 +261,14 @@
<string name="sk_follow_as">Jarraitu beste kontu batetik</string>
<string name="sk_followed_as">%s-(d/t)ik jarraitua</string>
<string name="sk_settings_hide_fab">Automatikoki ezkutatu Idatzi botoia</string>
<string name="sk_settings_reply_visibility_all">Erantzun guztiak</string>
<string name="sk_settings_reply_visibility_self">Niri eginiko erantzunak</string>
<string name="sk_settings_reply_visibility_following">Jarraitzen ditudanei eginiko erantzunak</string>
<string name="sk_in_reply">Erantzunez</string>
<string name="sk_reply_line_above_avatar">“Honi erantzunez” abatarraren gaineko lerroa</string>
<string name="sk_show_thread">Erakutsi haria</string>
<string name="sk_settings_confirm_before_reblog">Berretsi bultzatu aurretik</string>
<string name="sk_quoting_user">%s aipatzen</string>
<string name="sk_settings_reply_visibility">Erantzunaren ikusgarritasuna</string>
<string name="sk_settings_show_new_posts_button">Erakutsi argitalpen berriak” botoia</string>
<string name="sk_notification_action_replied">%s-(r)i erantzuna bidali da</string>
<string name="sk_compact_reblog_reply_line">Bultzada / erantzun lerro trinkoa</string>
<string name="sk_settings_reply_visibility_all">Erantzun guztiak</string>
<string name="sk_settings_reply_visibility_following">Jarraitzen ditudanei eginiko erantzunak</string>
<string name="sk_reply_line_above_avatar">\"Honi erantzunez\" abatarraren gaineko lerroa</string>
<string name="sk_show_thread">Erakutsi haria</string>
<string name="sk_compact_reblog_reply_line">Bultzada/erantzun lerro trinkoa</string>
<string name="sk_quoting_user">%s aipatzen</string>
<string name="sk_settings_reply_visibility_self">Niri eginiko erantzunak</string>
<string name="sk_notification_action_replied">%s-(r)i erantzun</string>
</resources>

View File

@@ -53,7 +53,7 @@
<string name="sk_translated_using">Traduit en utilisant %s</string>
<string name="sk_post_language">Langue : %s</string>
<string name="sk_available_languages">Langues disponibles</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_confirm_clear_recent_languages">Êtes-vous sûr de vouloir effacer vos langues récemment utilisées \?</string>
<string name="sk_clear_recent_languages">Effacer les langues récemment utilisées</string>
<string name="sk_example_domain">exemple.social</string>
@@ -273,4 +273,5 @@
<string name="sk_show_thread">Afficher le fil</string>
<string name="sk_compact_reblog_reply_line">Ligne de repost/réponse compacte</string>
<string name="sk_reply_line_above_avatar">Ligne \"En réponse à\" au-dessus de l\'avatar</string>
<string name="sk_settings_confirm_before_reblog">Confirmer avant de reposter</string>
</resources>

View File

@@ -44,7 +44,7 @@
<string name="sk_disable_marquee">Desactivar desprazamento do texto na barra de título</string>
<string name="sk_welcome_title">¡Benvida!</string>
<string name="sk_settings_contribute">Contribúe a Megalodon</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_example_domain">exemplo.social</string>
<string name="sk_available_languages">Idiomas dispoñíbeis</string>
<string name="sk_settings_profile">Configurar perfil</string>

View File

@@ -39,7 +39,7 @@
<string name="sk_settings_show_federated_timeline">Összevont idővonal megjelenítése</string>
<string name="sk_confirm_clear_recent_languages">Biztos, hogy törölni szeretné a nemrég használt nyelveket\?</string>
<string name="sk_available_languages">Elérhető nyelvek</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_settings_translate_only_opened">Csak a megnyitott hozzászólások lefordítása</string>
<string name="sk_already_reblogged">Már reblogoltam</string>
<string name="sk_reblogged_as">Átlogolva mint %s</string>

View File

@@ -53,7 +53,7 @@
<string name="sk_confirm_clear_recent_languages">Apakah Anda yakin ingin menghapus bahasa terkini yang Anda gunakan\?</string>
<string name="sk_color_palette_material3">Sistem</string>
<string name="sk_available_languages">Bahasa yang tersedia</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_translate_post">Terjemahkan</string>
<string name="sk_translate_show_original">Tampilkan yang asli</string>
<string name="sk_post_language">Bahasa: %s</string>
@@ -273,4 +273,5 @@
<string name="sk_reply_line_above_avatar">Baris “Membalas ke” di atas avatar</string>
<string name="sk_show_thread">Tampilkan utasan</string>
<string name="sk_compact_reblog_reply_line">Baris berbagi/balasan</string>
<string name="sk_settings_confirm_before_reblog">Konfirmasi sebelum membagikan ulang</string>
</resources>

View File

@@ -51,7 +51,7 @@
<string name="sk_translate_show_original">Mostra originale</string>
<string name="sk_translated_using">Tradotto con %s</string>
<string name="sk_post_language">Lingua: %s</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_confirm_clear_recent_languages">Sei sicuro di voler cancellare le lingue usate di recente\?</string>
<string name="sk_clear_recent_languages">Cancella le lingue usate di recente</string>
<string name="sk_welcome_title">Benvenuto!</string>

View File

@@ -51,7 +51,7 @@
<string name="sk_translate_post">번역하기</string>
<string name="sk_translate_show_original">원본 보기</string>
<string name="sk_post_language">언어: %s</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_translated_using">%s를 통해 번역함</string>
<string name="sk_available_languages">모든 언어</string>
<string name="sk_clear_recent_languages">최근 사용한 언어 지우기</string>
@@ -100,7 +100,7 @@
<string name="sk_open_with_account">다른 계정으로 열기</string>
<string name="sk_resource_not_found">리소스를 찾을 수 없습니다</string>
<string name="sk_loading_resource_on_instance_title">%s 인스턴스에서 찾아오는 중</string>
<string name="sk_quote_post">언급하여 게시</string>
<string name="sk_quote_post">인용하여 게시</string>
<string name="sk_unsent_posts">게시하지 않은 게시물</string>
<string name="sk_draft">초안 작성</string>
<string name="sk_schedule">게시 예약</string>
@@ -240,7 +240,7 @@
<string name="sk_settings_glitch_instance">Glitch 로컬에만 게시 모드</string>
<string name="sk_settings_support_local_only">서버가 로컬에만 게시하는 것을 지원함</string>
<string name="sk_inline_local_only">로컬에만 게시</string>
<string name="sk_inline_direct">멘션 사람에게만 게시</string>
<string name="sk_inline_direct">멘션 사람들만 보임</string>
<string name="sk_instance_features">인스턴스 기능 목록</string>
<string name="sk_settings_glitch_mode_explanation">사용하시는 인스턴스가 Glitch에서 실행 중인 경우 활성화하세요. Hometown이나 Akkoma의 경우 활성화할 필요가 없습니다.</string>
<string name="sk_settings_see_new_posts_button">“새 게시물 보기” 버튼</string>
@@ -267,7 +267,7 @@
<string name="sk_settings_reply_visibility_all">모든 답글</string>
<string name="sk_settings_reply_visibility_following">팔로우한 계정에 대한 답글</string>
<string name="sk_settings_reply_visibility_self">나에 대한 답글</string>
<string name="sk_quoting_user">%s 님 언급</string>
<string name="sk_quoting_user">%s 님 인용</string>
<string name="sk_reply_line_above_avatar">아바타 위의 “…님에게 답글” 정보</string>
<string name="sk_show_thread">스레드 보기</string>
<string name="sk_notification_action_replied">%s 님에게 답글을 보냈습니다</string>

View File

@@ -45,7 +45,7 @@
<string name="sk_reply_as">တခြားအကောင့်ဖြင့် ရီပလိုင်းပြန်မည်</string>
<string name="sk_translated_using">%s ဖြင့် ဘာသာပြန်ထားသည်</string>
<string name="sk_post_language">ဘာသာစကား။ ။%s</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_settings_filters">Filter များကို စီစဉ်မည်</string>
<string name="sk_settings_auth">လုံခြုံရေးဆိုင်ရာ ဆက်တင်များ</string>
<string name="sk_settings_rules">စည်းကမ်းချက်များ</string>

View File

@@ -53,7 +53,7 @@
<string name="sk_bookmarked_as">Bookmark opgeslagen als %s</string>
<string name="sk_already_bookmarked">Al als bookmark opgeslagen</string>
<string name="sk_favorited_as">Als favoriet opgeslagen als %s</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_example_domain">example.social</string>
<string name="sk_reply_as">Antwoord met ander account</string>
<string name="sk_settings_uniform_icon_for_notifications">Zelfde icoon voor alle meldingen</string>

View File

@@ -53,7 +53,7 @@
<string name="sk_translated_using">Przetłumaczono przy użyciu %s</string>
<string name="sk_post_language">Język: %s</string>
<string name="sk_available_languages">Dostępne języki</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_confirm_clear_recent_languages">Czy na pewno chcesz wyczyścić ostatnio użyte języki\?</string>
<string name="sk_clear_recent_languages">Wyczyść ostatnio użyte języki</string>
<string name="sk_example_domain">przykład.social</string>
@@ -271,6 +271,5 @@
<string name="sk_reply_line_above_avatar">Tekst \"W odpowiedzi na\" nad avatarem</string>
<string name="sk_show_thread">Pokaż wątek</string>
<string name="sk_compact_reblog_reply_line">Zmniejsz linię reblogu/odpowiedzi</string>
<string name="sk_settings_show_new_posts_button">Przycisk \"Pokaż nowe wpisy\"</string>
<string name="sk_settings_confirm_before_reblog">Potwierdź przed reblogowaniem</string>
</resources>

View File

@@ -51,7 +51,7 @@
<string name="sk_translated_using">Traduzido usando %s</string>
<string name="sk_post_language">Idioma: %s</string>
<string name="sk_available_languages">Idiomas disponíveis</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_confirm_clear_recent_languages">Você tem certeza que deseja limpar os idiomas usados recentemente\?</string>
<string name="sk_clear_recent_languages">Limpar idiomas usados recentemente</string>
<string name="sk_notify_posts">Notificações de publicações</string>

View File

@@ -25,7 +25,7 @@
<string name="sk_translate_show_original">Показать оригинал</string>
<string name="sk_translated_using">Переведено через %s</string>
<string name="sk_available_languages">Доступные языки</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_welcome_title">Добро пожаловать!</string>
<string name="sk_example_domain">example.social</string>
<string name="sk_settings_load_new_posts">Автоматически загружать новые посты</string>

View File

@@ -52,7 +52,7 @@
<string name="sk_settings_color_palette">Barvna paleta</string>
<string name="sk_poll_allow_multiple">Dovoli več izbir</string>
<string name="sk_translate_show_original">Pokaži izvirnik</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_welcome_title">Dobrodošli!</string>
<string name="sk_example_domain">primer.social</string>
<string name="sk_already_bookmarked">Že dodano med zaznamke</string>

View File

@@ -13,7 +13,7 @@
<string name="sk_translated_using">Перекладено за допомогою %s</string>
<string name="sk_post_language">Мова: %s</string>
<string name="sk_available_languages">Доступні мови</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_clear_recent_languages">Очистити нещодавно використані мови</string>
<string name="sk_settings_always_reveal_content_warnings">Завжди розкривати попередження про вміст</string>
<string name="sk_notification_type_status">Дописи</string>
@@ -272,6 +272,5 @@
<string name="sk_reply_line_above_avatar">Рядок «У відповідь» над аватаром</string>
<string name="sk_show_thread">Показати потік</string>
<string name="sk_compact_reblog_reply_line">Компактний рядок для поширеного допису/відповіді</string>
<string name="sk_settings_confirm_before_reblog">Запросити підтвердження перед репостом</string>
<string name="sk_settings_show_new_posts_button">Кнопка \"Показати нові публікації\"</string>
<string name="sk_settings_confirm_before_reblog">Підтверджувати поширення</string>
</resources>

View File

@@ -57,7 +57,7 @@
<string name="sk_translated_using">使用 %s 翻译</string>
<string name="sk_post_language">语言:%s</string>
<string name="sk_available_languages">可用语言</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_example_domain">example.social</string>
<string name="sk_tabs_disable_swipe">禁用选项卡之间的滑动</string>
<string name="sk_settings_profile">设置个人资料</string>

View File

@@ -7,7 +7,7 @@
<string name="sk_translated_using">通過 %s 翻譯</string>
<string name="sk_post_language">語言: %s</string>
<string name="sk_available_languages">可用語言</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_welcome_title">歡迎!</string>
<string name="sk_app_name">Megalodon</string>
<string name="sk_pinned_posts">釘選</string>

View File

@@ -60,7 +60,7 @@
<string name="sk_translated_using">Translated using %s</string>
<string name="sk_post_language">Language: %s</string>
<string name="sk_available_languages">Available languages</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_language_name">%1$s (%2$s)</string>
<string name="sk_clear_recent_languages">Clear recently used languages</string>
<string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>
<string name="sk_welcome_title">Welcome!</string>
@@ -89,8 +89,8 @@
<string name="sk_settings_translation_availability_note_unavailable">%s does not appear to support translation.</string>
<string name="sk_loading_fediverse_resource_title">Looking it up on the Fediverse</string>
<string name="sk_loading_resource_on_instance_title">Looking it up on %s</string>
<string name="sk_undo_reblog">Undo reblog</string>
<string name="sk_reblog_with_visibility">Reblog with visibility</string>
<string name="sk_undo_reblog">Undo boost</string>
<string name="sk_reblog_with_visibility">Boost with visibility</string>
<string name="sk_quote_post">Post about this</string>
<string name="sk_hashtags_you_follow">Hashtags you follow</string>
<string name="sk_copy_link_to_post">Copy link to post</string>
@@ -102,9 +102,9 @@
<string name="sk_favorite_as">Favorite with other account</string>
<string name="sk_favorited_as">Favorited as %s</string>
<string name="sk_already_favorited">Already favorited</string>
<string name="sk_reblog_as">Reblog with other account</string>
<string name="sk_reblogged_as">Reblogged as %s</string>
<string name="sk_already_reblogged">Already reblogged</string>
<string name="sk_reblog_as">Boost with other account</string>
<string name="sk_reblogged_as">Boosted as %s</string>
<string name="sk_already_reblogged">Already boosted</string>
<string name="sk_reply_as">Reply with other account</string>
<string name="sk_settings_uniform_icon_for_notifications">Uniform icon for all notifications</string>
<string name="sk_forward_report_to">Forward to %s</string>
@@ -230,7 +230,7 @@
<string name="sk_alt_button">ALT</string>
<string name="sk_post_edited">edited</string>
<string name="sk_notification_type_update">Edited posts</string>
<string name="sk_notify_update">Edits a reblogged post</string>
<string name="sk_notify_update">Edits a boosted post</string>
<string name="sk_attach_file">Attach file</string>
<string name="sk_searching">Searching…</string>
<string name="sk_no_results">No results</string>
@@ -252,6 +252,7 @@
<string name="sk_settings_glitch_mode_explanation">Enable this if your home instance runs on Glitch. Not needed for Hometown or Akkoma.</string>
<string name="sk_signed_up">signed up</string>
<string name="sk_reported">reported</string>
<string name="sk_reacted">reacted with %s</string>
<string name="sk_sign_ups">Users signing up</string>
<string name="sk_new_reports">New reports</string>
<string name="sk_settings_server_version">Server version: %s</string>
@@ -271,6 +272,6 @@
<string name="sk_in_reply">In reply</string>
<string name="sk_reply_line_above_avatar">“In reply to” line above avatar</string>
<string name="sk_show_thread">Show thread</string>
<string name="sk_compact_reblog_reply_line">Compact reblog/reply line</string>
<string name="sk_settings_confirm_before_reblog">Confirm before reblogging</string>
<string name="sk_compact_reblog_reply_line">Compact boost/reply line</string>
<string name="sk_settings_confirm_before_reblog">Confirm before boosting</string>
</resources>