Merge translation files from master branch.

1 files changed, 42 insertions, 37 deletions

diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po b/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
index bc41c567763..b6cc280fb53 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpovmodeler\n"
-"POT-Creation-Date: 2020-09-27 21:15+0200\n"
+"POT-Creation-Date: 2021-10-21 20:21+0000\n"
 "PO-Revision-Date: 2004-07-13 09:07+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -175,7 +175,7 @@ msgid "Strength:"
 msgstr "力度："
 
 #: pmblobedit.cpp:39 pmisosurfaceedit.cpp:85 pmmediaedit.cpp:94
-#: pmpreviewsettings.cpp:107 pmrendermodesdialog.cpp:332
+#: pmpreviewsettings.cpp:107 pmrendermodesdialog.cpp:331
 msgid "Threshold:"
 msgstr "阈值："
 
@@ -880,7 +880,7 @@ msgstr "金属感："
 msgid "Iridiscence"
 msgstr "彩虹色"
 
-#: pmfinishedit.cpp:105 pmrendermodesdialog.cpp:344
+#: pmfinishedit.cpp:105 pmrendermodesdialog.cpp:343
 msgid "Amount:"
 msgstr "数量："
 
@@ -954,7 +954,7 @@ msgid "Lambda:"
 msgstr ""
 
 #: pmfogedit.cpp:96 pmlistpatternedit.cpp:59 pmpatternedit.cpp:250
-#: pmpreviewsettings.cpp:103 pmrendermodesdialog.cpp:336
+#: pmpreviewsettings.cpp:103 pmrendermodesdialog.cpp:335
 msgid "Depth:"
 msgstr "深度："
 
@@ -1643,11 +1643,11 @@ msgstr "新标签"
 msgid "Floating"
 msgstr "浮动"
 
-#: pmlayoutsettings.cpp:147 pmrainbowedit.cpp:59 pmrendermodesdialog.cpp:274
+#: pmlayoutsettings.cpp:147 pmrainbowedit.cpp:59 pmrendermodesdialog.cpp:273
 msgid "Width:"
 msgstr "宽度："
 
-#: pmlayoutsettings.cpp:148 pmrendermodesdialog.cpp:278 pmslopeedit.cpp:45
+#: pmlayoutsettings.cpp:148 pmrendermodesdialog.cpp:277 pmslopeedit.cpp:45
 msgid "Height:"
 msgstr "高度："
 
@@ -1733,7 +1733,7 @@ msgstr "不能保存文件。"
 msgid "Name: "
 msgstr "名称："
 
-#: pmlibraryentrypreview.cpp:67 pmrendermodesdialog.cpp:255
+#: pmlibraryentrypreview.cpp:67 pmrendermodesdialog.cpp:254
 msgid "Description:"
 msgstr "描述："
 
@@ -1875,7 +1875,7 @@ msgstr "适应："
 msgid "Orient"
 msgstr "渐变"
 
-#: pmlightedit.cpp:90 pmrendermodesdialog.cpp:341
+#: pmlightedit.cpp:90 pmrendermodesdialog.cpp:340
 msgid "Jitter"
 msgstr "抖动"
 
@@ -2011,7 +2011,7 @@ msgstr "材质映射图"
 msgid "media"
 msgstr "介质"
 
-#: pmmediaedit.cpp:46 pmrendermodesdialog.cpp:326
+#: pmmediaedit.cpp:46 pmrendermodesdialog.cpp:325
 msgid "Method:"
 msgstr "方法："
 
@@ -2356,7 +2356,7 @@ msgstr "导入 Povray..."
 msgid "&Export..."
 msgstr "导出 Povray(&E)..."
 
-#: pmpart.cpp:254 pmrendermodesdialog.cpp:41 pmrendermodesdialog.cpp:243
+#: pmpart.cpp:254 pmrendermodesdialog.cpp:41 pmrendermodesdialog.cpp:242
 msgid "Render Modes"
 msgstr "渲染方式"
 
@@ -2634,7 +2634,7 @@ msgstr "Povray 源码"
 msgid "Iso Surface"
 msgstr ""
 
-#: pmpart.cpp:520 pmrendermodesdialog.cpp:350
+#: pmpart.cpp:520
 msgid "Radiosity"
 msgstr "辐射"
 
@@ -3446,7 +3446,7 @@ msgstr "地板"
 msgid "Enable floor"
 msgstr "启用地板"
 
