[Bf-translations-svn] SVN commit: /data/svn/repos/bf-translations [3070] branches/zh_CN/zh_CN.po : fixes

bf-translations at blender.org bf-translations at blender.org
Wed Sep 10 18:43:30 CEST 2014


Revision: 3070
          https://developer.blender.org/rBTS3070
Author:   leon_cheung
Date:     2014-09-10 16:43:28 +0000 (Wed, 10 Sep 2014)
Log Message:
-----------
fixes

Modified Paths:
--------------
    branches/zh_CN/zh_CN.po

Modified: branches/zh_CN/zh_CN.po
===================================================================
--- branches/zh_CN/zh_CN.po	2014-09-09 23:01:59 UTC (rev 3069)
+++ branches/zh_CN/zh_CN.po	2014-09-10 16:43:28 UTC (rev 3070)
@@ -37,8 +37,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< .mine
 "X-Generator: Poedit 1.6.9\n"
+"Language: zh_CN\n"
+=======
+"X-Generator: Poedit 1.6.9\n"
 "Language: zh_CN"
+>>>>>>> .r3069
 
 #. :src: bpy.types.ActionGroup
 msgid "Action Group"
@@ -1124,7 +1129,7 @@
 #. :src: bpy.types.Controller.use_priority
 #: scripts/startup/bl_ui/properties_freestyle.py:722
 msgid "Priority"
-msgstr "首要"
+msgstr "优先级"
 
 #. :src: bpy.types.ActionActuator.priority
 msgid "Execution priority - lower numbers will override actions with higher numbers (with 2 or more actions at once, the overriding channels must be lower in the stack)"
@@ -1668,8 +1673,12 @@
 #. :src: bpy.types.FreestyleLineStyle.integration_type:'MIN'
 #. :src: bpy.types.OBJECT_OT_vertex_warp.min
 #. :src: bpy.types.WM_OT_properties_edit.min
+<<<<<<< .mine
+#: scripts/addons/cycles/ui.py:208 scripts/addons/cycles/ui.py:222
+=======
 #: scripts/addons/cycles/ui.py:208
 #: scripts/addons/cycles/ui.py:222
+>>>>>>> .r3069
 #: scripts/startup/bl_ui/properties_constraint.py:252
 #: scripts/startup/bl_ui/properties_constraint.py:259
 #: scripts/startup/bl_ui/properties_constraint.py:266
@@ -1713,8 +1722,12 @@
 #. :src: bpy.types.CompositorNodeChannelMatte.limit_method:'MAX'
 #. :src: bpy.types.OBJECT_OT_vertex_warp.max
 #. :src: bpy.types.WM_OT_properties_edit.max
+<<<<<<< .mine
+#: scripts/addons/cycles/ui.py:207 scripts/addons/cycles/ui.py:221
+=======
 #: scripts/addons/cycles/ui.py:207
 #: scripts/addons/cycles/ui.py:221
+>>>>>>> .r3069
 #: scripts/startup/bl_ui/properties_constraint.py:253
 #: scripts/startup/bl_ui/properties_constraint.py:260
 #: scripts/startup/bl_ui/properties_constraint.py:267
@@ -2156,8 +2169,12 @@
 #. :src: bpy.types.NearSensor.distance
 #. :src: bpy.types.RadarSensor.distance
 #. :src: bpy.types.WorldLighting.distance
+<<<<<<< .mine
+#: scripts/addons/cycles/ui.py:457 scripts/addons/cycles/ui.py:851
+=======
 #: scripts/addons/cycles/ui.py:457
 #: scripts/addons/cycles/ui.py:851
+>>>>>>> .r3069
 #: scripts/startup/bl_ui/properties_constraint.py:218
 #: scripts/startup/bl_ui/properties_data_bone.py:355
 #: scripts/startup/bl_ui/properties_data_camera.py:173
@@ -3025,6 +3042,7 @@
 msgid "The message body will be set by the Property Value"
 msgstr "文本主体将由属性值设定"
 
+<<<<<<< .mine
 #. :src: bpy.types.MouseActuator
 msgid "Mouse Actuator"
 msgstr "鼠标促动器"
@@ -3126,6 +3144,258 @@
 msgstr "重置"
 
 #. :src: bpy.types.MouseActuator.reset_x
