Merge translation files from master branch.

2 files changed, 0 insertions, 94 deletions

diff --git a/tde-i18n-zh_CN/messages/tdeartwork/klock.po b/tde-i18n-zh_CN/messages/tdeartwork/klock.po
index 941ec4ba815..4a91abdd26c 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/klock.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/klock.po
@@ -1505,7 +1505,6 @@ msgstr ""
 
 #: kdesavers/tdeasciiquarium/settingswidget.ui:27
 #, fuzzy, no-c-format
-#| msgid "Number of bees:"
 msgid "Number of Fish:"
 msgstr "蜜蜂数目："
 
diff --git a/tde-i18n-zh_CN/messages/tdeartwork/kxsconfig.po b/tde-i18n-zh_CN/messages/tdeartwork/kxsconfig.po
index 5bb44b7c986..2b3a537b2c6 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/kxsconfig.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/kxsconfig.po
@@ -1077,7 +1077,6 @@ msgstr "1 分钟"
 #: ScreenSavers/m6502.xml.h:8 ScreenSavers/vfeedback.xml.h:3
 #: ScreenSavers/xanalogtv.xml.h:5
 #, fuzzy
-#| msgid "Colors"
 msgid "Color Knob"
 msgstr "颜色数"
 
@@ -1497,7 +1496,6 @@ msgstr ""
 
 #: ScreenSavers/beats.xml.h:12
 #, fuzzy
-#| msgid "Galaxy"
 msgid "Galaxy cycle"
 msgstr "星系"
 
@@ -1528,7 +1526,6 @@ msgstr "生长"
 
 #: ScreenSavers/binaryring.xml.h:6
 #, fuzzy
-#| msgid "Radius"
 msgid "Ring Radius"
 msgstr "半径"
 
@@ -1569,7 +1566,6 @@ msgstr ""
 
 #: ScreenSavers/biof.xml.h:3
 #, fuzzy
-#| msgid "Triangle"
 msgid "Preset - Triangles"
 msgstr "三角形"
 
@@ -2175,7 +2171,6 @@ msgstr ""
 
 #: ScreenSavers/busyspheres.xml.h:1
 #, fuzzy
-#| msgid "Sphere"
 msgid "Busy Spheres"
 msgstr "球体"
 
@@ -2388,7 +2383,6 @@ msgstr ""
 
 #: ScreenSavers/cityflow.xml.h:15
 #, fuzzy
-#| msgid "Complexity"
 msgid "Wave complexity"
 msgstr "复杂度"
 
@@ -2599,7 +2593,6 @@ msgstr ""
 
 #: ScreenSavers/covid19.xml.h:10
 #, fuzzy
-#| msgid "States"
 msgid "United States"
 msgstr "状态数"
 
@@ -3050,13 +3043,11 @@ msgstr "周期数"
 
 #: ScreenSavers/cyclone.xml.h:2
 #, fuzzy
-#| msgid "Cycles"
 msgid "Cyclones"
 msgstr "周期数"
 
 #: ScreenSavers/cyclone.xml.h:3
 #, fuzzy
-#| msgid "Particles"
 msgid "Particles per cyclone"
 msgstr "粒子数"
 
@@ -3073,7 +3064,6 @@ msgstr "小"
 #: ScreenSavers/cyclone.xml.h:5 ScreenSavers/flux.xml.h:10
 #: ScreenSavers/solarwinds.xml.h:10
 #, fuzzy
-#| msgid "Particles"
 msgid "Particle size"
 msgstr "粒子数"
 
@@ -3084,7 +3074,6 @@ msgstr "粒子数"
 #: ScreenSavers/lorenz.xml.h:6 ScreenSavers/plasma.xml.h:4
 #: ScreenSavers/skyrocket.xml.h:11 ScreenSavers/solarwinds.xml.h:11
 #, fuzzy
-#| msgid "Large"
 msgid "Larger"
 msgstr "大"
 
@@ -3100,7 +3089,6 @@ msgstr "少"
 
 #: ScreenSavers/cyclone.xml.h:8
 #, fuzzy
