Merge upstream redesign (#714)

* merge toolbar fragment

* Fix store screenshot generator

* Fix alert color

* Fix #609

* Fix crash

* bigger hitbox for chips

* support mastodon languages

* merge ui utils

* merge stuff

* fix icon

* ensure 48dp touch target

* init local prefs, add helper function for enum values

* update compose action layout

* merge compose-adj files

* update extended footer

* fix poll wrong option checked

closes sk22#641

* no border when disabled

closes sk22#640

* Fix #610

* Minor fixes

* Fix alert color

* Fix #609

* Fix crash

* Fix #610

* Minor fixes

* add resources

* more compatible mastodon language

* fix html parser

* mark as read on refresh

* update tab bar

* tweak m3 buttons

* update compose-adj files

* tweak and update styles

* m3 expand button

* flag icon should be 18dp, actually

* More minor fixes

closes #612

* More minor fixes

closes #612

* Bump version

* fix no create status event when redrafting

* add material 3 assets

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* New translations strings.xml (Thai)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* use new buttons for profile fragment

* merge compose fragment

* merge all the styles! oh dear

* New translations full_description.txt (Indonesian)

* New translations full_description.txt (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations full_description.txt (Chinese Simplified)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* New translations strings.xml (Greek)

* Make the default server configurable

* Pass the system timezone to server when signing up

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Japanese)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* Make the default server configurable

* Pass the system timezone to server when signing up

* oops. accidentally pasted the commit message in the code

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Belarusian)

* prepare merging profile fragment

* merge profile fragment

* New translations strings.xml (Belarusian)

* New translations strings.xml (Greek)

* fix icon padding

* apply post header changes

* minor margin tweaks

* fix footer buttons

* fix header announcement buttons

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations full_description.txt (Japanese)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* fix replying

* New translations strings.xml (Icelandic)

* fix translate button

* fix more button visibility

* fix counts label styling

* fix disabled boost button opacity

* fix tab layouts

* fix notification icon color crash

* New translations strings.xml (Greek)

* implement elevation listener in home tab

* fix elevation and listener in home tab

* add elevation scroll listener to notifications

* New translations strings.xml (Scottish Gaelic)

* Add editorconfig

So that PRs like #625 don't happen again

* Crash fix

* 🤔

* New translations strings.xml (Greek)

* New translations strings.xml (Japanese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* fix notification elevation and integrate divider

* 🤔

* Crash fix

* Add editorconfig

So that PRs like #625 don't happen again

* New translations strings.xml (Turkish)

* save interactions in cache

* New translations strings.xml (Turkish)

* merge new discover/search

* New translations strings.xml (Bengali)

* New translations strings.xml (Scottish Gaelic)

* New translations strings.xml (Bengali)

* merge new settings fragments

* fix no auth callback always being executed

* allow opening server info from profile

closes sk22#593

* fix hide boosts icon color

closes sk22#676

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Turkish)

* update fedinuke list

from source; doesn't contain any modifications regarding a recent issue

* New translations strings.xml (Turkish)

* remove unused class

* fix crash

* darken m3 outline color a bit

* use m3 outline again

* fix misalignment

closes sk22#682

* New translations strings.xml (Turkish)

* New translations full_description.txt (Turkish)

* New translations short_description.txt (Turkish)

* fix crash

* fix metadata sorting

* show pronouns in header/account lists

* fix broken divider line

closes sk22#679

* trim pronouns

* improve pronoun display

* New translations strings.xml (French)

* New translations strings.xml (Japanese)

* fix broken federated timeline

closes sk22#685

* fix broken -1 fallback behavior

closes sk22#681

* don't display nothing if server about request fails

closes sk22#678

* New translations strings.xml (Ukrainian)

* migrate global prefs to local prefs

* do confirm unfollow by default

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* make sure list in prefs are always mutable and nut null

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* fix pronouns edge case

* add back fix for stretched images

closes sk22#636

* fix null pointer on missing default posting language

* fix default posting language not being applied

* bigger username hitbox

closes sk22#688

* fix rtl header username alignment

closes sk22#689

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* hopefully fix crashes

closes sk22#692

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* fix pronoun crash

* New translations strings.xml (Persian)

* New translations strings.xml (Ukrainian)

* re-add true black mode

