<div>Hi Amin,</div>this commit is wrong. your local copy of the file had svn conflicts and should have been solved before the commit.<div><br></div><div>--</div><div>Dalai<br><div class="gmail_quote">2011/11/22 <span dir="ltr"><<a href="mailto:bf-translations@blender.org" target="_blank">bf-translations@blender.org</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Revision: 217<br>
<a href="http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-translations&revision=217" target="_blank">http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-translations&revision=217</a><br>
Author: leomoon<br>
Date: 2011-11-23 04:44:12 +0000 (Wed, 23 Nov 2011)<br>
Log Message:<br>
-----------<br>
<br>
<br>
Modified Paths:<br>
--------------<br>
trunk/po/fa.po<br>
<br>
Modified: trunk/po/fa.po<br>
===================================================================<br>
--- trunk/po/fa.po 2011-11-23 04:31:56 UTC (rev 216)<br>
+++ trunk/po/fa.po 2011-11-23 04:44:12 UTC (rev 217)<br>
@@ -24,7 +24,11 @@<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_utils.c:120<br>
#, c-format<br>
msgid "%d items"<br>
+<<<<<<< .mine<br>
+msgstr "%d ﻡﻼﻗﺍ"<br>
+=======<br>
msgstr "% ﻡﻼﻗﺍ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:312<br>
msgid "Browse Scene to be linked"<br>
@@ -60,11 +64,19 @@<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:320<br>
msgid "Browse Lattice Data to be linked"<br>
+<<<<<<< .mine<br>
+msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﺲﯿﺗﻻ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"<br>
+=======<br>
msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﺲﯿﺗﻻ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:321<br>
msgid "Browse Lamp Data to be linked"<br>
+<<<<<<< .mine<br>
+msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﭗﻣﻻ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"<br>
+=======<br>
msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﭗﻣﻻ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:322<br>
msgid "Browse Camera Data to be linked"<br>
@@ -116,7 +128,11 @@<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:336<br>
msgid "Browse ID data to be linked"<br>
+<<<<<<< .mine<br>
+msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﯼﺩ−ﯼﺁ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"<br>
+=======<br>
msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﯼﺩﯼﺁ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:401<br>
msgid "Indirect library datablock, cannot change"<br>
@@ -146,12 +162,17 @@<br>
msgstr "ﻥﺩﺮﮐ ﺯﺎﺑ"<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:475<br>
+<<<<<<< .mine<br>
+msgid "Unlink datablock. Shift + Click to set users to zero, data will then not be saved"<br>
+msgstr "ﺪﺷ ﺪﻫﺍﻮﺨﻧ ﻩﺮﯿﺧﺫ ﺕﺎﻋﻼﻃﺍ .ﺮﻔﺻ ﻪﺑ ﻥﺩﺮﮐ ﻢﯿﻈﻨﺗ ﯼﺍﺮﺑ ﮏﯿﻠﮐ + ﺖﻔﯿﺷ .ﻦﮐ ﺍﺪﺟ ﺍﺭ ﻩﺩﺍﺩ ﮎﻮﻠﺑ"<br>
+=======<br>
msgid ""<br>
"Unlink datablock. Shift + Click to set users to zero, data will then not be "<br>
"saved"<br>
msgstr ""<br>
" ﻩﺮﯿﺧﺫ ﺕﺎﻋﻼﻃﺍ .ﺮﻔﺻ ﻪﺑ ﻥﺩﺮﮐ ﻢﯿﻈﻨﺗ ﯼﺍﺮﺑ ﮏﯿﻠﮐ + ﺖﻔﯿﺷ .ﻦﮐ ﺍﺪﺟ ﺍﺭ ﻩﺩﺍﺩ ﮎﻮﻠﺑ"<br>
"ﺪﺷ ﺪﻫﺍﻮﺨﻧ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:737<br>
msgid "Make Real"<br>
@@ -159,7 +180,11 @@<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:738<br>
msgid "Convert virtual modifier to a real modifier"<br>
+<<<<<<< .mine<br>
+msgstr "ﯽﻌﻗﺍﻭ ﺡﻼﺻﺍ ﮏﯾ ﻪﺑ ﯼﺯﺎﺠﻣ ﺮﮕﺣﻼﺻﺍ ﻞﯾﺪﺒﺗ"<br>
+=======<br>
msgstr "ﯽﻌﻗﺍﻭ ﺡﻼﺻﺍ ﮏﯾ ﻪﺑ ﯼﺯﺎﺠﻣ ﺮﮕﺣﻼﺻﺍ ﻞﯾﺪﺒﺗ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:775<br>
msgid "Apply modifier to editing cage during Editmode"<br>
@@ -256,7 +281,11 @@<br>
#: release/scripts/startup/bl_ui/space_info.py:300<br>
#: release/scripts/startup/bl_ui/space_userpref.py:353<br>
msgid "Lamp"<br>
+<<<<<<< .mine<br>
+msgstr "ﭗﻣﻻ"<br>
+=======<br>
msgstr "ﭗﻣﻻ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1223<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:132<br>
@@ -341,7 +370,11 @@<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1320<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1364<br>
msgid "Delete the active position"<br>
+<<<<<<< .mine<br>
+msgstr "ﻝﺎﻌﻓ ﻩﺎﮕﯾﺎﺟ ﻑﺬﺣ"<br>
+=======<br>
msgstr "ﻝﺎﻌﻓ ﺖﯿﻌﻗﻮﻣ ﻑﺬﺣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1325<br>
msgid "Flip colorband"<br>
@@ -368,19 +401,35 @@<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1630<br>
msgid "Min X "<br>
+<<<<<<< .mine<br>
+msgstr "X ﻞﻗﺍﺪﺣ"<br>
+=======<br>
msgstr " ﻞﻗﺍﺪﺣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1631<br>
msgid "Min Y "<br>
+<<<<<<< .mine<br>
+msgstr "Y ﻞﻗﺍﺪﺣ"<br>
+=======<br>
msgstr " ﻞﻗﺍﺪﺣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1632<br>
msgid "Max X "<br>
+<<<<<<< .mine<br>
+msgstr "X ﺮﺜﮐﺍﺪﺣ"<br>
+=======<br>
msgstr " ﺮﺜﮐﺍﺪﺣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1633<br>
msgid "Max Y "<br>
+<<<<<<< .mine<br>
+msgstr "Y ﺮﺜﮐﺍﺪﺣ"<br>
+=======<br>
msgstr " ﺮﺜﮐﺍﺪﺣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1682<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1704<br>
@@ -473,26 +522,46 @@<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:2635<br>
msgid "Click to see rest of reports in textblock: 'Recent Reports'"<br>
+<<<<<<< .mine<br>
+msgstr "«ﺮﯿﺧﺍ ﯼﺎﻫ ﺵﺭﺍﺰﮔ» :ﺪﯿﻨﮐ ﮏﯿﻠﮐ ﻦﺘﻣ ﮎﻮﻠﺑ ﺵﺭﺍﺰﮔ ﻪﯿﻘﺑ ﻥﺪﯾﺩ ﯼﺍﺮﺑ"<br>
+=======<br>
msgstr "ﺮﯿﺧﺍ ﯼﺎﻫ ﺵﺭﺍﺰﮔ :ﺪﯿﻨﮐ ﮏﯿﻠﮐ ﻦﺘﻣ ﮎﻮﻠﺑ ﺵﺭﺍﺰﮔ ﻪﯿﻘﺑ ﻥﺪﯾﺩ ﯼﺍﺮﺑ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_layout.c:2803<br>
msgid "No Properties"<br>
+<<<<<<< .mine<br>
+msgstr "ﯽﮔﮋﯾﻭ ﻥﻭﺪﺑ"<br>
+=======<br>
msgstr "ﯽﮕﺰﯾﻭ ﻥﻭﺪﺑ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:413<br>
#, c-format<br>
msgid "Shortcut: %s"<br>
+<<<<<<< .mine<br>
+msgstr "%s :ﺮﺒﻧﺎﯿﻣ"<br>
+=======<br>
msgstr "% :ﺮﺒﻧﺎﯿﻣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:423<br>
#, c-format<br>
msgid "Value: %s"<br>
+<<<<<<< .mine<br>
+msgstr "%s :ﺭﺍﺪﻘﻣ"<br>
+=======<br>
msgstr "% :ﺭﺍﺪﻘﻣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:435<br>
#, c-format<br>
msgid "Radians: %f"<br>
+<<<<<<< .mine<br>
+msgstr "%f :ﻥﺎﯾﺩﺍﺭ"<br>
+=======<br>
msgstr "% :ﻥﺎﯾﺩﺍﺭ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:444<br>
#, c-format<br>
@@ -502,23 +571,39 @@<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:452<br>
#, c-format<br>
msgid "Python: %s.%s"<br>
+<<<<<<< .mine<br>
+msgstr "%s.%s :ﻥﻮﺘﯾﺎﭘ"<br>
+=======<br>
msgstr "%.% :ﻥﻮﺘﯾﺎﭘ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:460<br>
#, c-format<br>
msgid "Library: %s"<br>
+<<<<<<< .mine<br>
+msgstr "%s :ﻪﻧﺎﺨﺑﺎﺘﮐ"<br>
+=======<br>
msgstr "% :ﻪﻧﺎﺨﺑﺎﺘﮐ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:475<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:499<br>
#, c-format<br>
msgid "Python: %s"<br>
+<<<<<<< .mine<br>
+msgstr "%s :ﻥﻮﺘﯾﺎﭘ"<br>
+=======<br>
msgstr "% :ﻥﻮﺘﯾﺎﭘ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:489<br>
#, c-format<br>
msgid "Disabled: %s"<br>
+<<<<<<< .mine<br>
+msgstr "%s :ﻝﺎﻌﻓﺮﯿﻏ"<br>
+=======<br>
msgstr "% :ﻝﺎﻌﻓﺮﯿﻏ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:130<br>
#: bpy.types.ParticleSettings.render_step bpy.types.INFO_MT_render<br>
@@ -605,16 +690,28 @@<br>
#: release/scripts/startup/bl_ui/properties_data_modifier.py:845<br>
#: release/scripts/startup/bl_ui/space_view3d.py:955<br>
msgid "Object"<br>
+<<<<<<< .mine<br>
+msgstr "ءﯽﺷ"<br>
+=======<br>
msgstr "ﺀﯽﺷ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:134<br>
#: bpy.types.OBJECT_PT_constraints<br>
msgid "Object Constraints"<br>
+<<<<<<< .mine<br>
+msgstr "ءﺎﯿﺷﺍ ﯼﺎﻫ ﺖﯾﺩﻭﺪﺤﻣ"<br>
+=======<br>
msgstr "ﺀﺎﯿﺷﺍ ﯼﺎﻫ ﺖﯾﺩﻭﺪﺤﻣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:135<br>
msgid "Object Modifiers"<br>
+<<<<<<< .mine<br>
+msgstr "ءﯽﺷ ﯼﺎﻫ ﺮﮔ ﺡﻼﺻﺍ"<br>
+=======<br>
msgstr "ﺀﯽﺷ ﯼﺎﻫ ﺮﮔ ﺡﻼﺻﺍ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:136<br>
#: bpy.types.OBJECT_OT_make_links_data.type, 'OBDATA'<br>
@@ -622,7 +719,11 @@<br>
#: bpy.types.OBJECT_OT_modifier_apply.apply_as, 'DATA'<br>
#: bpy.types.OBJECT_OT_select_linked.type,<br>
msgid "Object Data"<br>
+<<<<<<< .mine<br>
+msgstr "ءﯽﺷ ﯼﺎﻫ ﻩﺩﺍﺩ"<br>
+=======<br>
msgstr "ﺀﯽﺷ ﯼﺎﻫ ﻩﺩﺍﺩ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:137<br>
#: bpy.types.ArmatureActuator.bone<br>
@@ -680,7 +781,11 @@<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_file/file_draw.c:190<br>
msgid "File name, overwrite existing"<br>
+<<<<<<< .mine<br>
+msgstr "ﺩﻮﺟﻮﻣ ﯽﺴﯾﻮﻧﺯﺎﺑ ٬ﻞﯾﺎﻓ ﻡﺎﻧ"<br>
+=======<br>
msgstr "ﺩﻮﺟﻮﻣ ﯽﺴﯾﻮﻧﺯﺎﺑ ﻞﯾﺎﻓ ﻡﺎﻧ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_file/file_draw.c:190<br>
msgid "File name"<br>
@@ -701,12 +806,20 @@<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:280<br>
msgid "Mode: %t"<br>
+<<<<<<< .mine<br>
+msgstr "ﺖﻟﺎﺣ: t%"<br>
+=======<br>
msgstr "ﺖﻟﺎﺣ: %"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:285<br>
#: KM_HIERARCHY.VIEW_3D.EMPTY<br>
msgid "Object Mode"<br>
+<<<<<<< .mine<br>
+msgstr "ءﯽﺷ ﺖﻟﺎﺣ"<br>
+=======<br>
msgstr "ﺀﯽﺷ ﺖﻟﺎﺣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:296<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:300<br>
@@ -740,7 +853,11 @@<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:316<br>
msgid "Pose Mode"<br>
+<<<<<<< .mine<br>
+msgstr "ﺖﺳﮊ ﺖﻟﺎﺣ"<br>
+=======<br>
msgstr "ﺖﺴﺯ ﺖﻟﺎﺣ"<br>
+>>>>>>> .r216<br>
<br>
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:320<br>
msgid "Particle Mode"<br>
@@ -816,7 +933,7 @@<br>
<br>
<br>
@@ Diff output truncated at 10240 characters. @@<br>
_______________________________________________<br>
Bf-translations-svn mailing list<br>
<a href="mailto:Bf-translations-svn@blender.org" target="_blank">Bf-translations-svn@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/bf-translations-svn" target="_blank">http://lists.blender.org/mailman/listinfo/bf-translations-svn</a><br>
</blockquote></div><br></div>