-#| msgid "Complexity"
 msgid "Cyclone complexity"
 msgstr "复杂度"
 
@@ -3122,7 +3110,6 @@ msgstr "多"
 #: ScreenSavers/plasma.xml.h:8 ScreenSavers/solarwinds.xml.h:12
 #: ScreenSavers/sundancer2.xml.h:3
 #, fuzzy
-#| msgid "Slow"
 msgid "Slower"
 msgstr "慢"
 
@@ -3134,7 +3121,6 @@ msgstr "慢"
 #: ScreenSavers/lattice.xml.h:25 ScreenSavers/plasma.xml.h:10
 #: ScreenSavers/solarwinds.xml.h:14 ScreenSavers/sundancer2.xml.h:5
 #, fuzzy
-#| msgid "Fast"
 msgid "Faster"
 msgstr "快"
 
@@ -3322,7 +3308,6 @@ msgstr ""
 
 #: ScreenSavers/deepstars.xml.h:1
 #, fuzzy
-#| msgid "Stars"
 msgid "DeepStars"
 msgstr "星球数"
 
@@ -3471,7 +3456,6 @@ msgstr ""
 
 #: ScreenSavers/drempels.xml.h:11
 #, fuzzy
-#| msgid "Control Points"
 msgid "Control Point Density"
 msgstr "控制点数"
 
@@ -4007,25 +3991,21 @@ msgstr "纹理图案"
 
 #: ScreenSavers/euphoria.xml.h:5
 #, fuzzy
-#| msgid "Texture PPM File"
 msgid "Texture - none"
 msgstr "纹理 PPM 文件"
 
 #: ScreenSavers/euphoria.xml.h:6
 #, fuzzy
-#| msgid "Texture PPM File"
 msgid "Texture - Plasma"
 msgstr "纹理 PPM 文件"
 
 #: ScreenSavers/euphoria.xml.h:7
 #, fuzzy
-#| msgid "Texture PPM File"
 msgid "Texture - Stringy"
 msgstr "纹理 PPM 文件"
 
 #: ScreenSavers/euphoria.xml.h:8
 #, fuzzy
-#| msgid "Texture PPM File"
 msgid "Texture - Linear"
 msgstr "纹理 PPM 文件"
 
@@ -4058,7 +4038,6 @@ msgstr ""
 
 #: ScreenSavers/euphoria.xml.h:22
 #, fuzzy
-#| msgid "Wireframe"
 msgid "Draw wireframe"
 msgstr "线条框架"
 
@@ -4105,7 +4084,6 @@ msgstr ""
 
 #: ScreenSavers/euphoria.xml.h:32
 #, fuzzy
-#| msgid "Kaleidescope"
 msgid "Preset - Kaleidoscope"
 msgstr "万花筒"
 
@@ -4204,7 +4182,6 @@ msgstr "灰色情怀"
 
 #: ScreenSavers/feedback.xml.h:4
 #, fuzzy
-#| msgid "Colors"
 msgid "Color Period"
 msgstr "颜色数"
 
@@ -4215,13 +4192,11 @@ msgstr "鲸鱼速度"
 
 #: ScreenSavers/feedback.xml.h:8
 #, fuzzy
-#| msgid "Density"
 msgid "Cell Density"
 msgstr "密度"
 
 #: ScreenSavers/feedback.xml.h:10
 #, fuzzy
-#| msgid "Resolution"
 msgid "Texture Resolution"
 msgstr "分辨率"
 
@@ -4282,7 +4257,6 @@ msgstr ""
 
 #: ScreenSavers/fieldlines.xml.h:12
 #, fuzzy
-#| msgid "ElectricSheep"
 msgid "Electric"
 msgstr "电子羊"
 
@@ -4614,7 +4588,6 @@ msgstr "显示一些不断四处旋转的实心立体文字。由 Jamie Zawinski
 
 #: ScreenSavers/flocks.xml.h:1
 #, fuzzy
-#| msgid "Rocks"
 msgid "Flocks"
 msgstr "陨石"
 
