pot/merge.

15 files changed, 87 insertions, 73 deletions

diff --git a/src/tools/po/cs_CZ.po b/src/tools/po/cs_CZ.po
index 104594b16..2db7b75eb 100644
--- a/src/tools/po/cs_CZ.po
+++ b/src/tools/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-02-03 10:14+0100\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"
diff --git a/src/tools/po/da_DK.po b/src/tools/po/da_DK.po
index 71b806d56..51dad36f2 100644
--- a/src/tools/po/da_DK.po
+++ b/src/tools/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2015-10-27 17:25+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 987e49823..41c76a719 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-03-12 03:44+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index f92b5e101..a95bb1436 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-02-09 01:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index e20608b83..a10183614 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-02-29 18:29+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 3920506b6..7d430aae8 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-03-10 11:13+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 92308233d..8df795d5b 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2015-12-15 20:07+0100\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
diff --git a/src/tools/po/pl_PL.po b/src/tools/po/pl_PL.po
index eb1f90a41..075c199d1 100644
--- a/src/tools/po/pl_PL.po
+++ b/src/tools/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2015-10-10 19:01+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/src/tools/po/pt_BR.po b/src/tools/po/pt_BR.po
index c42068cc0..3fbf0d387 100644
--- a/src/tools/po/pt_BR.po
+++ b/src/tools/po/pt_BR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-16 19:54+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-03-17 10:39-0300\n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: \n"
-"Language-Team: \n"
 "X-Generator: Poedit 1.8.7\n"
 
 #: src/tools/dcpomatic.cc:346
diff --git a/src/tools/po/pt_PT.po b/src/tools/po/pt_PT.po
index 1e64ad173..4a6d76784 100644
--- a/src/tools/po/pt_PT.po
+++ b/src/tools/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic PORTUGUESE (Portugal)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-03-19 13:01+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index a4506ef08..698f460c9 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-03-02 09:26+0200\n"
 "Last-Translator: Igor V <iva_co@ukr.net>\n"
 "Language-Team: Russian\n"
diff --git a/src/tools/po/sk_SK.po b/src/tools/po/sk_SK.po
index 5585fc6ba..1c1fe1355 100644
--- a/src/tools/po/sk_SK.po
+++ b/src/tools/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-01-06 00:23+0100\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index cf46ac013..b6b3f694a 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2015-11-11 17:13+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/uk_UA.po b/src/tools/po/uk_UA.po
index c816cc78b..2e4efd70e 100644
--- a/src/tools/po/uk_UA.po
+++ b/src/tools/po/uk_UA.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-07 11:02+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2016-03-02 09:26+0200\n"
 "Last-Translator: Igor V <iva_co@ukr.net>\n"
 "Language-Team: Ukrainian\n"
diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index 72e4b4ab6..0ff96f333 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-02 23:12+0000\n"
+"POT-Creation-Date: 2016-03-21 16:13+0000\n"
 "PO-Revision-Date: 2015-12-24 15:16+0800\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Rov <lojy2009@qq.com>\n"
@@ -19,79 +19,80 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/tools/dcpomatic.cc:334
+#: src/tools/dcpomatic.cc:346
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1文件已存在！"
 
-#: src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic_batch.cc:59
 msgid "&Add Film..."
 msgstr "&添加工程"
 
-#: src/tools/dcpomatic.cc:735
+#: src/tools/dcpomatic.cc:828
 msgid "&Content"
 msgstr "&内容"
 
-#: src/tools/dcpomatic.cc:733
+#: src/tools/dcpomatic.cc:826 src/tools/dcpomatic_batch.cc:81
 msgid "&Edit"
 msgstr "&编辑"
 
-#: src/tools/dcpomatic.cc:693
+#: src/tools/dcpomatic.cc:784 src/tools/dcpomatic_batch.cc:61
 msgid "&Exit"
 msgstr "&退出"
 
-#: src/tools/dcpomatic.cc:731 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:824 src/tools/dcpomatic_batch.cc:79
 msgid "&File"
 msgstr "&文件"
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:831 src/tools/dcpomatic_batch.cc:84
 msgid "&Help"
 msgstr "&帮助"
 
-#: src/tools/dcpomatic.cc:736
+#: src/tools/dcpomatic.cc:829
 msgid "&Jobs"
 msgstr "&创建"
 
-#: src/tools/dcpomatic.cc:710
+#: src/tools/dcpomatic.cc:801
 msgid "&Make DCP\tCtrl-M"
 msgstr "&创建DCP\tCtrl+M"
 
