Fix some i18n mis-merges.

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index cc611f1aa24d8e4de2188d9bb36bb5d29f967ccd..afba86a42ee853bb9b8ac3c5e1902db4d1aa7f24 100644 (file)
--- 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 2ff1808d03c3f97fe2fa5805d5eaa87d19806578..43e1967650715eebe5921f134ea8dca8db371813 100644 (file)
--- 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"