@@ -4642,7 +4615,6 @@ msgstr "球体大小"
 
 #: ScreenSavers/flocks.xml.h:10
 #, fuzzy
-#| msgid "Complexity"
 msgid "Blob complexity"
 msgstr "复杂度"
 
@@ -4662,7 +4634,6 @@ msgstr ""
 #: ScreenSavers/flocks.xml.h:19 ScreenSavers/matrixview.xml.h:2
 #: ScreenSavers/skyrocket.xml.h:5 ScreenSavers/spirographx.xml.h:5
 #, fuzzy
-#| msgid "Short"
 msgid "Shorter"
 msgstr "短"
 
@@ -4683,7 +4654,6 @@ msgstr ""
 
 #: ScreenSavers/flocks.xml.h:25
 #, fuzzy
-#| msgid "Leave Trails"
 msgid "Preset - Trails"
 msgstr "留下轨迹"
 
@@ -4697,7 +4667,6 @@ msgstr ""
 
 #: ScreenSavers/flocks.xml.h:28
 #, fuzzy
-#| msgid "Particles"
 msgid "Preset - Circles"
 msgstr "粒子数"
 
@@ -4850,7 +4819,6 @@ msgstr ""
 
 #: ScreenSavers/flux.xml.h:1
 #, fuzzy
-#| msgid "GFlux"
 msgid "Flux"
 msgstr "G流体"
 
@@ -4861,7 +4829,6 @@ msgstr "圆环数目"
 
 #: ScreenSavers/flux.xml.h:3
 #, fuzzy
-#| msgid "Particles"
 msgid "Particles per field"
 msgstr "粒子数"
 
@@ -4876,7 +4843,6 @@ msgstr ""
 
 #: ScreenSavers/flux.xml.h:6 ScreenSavers/solarwinds.xml.h:7
 #, fuzzy
-#| msgid "Control Points"
 msgid "Geometry - Points"
 msgstr "控制点数"
 
@@ -4904,7 +4870,6 @@ msgstr "扩展算法"
 
 #: ScreenSavers/flux.xml.h:19
 #, fuzzy
-#| msgid "Rotation"
 msgid "Rotation rate"
 msgstr "旋转"
 
@@ -4915,7 +4880,6 @@ msgstr "滚动速度"
 
 #: ScreenSavers/flux.xml.h:21
 #, fuzzy
-#| msgid "Fertility"
 msgid "Instability"
 msgstr "肥沃程度"
 
@@ -5247,7 +5211,6 @@ msgstr "最大迭代深度"
 
 #: ScreenSavers/gibson.xml.h:10
 #, fuzzy
-#| msgid "Lower Left"
 msgid "Tower depth"
 msgstr "左下"
 
@@ -5528,7 +5491,6 @@ msgstr "显示星星"
 
 #: ScreenSavers/glplanet.xml.h:10
 #, fuzzy
-#| msgid "Night   Dim"
 msgid "Night image"
 msgstr "夜晚  暗淡"
 
@@ -5794,7 +5756,6 @@ msgstr ""
 
 #: ScreenSavers/gravitywell.xml.h:1
 #, fuzzy
-#| msgid "Gravity"
 msgid "GravityWell"
 msgstr "重力"
 
@@ -5919,7 +5880,6 @@ msgstr ""
 
 #: ScreenSavers/handsy.xml.h:1
 #, fuzzy
-#| msgid "Handedness"
 msgid "Handsy"
 msgstr "螺旋方向"
 
@@ -5946,43 +5906,36 @@ msgstr "不旋转"
 
 #: ScreenSavers/headroom.xml.h:9
 #, fuzzy
-#| msgid "Rotate around X axis"
 msgid "Wobble around X axis"
 msgstr "围绕 X 轴旋转"
 
 #: ScreenSavers/headroom.xml.h:10
 #, fuzzy
-#| msgid "Rotate around Y axis"
 msgid "Wobble around Y axis"
 msgstr "围绕 Y 轴旋转"
 
 #: ScreenSavers/headroom.xml.h:11
 #, fuzzy
