[Bf-translations-dev] [Bf-translations-svn] SVN commit: /data/svn/bf-translations [314] branches: Updated branches from svn43429.

[Bastien Montagne]

A merge creates a "fuzzy" translation when it encounters a new message 
which is somewhat similar to an existing already translated one.

Typically, this happens when an english message was spell-fixed (but 
also when a real new message has some similarities with an existing 
one).

That said, I doubt *that* merge generated 2000 fuzzies – there was no 
big change in i18n since a month or so, now…

Regards,
Bastien

Le lundi 16 janvier 2012 20:53:00, Yousef Hurfoush a écrit :
> *one question, why merging creates fuzzy translation? i have about 
> 2000 one from merging!*
>
>
> *Regards*
> *Yousef Harfoush
> *
> *bat3a at msn.com* <mailto:bat3a at msn.com>
>
>
> > From: bf-translations at blender.org
> > To: bf-translations-svn at blender.org
> > Date: Mon, 16 Jan 2012 19:26:23 +0000
> > Subject: [Bf-translations-svn] SVN commit: /data/svn/bf-translations 
> [314] branches: Updated branches from svn43429.
> >
> > Revision: 314
> > 
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-translations&revision=314
> > Author: mont29
> > Date: 2012-01-16 19:26:16 +0000 (Mon, 16 Jan 2012)
> > Log Message:
> > -----------
> > Updated branches from svn43429.
> >
> > Modified Paths:
> > --------------
> > branches/ar/ar.po
> > branches/bg/bg.po
> > branches/ca/ca.po
> > branches/cs/cs.po
> > branches/de/de.po
> > branches/el/el.po
> > branches/es/es.po
> > branches/es_ES/es_ES.po
> > branches/es_MX/es_MX.po
> > branches/fa/fa.po
> > branches/fi/fi.po
> > branches/fr/fr.po
> > branches/id/id.po
> > branches/it/it.po
> > branches/ja/ja.po
> > branches/ky/ky.po
> > branches/ne/ne.po
> > branches/pl/pl.po
> > branches/pt_BR/pt_BR.po
> > branches/ru/ru.po
> > branches/sr/sr.po
> > branches/sr at latin/sr at latin.po
> > branches/sv/sv.po
> > branches/zh_CN/zh_CN.po
> > branches/zh_TW/zh_TW.po
> >
> > Modified: branches/ar/ar.po
> > ===================================================================
> > --- branches/ar/ar.po 2012-01-16 18:07:33 UTC (rev 313)
> > +++ branches/ar/ar.po 2012-01-16 19:26:16 UTC (rev 314)
> > @@ -7,7 +7,7 @@
> > msgstr ""
> > "Project-Id-Version: Blender\n"
> > "Report-Msgid-Bugs-To: \n"
> > -"POT-Creation-Date: 2012-01-10 09:26+0100\n"
> > +"POT-Creation-Date: 2012-01-16 20:21+0100\n"
> > "PO-Revision-Date: 2012-01-13 17:06+0200\n"
> > "Last-Translator: \n"
> > "Language-Team: batProject <bat3a at msn.com>\n"
> > @@ -20,6 +20,7 @@
> > "X-Poedit-SourceCharset: utf-8\n"
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_utils.c:120
> > +#, c-format
> > msgid "%d items"
> > msgstr "%d عناصر"
> >
> > @@ -144,8 +145,12 @@
> > msgstr "إفتح"
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:476
> > -msgid "Unlink datablock. Shift + Click to set users to zero, data 
> will then not be saved"
> > -msgstr "فك ربط تسلسل البيانات. 'شيفت' + ضغطة لجعل المستخدمين صفرا، 
> لن تسجل البيانات عندها"
> > +msgid ""
> > +"Unlink datablock. Shift + Click to set users to zero, data will 
> then not be "
> > +"saved"
> > +msgstr ""
> > +"فك ربط تسلسل البيانات. 'شيفت' + ضغطة لجعل المستخدمين صفرا، لن تسجل 
> البيانات "
> > +"عندها"
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:741
> > msgid "Make Real"
> > @@ -165,7 +170,7 @@
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:850
> > #: bpy.types.VIEW3D_MT_object_apply bpy.types.VIEW3D_MT_pose_apply
> > -#: release/scripts/startup/bl_ui/space_view3d_toolbar.py:1168
> > +#: release/scripts/startup/bl_ui/space_view3d_toolbar.py:1183
> > msgid "Apply"
> > msgstr "طبق"
> >
> > @@ -194,18 +199,15 @@
> > #: bpy.types.DriverTarget.id_type:'TEXTURE'
> > #: bpy.types.DynamicPaintSurface.init_texture
> > #: bpy.types.EffectorWeights.texture bpy.types.FieldSettings.texture
> > -#: bpy.types.FieldSettings.type:'TEXTURE'
> > -#: bpy.types.Action.id_root:'TEXTURE'
> > +#: bpy.types.FieldSettings.type:'TEXTURE' 
> bpy.types.Action.id_root:'TEXTURE'
> > #: bpy.types.Brush.texture bpy.types.NodeTree.type:'TEXTURE'
> > #: bpy.types.KeyingSetPath.id_type:'TEXTURE'
> > #: bpy.types.MaterialHalo.use_texture bpy.types.DisplaceModifier.texture
> > #: bpy.types.WarpModifier.texture bpy.types.WaveModifier.texture
> > -#: bpy.types.CompositorNode.type:'TEXTURE'
> > -#: bpy.types.CompositorNodeTexture
> > +#: bpy.types.CompositorNode.type:'TEXTURE' 
> bpy.types.CompositorNodeTexture
> > #: bpy.types.CompositorNodeTexture.texture 
> bpy.types.ShaderNode.type:'TEXTURE'
> > #: bpy.types.ShaderNodeTexture bpy.types.ShaderNodeTexture.texture
> > -#: bpy.types.TextureNode.type:'TEXTURE'
> > -#: bpy.types.TextureNodeTexture
> > +#: bpy.types.TextureNode.type:'TEXTURE' bpy.types.TextureNodeTexture
> > #: bpy.types.TextureNodeTexture.texture
> > #: bpy.types.NODE_OT_new_node_tree.type:'TEXTURE'
> > #: bpy.types.OBJECT_OT_effector_add.type:'TEXTURE'
> > @@ -218,9 +220,9 @@
> > #: bpy.types.SpaceProperties.context:'TEXTURE'
> > #: bpy.types.SpaceView3D.viewport_shade:'TEXTURED'
> > #: bpy.types.TextureSlot.texture
> > -#: release/scripts/startup/bl_ui/properties_data_modifier.py:795
> > +#: release/scripts/startup/bl_ui/properties_data_modifier.py:794
> > #: release/scripts/startup/bl_ui/properties_material.py:519
> > -#: release/scripts/startup/bl_ui/space_userpref.py:357
> > +#: release/scripts/startup/bl_ui/space_userpref.py:355
> > msgid "Texture"
> > msgstr "النسيج"
> >
> > @@ -229,8 +231,7 @@
> > #: bpy.types.ConstraintActuator.material
> > #: bpy.types.DriverTarget.id_type:'MATERIAL'
> > #: bpy.types.DynamicPaintBrushSettings.material
> > -#: bpy.types.Action.id_root:'MATERIAL'
> > -#: bpy.types.Material.active_node_material
> > +#: bpy.types.Action.id_root:'MATERIAL' 
> bpy.types.Material.active_node_material
> > #: bpy.types.ParticleSettings.draw_color:'MATERIAL'
> > #: bpy.types.ParticleSettings.material
> > #: bpy.types.KeyingSetPath.id_type:'MATERIAL'
> > @@ -244,35 +245,30 @@
> > #: bpy.types.RenderSettings.sequencer_gl_preview:'MATERIAL'
> > #: bpy.types.RenderSettings.sequencer_gl_render:'MATERIAL'
> > #: bpy.types.CollisionSensor.material bpy.types.RaySensor.material
> > -#: bpy.types.RaySensor.ray_type:'MATERIAL'
> > -#: bpy.types.TouchSensor.material
> > +#: bpy.types.RaySensor.ray_type:'MATERIAL' 
> bpy.types.TouchSensor.material
> > #: bpy.types.SpaceProperties.context:'MATERIAL'
> > #: bpy.types.SpaceProperties.texture_context:'MATERIAL'
> > #: bpy.types.SpaceView3D.viewport_shade:'MATERIAL'
> > #: release/scripts/startup/bl_ui/properties_render.py:103
> > -#: release/scripts/startup/bl_ui/space_userpref.py:356
> > +#: release/scripts/startup/bl_ui/space_userpref.py:354
> > msgid "Material"
> > msgstr "خامة"
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1225
> > -#: bpy.types.DriverTarget.id_type:'LAMP'
> > -#: bpy.types.Action.id_root:'LAMP'
> > -#: bpy.types.Object.type:'LAMP'
> > -#: bpy.types.KeyingSetPath.id_type:'LAMP'
> > +#: bpy.types.DriverTarget.id_type:'LAMP' 
> bpy.types.Action.id_root:'LAMP'
> > +#: bpy.types.Object.type:'LAMP' bpy.types.KeyingSetPath.id_type:'LAMP'
> > #: bpy.types.EXPORT_SCENE_OT_fbx.object_types:'LAMP'
> > #: bpy.types.OBJECT_OT_add.type:'LAMP'
> > -#: bpy.types.OBJECT_OT_select_by_type.type:'LAMP'
> > -#: bpy.types.CyclesLamp_PT_lamp
> > +#: bpy.types.OBJECT_OT_select_by_type.type:'LAMP' 
> bpy.types.CyclesLamp_PT_lamp
> > #: bpy.types.DATA_PT_lamp bpy.types.ThemeView3D.lamp
> > -#: release/scripts/startup/bl_ui/space_info.py:300
> > -#: release/scripts/startup/bl_ui/space_userpref.py:355
> > +#: release/scripts/startup/bl_ui/space_info.py:302
> > +#: release/scripts/startup/bl_ui/space_userpref.py:353
> > msgid "Lamp"
> > msgstr "مصباح"
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1227
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:132
> > -#: bpy.types.DriverTarget.id_type:'WORLD'
> > -#: bpy.types.Action.id_root:'WORLD'
> > +#: bpy.types.DriverTarget.id_type:'WORLD' 
> bpy.types.Action.id_root:'WORLD'
> > #: bpy.types.Scene.world bpy.types.KeyingSetPath.id_type:'WORLD'
> > #: bpy.types.WORLD_PT_game_world bpy.types.WORLD_PT_world
> > #: bpy.types.RenderSettings.bake_normal_space:'WORLD'
> > @@ -304,15 +300,12 @@
> > #: bpy.types.PropertyActuator.mode:'ADD'
> > #: bpy.types.AnimData.action_blend_type:'ADD'
> > #: bpy.types.ColorMapping.blend_type:'ADD'
> > -#: bpy.types.FModifierNoise.blend_type:'ADD'
> > -#: bpy.types.Brush.blend:'ADD'
> > -#: bpy.types.Brush.direction:'ADD'
> > -#: bpy.types.Brush.vertex_tool:'ADD'
> > +#: bpy.types.FModifierNoise.blend_type:'ADD' 
> bpy.types.Brush.blend:'ADD'
> > +#: bpy.types.Brush.direction:'ADD' bpy.types.Brush.vertex_tool:'ADD'
> > #: bpy.types.Material.diffuse_ramp_blend:'ADD'
> > #: bpy.types.Material.specular_ramp_blend:'ADD'
> > #: bpy.types.LampSkySettings.sky_blend_type:'ADD'
> > -#: bpy.types.MaterialGameSettings.alpha_blend:'ADD'
> > -#: bpy.types.MaterialHalo.add
> > +#: bpy.types.MaterialGameSettings.alpha_blend:'ADD' 
> bpy.types.MaterialHalo.add
> > #: bpy.types.INFO_MT_add bpy.types.INFO_MT_edit_curve_add
> > #: bpy.types.LOGIC_MT_logicbricks_add bpy.types.NLA_MT_add
> > #: bpy.types.SEQUENCER_MT_add 
> bpy.types.VertexWeightMixModifier.mix_mode:'ADD'
> > @@ -329,13 +322,11 @@
> > #: bpy.types.MESH_OT_blend_from_shape.add
> > #: bpy.types.SEQUENCER_OT_change_effect_type.type:'ADD'
> > #: bpy.types.SEQUENCER_OT_effect_strip_add.type:'ADD'
> > -#: bpy.types.ParticleBrush.puff_mode:'ADD'
> > -#: bpy.types.ParticleEdit.tool:'ADD'
> > -#: bpy.types.Sequence.blend_type:'ADD'
> > -#: bpy.types.Sequence.type:'ADD'
> > +#: bpy.types.ParticleBrush.puff_mode:'ADD' 
> bpy.types.ParticleEdit.tool:'ADD'
> > +#: bpy.types.Sequence.blend_type:'ADD' bpy.types.Sequence.type:'ADD'
> > #: bpy.types.TextureSlot.blend_type:'ADD'
> > #: bpy.types.WorldLighting.ao_blend_type:'ADD'
> > -#: release/scripts/startup/bl_ui/space_sequencer.py:205
> > +#: release/scripts/startup/bl_ui/space_sequencer.py:202
> > #: release/scripts/startup/bl_ui/space_view3d_toolbar.py:327
> > msgid "Add"
> > msgstr "أضف"
> > @@ -347,16 +338,14 @@
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1323
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1367
> > -#: bpy.types.KeyMapItem.key_modifier:'DEL'
> > -#: bpy.types.KeyMapItem.type:'DEL'
> > +#: bpy.types.KeyMapItem.key_modifier:'DEL' 
> bpy.types.KeyMapItem.type:'DEL'
> > #: bpy.types.CONSOLE_OT_delete bpy.types.CURVE_OT_delete
> > #: bpy.types.FONT_OT_delete bpy.types.MBALL_OT_delete_metaelems
> > #: bpy.types.MESH_OT_delete bpy.types.NODE_OT_delete
> > #: bpy.types.OBJECT_OT_delete
> > #: bpy.types.OUTLINER_OT_object_operation.type:'DELETE'
> > #: bpy.types.PARTICLE_OT_delete bpy.types.TEXT_OT_delete
> > -#: bpy.types.SceneGameData.exit_key:'DEL'
> > -#: bpy.types.KeyboardSensor.key:'DEL'
> > +#: bpy.types.SceneGameData.exit_key:'DEL' 
> bpy.types.KeyboardSensor.key:'DEL'
> > #: bpy.types.KeyboardSensor.modifier_key_1:'DEL'
> > #: bpy.types.KeyboardSensor.modifier_key_2:'DEL'
> > #: release/scripts/startup/bl_ui/space_view3d_toolbar.py:329
> > @@ -378,7 +367,8 @@
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1334
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1381
> > -msgid "Interpolation %t|Ease %x1|Cardinal %x3|Linear %x0|B-Spline 
> %x2|Constant %x4"
> > +msgid ""
> > +"Interpolation %t|Ease %x1|Cardinal %x3|Linear %x0|B-Spline 
> %x2|Constant %x4"
> > msgstr "توليد %t|تسهيل %x1|أصلي %x3|خطي %x0|منحنى %x2|ثابت %x4"
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1335
> > @@ -447,8 +437,7 @@
> >
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1835
> > #: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1837
> > -#: bpy.types.KeyMap.region_type:'TOOLS'
> > -#: bpy.types.CLIP_OT_tools
> > +#: bpy.types.KeyMap.region_type:'TOOLS' bpy.types.CLIP_OT_tools
> > #: bpy.types.Region.type:'TOOLS'
> > msgid "Tools"
> > msgstr "أدوات"
> > @@ -472,90 +461,95 @@
> > msgid "Reset Black/White point and curves"
> > msgstr "أعد ضبط النقط السوداء/البيضاء و المنحنيات"
> >
> > -#: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:2578
> > +#: 
> /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:2582
> > msgid "Stop this job"
> > msgstr "أوقف هذه العملية"
> >
> >
> > @@ Diff output truncated at 10240 characters. @@
> > _______________________________________________
> > Bf-translations-svn mailing list
> > Bf-translations-svn at blender.org
> > http://lists.blender.org/mailman/listinfo/bf-translations-svn
>
>
> _______________________________________________
> Bf-translations-dev mailing list
> Bf-translations-dev at blender.org
> http://lists.blender.org/mailman/listinfo/bf-translations-dev