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-ko-rKR/strings.xml

@@ -1,25 +1,14 @@
 <?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>
 	<string name="error">오류</string>
-	<string name="not_a_mastodon_instance">%s는 마스토돈 서버인 것 같지 않습니다.</string>
 	<string name="ok">확인</string>
 	<string name="preparing_auth">인증 준비 중…</string>
 	<string name="finishing_auth">인증을 끝마치는 중…</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="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="share_toot_title">공유</string>
 	<string name="settings">설정</string>
 	<string name="publish">게시</string>
@@ -32,9 +21,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>
@@ -42,8 +28,6 @@
 	<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="mute_user">%s 뮤트</string>
 	<string name="unmute_user">%s 뮤트 해제</string>
 	<string name="block_user">%s 차단</string>
@@ -71,7 +55,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>
@@ -84,9 +67,6 @@
 	<plurals name="x_days_left">
 		<item quantity="other">%d일 남았습니다</item>
 	</plurals>
-	<plurals name="x_voters">
-		<item quantity="other">%,d명의 투표자</item>
-	</plurals>
 	<string name="poll_closed">마감됨</string>
 	<string name="confirm_mute_title">계정 뮤트</string>
 	<string name="confirm_mute">%s 뮤트 확인</string>
@@ -102,42 +82,29 @@
 	<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>
 	<string name="deleting">삭제 중…</string>
 	<string name="notification_channel_audio_player">오디오 재생</string>
 	<string name="play">재생</string>
 	<string name="pause">일시정지</string>
-	<string name="log_out">로그아웃</string>
 	<string name="add_account">계정 추가</string>
 	<string name="search_hint">검색</string>
 	<string name="hashtags">해시태그</string>
 	<string name="news">소식</string>
 	<string name="for_you">추천</string>
-	<string name="all_notifications">모두</string>
 	<string name="mentions">멘션</string>
 	<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_subtitle">가장 알맞은 것을 선택하세요</string>
-	<string name="report_reason_personal">마음에 안 듭니다</string>
 	<string name="report_reason_personal_subtitle">내가 보기 싫은 종류에 속합니다</string>
-	<string name="report_reason_spam">스팸입니다</string>
 	<string name="report_reason_spam_subtitle">악성 링크, 반응 스팸, 또는 반복적인 답장</string>
 	<string name="report_reason_violation">서버 규칙을 위반합니다</string>
 	<string name="report_reason_violation_subtitle">특정 규칙을 위반합니다</string>
-	<string name="report_reason_other">기타</string>
 	<string name="report_reason_other_subtitle">이슈가 다른 분류에 속하지 않습니다</string>
 	<string name="report_choose_rule">어떤 규칙을 위반했나요?</string>
 	<string name="report_choose_rule_subtitle">해당하는 사항을 모두 선택하세요</string>
@@ -146,21 +113,13 @@
 	<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="unfollow_user">%s 팔로우 해제</string>
 	<string name="unfollow">팔로우 해제</string>
-	<string name="block_user_explain">상대방은 나를 팔로우 하거나 내 게시물을 볼 수 없게 됩니다, 하지만 내가 차단한 사실은 알 수 있습니다.</string>
-	<string name="report_personal_title">이런 것을 보지 않길 원하나요?</string>
-	<string name="report_personal_subtitle">마스토돈에서 보기 싫은 것을 보았다면, 해당하는 사람을 지울 수 있습니다.</string>
 	<string name="back">뒤로 가기</string>
-	<string name="instance_catalog_title">마스토돈은 여러 다른 서버에 존재하는 사용자들로 이루어져 있습니다.</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>
@@ -182,27 +141,14 @@
 	<string name="category_tech">기술</string>
 	<string name="confirm_email_title">받은 편지함을 확인하세요</string>
 	<!-- %s is the email address -->