-#| msgid "Rotate around Z axis"
 msgid "Wobble around Z axis"
 msgstr "围绕 Z 轴旋转"
 
 #: ScreenSavers/headroom.xml.h:12
 #, fuzzy
-#| msgid "Rotate around X and Y axes"
 msgid "Wobble around X and Y axes"
 msgstr "围绕 X 和 Y 轴旋转"
 
 #: ScreenSavers/headroom.xml.h:13
 #, fuzzy
-#| msgid "Rotate around X and Z axes"
 msgid "Wobble around X and Z axes"
 msgstr "围绕 X 和 Z 轴旋转"
 
 #: ScreenSavers/headroom.xml.h:14
 #, fuzzy
-#| msgid "Rotate around Y and Z axes"
 msgid "Wobble around Y and Z axes"
 msgstr "围绕 Y 和 Z 轴旋转"
 
 #: ScreenSavers/headroom.xml.h:15
 #, fuzzy
-#| msgid "Rotate around all three axes"
 msgid "Wobble around all three axes"
 msgstr "围绕三个轴旋转"
 
@@ -5997,7 +5950,6 @@ msgstr ""
 
 #: ScreenSavers/helios.xml.h:1
 #, fuzzy
-#| msgid "Helix"
 msgid "Helios"
 msgstr "螺旋"
 
@@ -6060,37 +6012,31 @@ msgstr "方块大小"
 
 #: ScreenSavers/hexadrop.xml.h:11 ScreenSavers/klein.xml.h:2
 #, fuzzy
-#| msgid "Random Cell Shape"
 msgid "Random shape"
 msgstr "随机单元格形状"
 
 #: ScreenSavers/hexadrop.xml.h:12
 #, fuzzy
-#| msgid "Triangle"
 msgid "Triangles"
 msgstr "三角形"
 
 #: ScreenSavers/hexadrop.xml.h:13
 #, fuzzy
-#| msgid "Square"
 msgid "Squares"
 msgstr "方形"
 
 #: ScreenSavers/hexadrop.xml.h:14
 #, fuzzy
-#| msgid "Ant Size"
 msgid "Hexagons"
 msgstr "蚂蚁大小"
 
 #: ScreenSavers/hexadrop.xml.h:15
 #, fuzzy
-#| msgid "Octahedron"
 msgid "Octagons"
 msgstr "正八面体"
 
 #: ScreenSavers/hexadrop.xml.h:16
 #, fuzzy
-#| msgid "Random Cell Shape"
 msgid "Random speed"
 msgstr "随机单元格形状"
 
@@ -6133,7 +6079,6 @@ msgstr ""
 
 #: ScreenSavers/hexstrut.xml.h:9
 #, fuzzy
-#| msgid "Ant Size"
 msgid "Hexagon Size"
 msgstr "蚂蚁大小"
 
@@ -6342,7 +6287,6 @@ msgstr ""
 
 #: ScreenSavers/hydrostat.xml.h:27
 #, fuzzy
-#| msgid "Pulsar"
 msgid "Pulse"
 msgstr "脉冲星"
 
@@ -6357,27 +6301,23 @@ msgstr ""
 
 #: ScreenSavers/hyperspace.xml.h:1
 #, fuzzy
-#| msgid "Hyperball"
 msgid "Hyperspace"
 msgstr "超线球"
 
 #: ScreenSavers/hyperspace.xml.h:9
 #, fuzzy
-#| msgid "Ant Size"
 msgid "Star Size"
 msgstr "蚂蚁大小"
 
 #: ScreenSavers/hyperspace.xml.h:11 ScreenSavers/matrixview.xml.h:8
 #: ScreenSavers/skyrocket.xml.h:16
 #, fuzzy
-#| msgid "Power"
 msgid "Lower"
 msgstr "动力"
 
 #: ScreenSavers/hyperspace.xml.h:13 ScreenSavers/matrixview.xml.h:6
 #: ScreenSavers/skyrocket.xml.h:18
 #, fuzzy
-#| msgid "High"
 msgid "Higher"
 msgstr "高"
 