* asterisk can be a pronoun

* New translations strings.xml (Persian)

* true black mode fixes and clean-ups

* material 3 button background for switcher

* darker tab bar selected background

* better align follow/following button widths

* restore rainbow refresh colors

* fix search transition

* fix min width issue with switcher button

* fix no elevation when true black is enabled in light theme

* use statusForContent to determine spoilerRevealed

closes sk22#694

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* fix profile tab bar in true black theme

* fix m3 default button style

closes sk22#697

* prettier role badges

closes sk22#663

* fix translate button spacing

closes sk22#655

* use m3 switches in dialogs

closes sk22#653

* implement color palette switcher

* fix color palettes being overwritten

* add display and notification settings

* clean up code

* per-account single notification setting

* add missing items to notification types

* add prefix replies setting

* add show replies/boosts and reply visibility

* add load/see new posts settings

* fix spectator mode missing spoiler padding

* add a bunch of display settings

* update fedinuke

* add content type settings

* add settings for local-onlu

* add missing settings items

* fix visibility button icon tint

* hopefully fix some crashes

* normalize padding above edit text

* apparently, some people don't like pills

closes sk22#706

* fix play button color

closes sk22#705

mastodon/src/main/res/values-zh-rTW/strings.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">新增帳號</string>
-	<string name="already_have_account">我已擁有帳號</string>
 	<string name="log_in">登入</string>
 	<string name="next">下一步</string>
 	<string name="loading_instance">正在取得伺服器資訊...</string>
@@ -13,15 +11,11 @@
 	<string name="user_boosted">%s 已轉嘟</string>
 	<string name="in_reply_to">回覆給 %s</string>
 	<string name="notifications">通知</string>
-	<string name="user_followed_you">已跟隨您</string>
-	<string name="user_sent_follow_request">傳送跟隨請求給您</string>
-	<string name="user_favorited">已將您的嘟文加入最愛</string>
-	<string name="notification_boosted">已轉嘟您的嘟文</string>
-	<string name="poll_ended">投票已結束</string>
-	<string name="time_seconds">%d 秒</string>
-	<string name="time_minutes">%d 分</string>
-	<string name="time_hours">%d 小時</string>
-	<string name="time_days">%d 天</string>
+	<string name="user_followed_you">%s 已跟隨您</string>
+	<string name="user_sent_follow_request">%s 已傳送跟隨請求給您</string>
+	<string name="user_favorited">%s 已將您的嘟文加入最愛</string>
+	<string name="notification_boosted">%s 已轉嘟您的嘟文</string>
+	<string name="poll_ended">檢視您參與之一則投票結果</string>
 	<string name="share_toot_title">分享</string>
 	<string name="settings">設定</string>
 	<string name="publish">發佈</string>
@@ -34,9 +28,6 @@
 	<plurals name="following">
 		<item quantity="other">跟隨中</item>
 	</plurals>
-	<plurals name="posts">
-		<item quantity="other">嘟文</item>
-	</plurals>
 	<string name="posts">嘟文</string>
 	<string name="posts_and_replies">嘟文及回覆</string>
 	<string name="media">媒體</string>
@@ -44,8 +35,7 @@
 	<string name="button_follow">跟隨</string>
 	<string name="button_following">正在跟隨</string>
 	<string name="edit_profile">編輯個人檔案</string>
-	<string name="mention_user">提及 %s</string>
-	<string name="share_user">分享 %s</string>
+	<string name="share_user">分享個人檔案</string>
 	<string name="mute_user">靜音 %s</string>
 	<string name="unmute_user">取消靜音 %s</string>
 	<string name="block_user">封鎖 %s</string>
@@ -73,7 +63,6 @@
 	<plurals name="x_days">
 		<item quantity="other">%d 天</item>
 	</plurals>
-	<string name="compose_poll_duration">持續時間：%s</string>
 	<plurals name="x_seconds_left">
 		<item quantity="other">剩餘 %d 秒</item>
 	</plurals>
@@ -86,8 +75,8 @@
 	<plurals name="x_days_left">
 		<item quantity="other">剩餘 %d 天</item>
 	</plurals>
