merge conflict solved.

StevenHsuYL · StevenHsuYL · commit 2dbe94e20180 · 2021-07-05T21:40:43.000+08:00
with minor revision.
diff --git a/tutorial/whatnow.po b/tutorial/whatnow.po
@@ -4,12 +4,13 @@
 #
 # Translators:
 # Steven Hsu <hsuhaochun@gmail.com>, 2021
+# meowmeowcat <meowmeowcat1211@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.9\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-20 18:08+0800\n"
-"PO-Revision-Date: 2021-06-28 14:21+0800\n"
+"PO-Revision-Date: 2021-07-05 21:37+0800\n"
 "Last-Translator: meowmeowcat <meowmeowcat1211@gmail.com>\n"
 "Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
 "tw)\n"
@@ -174,5 +175,5 @@ msgid ""
 "\"Cheese Shop\" is a Monty Python's sketch: a customer enters a cheese shop, "
 "but whatever cheese he asks for, the clerk says it's missing."
 msgstr ""
-"「Cheese Shop」是 Monty Python 的一個短劇：一位顧客進入一家起司店，但無論他要"
-"哪種起司，店員都說沒有貨。"
+"「Cheese Shop（起司店）」是 Monty Python 的一個短劇：一位顧客進入一家起司店，"
+"但無論他要哪種起司，店員都說沒有貨。"