-#: pmpreviewsettings.cpp:96 pmrendermodesdialog.cpp:321
+#: pmpreviewsettings.cpp:96 pmrendermodesdialog.cpp:320
 msgid "Antialiasing"
 msgstr "边缘平滑"
 
@@ -3711,7 +3711,7 @@ msgstr "前"
 msgid "back"
 msgstr "后"
 
-#: pmrendermode.cpp:51
+#: pmrendermode.cpp:49
 msgid "New mode"
 msgstr "新方式"
 
@@ -3732,7 +3732,8 @@ msgid "5: Render shadows, including extended lights"
 msgstr "5：渲染阴影，包括扩展的光线"
 
 #: pmrendermodesdialog.cpp:232
-msgid "6, 7: Compute texture patterns"
+#, fuzzy
+msgid "6, 7: Compute texture patterns, compute photons"
 msgstr "6，7：计算纹理图案"
 
 #: pmrendermodesdialog.cpp:233
@@ -3740,66 +3741,58 @@ msgid "8: Compute reflected, refracted, and transmitted rays"
 msgstr "8：计算反射、折射和透射的光线"
 
 #: pmrendermodesdialog.cpp:234
-msgid "9: Compute media"
-msgstr "9：计算介质"
-
-#: pmrendermodesdialog.cpp:235
-msgid "10: Compute radiosity but no media"
-msgstr "10：计算辐射性但是没有介质"
-
-#: pmrendermodesdialog.cpp:236
-msgid "11: Compute radiosity and media"
-msgstr "11：计算辐射性和介质"
+msgid "9, 10, 11: Compute media, radiosity and subsurface light transport"
+msgstr ""
 
-#: pmrendermodesdialog.cpp:269
+#: pmrendermodesdialog.cpp:268
 msgid "Size"
 msgstr "大小"
 
-#: pmrendermodesdialog.cpp:284
+#: pmrendermodesdialog.cpp:283
 msgid "Subsection"
 msgstr "子章节"
 
-#: pmrendermodesdialog.cpp:289
+#: pmrendermodesdialog.cpp:288
 msgid "Start column:"
 msgstr "开始列："
 
-#: pmrendermodesdialog.cpp:293
+#: pmrendermodesdialog.cpp:292
 msgid "End column:"
 msgstr "结束列："
 
-#: pmrendermodesdialog.cpp:297
+#: pmrendermodesdialog.cpp:296
 msgid "Start row:"
 msgstr "开始行："
 
-#: pmrendermodesdialog.cpp:301
+#: pmrendermodesdialog.cpp:300
 msgid "End row:"
 msgstr "结束行："
 
-#: pmrendermodesdialog.cpp:311
+#: pmrendermodesdialog.cpp:310
 msgid "Quality"
 msgstr "质量"
 
-#: pmrendermodesdialog.cpp:315
+#: pmrendermodesdialog.cpp:314
 msgid "Quality:"
 msgstr "质量："
 
-#: pmrendermodesdialog.cpp:329
+#: pmrendermodesdialog.cpp:328
 msgid "Non Recursive"
 msgstr "非递归的"
 
-#: pmrendermodesdialog.cpp:330
+#: pmrendermodesdialog.cpp:329
 msgid "Recursive"
 msgstr "递归"
 
-#: pmrendermodesdialog.cpp:357
+#: pmrendermodesdialog.cpp:353
 msgid "Output"
 msgstr "输出"
 
-#: pmrendermodesdialog.cpp:360
+#: pmrendermodesdialog.cpp:356
 msgid "Alpha"
 msgstr "Alpha"
 
-#: pmrendermodesdialog.cpp:449
+#: pmrendermodesdialog.cpp:443
 msgid "Please enter a description for the render mode."
 msgstr "请输入渲染模式的描述。"
 
@@ -4418,6 +4411,15 @@ msgstr "其它对象"
 msgid "Povray Rendering"
 msgstr "Povray 渲染"
 
+#~ msgid "9: Compute media"
+#~ msgstr "9：计算介质"
+
+#~ msgid "10: Compute radiosity but no media"
+#~ msgstr "10：计算辐射性但是没有介质"
+
+#~ msgid "11: Compute radiosity and media"
+#~ msgstr "11：计算辐射性和介质"
+
 #, fuzzy
 #~ msgid "Center"
 #~ msgstr "中心："
@@ -4532,3 +4534,6 @@ msgstr "Povray 渲染"
 #, fuzzy
 #~ msgid "Radial divisions"
 #~ msgstr "各对象设置"
+
+#~ msgid "6, 7: Compute texture patterns"
+#~ msgstr "6，7：计算纹理图案"