-	<plurals name="x_voters">
-		<item quantity="other">%,d 位投票者</item>
+	<plurals name="x_votes">
+		<item quantity="other">%,d 票</item>
 	</plurals>
 	<string name="poll_closed">已關閉</string>
 	<string name="confirm_mute_title">靜音帳號</string>
@@ -104,10 +93,8 @@
 	<string name="confirm_unblock_domain_title">解除封鎖網域</string>
 	<string name="confirm_unblock">確認將 %s 解除封鎖</string>
 	<string name="do_unblock">解除封鎖</string>
-	<string name="button_muted">已靜音</string>
 	<string name="button_blocked">已封鎖</string>
 	<string name="action_vote">投票</string>
-	<string name="tap_to_reveal">輕觸以顯示</string>
 	<string name="delete">刪除</string>
 	<string name="confirm_delete_title">刪除嘟文</string>
 	<string name="confirm_delete">您確定要刪除此嘟文？</string>
@@ -126,12 +113,9 @@
 	<plurals name="x_people_talking">
 		<item quantity="other">%d 個人正在討論</item>
 	</plurals>
-	<plurals name="discussed_x_times">
-		<item quantity="other">已討論過 %d 次</item>
-	</plurals>
 	<string name="report_title">檢舉 %s</string>
 	<string name="report_choose_reason">這則嘟文有什麼問題嗎？</string>
-	<string name="report_choose_reason_account">%s 有什麼問題？</string>
+	<string name="report_choose_reason_account">%s 有什麼問題嗎？</string>
 	<string name="report_choose_reason_subtitle">選取最符合的</string>
 	<string name="report_reason_personal">我不喜歡</string>
 	<string name="report_reason_personal_subtitle">這是您不想看到的</string>
@@ -148,22 +132,19 @@
 	<string name="report_comment_title">有什麼其他要讓我們知道的嗎？</string>
 	<string name="report_comment_hint">其他備註</string>
 	<string name="sending_report">正在傳送回報……</string>
-	<string name="report_sent_title">感謝您的檢舉，我們將會著手處理。</string>
-	<string name="report_sent_subtitle">當我們正在審核時，您可以對 %s 採取以下措施。</string>
+	<string name="report_sent_title">感謝您的檢舉，我們將著手處理。</string>
+	<string name="report_sent_subtitle">當我們正在審核時，您可以對 %s 採取以下措施：</string>
 	<string name="unfollow_user">取消跟隨 %s</string>
 	<string name="unfollow">取消跟隨</string>
-	<string name="mute_user_explain">您不會在您的首頁時間軸中再見到他們的嘟文或轉嘟。他們不會知道他們已被靜音。</string>
-	<string name="block_user_explain">他們將無法跟隨您或是看到您的嘟文。他們能看到他們是否已被封鎖。</string>
+	<string name="mute_user_explain">您將不再看到他們的嘟文。他們仍能可以跟隨您以及察看您的嘟文，並且不會知道他們已被靜音。</string>
+	<string name="block_user_explain">您將不再看到他們的嘟文。他們將無法看到您的嘟文或是跟隨您。他們會發現他們已被封鎖。</string>
 	<string name="report_personal_title">不想再看到這個？</string>
-	<string name="report_personal_subtitle">當您看到某些不喜歡的內容時，您可以將該帳號從您的體驗中移除。</string>
+	<string name="report_personal_subtitle">以下是控制您想於 Mastodon 看到什麼內容之選項：</string>
 	<string name="back">返回</string>
-	<string name="instance_catalog_title">Mastodon 由不同伺服器的使用者組成。</string>
-	<string name="instance_catalog_subtitle">基於您的興趣、地區、或一般用途選定一個伺服器。您仍會與任何伺服器中的每個人連結。</string>
 	<string name="search_communities">伺服器名稱或 URL</string>
 	<string name="instance_rules_title">伺服器規則</string>
 	<string name="instance_rules_subtitle">繼續的話，您將同意以下由 %s 之管理員訂定及執行之伺服器規則。</string>
 	<string name="signup_title">新增帳號</string>
-	<string name="edit_photo">編輯</string>
 	<string name="display_name">名稱</string>
 	<string name="username">使用者名稱</string>
 	<string name="email">電子郵件地址</string>
@@ -192,20 +173,12 @@
 	<string name="resent_email">確認郵件已發送</string>
 	<string name="compose_hint">正在想些什麼嗎？</string>
 	<string name="content_warning">內容警告</string>
