From 38b97532ecef1b2200a5d987ff3c2deac1362b1f Mon Sep 17 00:00:00 2001
From: yanleiberg <yanleiberg@gmail.com>
Date: Mon, 1 Jul 2024 07:20:31 -0400
Subject: [PATCH] Fix #2866: Objective not displayed correctly in Chinese and
 Japanese
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- wrong MONTHYEAR in the goal description for zh-CN
- remove {NEWLINE} for better layout
- add "底" （meaning "the end of" a month) to STR_2386 and STR_2387 to avoid confusions meaning.
- wrong MONTHYEAR in the goal description for zh-TW
- wrong MONTHYEAR in the goal description for ja-JP
---
 data/language/ja-JP.txt | 2 +-
 data/language/zh-CN.txt | 4 ++--
 data/language/zh-TW.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/language/ja-JP.txt b/data/language/ja-JP.txt
index 3e96de37eb..aee1921927 100644
--- a/data/language/ja-JP.txt
+++ b/data/language/ja-JP.txt
@@ -1729,7 +1729,7 @@ STR_2382    :地形
 STR_2383    :水
 STR_2384    :{WINDOW_COLOUR_2}あなたの目標:
 STR_2385    :{BLACK}なし
-STR_2386    :{BLACK}{POP16}{MONTHYEAR}の終わりに、 パークの内に{PUSH16}{PUSH16}{COMMA32}以上人の来客し、600以上のパーク評価値を取得する必要があります。
+STR_2386    :{BLACK}{POP16}{POP16}{MONTHYEAR}の終わりに、 パークの内に{PUSH16}{PUSH16}{PUSH16}{COMMA32}以上人の来客し、600以上のパーク評価値を取得する必要があります。
 STR_2387    :{BLACK}{POP16}{MONTHYEAR}の終わりに、 {CURRENCY}以上のパーク評価額を取得する必要があります。
 STR_2388    :{BLACK}楽しんで下さい！
 STR_2389    :{BLACK}最高の{STRINGID}を建設してください！
diff --git a/data/language/zh-CN.txt b/data/language/zh-CN.txt
index 0e9f0cff6a..7e53e8eda2 100644
--- a/data/language/zh-CN.txt
+++ b/data/language/zh-CN.txt
@@ -1739,8 +1739,8 @@ STR_2382    :土地
 STR_2383    :水面
 STR_2384    :{WINDOW_COLOUR_2}你的目标：
 STR_2385    :{BLACK}无
-STR_2386    :{BLACK}截止{POP16}{MONTHYEAR}，园区内至少有{NEWLINE}{PUSH16}{PUSH16}{COMMA32}游客，并且游乐园评分不低于600
-STR_2387    :{BLACK}截止{POP16}{MONTHYEAR}，游乐园价值不低于{CURRENCY}
+STR_2386    :{BLACK}截止{POP16}{POP16}{MONTHYEAR}底，园区内至少有{PUSH16}{PUSH16}{PUSH16}{COMMA32}游客，并且游乐园评分不低于600
+STR_2387    :{BLACK}截止{POP16}{MONTHYEAR}底，游乐园价值不低于{CURRENCY}
 STR_2388    :{BLACK}尽情地玩！
 STR_2389    :{BLACK}建造你的最佳{STRINGID}吧！
 STR_2390    :{BLACK}在你的游乐园中运营10种类型的过山车，并且每一个的兴奋度不低于6.00
diff --git a/data/language/zh-TW.txt b/data/language/zh-TW.txt
index 84c65a9cfc..269af446af 100644
--- a/data/language/zh-TW.txt
+++ b/data/language/zh-TW.txt
@@ -1741,7 +1741,7 @@ STR_2382    :土地
 STR_2383    :水塘
 STR_2384    :{WINDOW_COLOUR_2}你的目標:
 STR_2385    :{BLACK}無
-STR_2386    :{BLACK}在{POP16}{MONTHYEAR}尾之前, 樂園裡至少有{PUSH16}{PUSH16}{COMMA32}個遊客, 而且樂園評價並不低於600
+STR_2386    :{BLACK}在{POP16}{POP16}{MONTHYEAR}尾之前, 樂園裡至少有{PUSH16}{PUSH16}{PUSH16}{COMMA32}個遊客, 而且樂園評價並不低於600
 STR_2387    :{BLACK}在{POP16}{MONTHYEAR}尾之前, 樂園價值必需達到{CURRENCY}
 STR_2388    :{BLACK}盡情玩吧!
 STR_2389    :{BLACK}建造你的最佳{STRINGID}吧!