-#: src/tools/dcpomatic.cc:682
+#: src/tools/dcpomatic.cc:773
 msgid "&Open...\tCtrl-O"
 msgstr "&打开...\tCtrl+O"
 
-#: src/tools/dcpomatic.cc:699 src/tools/dcpomatic.cc:702
+#: src/tools/dcpomatic.cc:790 src/tools/dcpomatic.cc:793
+#: src/tools/dcpomatic_batch.cc:67 src/tools/dcpomatic_batch.cc:70
 msgid "&Preferences...\tCtrl-P"
 msgstr "&设置....\tCtrl+P"
 
-#: src/tools/dcpomatic.cc:695 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:786 src/tools/dcpomatic_batch.cc:63
 msgid "&Quit"
 msgstr "&退出"
 
-#: src/tools/dcpomatic.cc:684
+#: src/tools/dcpomatic.cc:775
 msgid "&Save\tCtrl-S"
 msgstr "&保存\tCtrl+S"
 
-#: src/tools/dcpomatic.cc:712
+#: src/tools/dcpomatic.cc:805
 msgid "&Send DCP to TMS"
 msgstr "&发送DCP到TMS"
 
-#: src/tools/dcpomatic.cc:737
+#: src/tools/dcpomatic.cc:830 src/tools/dcpomatic_batch.cc:83
 msgid "&Tools"
 msgstr "&工具"
 
-#: src/tools/dcpomatic.cc:727 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:820 src/tools/dcpomatic_batch.cc:77
 msgid "About"
 msgstr "关于"
 
-#: src/tools/dcpomatic.cc:725
+#: src/tools/dcpomatic.cc:818
 msgid "About DCP-o-matic"
 msgstr "关于DCP-o-matic"
 
-#: src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic_batch.cc:115
 msgid "Add Film..."
 msgstr "添加工程"
 
-#: src/tools/dcpomatic.cc:938
+#: src/tools/dcpomatic.cc:1058
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -100,7 +101,7 @@ msgstr ""
 "发生异常: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:947
+#: src/tools/dcpomatic.cc:1067
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -109,111 +110,124 @@ msgstr ""
 "出现未知错误: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:473 src/tools/dcpomatic.cc:952
-#: src/tools/dcpomatic.cc:961
+#: src/tools/dcpomatic.cc:485 src/tools/dcpomatic.cc:563
+#: src/tools/dcpomatic.cc:1072
 msgid "An unknown exception occurred."
 msgstr "出现未知错误."
 
-#: src/tools/dcpomatic.cc:430
+#: src/tools/dcpomatic.cc:442
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "配置错误 %s (%s)"
 
-#: src/tools/dcpomatic.cc:469
+#: src/tools/dcpomatic.cc:481 src/tools/dcpomatic.cc:559
 msgid "CPL's content is not encrypted."
 msgstr "该CPL未加密."
 
-#: src/tools/dcpomatic.cc:719
+#: src/tools/dcpomatic.cc:812
 msgid "Check for updates"
 msgstr "检查更新"
 
-#: src/tools/dcpomatic.cc:874 src/tools/dcpomatic_batch.cc:242
+#: src/tools/dcpomatic.cc:529
+#, fuzzy
+msgid "Could not find batch converter."
+msgstr "DCP-o-matic 批量转换"
+
+#: src/tools/dcpomatic.cc:996 src/tools/dcpomatic_batch.cc:326
 msgid "Could not load film %1 (%2)"
 msgstr "无法加载工程 %s (%s)"
 
-#: src/tools/dcpomatic.cc:432
+#: src/tools/dcpomatic.cc:444
 #, c-format
 msgid "Could not make DCP: %s"
 msgstr "创建DCP失败: %s"
 
-#: src/tools/dcpomatic.cc:285 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:297 src/tools/dcpomatic_batch.cc:136
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "不能打开工程，在 %s (%s)"
 
-#: src/tools/dcpomatic.cc:529
+#: src/tools/dcpomatic.cc:619
 msgid "Could not show DCP"
 msgstr "不能显示DCP"
 
-#: src/tools/dcpomatic.cc:520
+#: src/tools/dcpomatic.cc:610
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "无法显示DCP (无法运行在konqueror出错)"
 
-#: src/tools/dcpomatic.cc:513
+#: src/tools/dcpomatic.cc:603
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "无法显示DCP (无法运行在nautilus出错)"
 
