Fix conflicts

Author: daveearley

frontend/src/locales/zh-hk.js

@@ -34,7 +34,7 @@ msgstr "There's nothing to show yet"
 #~ "\"\"密碼的説明。\"\""
 
 #: src/components/common/ReportTable/index.tsx:303
-#: src/locales.ts:61
+#: src/locales.ts:66
 msgid "{0}"
 msgstr ""
 
@@ -865,7 +865,7 @@ msgstr "賬單設置"
 msgid "Brand Control"
 msgstr "品牌控制"
 
-#: src/components/common/LanguageSwitcher/index.tsx:24
+#: src/components/common/LanguageSwitcher/index.tsx:26
 msgid "Brazilian Portuguese"
 msgstr "巴西葡萄牙語"
 
@@ -1081,13 +1081,13 @@ msgstr "結賬設置"
 #~ msgid "Chinese"
 #~ msgstr "中文"
 
-#: src/components/common/LanguageSwitcher/index.tsx:26
+#: src/components/common/LanguageSwitcher/index.tsx:28
 msgid "Chinese (Simplified)"
 msgstr "簡體中文"
 
-#: src/components/common/LanguageSwitcher/index.tsx:28
-#~ msgid "Chinese (Traditional)"
-#~ msgstr "繁體中文"
+#: src/components/common/LanguageSwitcher/index.tsx:30
+msgid "Chinese (Traditional)"
+msgstr "繁體中文"
 
 #: src/components/routes/event/HomepageDesigner/index.tsx:133
 msgid "Choose a color for your background"
@@ -1801,6 +1801,10 @@ msgstr "複製設置"
 msgid "Duplicate Webhooks"
 msgstr "複製 Webhooks"
 
+#: src/components/common/LanguageSwitcher/index.tsx:22
+msgid "Dutch"
+msgstr ""
+
 #: src/components/forms/ProductForm/index.tsx:78
 msgid "Early bird"
 msgstr "早起的鳥兒"
@@ -2013,7 +2017,7 @@ msgid "Ended Events"
 msgstr "已結束的活動"
 
 #: src/components/common/LanguageSwitcher/index.tsx:16
-#: src/components/common/LanguageSwitcher/index.tsx:44
+#: src/components/common/LanguageSwitcher/index.tsx:48
 #: src/components/modals/CreateAttendeeModal/index.tsx:145
 #: src/components/routes/profile/ManageProfile/index.tsx:173
 msgid "English"
@@ -2572,7 +2576,7 @@ msgstr "客户有多少分鐘來完成訂單。我們建議至少 15 分鐘"
 msgid "How many times can this code be used?"
 msgstr "這個代碼可以使用多少次？"
 
-#: src/components/common/Editor/index.tsx:71
+#: src/components/common/Editor/index.tsx:75
 msgid "HTML character limit exceeded: {htmlLength}/{maxLength}"
 msgstr "HTML字符限制已超出：{htmlLength}/{maxLength}"
 
@@ -3837,7 +3841,7 @@ msgstr "請稍候，我們正在準備您的發票..."
 msgid "Please wait while we prepare your orders for export..."
 msgstr "請稍候，我們正在準備導出您的訂單..."
 
-#: src/components/common/LanguageSwitcher/index.tsx:22
+#: src/components/common/LanguageSwitcher/index.tsx:24
 msgid "Portuguese"
 msgstr "葡萄牙語"
 
@@ -5568,7 +5572,7 @@ msgstr "增值税"
 msgid "Venue Name"
 msgstr "地點名稱"
 
-#: src/components/common/LanguageSwitcher/index.tsx:28
+#: src/components/common/LanguageSwitcher/index.tsx:32
 msgid "Vietnamese"
 msgstr "越南語"