+msgid ""
+"Reset the cursor's X position to the center of the screen space after "
+"calculating"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.reset_y
+msgid ""
+"Reset the cursor's Y position to the center of the screen space after "
+"calculating"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.local_x
+#. :src: bpy.types.MouseActuator.local_y
+#. :src: bpy.types.DisplaceModifier.texture_coords:'LOCAL'
+#. :src: bpy.types.VertexWeightEditModifier.mask_tex_mapping:'LOCAL'
+#. :src: bpy.types.VertexWeightMixModifier.mask_tex_mapping:'LOCAL'
+#. :src: bpy.types.VertexWeightProximityModifier.mask_tex_mapping:'LOCAL'
+#. :src: bpy.types.WarpModifier.texture_coords:'LOCAL'
+#. :src: bpy.types.WaveModifier.texture_coords:'LOCAL'
+#. :src: bpy.types.SpaceView3D.transform_orientation:'LOCAL'
+#: scripts/startup/bl_ui/properties_material.py:782
+#: source/blender/editors/space_view3d/view3d_buttons.c:388
+#: source/blender/nodes/shader/nodes/node_shader_geom.c:41
+msgid "Local"
+msgstr "自身"
+
+#. :src: bpy.types.MouseActuator.local_x
+#. :src: bpy.types.MouseActuator.local_y
+msgid "Apply rotation locally"
+msgstr "应用本地旋转"
+
+#. :src: bpy.types.MouseActuator.threshold_x
+#. :src: bpy.types.MouseActuator.threshold_y
+#. :src: bpy.types.GameSoftBodySettings.shape_threshold
+#. :src: bpy.types.MetaBall.threshold
+#. :src: bpy.types.ParticleSettings.roughness_2_threshold
+#. :src: bpy.types.ParticleSettings.child_length_threshold
+#. :src: bpy.types.ParticleSettings.branch_threshold
+#. :src: bpy.types.RemeshModifier.threshold
+#. :src: bpy.types.CompositorNodeDefocus.threshold
+#. :src: bpy.types.CompositorNodeDespeckle.threshold
+#. :src: bpy.types.CompositorNodeDilateErode.mode:'THRESHOLD'
+#. :src: bpy.types.CompositorNodeGlare.threshold
+#. :src: bpy.types.ACTION_OT_clean.threshold
+#. :src: bpy.types.ARMATURE_OT_select_similar.threshold
+#. :src: bpy.types.CLIP_OT_detect_features.threshold
+#. :src: bpy.types.GRAPH_OT_clean.threshold
+#. :src: bpy.types.GRAPH_OT_sound_bake.threshold
+#. :src: bpy.types.MBALL_OT_select_similar.threshold
+#. :src: bpy.types.MESH_OT_select_similar.threshold
+#. :src: bpy.types.MESH_OT_symmetrize.threshold
+#. :src: bpy.types.MESH_OT_symmetry_snap.threshold
+#. :src: bpy.types.Print3DSettings.threshold_zero
+#. :src: bpy.types.GlowSequence.threshold
+#. :src: bpy.types.SmokeDomainSettings.adapt_threshold
+#. :src: bpy.types.UserPreferencesView.pie_menu_threshold
+#. :src: bpy.types.WorldLighting.threshold
+#: scripts/startup/bl_ui/properties_data_lamp.py:256
+#: scripts/startup/bl_ui/properties_data_metaball.py:70
+#: scripts/startup/bl_ui/properties_material.py:495
+#: scripts/startup/bl_ui/properties_material.py:438
+#: scripts/startup/bl_ui/properties_particle.py:502
+#: scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py:59
+#: scripts/startup/bl_ui/properties_render.py:332
+msgid "Threshold"
+msgstr "阈值"
+
+#. :src: bpy.types.MouseActuator.threshold_x
+msgid "Amount of X motion before mouse movement will register"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.threshold_y
+msgid "Amount of Y motion before mouse movement will register"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.object_axis_x
+#. :src: bpy.types.MouseActuator.object_axis_y
+msgid "Object Axis"
+msgstr "物体坐标"
+
+#. :src: bpy.types.MouseActuator.object_axis_x
+msgid "Local object axis mouse movement in the X direction will apply to"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.object_axis_x:'OBJECT_AXIS_X'
+#. :src: bpy.types.MouseActuator.object_axis_y:'OBJECT_AXIS_X'
+#. :src: bpy.types.ScrewModifier.axis:'X'
+#. :src: bpy.types.CompositorNodeTranslate.wrap_axis:'XAXIS'
+#. :src: bpy.types.MESH_OT_select_axis.axis:'X_AXIS'
+#. :src: bpy.types.RigidBodyConstraint.use_limit_lin_x
+#. :src: bpy.types.ThemeUserInterface.axis_x
+#: source/blender/makesrna/intern/rna_space.c:1615
+msgid "X Axis"
+msgstr "X 轴"
+
+#. :src: bpy.types.MouseActuator.object_axis_x:'OBJECT_AXIS_Y'
+#. :src: bpy.types.MouseActuator.object_axis_y:'OBJECT_AXIS_Y'
+#. :src: bpy.types.ScrewModifier.axis:'Y'
+#. :src: bpy.types.CompositorNodeTranslate.wrap_axis:'YAXIS'
+#. :src: bpy.types.MESH_OT_select_axis.axis:'Y_AXIS'
+#. :src: bpy.types.RigidBodyConstraint.use_limit_lin_y
+#. :src: bpy.types.ThemeUserInterface.axis_y
+#: source/blender/makesrna/intern/rna_space.c:1619
+msgid "Y Axis"
+msgstr "Y 轴"
+
+#. :src: bpy.types.MouseActuator.object_axis_x:'OBJECT_AXIS_Z'
+#. :src: bpy.types.MouseActuator.object_axis_y:'OBJECT_AXIS_Z'
+#. :src: bpy.types.ScrewModifier.axis:'Z'
+#. :src: bpy.types.MESH_OT_select_axis.axis:'Z_AXIS'
+#. :src: bpy.types.RigidBodyConstraint.use_limit_lin_z
+#. :src: bpy.types.ThemeUserInterface.axis_z
+#: source/blender/makesrna/intern/rna_space.c:1623
+msgid "Z Axis"
+msgstr "Z 轴"
+
+#. :src: bpy.types.MouseActuator.object_axis_y
+msgid "Local object axis mouse movement in the Y direction will apply to"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.sensitivity_x
+#. :src: bpy.types.MouseActuator.sensitivity_y
+#. :src: bpy.types.UserPreferencesInput.ndof_sensitivity
+msgid "Sensitivity"
+msgstr "敏感度"
+
+#. :src: bpy.types.MouseActuator.sensitivity_x
+msgid "Sensitivity of the X axis"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.sensitivity_y
+msgid "Sensitivity of the Y axis"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.min_x
+msgid "Maximum negative rotation allowed by X mouse movement (0 for infinite)"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.max_x
+msgid "Maximum positive rotation allowed by X mouse movement (0 for infinite)"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.min_y
+msgid "Maximum negative rotation allowed by Y mouse movement (0 for infinite)"
+msgstr ""
+
+#. :src: bpy.types.MouseActuator.max_y
+msgid "Maximum positive rotation allowed by Y mouse movement (0 for infinite)"
+msgstr ""
+
+=======
+#. :src: bpy.types.MouseActuator
+msgid "Mouse Actuator"
+msgstr "鼠标促动器"
+
+#. :src: bpy.types.MouseActuator.mode
+#. :src: bpy.types.PropertyActuator.mode
+#. :src: bpy.types.SceneActuator.mode
+#. :src: bpy.types.FModifierGenerator.mode
+#. :src: bpy.types.Histogram.mode
+#. :src: bpy.types.Object.mode
+#. :src: bpy.types.Itasc.mode
+#. :src: bpy.types.DecimateModifier.decimate_type
+#. :src: bpy.types.MaskModifier.mode
+#. :src: bpy.types.RemeshModifier.mode
+#. :src: bpy.types.ShrinkwrapModifier.wrap_method
+#. :src: bpy.types.SimpleDeformModifier.deform_method
+#. :src: bpy.types.MovieTrackingMarker.mute
+#. :src: bpy.types.MovieTrackingPlaneMarker.mute
+#. :src: bpy.types.CompositorNodeCombYCCA.mode
+#. :src: bpy.types.CompositorNodeDilateErode.mode
+#. :src: bpy.types.CompositorNodeSepYCCA.mode
+#. :src: bpy.types.ACTION_OT_select_column.mode
+#. :src: bpy.types.ACTION_OT_select_leftright.mode
+#. :src: bpy.types.ANIM_OT_channels_editable_toggle.mode
+#. :src: bpy.types.ANIM_OT_channels_setting_disable.mode
+#. :src: bpy.types.ANIM_OT_channels_setting_enable.mode
+#. :src: bpy.types.ANIM_OT_channels_setting_toggle.mode
+#. :src: bpy.types.BRUSH_OT_active_index_set.mode
+#. :src: bpy.types.CLIP_OT_mode_set.mode
+#. :src: bpy.types.CURVE_OT_extrude.mode
+#. :src: bpy.types.GPENCIL_OT_draw.mode
+#. :src: bpy.types.GRAPH_OT_duplicate.mode
+#. :src: bpy.types.GRAPH_OT_select_column.mode
+#. :src: bpy.types.GRAPH_OT_select_leftright.mode
+#. :src: bpy.types.MESH_OT_duplicate.mode
+#. :src: bpy.types.NLA_OT_duplicate.mode
+#. :src: bpy.types.NLA_OT_select_leftright.mode
+#. :src: bpy.types.OBJECT_OT_duplicate.mode
+#. :src: bpy.types.OBJECT_OT_mode_set.mode
+#. :src: bpy.types.PAINT_OT_mask_flood_fill.mode
+#. :src: bpy.types.PAINT_OT_mask_lasso_gesture.mode
+#. :src: bpy.types.SCULPT_OT_uv_sculpt_stroke.mode
+#. :src: bpy.types.SEQUENCER_OT_duplicate.mode

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-translations-svn mailing list