[Bf-translations-svn] SVN commit: /data/svn/repos/bf-translations [4905] branches/ab/ab.po: Added translations 08-05
bf-translations at blender.org
bf-translations at blender.org
Wed May 8 15:57:47 CEST 2019
Revision: 4905
https://developer.blender.org/rBTS4905
Author: Nart
Date: 2019-05-08 15:57:46 +0200 (Wed, 08 May 2019)
Log Message:
-----------
Added translations 08-05
Modified Paths:
--------------
branches/ab/ab.po
Modified: branches/ab/ab.po
===================================================================
--- branches/ab/ab.po 2019-05-07 13:18:29 UTC (rev 4904)
+++ branches/ab/ab.po 2019-05-08 13:57:46 UTC (rev 4905)
@@ -6,7 +6,13 @@
# * Nart <daniel.abzakh at gmail.com>, 2019.
msgid ""
msgstr ""
+<<<<<<< .mine
+"Project-Id-Version: Blender 2.80 (sub 57) (b'bcefceb20058')\n"
+||||||| .r4872
+"Project-Id-Version: Blender 2.80 (sub 50) (b'2b79f274e38b')\n"
+=======
"Project-Id-Version: Blender 2.80 (sub 60) (b'1c5860407068')\n"
+>>>>>>> .r4904
"Report-Msgid-Bugs-To: \n"
"\"POT-Creation-Date: 2019-02-25 20:41:30\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -45,8 +51,16 @@
#. :src: bpy.types.Panel.bl_region_type:'CHANNELS'
#. :src: bpy.types.Region.type:'CHANNELS'
#. :src: bpy.types.ThemeDopeSheet.channels
+<<<<<<< .mine
+#: scripts/startup/bl_ui/space_node.py:573
+#: scripts/startup/bl_ui/space_userpref.py:525
+||||||| .r4872
+#: scripts/startup/bl_ui/space_node.py:489
+#: scripts/startup/bl_ui/space_userpref.py:523
+=======
#: scripts/startup/bl_ui/space_node.py:572
#: scripts/startup/bl_ui/space_userpref.py:527
+>>>>>>> .r4904
msgid "Channels"
msgstr ""
@@ -200,7 +214,13 @@
#. :src: bpy.types.OBJECT_OT_vertex_group_lock.action:'LOCK'
#. :src: bpy.types.RegionView3D.lock_rotation
#. :src: bpy.types.Sequence.lock
+<<<<<<< .mine
+#: scripts/startup/bl_ui/space_view3d_toolbar.py:1200
+||||||| .r4872
+#: scripts/startup/bl_ui/space_view3d_toolbar.py:1020
+=======
#: scripts/startup/bl_ui/space_view3d_toolbar.py:1190
+>>>>>>> .r4904
msgid "Lock"
msgstr ""
@@ -320,12 +340,28 @@
#. :src: bpy.types.VertexGroup.name
#. :src: bpy.types.ViewLayer.name
#. :src: bpy.types.wmOwnerID.name
+<<<<<<< .mine
#: scripts/startup/bl_ui/properties_data_camera.py:387
#: scripts/startup/bl_ui/properties_object.py:231
+#: scripts/startup/bl_ui/properties_physics_dynamicpaint.py:447
+#: scripts/startup/bl_ui/properties_physics_dynamicpaint.py:504
+#: source/blender/editors/space_image/image_ops.c:2545
+#: source/blender/editors/space_node/drawnode.c:743
+||||||| .r4872
+#: scripts/startup/bl_ui/properties_data_camera.py:385
+#: scripts/startup/bl_ui/properties_object.py:227
+#: scripts/startup/bl_ui/properties_physics_dynamicpaint.py:447
+#: scripts/startup/bl_ui/properties_physics_dynamicpaint.py:504
+#: source/blender/editors/space_image/image_ops.c:2505
+#: source/blender/editors/space_node/drawnode.c:727
+=======
+#: scripts/startup/bl_ui/properties_data_camera.py:387
+#: scripts/startup/bl_ui/properties_object.py:231
#: scripts/startup/bl_ui/properties_physics_dynamicpaint.py:441
#: scripts/startup/bl_ui/properties_physics_dynamicpaint.py:498
#: source/blender/editors/space_image/image_ops.c:2332
#: source/blender/editors/space_node/drawnode.c:761
+>>>>>>> .r4904
msgid "Name"
msgstr ""
@@ -704,7 +740,13 @@
#. :src: bpy.types.SequenceProxy.filepath
#. :src: bpy.types.SpaceNodeEditorPath
#. :src: bpy.types.StudioLight.path
+<<<<<<< .mine
+#: scripts/startup/bl_ui/properties_physics_common.py:157
+||||||| .r4872
+#: scripts/startup/bl_ui/properties_physics_common.py:149
+=======
#: scripts/startup/bl_ui/properties_physics_common.py:155
+>>>>>>> .r4904
#: scripts/startup/bl_ui/space_clip.py:76
#: source/blender/editors/space_graph/graph_buttons.c:742
msgid "Path"
@@ -952,6 +994,26 @@
#. :src: bpy.types.ColorMixSequence.blend_effect:'ADD'
#. :src: bpy.types.ShaderFxRim.mode:'ADD'
#. :src: bpy.types.TextureSlot.blend_type:'ADD'
+<<<<<<< .mine
+#: scripts/startup/bl_ui/properties_grease_pencil_common.py:341
+#: scripts/startup/bl_ui/space_image.py:1070
+#: scripts/startup/bl_ui/space_view3d.py:337
+#: scripts/startup/bl_ui/space_view3d.py:339
+#: scripts/startup/bl_ui/space_view3d.py:341
+#: scripts/startup/bl_ui/space_view3d.py:343
+#: scripts/startup/bl_ui/space_view3d.py:345
+#: scripts/startup/bl_ui/space_view3d.py:347
+#: scripts/startup/bl_ui/space_view3d_toolbar.py:1255
+||||||| .r4872
+#: scripts/startup/bl_ui/properties_grease_pencil_common.py:341
+#: scripts/startup/bl_ui/space_view3d.py:339
+#: scripts/startup/bl_ui/space_view3d.py:341
+#: scripts/startup/bl_ui/space_view3d.py:343
+#: scripts/startup/bl_ui/space_view3d.py:345
+#: scripts/startup/bl_ui/space_view3d.py:347
+#: scripts/startup/bl_ui/space_view3d.py:349
+#: scripts/startup/bl_ui/space_view3d_toolbar.py:1098
+=======
#: scripts/startup/bl_ui/properties_grease_pencil_common.py:337
#: scripts/startup/bl_ui/space_image.py:1182
#: scripts/startup/bl_ui/space_view3d.py:691
@@ -961,6 +1023,7 @@
#: scripts/startup/bl_ui/space_view3d.py:699
#: scripts/startup/bl_ui/space_view3d.py:701
#: scripts/startup/bl_ui/space_view3d_toolbar.py:1245
+>>>>>>> .r4904
msgid "Add"
msgstr "Ацҵара"
@@ -1053,9 +1116,18 @@
#. :src: bpy.types.ColorMixSequence.blend_effect:'SUBTRACT'
#. :src: bpy.types.ShaderFxRim.mode:'SUBTRACT'
#. :src: bpy.types.TextureSlot.blend_type:'SUBTRACT'
+<<<<<<< .mine
+#: scripts/startup/bl_ui/properties_grease_pencil_common.py:342
+#: scripts/startup/bl_ui/space_image.py:1071
+#: scripts/startup/bl_ui/space_view3d_toolbar.py:1256
+||||||| .r4872
+#: scripts/startup/bl_ui/properties_grease_pencil_common.py:342
+#: scripts/startup/bl_ui/space_view3d_toolbar.py:1099
+=======
#: scripts/startup/bl_ui/properties_grease_pencil_common.py:338
#: scripts/startup/bl_ui/space_image.py:1183
#: scripts/startup/bl_ui/space_view3d_toolbar.py:1246
+>>>>>>> .r4904
msgid "Subtract"
msgstr "Ацхра"
@@ -1181,8 +1253,16 @@
#. :src: bpy.types.AnimData.drivers
#. :src: bpy.types.AnimDataDrivers
#. :src: bpy.types.SpaceGraphEditor.mode:'DRIVERS'
+<<<<<<< .mine
+#: source/blender/editors/animation/anim_channels_defines.c:1318
+#: source/blender/editors/space_outliner/outliner_tree.c:846
+||||||| .r4872
+#: source/blender/editors/animation/anim_channels_defines.c:1301
+#: source/blender/editors/space_outliner/outliner_tree.c:816
+=======
#: source/blender/editors/animation/anim_channels_defines.c:1387
#: source/blender/editors/space_outliner/outliner_tree.c:850
+>>>>>>> .r4904
msgid "Drivers"
msgstr ""
@@ -1192,7 +1272,13 @@
#. :src: bpy.types.AnimData.nla_tracks
#. :src: bpy.types.NlaTracks
+<<<<<<< .mine
+#: source/blender/editors/space_outliner/outliner_tree.c:875
+||||||| .r4872
+#: source/blender/editors/space_outliner/outliner_tree.c:845
+=======
#: source/blender/editors/space_outliner/outliner_tree.c:878
+>>>>>>> .r4904
msgid "NLA Tracks"
msgstr ""
@@ -1476,10 +1562,21 @@
#. :src: bpy.types.Region.height
#. :src: bpy.types.WorldMistSettings.height
#: scripts/startup/bl_ui/properties_data_camera.py:209
+<<<<<<< .mine
+#: scripts/startup/bl_ui/space_view3d.py:5892
+#: scripts/startup/bl_ui/space_view3d_toolbar.py:352
+#: source/blender/editors/space_image/image_ops.c:2551
+#: source/blender/nodes/shader/nodes/node_shader_bump.c:29
+||||||| .r4872
+#: scripts/startup/bl_ui/space_view3d_toolbar.py:336
+#: source/blender/editors/space_image/image_ops.c:2511
+#: source/blender/nodes/shader/nodes/node_shader_bump.c:29
+=======
#: scripts/startup/bl_ui/space_view3d.py:6296
#: scripts/startup/bl_ui/space_view3d_toolbar.py:342
#: source/blender/editors/space_image/image_ops.c:2338
#: source/blender/nodes/shader/nodes/node_shader_bump.c:31
+>>>>>>> .r4904
#: source/blender/nodes/shader/nodes/node_shader_displacement.c:24
msgid "Height"
msgstr ""
@@ -1539,8 +1636,15 @@
#. :src: bpy.types.SpaceView3D.show_object_viewport_empty
#. :src: bpy.types.ThemeView3D.empty
#. :src: bpy.types.WorkSpaceTool.space_type:'EMPTY'
+<<<<<<< .mine
+#: scripts/startup/bl_ui/space_view3d.py:4800
+#: source/blender/blenkernel/intern/object.c:774
+||||||| .r4872
+#: source/blender/blenkernel/intern/object.c:774
+=======
#: scripts/startup/bl_ui/space_view3d.py:5170
#: source/blender/blenkernel/intern/object.c:773
+>>>>>>> .r4904
#: source/blender/blenkernel/intern/object.c:778
msgid "Empty"
msgstr "Аҭацәы"
@@ -1980,8 +2084,16 @@
#. :src: bpy.types.Region.width
#: scripts/addons/cycles/ui.py:573
#: scripts/startup/bl_ui/properties_data_camera.py:205
+<<<<<<< .mine
+#: source/blender/editors/space_image/image_ops.c:2548
+#: source/blender/nodes/shader/nodes/node_shader_squeeze.c:29
+||||||| .r4872
+#: source/blender/editors/space_image/image_ops.c:2508
+#: source/blender/nodes/shader/nodes/node_shader_squeeze.c:29
+=======
#: source/blender/editors/space_image/image_ops.c:2335
#: source/blender/nodes/shader/nodes/node_shader_squeeze.c:28
+>>>>>>> .r4904
msgid "Width"
msgstr ""
@@ -2442,11 +2554,25 @@
#: scripts/startup/bl_ui/properties_data_shaderfx.py:154
#: scripts/startup/bl_ui/properties_data_shaderfx.py:117
#: scripts/startup/bl_ui/properties_mask_common.py:197
+<<<<<<< .mine
#: scripts/startup/bl_ui/properties_texture.py:702
+#: source/blender/blenkernel/intern/tracking.c:1833
+#: source/blender/editors/object/object_relations.c:939
+#: source/blender/editors/space_graph/graph_buttons.c:719
+#: source/blender/editors/space_outliner/outliner_dragdrop.c:407
+||||||| .r4872
+#: scripts/startup/bl_ui/properties_texture.py:746
+#: source/blender/blenkernel/intern/tracking.c:1833
+#: source/blender/editors/object/object_relations.c:936
+#: source/blender/editors/space_graph/graph_buttons.c:719
+#: source/blender/editors/space_outliner/outliner_dragdrop.c:386
+=======
+#: scripts/startup/bl_ui/properties_texture.py:702
#: source/blender/blenkernel/intern/tracking.c:1937
#: source/blender/editors/object/object_relations.c:1006
#: source/blender/editors/space_graph/graph_buttons.c:851
#: source/blender/editors/space_outliner/outliner_dragdrop.c:415
+>>>>>>> .r4904
#: source/blender/nodes/shader/nodes/node_shader_tex_coord.c:29
msgid "Object"
msgstr "Амаҭәар"
@@ -2501,11 +2627,25 @@
#. :src: bpy.types.SCENE_OT_freestyle_alpha_modifier_add.type:'TANGENT'
#. :src: bpy.types.SCENE_OT_freestyle_color_modifier_add.type:'TANGENT'
#. :src: bpy.types.SCENE_OT_freestyle_thickness_modifier_add.type:'TANGENT'
+<<<<<<< .mine
#: scripts/startup/bl_ui/properties_particle.py:535
+#: source/blender/blenkernel/intern/customdata.c:1310
+#: source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c:29
+#: source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c:28
+#: source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c:43
+||||||| .r4872
+#: scripts/startup/bl_ui/properties_particle.py:537
+#: source/blender/blenkernel/intern/customdata.c:1311
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-translations-svn
mailing list