-	<string name="confirm_email_subtitle">%s에 인증하기 위해 우리가 보낸 링크를 누르세요. 여기서 기다리겠습니다.</string>
-	<string name="confirm_email_didnt_get">링크를 못 받으셨나요?</string>
 	<string name="resend">재전송</string>
 	<string name="open_email_app">이메일 앱 열기</string>
 	<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">%2$d개 중 %1$d번째 단계</string>
 	<string name="skip">건너뛰기</string>
 	<string name="notification_type_follow">새 팔로워</string>
 	<string name="notification_type_favorite">좋아함</string>
@@ -210,45 +156,21 @@
 	<string name="notification_type_poll">투표</string>
 	<string name="choose_account">계정 선택</string>
 	<string name="err_not_logged_in">먼저 마스토돈에 로그인해야 합니다</string>
-	<plurals name="cant_add_more_than_x_attachments">
-		<item quantity="other">%d개의 미디어를 초과해서 첨부할 수 없습니다</item>
-	</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="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_mention">나를 멘션함</string>
-	<string name="settings_boring">지루한 영역</string>
-	<string name="settings_account">계정 설정</string>
 	<string name="settings_contribute">마스토돈에 기여</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">안드로이드용 마스토돈 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="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_favorite">좋아요</string>
@@ -257,13 +179,11 @@
 	<string name="add_media">미디어 추가</string>
 	<string name="add_poll">투표 추가</string>
 	<string name="emoji">에모지</string>
-	<string name="post_visibility">게시물 공개 범위</string>
 	<string name="home_timeline">홈 타임라인</string>
 	<string name="my_profile">내 프로필</string>
 	<string name="media_viewer">미디어 뷰어</string>
 	<string name="follow_user">%s 팔로우</string>
 	<string name="unfollowed_user">%s 님을 팔로우 해제했습니다</string>
-	<string name="followed_user">이제 %s 님을 팔로우 합니다</string>
 	<string name="open_in_browser">브라우저에서 열기</string>
 	<string name="signup_reason">가입하려는 이유가 무엇인가요?</string>
 	<string name="signup_reason_note">이 정보는 우리가 심사를 하는 데에 참고할 수 있습니다.</string>
@@ -278,21 +198,13 @@
 	<string name="error_saving_file">파일 저장 오류</string>
 	<string name="file_saved">파일 저장됨</string>
 	<string name="downloading">다운로드 중…</string>
-	<string name="no_app_to_handle_action">이 동작을 처리할 앱이 없습니다</string>
-	<string name="local_timeline">커뮤니티</string>
-	<string name="trending_posts_info_banner">당신이 속한 마스토돈 서버에서 관심을 끌고 있는 게시물들입니다.</string>
-	<string name="trending_hashtags_info_banner">당신이 속한 마스토돈 서버에서 관심을 끌고 있는 해시태그들입니다.</string>
-	<string name="trending_links_info_banner">당신이 속한 마스토돈 서버에서 가장 많이 공유되고 있는 소식들입니다.</string>
-	<string name="local_timeline_info_banner">당신과 같은 마스토돈 서버에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
-	<string name="dismiss">지우기</string>
+	<!-- %s is the server domain -->
 	<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>
@@ -305,7 +217,6 @@
 	</plurals>
 	<string name="timestamp_via_app">%1$s에 %2$s에서</string>
 	<string name="time_now">방금</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>
@@ -337,14 +248,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">%1$s / %2$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">안드로이드용 마스토돈 %s 버전을 다운로드할 수 있습니다.</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_ready">안드로이드용 마스토돈 %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
 	<!-- %s is file size -->
 	<string name="download_update">다운로드 (%s)</string>
 	<string name="install_update">설치</string>
@@ -361,7 +267,6 @@
 	<string name="login_title">돌아오신 것을 환영합니다</string>
 	<string name="login_subtitle">계정을 생성한 서버에 로그인하세요.</string>
 	<string name="server_url">서버 URL</string>
