[Bf-translations-svn] SVN commit: /data/svn/bf-translations [219] trunk/po/fa.po: reverting rev.
bf-translations at blender.org
bf-translations at blender.org
Thu Nov 24 06:53:06 CET 2011
Revision: 219
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-translations&revision=219
Author: dfelinto
Date: 2011-11-24 05:53:01 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
reverting rev. 217. file svn conflicted committed
Modified Paths:
--------------
trunk/po/fa.po
Modified: trunk/po/fa.po
===================================================================
--- trunk/po/fa.po 2011-11-23 13:03:23 UTC (rev 218)
+++ trunk/po/fa.po 2011-11-24 05:53:01 UTC (rev 219)
@@ -24,11 +24,7 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_utils.c:120
#, c-format
msgid "%d items"
-<<<<<<< .mine
-msgstr "%d ﻡﻼﻗﺍ"
-=======
msgstr "% ﻡﻼﻗﺍ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:312
msgid "Browse Scene to be linked"
@@ -64,19 +60,11 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:320
msgid "Browse Lattice Data to be linked"
-<<<<<<< .mine
-msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﺲﯿﺗﻻ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"
-=======
msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﺲﯿﺗﻻ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:321
msgid "Browse Lamp Data to be linked"
-<<<<<<< .mine
-msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﭗﻣﻻ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"
-=======
msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﭗﻣﻻ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:322
msgid "Browse Camera Data to be linked"
@@ -128,11 +116,7 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:336
msgid "Browse ID data to be linked"
-<<<<<<< .mine
-msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﯼﺩ−ﯼﺁ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"
-=======
msgstr "ﻥﺩﺮﮐ ﮏﻨﯿﻟ ﯼﺍﺮﺑ ﯼﺩﯼﺁ ﻩﺩﺍﺩ ﺶﻨﯾﺰﮔ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:401
msgid "Indirect library datablock, cannot change"
@@ -162,17 +146,12 @@
msgstr "ﻥﺩﺮﮐ ﺯﺎﺑ"
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:475
-<<<<<<< .mine
-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 ""
" ﻩﺮﯿﺧﺫ ﺕﺎﻋﻼﻃﺍ .ﺮﻔﺻ ﻪﺑ ﻥﺩﺮﮐ ﻢﯿﻈﻨﺗ ﯼﺍﺮﺑ ﮏﯿﻠﮐ + ﺖﻔﯿﺷ .ﻦﮐ ﺍﺪﺟ ﺍﺭ ﻩﺩﺍﺩ ﮎﻮﻠﺑ"
"ﺪﺷ ﺪﻫﺍﻮﺨﻧ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:737
msgid "Make Real"
@@ -180,11 +159,7 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:738
msgid "Convert virtual modifier to a real modifier"
-<<<<<<< .mine
-msgstr "ﯽﻌﻗﺍﻭ ﺡﻼﺻﺍ ﮏﯾ ﻪﺑ ﯼﺯﺎﺠﻣ ﺮﮕﺣﻼﺻﺍ ﻞﯾﺪﺒﺗ"
-=======
msgstr "ﯽﻌﻗﺍﻭ ﺡﻼﺻﺍ ﮏﯾ ﻪﺑ ﯼﺯﺎﺠﻣ ﺮﮕﺣﻼﺻﺍ ﻞﯾﺪﺒﺗ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:775
msgid "Apply modifier to editing cage during Editmode"
@@ -281,11 +256,7 @@
#: release/scripts/startup/bl_ui/space_info.py:300
#: release/scripts/startup/bl_ui/space_userpref.py:353
msgid "Lamp"
-<<<<<<< .mine
-msgstr "ﭗﻣﻻ"
-=======
msgstr "ﭗﻣﻻ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1223
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:132
@@ -370,11 +341,7 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1320
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1364
msgid "Delete the active position"
-<<<<<<< .mine
-msgstr "ﻝﺎﻌﻓ ﻩﺎﮕﯾﺎﺟ ﻑﺬﺣ"
-=======
msgstr "ﻝﺎﻌﻓ ﺖﯿﻌﻗﻮﻣ ﻑﺬﺣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1325
msgid "Flip colorband"
@@ -401,35 +368,19 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1630
msgid "Min X "
-<<<<<<< .mine
-msgstr "X ﻞﻗﺍﺪﺣ"
-=======
msgstr " ﻞﻗﺍﺪﺣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1631
msgid "Min Y "
-<<<<<<< .mine
-msgstr "Y ﻞﻗﺍﺪﺣ"
-=======
msgstr " ﻞﻗﺍﺪﺣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1632
msgid "Max X "
-<<<<<<< .mine
-msgstr "X ﺮﺜﮐﺍﺪﺣ"
-=======
msgstr " ﺮﺜﮐﺍﺪﺣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1633
msgid "Max Y "
-<<<<<<< .mine
-msgstr "Y ﺮﺜﮐﺍﺪﺣ"
-=======
msgstr " ﺮﺜﮐﺍﺪﺣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1682
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:1704
@@ -522,46 +473,26 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_templates.c:2635
msgid "Click to see rest of reports in textblock: 'Recent Reports'"
-<<<<<<< .mine
-msgstr "«ﺮﯿﺧﺍ ﯼﺎﻫ ﺵﺭﺍﺰﮔ» :ﺪﯿﻨﮐ ﮏﯿﻠﮐ ﻦﺘﻣ ﮎﻮﻠﺑ ﺵﺭﺍﺰﮔ ﻪﯿﻘﺑ ﻥﺪﯾﺩ ﯼﺍﺮﺑ"
-=======
msgstr "ﺮﯿﺧﺍ ﯼﺎﻫ ﺵﺭﺍﺰﮔ :ﺪﯿﻨﮐ ﮏﯿﻠﮐ ﻦﺘﻣ ﮎﻮﻠﺑ ﺵﺭﺍﺰﮔ ﻪﯿﻘﺑ ﻥﺪﯾﺩ ﯼﺍﺮﺑ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_layout.c:2803
msgid "No Properties"
-<<<<<<< .mine
-msgstr "ﯽﮔﮋﯾﻭ ﻥﻭﺪﺑ"
-=======
msgstr "ﯽﮕﺰﯾﻭ ﻥﻭﺪﺑ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:413
#, c-format
msgid "Shortcut: %s"
-<<<<<<< .mine
-msgstr "%s :ﺮﺒﻧﺎﯿﻣ"
-=======
msgstr "% :ﺮﺒﻧﺎﯿﻣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:423
#, c-format
msgid "Value: %s"
-<<<<<<< .mine
-msgstr "%s :ﺭﺍﺪﻘﻣ"
-=======
msgstr "% :ﺭﺍﺪﻘﻣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:435
#, c-format
msgid "Radians: %f"
-<<<<<<< .mine
-msgstr "%f :ﻥﺎﯾﺩﺍﺭ"
-=======
msgstr "% :ﻥﺎﯾﺩﺍﺭ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:444
#, c-format
@@ -571,39 +502,23 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:452
#, c-format
msgid "Python: %s.%s"
-<<<<<<< .mine
-msgstr "%s.%s :ﻥﻮﺘﯾﺎﭘ"
-=======
msgstr "%.% :ﻥﻮﺘﯾﺎﭘ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:460
#, c-format
msgid "Library: %s"
-<<<<<<< .mine
-msgstr "%s :ﻪﻧﺎﺨﺑﺎﺘﮐ"
-=======
msgstr "% :ﻪﻧﺎﺨﺑﺎﺘﮐ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:475
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:499
#, c-format
msgid "Python: %s"
-<<<<<<< .mine
-msgstr "%s :ﻥﻮﺘﯾﺎﭘ"
-=======
msgstr "% :ﻥﻮﺘﯾﺎﭘ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/interface/interface_regions.c:489
#, c-format
msgid "Disabled: %s"
-<<<<<<< .mine
-msgstr "%s :ﻝﺎﻌﻓﺮﯿﻏ"
-=======
msgstr "% :ﻝﺎﻌﻓﺮﯿﻏ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:130
#: bpy.types.ParticleSettings.render_step bpy.types.INFO_MT_render
@@ -690,28 +605,16 @@
#: release/scripts/startup/bl_ui/properties_data_modifier.py:845
#: release/scripts/startup/bl_ui/space_view3d.py:955
msgid "Object"
-<<<<<<< .mine
-msgstr "ءﯽﺷ"
-=======
msgstr "ﺀﯽﺷ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:134
#: bpy.types.OBJECT_PT_constraints
msgid "Object Constraints"
-<<<<<<< .mine
-msgstr "ءﺎﯿﺷﺍ ﯼﺎﻫ ﺖﯾﺩﻭﺪﺤﻣ"
-=======
msgstr "ﺀﺎﯿﺷﺍ ﯼﺎﻫ ﺖﯾﺩﻭﺪﺤﻣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:135
msgid "Object Modifiers"
-<<<<<<< .mine
-msgstr "ءﯽﺷ ﯼﺎﻫ ﺮﮔ ﺡﻼﺻﺍ"
-=======
msgstr "ﺀﯽﺷ ﯼﺎﻫ ﺮﮔ ﺡﻼﺻﺍ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:136
#: bpy.types.OBJECT_OT_make_links_data.type, 'OBDATA'
@@ -719,11 +622,7 @@
#: bpy.types.OBJECT_OT_modifier_apply.apply_as, 'DATA'
#: bpy.types.OBJECT_OT_select_linked.type,
msgid "Object Data"
-<<<<<<< .mine
-msgstr "ءﯽﺷ ﯼﺎﻫ ﻩﺩﺍﺩ"
-=======
msgstr "ﺀﯽﺷ ﯼﺎﻫ ﻩﺩﺍﺩ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_buttons/buttons_header.c:137
#: bpy.types.ArmatureActuator.bone
@@ -781,11 +680,7 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_file/file_draw.c:190
msgid "File name, overwrite existing"
-<<<<<<< .mine
-msgstr "ﺩﻮﺟﻮﻣ ﯽﺴﯾﻮﻧﺯﺎﺑ ٬ﻞﯾﺎﻓ ﻡﺎﻧ"
-=======
msgstr "ﺩﻮﺟﻮﻣ ﯽﺴﯾﻮﻧﺯﺎﺑ ﻞﯾﺎﻓ ﻡﺎﻧ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_file/file_draw.c:190
msgid "File name"
@@ -806,20 +701,12 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:280
msgid "Mode: %t"
-<<<<<<< .mine
-msgstr "ﺖﻟﺎﺣ: t%"
-=======
msgstr "ﺖﻟﺎﺣ: %"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:285
#: KM_HIERARCHY.VIEW_3D.EMPTY
msgid "Object Mode"
-<<<<<<< .mine
-msgstr "ءﯽﺷ ﺖﻟﺎﺣ"
-=======
msgstr "ﺀﯽﺷ ﺖﻟﺎﺣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:296
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:300
@@ -853,11 +740,7 @@
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:316
msgid "Pose Mode"
-<<<<<<< .mine
-msgstr "ﺖﺳﮊ ﺖﻟﺎﺣ"
-=======
msgstr "ﺖﺴﺯ ﺖﻟﺎﺣ"
->>>>>>> .r216
#: /home/i7deb64/blender-2.5-svn/__work__/blender_msgs/source/blender/editors/space_view3d/view3d_header.c:320
msgid "Particle Mode"
@@ -933,7 +816,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-translations-svn
mailing list