@@ -6873,7 +6813,6 @@ msgstr ""
 
 #: ScreenSavers/kaleidocycle.xml.h:1
 #, fuzzy
-#| msgid "Kaleidescope"
 msgid "Kaleidocycle"
 msgstr "万花筒"
 
@@ -6927,13 +6866,11 @@ msgstr "加性颜色"
 
 #: ScreenSavers/klein.xml.h:24 ScreenSavers/projectiveplane.xml.h:17
 #, fuzzy
-#| msgid "Random"
 msgid "Random 3D"
 msgstr "随机"
 
 #: ScreenSavers/klein.xml.h:27 ScreenSavers/projectiveplane.xml.h:20
 #, fuzzy
-#| msgid "Random"
 msgid "Random 4D"
 msgstr "随机"
 
@@ -6995,7 +6932,6 @@ msgstr ""
 
 #: ScreenSavers/lattice.xml.h:7
 #, fuzzy
-#| msgid "Crystal"
 msgid "Material - Crystal"
 msgstr "晶格"
 
@@ -7029,7 +6965,6 @@ msgstr ""
 
 #: ScreenSavers/lattice.xml.h:16
 #, fuzzy
-#| msgid "Thickness"
 msgid "Thickness of tori"
 msgstr "线宽"
 
@@ -7153,7 +7088,6 @@ msgstr "填充"
 
 #: ScreenSavers/lcdscrub.xml.h:12
 #, fuzzy
-#| msgid "Scary Colors"
 msgid "Primary colors"
 msgstr "恐怖的颜色"
 
@@ -7260,7 +7194,6 @@ msgstr "波动速度："
 
 #: ScreenSavers/lorenz.xml.h:7
 #, fuzzy
-#| msgid "Triangle"
 msgid "Camera Angle"
 msgstr "三角形"
 
@@ -7348,7 +7281,6 @@ msgstr "水平对称次数"
 
 #: ScreenSavers/matrixview.xml.h:9
 #, fuzzy
-#| msgid "Resolution"
 msgid "Vertical Resolution"
 msgstr "分辨率"
 
@@ -7426,7 +7358,6 @@ msgstr ""
 
 #: ScreenSavers/maze3d.xml.h:1
 #, fuzzy
-#| msgid "Maze"
 msgid "Maze3D"
 msgstr "迷宫"
 
@@ -8295,7 +8226,6 @@ msgstr ""
 
 #: ScreenSavers/pixelcity.xml.h:7
 #, fuzzy
-#| msgid "Wireframe"
 msgid "Wire frame"
 msgstr "线条框架"
 
@@ -9360,7 +9290,6 @@ msgstr ""
 
 #: ScreenSavers/quasicrystal.xml.h:1
 #, fuzzy
-#| msgid "Crystal"
 msgid "QuasiCrystal"
 msgstr "晶格"
 
@@ -9394,7 +9323,6 @@ msgstr ""
 
 #: ScreenSavers/raverhoop.xml.h:9
 #, fuzzy
-#| msgid "Tight"
 msgid "Lights"
 msgstr "紧凑"
 
@@ -9774,7 +9702,6 @@ msgstr "100%"
 
 #: ScreenSavers/scooter.xml.h:16
 #, fuzzy
-#| msgid "Colors"
 msgid "Colorful"
 msgstr "颜色数"
 
@@ -9832,7 +9759,6 @@ msgstr ""
 
 #: ScreenSavers/skyrocket.xml.h:3
 #, fuzzy
-#| msgid "Number of rocks:"
 msgid "Maximum number of rockets"
 msgstr "石头块数："
 
@@ -9881,13 +9807,11 @@ msgstr ""
 
 #: ScreenSavers/skyrocket.xml.h:21
 #, fuzzy
-#| msgid "Duration"
 msgid "Illumination"
 msgstr "持续时间"
 
 #: ScreenSavers/skyrocket.xml.h:22
 #, fuzzy
-#| msgid "Xearth"
 msgid "Earth"
 msgstr "地球"
 