-	<string name="add_image_description">新增圖片描述...</string>
-	<string name="retry_upload">重新嘗試上傳</string>
-	<string name="edit_image">編輯圖片</string>
 	<string name="save">儲存</string>
 	<string name="add_alt_text">新增說明文字</string>
-	<string name="alt_text_subtitle">說明文字替視障人士描述您的照片。請試著僅包含足夠的細節以了解內容。</string>
-	<string name="alt_text_hint">舉例來說，一隻狗對著鏡頭瞇著眼睛懷疑地看著四周。</string>
 	<string name="visibility_public">公開</string>
 	<string name="visibility_followers_only">僅限跟隨者</string>
 	<string name="visibility_private">僅限提及者</string>
-	<string name="search_all">全部</string>
-	<string name="search_people">使用者</string>
-	<string name="recent_searches">最近的搜尋</string>
-	<string name="step_x_of_n">第 %1$d 步，共 %2$d 步</string>
+	<string name="recent_searches">最近的</string>
 	<string name="skip">跳過</string>
 	<string name="notification_type_follow">新的跟隨者</string>
 	<string name="notification_type_favorite">最愛</string>
@@ -219,41 +192,24 @@
 	</plurals>
 	<string name="media_attachment_unsupported_type">檔案 %s 的類型不受支援</string>
 	<string name="media_attachment_too_big">檔案 %1$s 超過 %2$s MB 的大小限制</string>
-	<string name="settings_theme">視覺外觀</string>
-	<string name="theme_auto">自動</string>
+	<string name="settings_theme">外觀設定</string>
+	<string name="theme_auto">使用裝置設定</string>
 	<string name="theme_light">淺色</string>
 	<string name="theme_dark">深色</string>
-	<string name="theme_true_black">純黑模式</string>
 	<string name="settings_behavior">行為</string>
 	<string name="settings_gif">播放動畫大頭貼與表情符號</string>
 	<string name="settings_custom_tabs">使用應用程式內建瀏覽器</string>
 	<string name="settings_notifications">通知</string>
-	<string name="notify_me_when">以下狀況請通知我</string>
-	<string name="notify_anyone">任何人</string>
-	<string name="notify_follower">跟隨者</string>
-	<string name="notify_followed">我跟隨的某人</string>
-	<string name="notify_none">沒有人</string>
-	<string name="notify_favorites">將我的嘟文加到最愛</string>
-	<string name="notify_follow">跟隨我</string>
-	<string name="notify_reblog">已轉嘟我的嘟文</string>
-	<string name="notify_mention">提及我</string>
-	<string name="settings_boring">無聊的區域</string>
-	<string name="settings_account">帳號設定</string>
 	<string name="settings_contribute">貢獻 Mastodon</string>
 	<string name="settings_tos">服務條款</string>
 	<string name="settings_privacy_policy">隱私權政策</string>
-	<string name="settings_spicy">危險地帶</string>
 	<string name="settings_clear_cache">清除媒體快取</string>
 	<string name="settings_app_version">供 Android 使用的 Mastodon v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">媒體快取已清除</string>
-	<string name="confirm_log_out">您確定要登出嗎？</string>
-	<string name="sensitive_content">敏感內容</string>
-	<string name="sensitive_content_explain">作者將此媒體標記為敏感。輕點以顯示。</string>
-	<string name="media_hidden">輕點以顯示</string>
+	<string name="confirm_log_out">登出 %s？</string>
+	<string name="sensitive_content_explain">作者將此媒體標記為敏感內容。</string>
 	<string name="avatar_description">前往 %s 的個人檔案</string>
 	<string name="more_options">更多選項</string>
-	<string name="reveal_content">顯示內容</string>
-	<string name="hide_content">隱藏內容</string>
 	<string name="new_post">新嘟文</string>
 	<string name="button_reply">回覆</string>
 	<string name="button_reblog">轉嘟</string>
@@ -263,7 +219,6 @@
 	<string name="add_media">新增媒體</string>
 	<string name="add_poll">建立投票</string>
 	<string name="emoji">emoji</string>
-	<string name="post_visibility">嘟文可見性</string>
 	<string name="home_timeline">首頁時間軸</string>
 	<string name="my_profile">我的個人檔案</string>
 	<string name="media_viewer">媒體檢視器</string>
