From db44880c0661d5e43d210629bb220cedaff733eb Mon Sep 17 00:00:00 2001
From: ButterflyOfFire <butterflyoffire@protonmail.com>
Date: Fri, 15 May 2020 20:09:26 +0000
Subject: [PATCH] Translated using Weblate (Chinese (Simplified, Singapore))

Currently translated at 81.7% (345 of 422 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/zh_Hans_SG/

Translated using Weblate (Korean)

Currently translated at 92.6% (391 of 422 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ko/

Translated using Weblate (Japanese)

Currently translated at 85.0% (359 of 422 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ja/

Translated using Weblate (French)

Currently translated at 100.0% (422 of 422 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/
---
 app/src/main/res/values-fr/strings.xml     |  3 +-
 app/src/main/res/values-ja/strings.xml     | 16 ++---
 app/src/main/res/values-ko/strings.xml     | 21 +++---
 app/src/main/res/values-zh-rSG/strings.xml | 75 +---------------------
 4 files changed, 24 insertions(+), 91 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 33fde945b..2230d028f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -48,7 +48,7 @@
     <string name="status_content_show_more">Déplier</string>
     <string name="status_content_show_less">Replier</string>
     <string name="message_empty">Rien ici.</string>
-    <string name="footer_empty">Il n’y a aucun pouet pour le moment.\nGlissez vers le bas pour actualiser !</string>
+    <string name="footer_empty">Il n’y a aucun pouet ici pour l’instant. Glissez vers le bas pour actualiser !</string>
     <string name="notification_reblog_format">%s a partagé votre pouet</string>
     <string name="notification_favourite_format">%s a ajouté votre pouet à ses favoris</string>
     <string name="notification_follow_format">%s vous suit</string>
@@ -475,4 +475,5 @@
     <string name="dialog_mute_warning">Mettre en sourdine @%s \?</string>
     <string name="action_unmute_conversation">Enlever la sourdine à la conversation</string>
     <string name="action_mute_conversation">Silencer la conversation</string>
+    <string name="pref_title_enable_swipe_for_tabs">Activer les gestes de glissement pour passer d’un onglet à l’autre</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 93dcb7856..886bfe1f8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -131,15 +131,13 @@
     <string name="label_header">ヘッダー</string>
     <string name="link_whats_an_instance">インスタンスとは？</string>
     <string name="login_connection">接続中…</string>
-    <string name="dialog_whats_an_instance">mastodon.social, mstdn.jp, pawoo.netや<!--
-        --><a href="https://instances.social">その他</a><!--
-        -->のような、あらゆるインスタンスのアドレスやドメインを入力できます。
-        \n\nまだアカウントをお持ちでない場合は、参加したいインスタンスの名前を入力することで<!--
-        -->そのインスタンスにアカウントを作成できます。
-        \n\nインスタンスはあなたのアカウントが提供される単独の場所ですが、<!--
-        -->他のインスタンスのユーザーとあたかも同じ場所にいるように簡単にコミュニケーションをとったりフォローしたりできます。
-        \n\nさらに詳しい情報は<a href="https://joinmastodon.org">joinmastodon.org</a>でご覧いただけます。
-    </string>
+    <string name="dialog_whats_an_instance">mastodon.social, icosahedron.website, social.tchncs.deや<a href="https://instances.social">その他</a>のような、あらゆるインスタンスのアドレスやドメインを入力できます。 
+\n
+\nまだアカウントをお持ちでない場合は、参加したいインスタンスの名前を入力することそのインスタンスにアカウントを作成できます。 
+\n
+\nインスタンスはあなたのアカウントが提供される単独の場所ですが、<!-- -->他のインスタンスのユーザーとあたかも同じ場所にいるように簡単にコミュニケーションをとったりフォローしたりできます。 
+\n
+\nさらに詳しい情報は<a href="https://joinmastodon.org">joinmastodon.org</a>でご覧いただけます。 </string>
     <string name="dialog_title_finishing_media_upload">メディアをアップロードしています</string>
     <string name="dialog_message_uploading_media">アップロード中…</string>
     <string name="dialog_download_image">ダウンロード</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 63ed949a6..b2a70125c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -146,19 +146,24 @@
     <string name="label_header">헤더</string>
     <string name="link_whats_an_instance">인스턴스가 무엇인가요\?</string>
     <string name="login_connection">연결 중…</string>
-    <string name="dialog_whats_an_instance">"인스턴스의 도메인 주소나 IP주소를 입력하실 수 있습니다. pawoo.net, twingyeo.kr, qdon.space 등이 있으며, 그 외에도 &lt;a href=“https://instances.social”&gt;더 많은 인스턴스&lt;/a&gt;가 당신을 기다리고 있습니다! 
+    <string name="dialog_whats_an_instance">인스턴스의 도메인 주소나 IP주소를 입력하실 수 있습니다. mastodon.social, icosahedron.website, social.tchncs.de 등이 있으며, 그 외에도 <a href="https://instances.social">더 많은 인스턴스</a>가 당신을 기다리고 있습니다! 
 \n
+\n 
 \n만약 계정이 없으시다면, 인스턴스 주소를 입력하신 후에 계정을 만드실 수 있습니다. 
+\n
 \n 
+\n
 \n여러분이 어느 인스턴스에 가입하시더라도, 다른 인스턴스에 있는 유저들과 문제 없이 소통하실 수 있습니다. 
+\n
 \n 
-\n자세한 사항은 &lt;a href=“https://joinmastodon.org”&gt;joinmastodon.org&lt;/a&gt;을 참조하세요. "<a href="https://instances.social">more!</a>
-        \n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
-        join and create an account there.\n\nAn instance is a single place where your account is
-        hosted, but you can easily communicate with and follow folks on other instances as though
-        you were on the same site.
-        \n\nMore info can be found at <a href="https://joinmastodon.org">joinmastodon.org</a>.
-    </string>
+\n
+\n자세한 사항은 &lt;a href=“https://joinmastodon.org”&gt;joinmastodon.org&lt;/a&gt;을 참조하세요. <a href="https://instances.social">more!</a> 
+\n
+\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to join and create an account there.
+\n
+\nAn instance is a single place where your account is hosted, but you can easily communicate with and follow folks on other instances as though you were on the same site. 
+\n
+\nMore info can be found at <a href="https://joinmastodon.org">joinmastodon.org</a>. </string>
     <string name="dialog_title_finishing_media_upload">미디어 업로드 완료</string>
     <string name="dialog_message_uploading_media">업로드 중…</string>
     <string name="dialog_download_image">다운로드</string>
diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
index 8ee40db1c..018b1f500 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="error_generic">应用程序出现异常</string>
     <string name="error_network">网络请求出错，请检查互联网连接并重试</string>
@@ -19,7 +19,6 @@
     <string name="error_media_upload_image_or_video">无法在嘟文中同时插入视频和图片</string>
     <string name="error_media_upload_sending">媒体文件上传失败</string>
     <string name="error_sender_account_gone">嘟文发送时出错</string>
-
     <string name="title_home">主页</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站时间轴</string>
@@ -39,7 +38,6 @@
     <string name="title_edit_profile">编辑个人资料</string>
     <string name="title_saved_toot">草稿</string>
     <string name="title_licenses">开源协议</string>
-
     <string name="status_username_format">\@%s</string>
     <string name="status_boosted_format">%s 转嘟了</string>
     <string name="status_sensitive_media_title">敏感内容</string>
@@ -49,17 +47,13 @@
     <string name="status_content_warning_show_less">折叠内容</string>
     <string name="status_content_show_more">展开</string>
     <string name="status_content_show_less">折叠</string>
-
     <string name="message_empty">还没有内容</string>
     <string name="footer_empty">还没有内容，向下拉动即可刷新</string>
-
     <string name="notification_reblog_format">%s 转嘟了你的嘟文</string>
     <string name="notification_favourite_format">%s 收藏了你的嘟文</string>
     <string name="notification_follow_format">%s 关注了你</string>
-
     <string name="report_username_format">报告用户 @%s 的滥用行为</string>
     <string name="report_comment_hint">报告更多信息</string>
-
     <string name="action_quick_reply">快速回复</string>
     <string name="action_reply">回复</string>
     <string name="action_reblog">转嘟</string>
@@ -119,57 +113,40 @@
     <string name="action_open_reblogger">打开转嘟用户主页</string>
     <string name="action_open_reblogged_by">显示转嘟</string>
     <string name="action_open_faved_by">显示收藏</string>
-
     <string name="title_hashtags_dialog">话题</string>
     <string name="title_mentions_dialog">提及</string>
     <string name="title_links_dialog">链接</string>
     <string name="action_open_media_n">打开媒体文件 #%d</string>
-
     <string name="download_image">正在下载 %1$s…</string>
-
     <string name="action_copy_link">复制链接</string>
     <string name="action_open_as">打开为 %s</string>
     <string name="action_share_as">分享为 …</string>
     <string name="download_media">下载媒体文件</string>
     <string name="downloading_media">正在下载媒体文件</string>
-
     <string name="send_status_link_to">分享链接到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒体到…</string>
-
     <string name="confirmation_reported">报告已发送！</string>
     <string name="confirmation_unblocked">已解除屏蔽</string>
     <string name="confirmation_unmuted">已取消隐藏</string>
-
     <string name="status_sent">已发送！</string>
     <string name="status_sent_long">成功发布回复</string>
-
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什么新鲜事？</string>
     <string name="hint_content_warning">内容提醒</string>
     <string name="hint_display_name">昵称</string>
     <string name="hint_note">简介</string>
     <string name="hint_search">搜索…</string>
-
     <string name="search_no_results">没找到结果</string>
-
     <string name="label_quick_reply">回复…</string>
     <string name="label_avatar">头像</string>
     <string name="label_header">标题</string>
-
     <string name="link_whats_an_instance">需要帮助？</string>
-
     <string name="login_connection">正在连接…</string>
-
     <string name="dialog_whats_an_instance">请输入你帐号所在的 Mastodon 站点的域名，比如 pawoo.net，acg.mn，wxw.moe，<a href="https://instances.social">等等</a> 。
         \n\n还没有 Mastodon 帐号？你也可以输入想注册的 Mastodon 站点的域名，然后在该服务器创建新的帐号并授权 Tusky 登入。
         \n\n在 Mastodon 里，跨站互动和站内互动一样简单。可以前往 <a href="https://joinmastodon.org">https://joinmastodon.org</a> 了解更多信息。
     </string>
-
-
-
-
-
     <string name="dialog_title_finishing_media_upload">正在结束上传…</string>
     <string name="dialog_message_uploading_media">正在上传…</string>
     <string name="dialog_download_image">下载</string>
@@ -177,12 +154,10 @@
     <string name="dialog_unfollow_warning">不再关注此用户？</string>
     <string name="dialog_delete_toot_warning">删除这条嘟文？</string>
     <string name="dialog_redraft_toot_warning">删除并重新编辑这条嘟文？</string>
-
     <string name="visibility_public">公开：所有人可见，并会出现在公共时间轴上</string>
     <string name="visibility_unlisted">不公开：所有人可见，但不会出现在公共时间轴上</string>
     <string name="visibility_private">仅关注者：只有经过你确认后关注你的用户可见</string>
     <string name="visibility_direct">私信：只有被提及的用户可见</string>
-
     <string name="pref_title_edit_notification_settings">通知设置</string>
     <string name="pref_title_notifications_enabled">通知</string>
     <string name="pref_title_notification_alerts">提醒</string>
@@ -199,13 +174,11 @@
     <string name="pref_title_app_theme">应用主题</string>
     <string name="pref_title_timelines">时间轴</string>
     <string name="pref_title_timeline_filters">过滤器</string>
-
     <string name="app_them_dark">黑夜</string>
     <string name="app_theme_light">白天</string>
     <string name="app_theme_black">暗色</string>
     <string name="app_theme_auto">自动切换</string>
     <string name="app_theme_system">跟随系统设定</string>
-
     <string name="pref_title_browser_settings">浏览器</string>
     <string name="pref_title_custom_tabs">使用 Chrome Custom Tabs</string>
     <string name="pref_title_hide_follow_button">浏览时自动隐藏发嘟按钮</string>
@@ -220,24 +193,19 @@
     <string name="pref_title_http_proxy_enable">启用 HTTP 代理</string>
     <string name="pref_title_http_proxy_server">HTTP 代理服务器</string>
     <string name="pref_title_http_proxy_port">HTTP 代理端口</string>
-
     <string name="pref_default_post_privacy">嘟文默认可见范围</string>
     <string name="pref_default_media_sensitivity">自动标记媒体为敏感内容</string>
     <string name="pref_publishing">发布（与服务器同步）</string>
     <string name="pref_failed_to_sync">同步设置失败</string>
-
     <string name="post_privacy_public">公开</string>
     <string name="post_privacy_unlisted">不公开</string>
     <string name="post_privacy_followers_only">仅关注者</string>
-
     <string name="pref_status_text_size">字体大小</string>
-
     <string name="status_text_size_smallest">最小</string>
     <string name="status_text_size_small">小</string>
     <string name="status_text_size_medium">标准</string>
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
-
     <string name="notification_mention_name">提及</string>
     <string name="notification_mention_descriptions">当有用户在嘟文中提及我时</string>
     <string name="notification_follow_name">关注</string>
@@ -248,21 +216,15 @@
     <string name="notification_favourite_description">当有用户收藏了我的嘟文时</string>
     <string name="notification_poll_name">投票</string>
     <string name="notification_poll_description">当我参与的投票结束时</string>
-
-
     <string name="notification_mention_format">%s 提及了你</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s 和 %4$d 人</string>
     <string name="notification_summary_medium">%1$s, %2$s, 和 %3$s</string>
     <string name="notification_summary_small">%1$s 和 %2$s</string>
     <string name="notification_title_summary">%d 个新互动</string>
-
     <string name="description_account_locked">锁嘟用户</string>
-
     <string name="about_title_activity">关于 Tusky</string>
     <string name="about_tusky_version">Tusky %s</string>
     <string name="about_tusky_license">Tusky 是基于 GNU General Public License Version 3 许可证开源的自由软件。完整的许可证协议：https://www.gnu.org/licenses/gpl-3.0.en.html</string>
-
-
     <!-- note to translators:
          * you should think of “free” as in “free speech,” not as in “free beer”.
            We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
@@ -278,14 +240,11 @@
         https://github.com/tuskyapp/Tusky/issues
     </string>
     <string name="about_tusky_account">Tusky 官方帐号</string>
-
     <string name="status_share_content">分享嘟文内容</string>
     <string name="status_share_link">分享嘟文链接</string>
     <string name="status_media_images">照片</string>
     <string name="status_media_video">视频</string>
-
     <string name="state_follow_requested">已发送关注请求</string>
-
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="abbreviated_in_years">%d 年内</string>
     <string name="abbreviated_in_days">%d 天内</string>
@@ -297,13 +256,11 @@
     <string name="abbreviated_hours_ago">%d 小时前</string>
     <string name="abbreviated_minutes_ago">%d 分钟前</string>
     <string name="abbreviated_seconds_ago">%d 秒前</string>
-
     <string name="follows_you">关注了你</string>
     <string name="pref_title_alway_show_sensitive_media">总是显示所有敏感媒体内容</string>
     <string name="title_media">媒体</string>
     <string name="replying_to">回复 @%s</string>
     <string name="load_more_placeholder_text">加载更多</string>
-
     <string name="pref_title_public_filter_keywords">公共时间轴</string>
     <string name="pref_title_thread_filter_keywords">对话</string>
     <string name="filter_addition_dialog_title">添加新的过滤器</string>
@@ -311,10 +268,8 @@
     <string name="filter_dialog_remove_button">移除</string>
     <string name="filter_dialog_update_button">更新</string>
     <string name="filter_add_description">需要过滤的文字</string>
-
     <string name="add_account_name">添加帐号</string>
     <string name="add_account_description">添加新的 Mastodon 帐号</string>
-
     <string name="action_lists">列表</string>
     <string name="title_lists">列表</string>
     <string name="title_list_timeline">列表时间轴</string>
@@ -328,9 +283,7 @@
     <string name="hint_search_people_list">搜索已关注的用户</string>
     <string name="action_add_to_list">添加用户到列表</string>
     <string name="action_remove_from_list">从列表中移除用户</string>
-
     <string name="compose_active_account_description">以 %1$s 发布嘟文</string>
-
     <string name="error_failed_set_caption">设置图片标题失败</string>
     <string name="hint_describe_for_visually_impaired">为视觉障碍用户提供的描述\n(限制 %d 字)</string>
     <string name="action_set_caption">设置图片标题</string>
@@ -344,7 +297,6 @@
     <string name="send_toot_notification_cancel_title">发送已被取消</string>
     <string name="send_toot_notification_saved_content">嘟文已保存为草稿</string>
     <string name="action_compose_shortcut">发表嘟文</string>
-
     <string name="error_no_custom_emojis">当前实例 %s 没有自定义表情符号</string>
     <string name="copy_to_clipboard_success">已复制到剪贴板</string>
     <string name="emoji_style">表情符号风格</string>
@@ -361,49 +313,35 @@
     <string name="caption_blobmoji">Android 4.4–7.1 的黄馒头表情符号</string>
     <string name="caption_twemoji">Mastodon 使用的表情符号</string>
     <!-- string name="emoji_shortcode_format" translatable="false">:%s:</string -->
-
     <string name="download_failed">下载失败</string>
-
     <string name="profile_badge_bot_text">机器人</string>
     <string name="account_moved_description">%1$s 已迁移到：</string>
-
     <string name="reblog_private">转嘟（可见者不变）</string>
     <string name="unreblog_private">取消转嘟</string>
-
     <string name="license_description">Tusky 使用了以下开源项目的源码：</string>
     <string name="license_apache_2">以 Apache License 授权（详见下方）</string>
     <string name="license_cc_by_4">CC-BY 4.0</string>
     <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
-
     <string name="profile_metadata_label">个人资料附加信息</string>
     <string name="profile_metadata_add">添加信息</string>
     <string name="profile_metadata_label_label">标签</string>
     <string name="profile_metadata_content_label">内容</string>
-
     <string name="pref_title_absolute_time">嘟文显示精确时间</string>
-
     <string name="label_remote_account">以下信息可能并不完整，要查看完整资料请使用浏览器打开</string>
-
     <string name="unpin_action">取消置顶</string>
     <string name="pin_action">置顶</string>
-
     <plurals name="favs">
         <item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; 次收藏</item>
     </plurals>
-
     <plurals name="reblogs">
         <item quantity="other">&lt;b&gt;%s&lt;/b&gt; 次转嘟</item>
     </plurals>
-
     <string name="title_reblogged_by">转嘟</string>
     <string name="title_favourited_by">收藏</string>
-
     <string name="conversation_1_recipients">%1$s</string>
     <string name="conversation_2_recipients">%1$s 和 %2$s</string>
     <string name="conversation_more_recipients">%1$s, %2$s 和 %3$d 等人</string>
     <string name="max_tab_number_reached">标签页不能超过 %1$d 个</string>
-
-
     <string name="description_status_media">
         媒体: %s
     </string>
@@ -431,22 +369,17 @@
     <string name="description_visiblity_direct">
         私信
     </string>
-
     <string name="hint_list_name">列表名</string>
-
     <string name="edit_hashtag_title">编辑话题</string>
     <string name="edit_hashtag_hint">话题名（不含前面的 # 号）</string>
     <string name="hashtag">话题</string>
     <string name="notifications_clear">清空</string>
     <string name="notifications_apply_filter">分类</string>
     <string name="filter_apply">应用</string>
-
     <string name="compose_shortcut_long_label">发表新嘟文</string>
     <string name="compose_shortcut_short_label">新嘟文</string>
     <string name="pref_title_bot_overlay">显示机器人标志</string>
-
     <string name="notification_clear_text">你确定要永久清空通知列表吗？</string>
-
     <string name="poll_info_format">
         <!-- 15 votes • 1 hour left -->
         %1$s • %2$s</string>
@@ -456,12 +389,9 @@
     <string name="poll_info_time_relative">剩余 %s</string>
     <string name="poll_info_time_absolute">%s 结束</string>
     <string name="poll_info_closed">已结束</string>
-
     <string name="poll_vote">投票</string>
-
     <string name="poll_ended_voted">你参与的投票已结束</string>
     <string name="poll_ended_created">你创建的投票已结束</string>
-
     <!--These are for timestamps on polls -->
     <plurals name="poll_timespan_days">
         <item quantity="other">%d 天</item>
@@ -475,5 +405,4 @@
     <plurals name="poll_timespan_seconds">
         <item quantity="other">%d 秒</item>
     </plurals>
-
-</resources>
+</resources>
\ No newline at end of file