From 8dc88d2fd7e9645f2fe60aa1e0592cfee87b8c5b Mon Sep 17 00:00:00 2001
From: poesty <poesty7450@gmail.com>
Date: Sat, 21 Oct 2023 13:34:02 +0000
Subject: [PATCH 1/3] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.7% (397 of 398 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
---
 .../src/main/res/values-zh-rCN/strings_sk.xml | 84 ++++++++++---------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index d207644ad6..f99a0394c9 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -2,29 +2,29 @@
 <resources>
     <string name="sk_pinned_posts">置顶</string>
     <string name="sk_delete_and_redraft">删除并重新编辑</string>
-    <string name="sk_confirm_delete_and_redraft_title">删除并重新编辑嘟文</string>
-    <string name="sk_confirm_delete_and_redraft">确定要删除并重新编辑此嘟文吗？</string>
+    <string name="sk_confirm_delete_and_redraft_title">删除并重新编辑帖文</string>
+    <string name="sk_confirm_delete_and_redraft">确定要删除并重新编辑此帖文吗？</string>
     <string name="sk_pin_post">置顶</string>
-    <string name="sk_confirm_pin_post_title">置顶嘟文</string>
-    <string name="sk_confirm_pin_post">你确定要在资料页置顶此嘟文吗？</string>
-    <string name="sk_pinning">正在置顶嘟文…</string>
+    <string name="sk_confirm_pin_post_title">置顶帖文</string>
+    <string name="sk_confirm_pin_post">你确定要在资料页置顶此帖文吗？</string>
+    <string name="sk_pinning">正在置顶帖文…</string>
     <string name="sk_unpin_post">取消置顶</string>
-    <string name="sk_confirm_unpin_post_title">取消嘟文置顶</string>
-    <string name="sk_confirm_unpin_post">你确定不再置顶此嘟文吗？</string>
+    <string name="sk_confirm_unpin_post_title">取消帖文置顶</string>
+    <string name="sk_confirm_unpin_post">你确定不再置顶此帖文吗？</string>
     <string name="sk_unpinning">正在取消置顶…</string>
     <string name="sk_image_description">图片描述</string>
     <string name="sk_visibility_unlisted">不公开</string>
     <string name="sk_federated_timeline">联邦时间轴</string>
-    <string name="sk_federated_timeline_info_banner">这些是互联实例中最新发布的嘟文。</string>
+    <string name="sk_federated_timeline_info_banner">这些是互联实例中最新发布的帖文。</string>
     <string name="sk_app_name">Megalodon</string>
     <string name="sk_settings_show_replies">显示回复</string>
     <string name="sk_settings_show_boosts">显示转嘟</string>
-    <string name="sk_settings_load_new_posts">自动加载新嘟文</string>
+    <string name="sk_settings_load_new_posts">自动加载新帖文</string>
     <string name="sk_settings_show_interaction_counts">显示互动次数</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">标记为敏感媒体</string>
-    <string name="sk_user_post_notifications_on">启用 %s 的嘟文通知</string>
-    <string name="sk_user_post_notifications_off">关闭 %s 的嘟文通知</string>
+    <string name="sk_user_post_notifications_on">启用 %s 的帖文通知</string>
+    <string name="sk_user_post_notifications_off">关闭 %s 的帖文通知</string>
     <string name="sk_update_available">Megalodon %s 已经可以下载了。</string>
     <string name="sk_update_ready">Megalodon %s 已下载，准备安装。</string>
     <string name="sk_check_for_update">检查更新</string>
@@ -45,8 +45,8 @@
     <string name="sk_color_palette_blue">蓝</string>
     <string name="sk_color_palette_brown">棕</string>
     <string name="sk_color_palette_yellow">黄</string>
-    <string name="sk_notification_type_status">嘟文</string>
-    <string name="sk_notification_type_posts">嘟文通知</string>
+    <string name="sk_notification_type_status">帖文</string>
+    <string name="sk_notification_type_posts">帖文通知</string>
     <string name="sk_translate_post">翻译</string>
     <string name="sk_translate_show_original">显示原文</string>
     <string name="sk_poll_allow_multiple">允许多选</string>
@@ -84,8 +84,8 @@
     <string name="sk_loading_fediverse_resource_title">在联邦宇宙上查找</string>
     <string name="sk_undo_reblog">撤销转嘟</string>
     <string name="sk_reblog_with_visibility">转嘟可见性</string>
-    <string name="sk_quote_post">引用此嘟文</string>
-    <string name="sk_copy_link_to_post">复制嘟文链接</string>
+    <string name="sk_quote_post">引用此帖文</string>
+    <string name="sk_copy_link_to_post">复制帖文链接</string>
     <string name="sk_hashtags_you_follow">你关注的标签</string>
     <string name="sk_loading_resource_on_instance_title">在 %s 上查找</string>
     <string name="sk_resource_not_found">找不到资源</string>
@@ -101,27 +101,27 @@
     <string name="sk_already_reblogged">已转嘟过</string>
     <string name="sk_reply_as">用其他账号回复</string>
     <string name="sk_settings_uniform_icon_for_notifications">所有通知的统一图标</string>
-    <string name="sk_unsent_posts">未发送的嘟文</string>
+    <string name="sk_unsent_posts">未发送的帖文</string>
     <string name="sk_confirm_delete_draft_title">删除草稿</string>
     <string name="sk_draft">草稿</string>
     <string name="sk_schedule">定时</string>
-    <string name="sk_confirm_delete_scheduled_post_title">删除定时嘟文</string>
-    <string name="sk_confirm_delete_scheduled_post">你确定要删除此定时嘟文吗？</string>
+    <string name="sk_confirm_delete_scheduled_post_title">删除定时帖文</string>
+    <string name="sk_confirm_delete_scheduled_post">你确定要删除此定时帖文吗？</string>
     <string name="sk_draft_or_schedule">草稿或定时</string>
-    <string name="sk_compose_draft">嘟文将保存为草稿。</string>
+    <string name="sk_compose_draft">帖文将保存为草稿。</string>
     <string name="sk_compose_scheduled">定时于</string>
     <string name="sk_draft_saved">草稿已保存</string>
-    <string name="sk_post_scheduled">嘟文已定时</string>
+    <string name="sk_post_scheduled">帖文已定时</string>
     <string name="sk_forward_report_to">转嘟给 %s</string>
-    <string name="sk_confirm_delete_draft">你确定要删除此嘟文草稿吗？</string>
+    <string name="sk_confirm_delete_draft">你确定要删除此帖文草稿吗？</string>
     <string name="sk_scheduled_too_soon_title">定时时间过早</string>
-    <string name="sk_scheduled_too_soon">嘟文只能设置为 10 分钟或更晚发送。</string>
+    <string name="sk_scheduled_too_soon">帖文只能设置为 10 分钟或更晚发送。</string>
     <string name="sk_save_draft">保存为草稿？</string>
     <string name="sk_save_changes">保存更改？</string>
     <string name="sk_confirm_save_draft">保存草稿？</string>
     <string name="sk_confirm_save_changes">保存更改？</string>
     <string name="sk_mark_as_draft">标记为草稿</string>
-    <string name="sk_schedule_post">定时嘟文</string>
+    <string name="sk_schedule_post">定时帖文</string>
     <string name="sk_compose_no_schedule">不要定时</string>
     <string name="sk_compose_no_draft">不要标记为草稿</string>
     <string name="sk_settings_reduce_motion">减少动画效果</string>
@@ -151,14 +151,14 @@
     <string name="sk_timeline_local">本站</string>
     <string name="sk_alt_text_missing">至少有一个附件不包含描述。</string>
     <string name="sk_publish_anyway">仍然发布</string>
-    <string name="sk_notify_posts_info_banner">如果你为某些人启用了嘟文通知，其新嘟文将显示在此处。</string>
+    <string name="sk_notify_posts_info_banner">如果你为某些人启用了帖文通知，其新帖文将显示在此处。</string>
     <string name="sk_timelines">时间线</string>
     <string name="sk_edit_timelines">编辑时间线</string>
     <string name="sk_alt_button">ALT</string>
     <string name="sk_post_edited">编辑</string>
-    <string name="sk_notification_type_update">编辑嘟文</string>
+    <string name="sk_notification_type_update">编辑帖文</string>
     <string name="sk_alt_text_missing_title">缺少 ALT 文本</string>
-    <string name="sk_timeline_posts">嘟文</string>
+    <string name="sk_timeline_posts">帖文</string>
     <string name="sk_timelines_add">添加</string>
     <string name="sk_timeline">时间线</string>
     <string name="sk_list">列表</string>
@@ -223,7 +223,7 @@
     <string name="sk_icon_headphones">耳机</string>
     <string name="sk_icon_human">人类</string>
     <string name="sk_icon_globe">地球</string>
-    <string name="sk_notify_update">编辑已转嘟嘟文</string>
+    <string name="sk_notify_update">编辑已转嘟帖文</string>
     <string name="sk_icon_pin">钉子</string>
     <string name="sk_remove_follower_confirm">通过屏蔽并立即解除屏蔽以移除%s的关注者身份？</string>
     <string name="sk_icon_clapper_board">拍板</string>
@@ -248,7 +248,7 @@
     <string name="sk_settings_glitch_mode_explanation">如果你的主实例运行 Glitch，请启用此功能。Hometown 或 Akkoma 不需要启用。</string>
     <string name="sk_sign_ups">用户注册</string>
     <string name="sk_new_reports">新举报</string>
-    <string name="sk_settings_see_new_posts_button">“查看新嘟文” 按钮</string>
+    <string name="sk_settings_see_new_posts_button">“查看新帖文” 按钮</string>
     <string name="sk_settings_server_version">服务器版本: %s</string>
     <string name="sk_notify_poll_results">投票结果</string>
     <string name="sk_expand">展开</string>
@@ -256,7 +256,7 @@
     <string name="sk_unfinished_attachments">正在上传附件</string>
     <string name="sk_unfinished_attachments_message">部分附件尚未上传完毕。</string>
     <string name="sk_filtered">已过滤：%s</string>
-    <string name="sk_settings_collapse_long_posts">折叠很长的嘟文</string>
+    <string name="sk_settings_collapse_long_posts">折叠很长的帖文</string>
     <string name="sk_settings_prefix_reply_cw_with_re">回复时在 CW 前加上 “re:”</string>
     <string name="sk_spectator_mode">旁观模式</string>
     <string name="sk_settings_hide_interaction">隐藏互动按钮</string>
@@ -287,7 +287,7 @@
     <string name="sk_content_type_markdown">Markdown</string>
     <string name="sk_content_type_bbcode">BBCode</string>
     <string name="sk_content_type_mfm">MFM</string>
-    <string name="sk_settings_content_types">启用嘟文格式</string>
+    <string name="sk_settings_content_types">启用帖文格式</string>
     <string name="sk_settings_content_types_explanation">允许在创建文章时设置类似Markdown的内容类型。注意，不是所有的实例都支持这个。</string>
     <string name="sk_settings_default_content_type">默认的内容类型</string>
     <string name="sk_timeline_bubble">Bubble</string>
@@ -319,7 +319,7 @@
     <string name="sk_disable_pill_shaped_active_indicator">禁用药丸状的活跃选项卡指示器</string>
     <string name="sk_settings_true_black">全黑模式</string>
     <string name="sk_settings_display_pronouns_in_timelines">在时间线上显示性别代词</string>
-    <string name="sk_settings_emoji_reactions_explanation">显示对嘟文的表情回应，并允许你添加自己的表情回应。许多 Fediverse 服务器支持此功能，但 Mastodon 不支持。</string>
+    <string name="sk_settings_emoji_reactions_explanation">显示对帖文的表情回应，并允许你添加自己的表情回应。许多 Fediverse 服务器支持此功能，但 Mastodon 不支持。</string>
     <string name="sk_settings_emoji_reactions_in_lists">在时间线中显示表情回应</string>
     <string name="sk_settings_emoji_reactions_in_lists_explanation">是否在时间线中显示表情回应。如果此选项为关闭，则只有在查看对话时才会显示表情回应。</string>
     <string name="sk_button_react">用表情回应</string>
@@ -349,12 +349,12 @@
     <string name="sk_icon_doctor">医生</string>
     <string name="sk_icon_diamond">钻石</string>
     <string name="sk_icon_umbrella">雨伞</string>
-    <string name="sk_edit_timeline_tag_main">包含标签的嘟文…</string>
+    <string name="sk_edit_timeline_tag_main">包含标签的帖文…</string>
     <string name="sk_edit_timeline_tag_none">…但都不包含</string>
     <string name="sk_edit_timeline_tag_any">…或包含其中任何一个</string>
     <string name="sk_edit_timeline_tag_hint">输入标签…</string>
     <string name="sk_edit_timeline_tags_hint">输入标签…</string>
-    <string name="sk_hashtag_timeline_local_only_switch">仅显示本地嘟文？</string>
+    <string name="sk_hashtag_timeline_local_only_switch">仅显示本地帖文？</string>
     <string name="sk_add_timeline_tag_error_empty">标签不可为空</string>
     <string name="sk_gif_badge">GIF</string>
     <string name="sk_settings_prefix_replies_always">回复至任何人</string>
@@ -370,29 +370,29 @@
     <string name="sk_tab_profile">个人资料</string>
     <string name="sk_settings_show_labels_in_navigation_bar">在导航栏中显示选项卡标签</string>
     <string name="sk_reacted_with">%1$s 回应了 %2$s</string>
-    <string name="sk_bubble_timeline_info_banner">这些都是实例管理员从网络中最新精选出来的嘟文。</string>
+    <string name="sk_bubble_timeline_info_banner">这些都是实例管理员从网络中最新精选出来的帖文。</string>
     <string name="sk_search_fediverse">搜索联邦宇宙</string>
     <string name="sk_time_seconds">%d 秒</string>
-    <string name="sk_settings_show_emoji_reactions_only_opened">仅当嘟文被打开时</string>
+    <string name="sk_settings_show_emoji_reactions_only_opened">仅当帖文被打开时</string>
     <string name="sk_time_hours">%d 时</string>
     <string name="sk_settings_show_emoji_reactions_hide_empty">隐藏空的表情回应</string>
     <string name="sk_settings_show_emoji_reactions">在时间线中显示表情回应</string>
     <plurals name="sk_posts_count_label">
-        <item quantity="other">嘟文</item>
+        <item quantity="other">帖文</item>
     </plurals>
     <string name="sk_suicide_search_terms">自杀</string>
-    <string name="sk_load_missing_posts_above">加载较新的嘟文</string>
+    <string name="sk_load_missing_posts_above">加载较新的帖文</string>
     <string name="sk_time_days">%d 天</string>
     <string name="sk_settings_show_emoji_reactions_always">始终显示添加按钮</string>
     <string name="sk_search_suicide_hotlines">查找求助热线</string>
     <string name="sk_do_not_show_again">下次不再显示</string>
-    <string name="sk_trending_posts_info_banner">这些嘟文正在联邦宇宙上引起关注。</string>
-    <string name="sk_load_missing_posts_below">加载较旧的嘟文</string>
+    <string name="sk_trending_posts_info_banner">这些帖文正在联邦宇宙上引起关注。</string>
+    <string name="sk_load_missing_posts_below">加载较旧的帖文</string>
     <string name="sk_search_suicide_title">以防你遇到困难…</string>
     <string name="sk_time_minutes">%d 分</string>
     <string name="sk_search_suicide_message">如果你正在寻找一个不自杀的迹象，这就是。如果你遇到困难，请考虑拨打当地的自杀热线。</string>
     <string name="sk_trending_links_info_banner">这些新闻故事正在联邦宇宙上被讨论。</string>
-    <string name="sk_post_contains_media">嘟文包含媒体</string>
+    <string name="sk_post_contains_media">帖文包含媒体</string>
     <string name="sk_blocked_accounts">已屏蔽账号</string>
     <string name="sk_muted_accounts">已静音账号</string>
     <string name="sk_settings_like_icon">使用心形作为收藏图标</string>
@@ -401,4 +401,8 @@
     <string name="sk_settings_color_palette_default">默认（%s）</string>
     <string name="sk_settings_underlined_links">链接加下划线</string>
     <string name="sk_edit_alt_text">编辑 ALT 文本</string>
+    <string name="sk_settings_default_visibility">默认发帖可见性</string>
+    <string name="sk_settings_lock_account">手动批准新关注者</string>
+    <string name="sk_timeline_cache_cleared">已清除主页时间线缓存</string>
+    <string name="sk_settings_clear_timeline_cache">清除主页时间线缓存</string>
 </resources>
\ No newline at end of file

From 2e360dc2758f1b9adb0e4420430ad29cfbd30e63 Mon Sep 17 00:00:00 2001
From: Espasant3 <eloi.b.pineiro@gmail.com>
Date: Fri, 20 Oct 2023 18:15:43 +0000
Subject: [PATCH 2/3] Translated using Weblate (Galician)

Currently translated at 98.7% (393 of 398 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/gl/
---
 .../src/main/res/values-gl-rES/strings_sk.xml    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/res/values-gl-rES/strings_sk.xml b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
index 1c579e4b60..88acf36407 100644
--- a/mastodon/src/main/res/values-gl-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
@@ -256,7 +256,7 @@
     <string name="sk_filtered">Filtrados: %s</string>
     <string name="sk_expand">Expandir</string>
     <string name="sk_settings_collapse_long_posts">Contraer publicacións moi longas</string>
-    <string name="sk_unfinished_attachments">Arranxar arquivos adxuntos\?</string>
+    <string name="sk_unfinished_attachments">Subindo arquivos adxuntos</string>
     <string name="sk_spectator_mode">Modo espectador</string>
     <string name="sk_settings_hide_interaction">Ocultar botóns de interacción</string>
     <string name="sk_follow_as">Seguir dende outra conta</string>
@@ -330,10 +330,10 @@
     <string name="sk_gif_badge">GIF</string>
     <string name="sk_settings_unifiedpush_no_distributor_body">Debe instalar un distribuidor para que as notificacións UnifiedPush funcionen. Para máis información, visita https://unifiedpush.org/</string>
     <string name="sk_settings_unifiedpush_no_distributor">Non se atopou ningún distribuidor</string>
-    <string name="sk_trending_posts_info_banner">Estas son publicacións que están a gañar tracción no teu servidor.</string>
+    <string name="sk_trending_posts_info_banner">Estas publicacións están a gañar tracción no Fediverso.</string>
     <string name="sk_settings_unifiedpush_choose">Escoller un distribuidor</string>
     <string name="sk_settings_continues_playback">Superposición de audio</string>
-    <string name="sk_trending_links_info_banner">Estas son as novas historias das que se está a falar no teu servidor.</string>
+    <string name="sk_trending_links_info_banner">Destas novas historias se está a falar en todo o Fediverso.</string>
     <string name="sk_settings_unifiedpush">Empregar UnifiedPush</string>
     <string name="sk_disable_pill_shaped_active_indicator">Desactivar o indicador de lapela activa en forma de pílula</string>
     <string name="sk_tab_profile">Perfil</string>
@@ -373,7 +373,7 @@
     <string name="sk_search_suicide_hotlines">Buscar unha liña de axuda</string>
     <string name="sk_duration_hours_1">1 hora</string>
     <string name="sk_duration_hours_6">6 horas</string>
-    <string name="sk_enter_emoji_hint">Escribe para reaccionar cunha emoticona</string>
+    <string name="sk_enter_emoji_hint">Escribe unha emoticona ou busca</string>
     <string name="sk_duration_days_7">7 días</string>
     <string name="sk_do_not_show_again">Non amosar outra vez</string>
     <string name="sk_suicide_helplines_url">https://findahelpline.com/es</string>
@@ -396,4 +396,12 @@
     <string name="sk_blocked_accounts">Contas bloqueadas</string>
     <string name="sk_muted_accounts">Contas silenciadas</string>
     <string name="sk_recently_used">Empregados recentemente</string>
+    <string name="sk_set_as_default">Establecer como predefinido</string>
+    <string name="sk_settings_color_palette_default">Defecto (%s)</string>
+    <string name="sk_settings_default_visibility">Visibilidade de publicación por defecto</string>
+    <string name="sk_settings_underlined_links">Ligazóns subliñadas</string>
+    <string name="sk_settings_lock_account">Aprobar manualmente novos seguidores</string>
+    <string name="sk_timeline_cache_cleared">Caché da cronoloxía de inicio borrada</string>
+    <string name="sk_settings_clear_timeline_cache">Borrar a caché da cronoloxía de inicio</string>
+    <string name="sk_edit_alt_text">Editar texto alternativo</string>
 </resources>
\ No newline at end of file

From df7a0ee490b36b1a046367b03dddb348b2699f27 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Fri, 20 Oct 2023 20:02:52 +0000
Subject: [PATCH 3/3] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (18 of 18 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
---
 metadata/uk/changelogs/56.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/uk/changelogs/56.txt b/metadata/uk/changelogs/56.txt
index 38e052474d..9dc0caecb6 100644
--- a/metadata/uk/changelogs/56.txt
+++ b/metadata/uk/changelogs/56.txt
@@ -1,6 +1,6 @@
 - Користувацькі кольорові теми від @LucasGGamerM
 - Новий текстовий логотип «megalodon», представлений @LucasGGamerM
-- Кращий пошук емодзі під час створення допису
+- Кращий пошук емоджі під час створення допису
 - Налагоджене голосування (показувати власний голос, завжди показувати кнопку голосування, не обрізати довгі відповіді)
 - Додано налаштування push-сповіщень для сповіщень про дописи
 - Виправлення помилок