@@ -288,20 +243,18 @@
 	<string name="file_saved">儲存成功</string>
 	<string name="downloading">正在下載...</string>
 	<string name="no_app_to_handle_action">沒有可以處理這個動作的 app</string>
-	<string name="local_timeline">社群</string>
-	<string name="trending_posts_info_banner">這些嘟文正在您 Mastodon 的角落受到注目。</string>
-	<string name="trending_hashtags_info_banner">這些主題標籤正在您 Mastodon 的角落受到注目。</string>
-	<string name="trending_links_info_banner">這些最新消息正在您 Mastodon 的角落被分享。</string>
-	<string name="local_timeline_info_banner">這些是和您同一 Mastodon 伺服器的人們最近發的嘟文。</string>
-	<string name="dismiss">關閉</string>
+	<string name="local_timeline">本站</string>
+	<string name="trending_posts_info_banner">這些嘟文正在 Mastodon 的各個角落受到注目。</string>
+	<string name="trending_links_info_banner">這些新聞故事正在 Mastodon 上被熱烈討論著。</string>
+	<!-- %s is the server domain -->
+	<string name="local_timeline_info_banner">這些是來自您伺服器 (%s) 所有使用者之嘟文。</string>
+	<string name="recommended_accounts_info_banner">基於您所跟隨的其他人，您可能會喜歡這些帳號。</string>
 	<string name="see_new_posts">檢視最新嘟文</string>
 	<string name="load_missing_posts">讀取錯過的嘟文</string>
 	<string name="follow_back">跟隨回去</string>
 	<string name="button_follow_pending">等待中</string>
 	<string name="follows_you">已跟隨您</string>
 	<string name="manually_approves_followers">手動審核跟隨者</string>
-	<string name="current_account">目前帳號</string>
-	<string name="log_out_account">登出 %s</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<plurals name="x_followers">
 		<item quantity="other">%,d 個跟隨者</item>
@@ -317,8 +270,6 @@
 	</plurals>
 	<string name="timestamp_via_app">%1$s 透過 %2$s</string>
 	<string name="time_now">剛剛</string>
-	<string name="post_info_reblogs">轉嘟</string>
-	<string name="post_info_favorites">最愛</string>
 	<string name="edit_history">編輯記錄</string>
 	<string name="last_edit_at_x">上次編輯於 %s</string>
 	<string name="time_just_now">剛剛</string>
@@ -350,14 +301,9 @@
 	<string name="file_size_kb">%.2f KB</string>
 	<string name="file_size_mb">%.2f MB</string>
 	<string name="file_size_gb">%.2f GB</string>
-	<string name="file_upload_progress">%2$s 中的 %1$s</string>
-	<string name="file_upload_time_remaining">剩餘 %s</string>
-	<string name="upload_error_connection_lost">您的裝置失去網路連線</string>
 	<string name="upload_processing">處理中...</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_available">Mastodon for Android %s 已可供下載。</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_ready">Mastodon for Android %s 已下載完成並準備安裝。</string>
 	<!-- %s is file size -->
 	<string name="download_update">下載 (%s)</string>
 	<string name="install_update">安裝</string>
@@ -387,7 +333,7 @@
 	<string name="server_filter_region_oceania">大洋洲</string>
 	<string name="not_accepting_new_members">目前暫不開放新成員</string>
 	<string name="category_special_interests">特別興趣</string>
-	<string name="signup_passwords_dont_match">密碼不符</string>
+	<string name="signup_passwords_dont_match">密碼不一致</string>
 	<string name="pick_server_for_me">請替我選擇</string>
 	<string name="profile_add_row">新增</string>
 	<string name="profile_setup">個人檔案設定</string>
@@ -404,7 +350,6 @@
 	<string name="sending_follows">正在跟隨使用者...</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s 不允許 %2$s 之信箱註冊。請重新試試另一個電子郵件服務商，或 &lt;a&gt; 挑選另一個伺服器 &lt;/a&gt;。</string>
-	<string name="signup_username_taken">這個帳號已經被註冊過囉。</string>
 	<string name="spoiler_show">仍要顯示</string>
 	<string name="spoiler_hide">重新隱藏</string>
 	<string name="poll_multiple_choice">請選擇一個或多個</string>