@@ -9982,13 +9906,11 @@ msgstr ""
 
 #: ScreenSavers/solarwinds.xml.h:1
 #, fuzzy
-#| msgid "Solaris"
 msgid "Solarwinds"
 msgstr "Solaris"
 
 #: ScreenSavers/solarwinds.xml.h:2
 #, fuzzy
-#| msgid "Wind"
 msgid "Winds"
 msgstr "风"
 
@@ -9998,7 +9920,6 @@ msgstr ""
 
 #: ScreenSavers/solarwinds.xml.h:4
 #, fuzzy
-#| msgid "Particles"
 msgid "Particles per wind"
 msgstr "粒子数"
 
@@ -10008,7 +9929,6 @@ msgstr ""
 
 #: ScreenSavers/solarwinds.xml.h:13
 #, fuzzy
-#| msgid "Particles"
 msgid "Particle speed"
 msgstr "粒子数"
 
@@ -10052,7 +9972,6 @@ msgstr "声纳"
 
 #: ScreenSavers/sonar.xml.h:8
 #, fuzzy
-#| msgid "Ping Subnet"
 msgid "Ping local subnet"
 msgstr "Ping 子网"
 
@@ -10198,13 +10117,11 @@ msgstr ""
 
 #: ScreenSavers/sphereeversion.xml.h:22
 #, fuzzy
-#| msgid "Scary Colors"
 msgid "Parallel colors"
 msgstr "恐怖的颜色"
 
 #: ScreenSavers/sphereeversion.xml.h:23
 #, fuzzy
-#| msgid "Scary Colors"
 msgid "Meridian colors"
 msgstr "恐怖的颜色"
 
@@ -10502,7 +10419,6 @@ msgstr "点数"
 
 #: ScreenSavers/strange.xml.h:13
 #, fuzzy, no-c-format
-#| msgid "100%"
 msgid "10%"
 msgstr "100%"
 
@@ -10726,13 +10642,11 @@ msgstr ""
 
 #: ScreenSavers/tessellimage.xml.h:5
 #, fuzzy
-#| msgid "1 second"
 msgid "0.1 second"
 msgstr "1 秒钟"
 
 #: ScreenSavers/tessellimage.xml.h:7
 #, fuzzy
-#| msgid "0 seconds"
 msgid "4 seconds"
 msgstr "0 秒钟"
 
@@ -10742,7 +10656,6 @@ msgstr ""
 
 #: ScreenSavers/tessellimage.xml.h:15
 #, fuzzy
-#| msgid "Delay"
 msgid "Delaunay"
 msgstr "延迟"
 
@@ -10955,7 +10868,6 @@ msgstr "显示线条框架"
 
 #: ScreenSavers/unicrud.xml.h:16
 #, fuzzy
-#| msgid "Display Seconds"
 msgid "Display emoticons"
 msgstr "显示秒数"
 
@@ -10984,7 +10896,6 @@ msgstr "幅度"
 
 #: ScreenSavers/unknownpleasures.xml.h:14
 #, fuzzy
-#| msgid "Mercator Projection"
 msgid "Orthographic Projection"
 msgstr "Mercator 投影"
 
@@ -11205,19 +11116,16 @@ msgstr "斑点数"
 
 #: ScreenSavers/winduprobot.xml.h:12
 #, fuzzy
-#| msgid "Robots"
 msgid "Robot size"
 msgstr "机器人数"
 
 #: ScreenSavers/winduprobot.xml.h:15
 #, fuzzy
-#| msgid "Transparency"
 msgid "Robot skin transparency"
 msgstr "透明"
 
 #: ScreenSavers/winduprobot.xml.h:18
 #, fuzzy
-#| msgid "Bubbles"
 msgid "Word bubbles"
 msgstr "泡泡"
 
@@ -11260,7 +11168,6 @@ msgstr ""
 
 #: ScreenSavers/xanalogtv.xml.h:3
 #, fuzzy
-#| msgid "Color Bars Enabled"
 msgid "Colorbars only"
 msgstr "显示彩条图案"