-#: src/tools/dcpomatic.cc:305 src/tools/dcpomatic.cc:826
-#: src/tools/dcpomatic.cc:862
+#: src/tools/dcpomatic.cc:317 src/tools/dcpomatic.cc:948
+#: src/tools/dcpomatic.cc:984
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_batch.cc:197 src/tools/dcpomatic_batch.cc:227
+#: src/tools/dcpomatic_batch.cc:278 src/tools/dcpomatic_batch.cc:308
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic 批量转换"
 
-#: src/tools/dcpomatic.cc:718
+#: src/tools/dcpomatic.cc:811 src/tools/dcpomatic_batch.cc:74
 msgid "Encoding servers..."
 msgstr "服务器编码..."
 
 #. / 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.
-#: src/tools/dcpomatic.cc:101
+#: src/tools/dcpomatic.cc:103
 msgid "Film changed"
 msgstr "修改工程"
 
-#: src/tools/dcpomatic.cc:717
+#: src/tools/dcpomatic.cc:810
 msgid "Hints..."
 msgstr "提示..."
 
-#: src/tools/dcpomatic.cc:711
+#: src/tools/dcpomatic.cc:803
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "制作KDM \tCtrl+K"
 
-#: src/tools/dcpomatic.cc:681
+#: src/tools/dcpomatic.cc:802
+msgid "Make DCP in &batch converter\tCtrl-B"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:804
+msgid "Make DKDM for DCP-o-matic..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:772
 msgid "New...\tCtrl-N"
 msgstr "新建工程\tCtrl+N"
 
-#: src/tools/dcpomatic.cc:729
+#: src/tools/dcpomatic.cc:822
 msgid "Report a problem..."
 msgstr "问题报告"
 
-#: src/tools/dcpomatic.cc:721
+#: src/tools/dcpomatic.cc:814
 msgid "Restore default preferences"
 msgstr "恢复默认首选项"
 
-#: src/tools/dcpomatic.cc:713
+#: src/tools/dcpomatic.cc:806
 msgid "S&how DCP"
 msgstr "&查看DCP"
 
-#: src/tools/dcpomatic.cc:98
+#: src/tools/dcpomatic.cc:100
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "是否保存 \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:707
+#: src/tools/dcpomatic.cc:798
 msgid "Scale to fit &height"
 msgstr "缩放到合适高度"
 
-#: src/tools/dcpomatic.cc:706
+#: src/tools/dcpomatic.cc:797
 msgid "Scale to fit &width"
 msgstr "缩放到合适宽度"
 
-#: src/tools/dcpomatic.cc:350 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:362 src/tools/dcpomatic_batch.cc:213
 msgid "Select film to open"
 msgstr "选择打开工程文件"
 
-#: src/tools/dcpomatic.cc:416
+#: src/tools/dcpomatic.cc:428
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -224,7 +238,7 @@ msgstr ""
 "创造该DCP包时大约需要缓存空间 %.1f Gb, 您当前可用磁盘空间只有 %.1f Gb.您是否"
 "仍然继续?"
 
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:426
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -233,39 +247,39 @@ msgstr ""
 "该DCP在创建中将占用约 %.1f Gb, 并且您正在使用的磁盘只有 %.1f Gb可用。你要继续"
 "吗？"
 
-#: src/tools/dcpomatic.cc:987
+#: src/tools/dcpomatic.cc:886
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "连接DCP-o-matic服务器失败."
 
-#: src/tools/dcpomatic.cc:324
+#: src/tools/dcpomatic.cc:336
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "目录 %1 已经存在且不为空。你确定要使用它？"
 
-#: src/tools/dcpomatic.cc:991
+#: src/tools/dcpomatic.cc:888
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "DCP-O-MATIC没有新的版本。"
 
-#: src/tools/dcpomatic.cc:590 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:681 src/tools/dcpomatic_batch.cc:155
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "有未完成的操作; 你确定你要退出吗？"
 
-#: src/tools/dcpomatic.cc:271
+#: src/tools/dcpomatic.cc:283
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr "老版本中创建的工程无法在高于创建版本中被打开，具体请参考设置！"
 
-#: src/tools/dcpomatic.cc:591 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:682 src/tools/dcpomatic_batch.cc:156
 msgid "Unfinished jobs"
 msgstr "未完成的工作"
 
-#: src/tools/dcpomatic.cc:716
+#: src/tools/dcpomatic.cc:809
 msgid "Video waveform..."
 msgstr "视频波形..."
 
-#: src/tools/dcpomatic.cc:359 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:371 src/tools/dcpomatic_batch.cc:222
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."