-	<string name="signup_random_server_explain">아무 것도 고르지 않은 경우, 당신의 언어에 따라 서버를 골라드립니다.</string>
 	<string name="server_filter_any_language">모든 언어</string>
 	<string name="server_filter_instant_signup">즉시 가입</string>
 	<string name="server_filter_manual_review">수동 리뷰</string>
@@ -374,16 +279,25 @@
 	<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="pick_server_for_me">나를 위한 추천</string>
 	<string name="profile_add_row">열 추가</string>
 	<string name="profile_setup">프로필 설정</string>
 	<string name="profile_setup_subtitle">나중에 언제든지 프로필 탭에서 완성할 수 있습니다.</string>
 	<string name="follow_all">모두 팔로우</string>
 	<string name="server_rules_disagree">동의 안 함</string>
-	<string name="privacy_policy_explanation">요약: 우리는 어떤 정보도 수집하거나 처리하지 않습니다.</string>
 	<!-- %s is server domain -->
 	<string name="server_policy_disagree">%s에 대해 비동의</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<!-- %s is formatted file size ("467 KB image") -->
+	<!-- %s is the server domain -->
+	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<!-- %s is the username -->
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<!-- Shown like a content warning, %s is the name of the filter -->
+	<!-- Shown in the post header. Please keep it short -->
 </resources>

mastodon/src/main/res/values-ko-rKR/strings_sk.xml

@@ -31,14 +31,14 @@
     <string name="sk_reject_follow_request">팔로우 요청 거부</string>
     <string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
     <string name="sk_settings_always_reveal_content_warnings">열람주의 게시물을 항상 펼치기</string>
-    <string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
+    <string name="sk_settings_enable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
     <string name="sk_app_name">Megalodon</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_update_available">Megalodon %s 버전을 다운로드할 수 있습니다.</string>
     <string name="sk_update_ready">Megalodon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
     <string name="sk_settings_show_federated_timeline">연합 타임라인 표시</string>
     <string name="sk_notification_type_status">게시물</string>
-    <string name="sk_notify_posts">게시물 알림</string>
+    <string name="sk_notification_type_posts">게시물 알림</string>
     <string name="sk_settings_color_palette">테마 색상</string>
     <string name="sk_color_palette_pink">분홍색</string>
     <string name="sk_color_palette_purple">보라색</string>
@@ -70,7 +70,7 @@
     <string name="sk_settings_donate">기부</string>
     <string name="sk_delete_notification_confirm_action">알림 삭제</string>
     <string name="sk_delete_notification_confirm">정말로 이 알림을 삭제하시겠습니까\?</string>
-    <string name="sk_enable_delete_notifications">알림 삭제 활성화</string>
+    <string name="sk_settings_enable_delete_notifications">알림 삭제 활성화</string>
     <string name="sk_settings_publish_button_text">게시 버튼 텍스트</string>
     <string name="sk_settings_publish_button_text_title">게시 버튼 사용자화</string>
     <string name="sk_settings_translate_only_opened">열린 게시물만 번역하기</string>
@@ -79,7 +79,7 @@
     <string name="sk_settings_translation_availability_note_unavailable">%s 인스턴스는 번역을 지원하지 않는 것 같습니다.</string>
     <string name="sk_clear_all_notifications_confirm">정말로 모든 알림을 삭제하시겠습니까\?</string>
     <string name="sk_clear_all_notifications_confirm_action">모두 삭제</string>
-    <string name="sk_tabs_disable_swipe">스와이프로 탭간 전환 비활성화</string>
+    <string name="sk_settings_tabs_disable_swipe">스와이프로 탭간 전환 비활성화</string>
     <string name="sk_clear_all_notifications">모든 알림 삭제</string>
     <string name="sk_loading_fediverse_resource_title">연합우주에서 찾아오는 중</string>
     <string name="sk_bookmark_as">다른 계정으로 보관</string>