From c4b76ea025e0d6430023bf42d115e6fb86e61a55 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 15 Feb 2017 00:19:32 +0000
Subject: [PATCH] Fix some i18n mis-merges.

---
 src/tools/po/zh_CN.po | 2 +-
 src/wx/po/zh_CN.po    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index cc611f1aa..afba86a42 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -231,7 +231,7 @@ msgstr "查看编码服务器..."
 #: src/tools/dcpomatic_kdm.cc:276
 #, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
-msgstr "目录 %1 已经存在且不为空。确定要使用它？"
+msgstr "目录 %s 已经存在且不为空。确定要使用它？"
 
 #. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
 #. / project (Film) has been changed since it was last saved.
diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 2ff1808d0..43e196765 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -721,9 +721,8 @@ msgid "Fade out time"
 msgstr "淡出时间"
 
 #: src/wx/kdm_dialog.cc:132
-#, fuzzy, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
-msgstr "已存在同名模板，是否覆盖？"
+msgstr ""
 
 #: src/wx/kdm_output_panel.cc:51
 msgid "Filename format"
-- 
2.30.2