From 548abe8d906f55717ba8dfee550042fdcf66ca81 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Nov 2024 07:29:19 +0100
Subject: [PATCH 1/3] New translations strings.xml (Vietnamese)

---
 .../src/main/res/values-vi-rVN/strings.xml    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/mastodon/src/main/res/values-vi-rVN/strings.xml b/mastodon/src/main/res/values-vi-rVN/strings.xml
index 1ecccc4a..f546ce61 100644
--- a/mastodon/src/main/res/values-vi-rVN/strings.xml
+++ b/mastodon/src/main/res/values-vi-rVN/strings.xml
@@ -284,6 +284,7 @@
 	<string name="add_bookmark">Lưu</string>
 	<string name="remove_bookmark">Bỏ lưu</string>
 	<string name="bookmarks">Những tút đã lưu</string>
+	<string name="your_favorites">Những tút đã thích</string>
 	<string name="login_title">Chào mừng trở lại</string>
 	<string name="login_subtitle">Đăng nhập với máy chủ nơi bạn tạo tài khoản.</string>
 	<string name="server_url">URL Máy chủ</string>
@@ -762,10 +763,43 @@ Bạn càng theo dõi nhiều người thì nó sẽ càng sôi động và thú
 	<string name="avatar_move_and_scale">Kéo và thu phóng</string>
 	<string name="confirm_avatar_crop">Chọn</string>
 	<string name="settings_use_dynamic_colors">Giống hệ thống</string>
+	<string name="settings_accounts">Tài khoản</string>
+	<string name="settings_add_account">Thêm tài khoản...</string>
+	<string name="settings_app_settings">Cài đặt ứng dụng</string>
+	<string name="account_settings">Cài đặt tài khoản</string>
+	<string name="settings_about_this_server">Về máy chủ này</string>
+	<string name="manage_account">Quản lý tài khoản</string>
+	<string name="switch_to_this_account">Chuyển sang tài khoản này</string>
+	<string name="delete_account">Xóa tài khoản</string>
+	<string name="notification_type_status">Những tút mới</string>
 	<plurals name="user_and_x_more_followed">
 		<item quantity="other">%1$s và %2$,d người khác đã theo dõi bạn</item>
 	</plurals>
+	<string name="familiar_followers_one">Theo dõi bởi %s</string>
+	<string name="familiar_followers_two">Theo dõi bởi %s và %s</string>
+	<string name="profile_saved_posts">Những tút đã lưu</string>
+	<string name="profile_saved_posts_explanation">Những tút bạn lưu chỉ hiển thị với bạn.</string>
+	<string name="search_people">Người</string>
+	<plurals name="familiar_followers_many">
+		<item quantity="other">Theo dõi bởi %1$s, %2$s, và %3$,d người khác</item>
+	</plurals>
+	<plurals name="x_followers_you_know">
+		<item quantity="other">%,d người theo dõi bạn biết</item>
+	</plurals>
 	<!-- appears when you're about to block a server -->
+	<plurals name="server_x_followers_will_be_removed">
+		<item quantity="other">%,d người theo dõi bạn ở máy chủ này sẽ bị xóa.</item>
+	</plurals>
 	<!-- The complete string will look like "You will lose X followers and Y people you follow". See will_lose_x_followers and will_lose_x_following -->
+	<string name="server_x_followers_and_following_will_be_removed">Bạn sẽ mất %1$s và %2$s.</string>
+	<plurals name="will_lose_x_followers">
+		<item quantity="other">%,d người theo dõi</item>
+	</plurals>
+	<plurals name="will_lose_x_following">
+		<item quantity="other">%,d người bạn theo dõi</item>
+	</plurals>
 	<!-- The complete string will look like "You will lose X people you follow". See will_lose_x_following -->
+	<string name="server_x_following_will_be_removed">Bạn sẽ mất %s.</string>
+	<string name="load_missing_posts_above">Tải tút chưa đọc ở trên</string>
+	<string name="load_missing_posts_below">Tải tút chưa đọc ở dưới</string>
 </resources>

From 5be9ae7ccebcd1fa729945515aca6831fd02c2eb Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Nov 2024 17:52:47 +0100
Subject: [PATCH 2/3] New translations strings.xml (Japanese)

---
 mastodon/src/main/res/values-ja-rJP/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mastodon/src/main/res/values-ja-rJP/strings.xml b/mastodon/src/main/res/values-ja-rJP/strings.xml
index 50232dd2..e22a5736 100644
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -284,6 +284,7 @@
 	<string name="add_bookmark">ブックマーク</string>
 	<string name="remove_bookmark">ブックマークから削除</string>
 	<string name="bookmarks">ブックマーク</string>
+	<string name="your_favorites">お気に入り</string>
 	<string name="login_title">お帰りなさい</string>
 	<string name="login_subtitle">アカウントがあるサーバーの URL を入力してください。</string>
 	<string name="server_url">サーバーの URL</string>