@@ -424,4 +369,188 @@
 	<string name="welcome_paragraph1">Mastodon 是去中心化的社交網路，意思是沒有單一公司掌控它。它由許多獨立運行而互相連接的伺服器組成。</string>
 	<string name="what_are_servers">伺服器是什麼？</string>
 	<string name="welcome_paragraph2"><![CDATA[所有的 Mastodon 帳號皆託管於一個伺服器上 — 其擁有各自之價值觀、規則、與管理者。無論您選擇何者，您皆能跟隨並與其他任何伺服器上的人們互動。]]></string>
+	<string name="opening_link">開啟連結...</string>
+	<string name="link_not_supported">此連結不被 app 所支援</string>
+	<string name="log_out_all_accounts">登出所有帳號</string>
+	<string name="confirm_log_out_all_accounts">確定要登出所有帳號嗎？</string>
+	<string name="retry">再試一次</string>
+	<string name="post_failed">發送嘟文失敗</string>
+	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s 張圖片</string>
+	<string name="attachment_description_video">%s 段影片</string>
+	<string name="attachment_description_audio">%s 則音訊</string>
+	<string name="attachment_description_unknown">%s個檔案</string>
+	<string name="attachment_type_image">圖片</string>
+	<string name="attachment_type_video">影片</string>
+	<string name="attachment_type_audio">音訊</string>
+	<string name="attachment_type_gif">GIF</string>
+	<string name="attachment_type_unknown">檔案</string>
+	<string name="attachment_x_percent_uploaded">已上傳 %d%%</string>
+	<string name="add_poll_option">新增投票選項</string>
+	<string name="poll_length">投票時間</string>
+	<string name="poll_style">投票方式</string>
+	<string name="compose_poll_single_choice">單選</string>
+	<string name="compose_poll_multiple_choice">多選</string>
+	<string name="delete_poll_option">刪除投票選項</string>
+	<string name="poll_style_title">投票方式</string>
+	<string name="alt_text">ALT 說明文字</string>
+	<string name="help">幫助</string>
+	<string name="what_is_alt_text">什麼是 ALT 說明文字？</string>
+	<string name="alt_text_help">ALT 說明文字為視覺障礙者、低網路頻寬或尋求額外上下文語境的人們提供圖片描述。\n\n您可以透過撰寫清晰、簡潔及客觀的說明文字以替所有人改善無障礙特性與協助理解。\n\n<ul><li>掌握幾個重要元素</li>\n<li>替圖片提供文字摘要</li>\n<li>使用常規行文結構</li>\n<li>避免冗贅資訊</li>\n<li>聚焦於趨勢和複雜視覺中之關鍵（如圖表或地圖）</li></ul></string>
+	<string name="edit_post">編輯嘟文</string>
+	<string name="no_verified_link">無已驗證連結</string>
+	<string name="compose_autocomplete_emoji_empty">瀏覽 emoji</string>
+	<string name="compose_autocomplete_users_empty">尋找您想找的人</string>
+	<string name="no_search_results">無法找到符合搜尋條件之結果</string>
+	<string name="language">語言</string>
+	<string name="language_default">預設</string>
+	<string name="language_system">系統設定</string>
+	<string name="language_detecting">自動偵測語言</string>
+	<string name="language_cant_detect">無法自動偵測語言</string>
+	<string name="language_detected">已偵測</string>
+	<string name="media_hidden">隱藏的媒體內容</string>
+	<string name="post_hidden">隱藏的嘟文</string>
+	<string name="report_title_post">檢舉嘟文</string>
+	<string name="forward_report_explanation">這個帳號屬於其他伺服器。要向該伺服器發送匿名的檢舉訊息嗎？</string>
+	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">轉寄至 %s</string>
+	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">已檢舉</string>
+	<string name="report_unfollow_explanation">取消跟隨他們以不再於您的首頁時間軸見到他們的嘟文。</string>
+	<string name="muted_user">已靜音 %s</string>
+	<string name="report_sent_already_blocked">您已經封鎖此使用者，當我們審核您的檢舉時，您不需要進行任何動作。</string>
+	<string name="report_personal_already_blocked">您已經封鎖此使用者，當我們審核您的檢舉時，您不需要進行任何動作。\n\n感謝您協助將 Mastodon 成為對每個人皆安全的好所在！</string>
+	<string name="blocked_user">已封鎖 %s</string>
+	<string name="mark_all_notifications_read">全部標記為已讀取</string>
+	<string name="settings_display">顯示</string>
+	<string name="settings_filters">過濾器</string>
+	<string name="settings_server_explanation">概要、規則、管理員</string>
+	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">關於 %s</string>
+	<string name="default_post_language">預設嘟文語言</string>
+	<string name="settings_alt_text_reminders">加上 ALT 說明文字提醒</string>
+	<string name="settings_confirm_unfollow">取消跟隨某人前先詢問我</string>
+	<string name="settings_confirm_boost">轉嘟前先詢問我</string>
+	<string name="settings_confirm_delete_post">刪除嘟文前先詢問我</string>
+	<string name="pause_all_notifications">暫停全部</string>
+	<string name="pause_notifications_off">關閉</string>
+	<string name="notifications_policy_anyone">所有人</string>
+	<string name="notifications_policy_followed">跟隨您的人</string>
+	<string name="notifications_policy_follower">您跟隨的人</string>
+	<string name="notifications_policy_no_one">沒有人</string>
+	<string name="settings_notifications_policy">接受通知來自</string>
+	<string name="notification_type_mentions_and_replies">提及與回覆</string>
+	<string name="pause_all_notifications_title">暫停所有通知</string>
+	<plurals name="x_weeks">
+		<item quantity="other">%d 個禮拜</item>
+	</plurals>
+	<!-- %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 -->
+	<string name="date_at_time">%1$s 於 %2$s</string>
+	<string name="today">今天</string>
+	<string name="yesterday">昨天</string>
+	<string name="tomorrow">明天</string>
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_ends">結束於：%s</string>
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">通知將於 %s 恢復。</string>
+	<string name="resume_notifications_now">現在回復</string>
+	<string name="open_system_notification_settings">前往系統通知設定</string>
+	<string name="about_server">關於</string>
+	<string name="server_rules">規則</string>
+	<string name="server_administrator">管理員</string>
+	<string name="send_email_to_server_admin">私訊管理員</string>
+	<string name="notifications_disabled_in_system">自您的裝置啟用通知以獲取來自任何地方的新消息。</string>
+	<string name="settings_even_more">更多更多的設定</string>
+	<string name="settings_show_cws">顯示內容警告</string>
+	<string name="settings_hide_sensitive_media">隱藏標為敏感內容的媒體</string>
+	<string name="settings_show_interaction_counts">嘟文互動數</string>
+	<string name="settings_show_emoji_in_names">於顯示名稱中自訂 emoji</string>
+	<plurals name="in_x_seconds">
+		<item quantity="other">%d 秒鐘內</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="other">%d 分鐘內</item>
+	</plurals>
+	<plurals name="in_x_hours">
+		<item quantity="other">%d 小時內</item>
+	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="other">%d 小時前</item>
+	</plurals>
+	<string name="alt_text_reminder_title">媒體沒有 ALT 說明文字</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="other">您的 %s 則圖片沒有 ALT 說明文字。您仍要發嘟嗎？</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="other">您的 %s 則多媒體附加檔案沒有 ALT 說明文字。您仍要發嘟嗎？</item>
+	</plurals>
+	<string name="count_one">一</string>
+	<string name="count_two">二</string>
+	<string name="count_three">三</string>
+	<string name="count_four">四</string>
+	<string name="alt_text_reminder_post_anyway">發嘟</string>
+	<!-- %s is the username -->
+	<string name="unfollow_confirmation">取消跟隨 %s？</string>
+	<string name="filter_active">生效</string>
+	<string name="filter_inactive">已停用</string>
+	<string name="settings_add_filter">新增過濾器</string>
+	<string name="settings_edit_filter">編輯過濾器</string>
+	<string name="settings_filter_duration">持續時間</string>
+	<string name="settings_filter_muted_words">已靜音文字</string>
+	<string name="settings_filter_context">靜音於</string>
+	<string name="settings_filter_show_cw">顯示內容警告</string>
+	<string name="settings_filter_show_cw_explanation">仍要顯示匹配此過濾器之嘟文，但隱藏於內容警告後</string>
+	<string name="settings_delete_filter">刪除過濾器</string>
+	<string name="filter_duration_forever">直到永遠</string>
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">結束於：%s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="other">%d 個已靜音單字或詞彙</item>
+	</plurals>
+	<string name="selection_2_options">%1$s 與 %2$s</string>
+	<string name="selection_3_options">%1$s、%2$s 與 %3$s</string>
+	<string name="selection_4_or_more">%1$s、%2$s 與 %3$d 個更多</string>
+	<string name="filter_context_home_lists">首頁 &amp; 列表</string>
+	<string name="filter_context_notifications">通知</string>
+	<string name="filter_context_public_timelines">公開時間軸</string>
+	<string name="filter_context_threads_replies">討論串 &amp; 回嘟</string>
+	<string name="filter_context_profiles">個人檔案</string>
+	<string name="settings_filter_title">標題</string>
+	<string name="settings_delete_filter_title">刪除過濾器「%s」？</string>
+	<string name="settings_delete_filter_confirmation">此過濾器將自您帳號之所有裝置中被刪除。</string>
+	<string name="add_muted_word">新增靜音文字</string>
+	<string name="edit_muted_word">編輯靜音文字</string>
+	<string name="add">新增</string>
+	<string name="filter_word_or_phrase">單字或詞彙</string>
+	<string name="filter_add_word_help">單字不分大小寫並且僅匹配完整單字。\n\n若您過濾關鍵字「apple」，則它將隱藏所有包含「apple」或「aPpLe」之嘟文，但不包含「pineapple」。</string>
+	<string name="settings_delete_filter_word">刪除單字「%s」？</string>
+	<string name="enter_selection_mode">選擇</string>
+	<string name="select_all">選擇權不</string>
+	<string name="settings_filter_duration_title">過濾器持續時間</string>
+	<string name="filter_duration_custom">自訂</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="other">刪除 %d 個單字？</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="other">已選擇 %d 個</item>
+	</plurals>
+	<string name="required_form_field_blank">不能為空白</string>
+	<string name="filter_word_already_in_list">已經在列表中</string>
+	<string name="app_update_ready">App 更新已就緒</string>
+	<string name="app_update_version">版本：%s</string>
+	<string name="downloading_update">正在下載 (%d%%)</string>
+	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">匹配過濾器「%s」</string>
+	<string name="search_mastodon">搜尋 Mastodon</string>
+	<string name="clear_all">清除全部</string>
+	<string name="search_open_url">於 Mastodon 中開啟連結</string>
+	<string name="posts_matching_hashtag">包含「%s」之嘟文</string>
+	<string name="search_go_to_account">前往 %s</string>
+	<string name="posts_matching_string">包含「%s」之嘟文</string>
+	<string name="accounts_matching_string">包含「%s」之帳號</string>
+	<!-- Shown in the post header. Please keep it short -->
+	<string name="time_seconds_ago_short">%d 秒前</string>
+	<string name="time_minutes_ago_short">%d 分鐘前</string>
+	<string name="time_hours_ago_short">%d 小時前</string>
+	<string name="time_days_ago_short">%d 天前</string>
 </resources>

mastodon/src/main/res/values-zh-rTW/strings_sk.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="sk_notification_type_status">嘟文</string>
-    <string name="sk_notify_posts">嘟文通知</string>
+    <string name="sk_notification_type_posts">嘟文通知</string>
     <string name="sk_poll_allow_multiple">允許複選</string>
     <string name="sk_translate_post">翻譯</string>
     <string name="sk_translated_using">通過 %s 翻譯</string>
@@ -36,7 +36,7 @@
     <string name="sk_follow_requests">跟隨請求</string>
     <string name="sk_accept_follow_request">接受跟隨請求</string>
     <string name="sk_reject_follow_request">拒絕跟隨請求</string>
-    <string name="sk_disable_marquee">停用標題列的滾動文本</string>
+    <string name="sk_settings_enable_marquee">停用標題列的滾動文本</string>
     <string name="sk_settings_show_federated_timeline">顯示聯邦時間軸</string>
     <string name="sk_settings_contribute">為 Megalodon 貢獻</string>
     <string name="sk_delete_and_redraft">刪除以重新撰寫</string>