@@ -758,6 +759,13 @@
 	<string name="moderation_warning_action_silence">あなたのアカウントは制限されています。</string>
 	<string name="moderation_warning_action_suspend">あなたのアカウントは停止されています。</string>
 	<string name="moderation_warning_learn_more">詳細</string>
+	<string name="text_show_more">もっと見る</string>
+	<string name="avatar_move_and_scale">移動と拡大/縮小</string>
+	<string name="confirm_avatar_crop">選択</string>
+	<string name="settings_accounts">アカウント</string>
+	<string name="settings_add_account">アカウントを追加...</string>
+	<string name="settings_app_settings">アプリ設定</string>
+	<string name="account_settings">アカウント設定</string>
 	<!-- appears when you're about to block a server -->
 	<!-- The complete string will look like "You will lose X followers and Y people you follow". See will_lose_x_followers and will_lose_x_following -->
 	<!-- The complete string will look like "You will lose X people you follow". See will_lose_x_following -->

From af1ae2fa0164124bcc86068071463d5ffb6735ab Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Nov 2024 19:08:14 +0100
Subject: [PATCH 3/3] New translations strings.xml (Japanese)

---
 .../src/main/res/values-ja-rJP/strings.xml    | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-ja-rJP/strings.xml b/mastodon/src/main/res/values-ja-rJP/strings.xml
index e22a5736..d960e210 100644
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -166,7 +166,7 @@
 	<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_auto">端末のテーマ</string>
 	<string name="theme_light">ライト</string>
 	<string name="theme_dark">ダーク</string>
 	<string name="settings_behavior">動作</string>
@@ -183,7 +183,7 @@
 	<string name="sensitive_content_explain">投稿者が閲覧注意に設定しました。</string>
 	<string name="avatar_description">%s さんのプロフィールを見る</string>
 	<string name="more_options">その他のオプション</string>
-	<string name="new_post">新しい投稿</string>
+	<string name="new_post">新規投稿</string>
 	<string name="button_reply">返信</string>
 	<string name="button_reblog">ブースト</string>
 	<string name="button_favorite">お気に入り</string>
@@ -221,7 +221,7 @@
 	<!-- %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="see_new_posts">新着投稿</string>
 	<string name="follow_back">フォローバック</string>
 	<string name="button_follow_pending">保留</string>
 	<string name="follows_you">フォローされています</string>
@@ -762,11 +762,44 @@
 	<string name="text_show_more">もっと見る</string>
 	<string name="avatar_move_and_scale">移動と拡大/縮小</string>
 	<string name="confirm_avatar_crop">選択</string>
+	<string name="settings_use_dynamic_colors">Dynamic color を使用する</string>
 	<string name="settings_accounts">アカウント</string>
 	<string name="settings_add_account">アカウントを追加...</string>
 	<string name="settings_app_settings">アプリ設定</string>
 	<string name="account_settings">アカウント設定</string>
+	<string name="settings_about_this_server">このサーバーについて</string>
+	<string name="manage_account">アカウント管理</string>
+	<string name="switch_to_this_account">このアカウントに切り替える</string>
+	<string name="delete_account">アカウントを削除する</string>
+	<string name="notification_type_status">新着投稿</string>
+	<plurals name="user_and_x_more_followed">
+		<item quantity="other">%1$s さん他 %2$,d 人にフォローされています</item>
+	</plurals>
+	<string name="familiar_followers_one">%s さんにフォローされています</string>
+	<string name="familiar_followers_two">%s さんと %s さんにフォローされています</string>
+	<string name="profile_saved_posts">保存した投稿</string>
+	<string name="profile_saved_posts_explanation">保存した投稿はあなたのみ閲覧できます。</string>
+	<string name="search_people">人々</string>
+	<plurals name="familiar_followers_many">
+		<item quantity="other">%1$s さん、%2$s さん他 %3$,d 人にフォローされています</item>
+	</plurals>
+	<plurals name="x_followers_you_know">
+		<item quantity="other">あなたの知り合い %,d 人のフォロワー</item>
+	</plurals>
 	<!-- appears when you're about to block a server -->
+	<plurals name="server_x_followers_will_be_removed">
+		<item quantity="other">このサーバーの %,d 人のフォロワーが削除されます。</item>
+	</plurals>
 	<!-- The complete string will look like "You will lose X followers and Y people you follow". See will_lose_x_followers and will_lose_x_following -->
+	<string name="server_x_followers_and_following_will_be_removed">%1$sと%2$sがいなくなります。</string>
+	<plurals name="will_lose_x_followers">
+		<item quantity="other">フォロワー %,d 人</item>
+	</plurals>
+	<plurals name="will_lose_x_following">
+		<item quantity="other">フォローしている %,d 人</item>
+	</plurals>
 	<!-- The complete string will look like "You will lose X people you follow". See will_lose_x_following -->
+	<string name="server_x_following_will_be_removed">%sがいなくなります。</string>
+	<string name="load_missing_posts_above">上の不足している投稿を読み込む</string>
+	<string name="load_missing_posts_below">下の不足している投稿を読み込む</string>
 </resources>