[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39332] branches/soc-2011-garlic: code clear, insert blf_gettext.c to blf.c

xiao xiangquan xiaoxiangquan at gmail.com
Fri Aug 12 15:43:22 CEST 2011


Revision: 39332
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39332
Author:   xiaoxiangquan
Date:     2011-08-12 13:43:21 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
code clear, insert blf_gettext.c to blf.c

Modified Paths:
--------------
    branches/soc-2011-garlic/SConstruct
    branches/soc-2011-garlic/po/zh_CN.po
    branches/soc-2011-garlic/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-garlic/source/blender/blenfont/BLF_api.h
    branches/soc-2011-garlic/source/blender/blenfont/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/blenfont/intern/blf.c
    branches/soc-2011-garlic/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-garlic/source/blender/editors/include/ED_datafiles.h
    branches/soc-2011-garlic/source/blender/python/generic/blf_py_api.c

Removed Paths:
-------------
    branches/soc-2011-garlic/source/blender/blenfont/intern/blf_gettext.c

Modified: branches/soc-2011-garlic/SConstruct
===================================================================
--- branches/soc-2011-garlic/SConstruct	2011-08-12 13:41:10 UTC (rev 39331)
+++ branches/soc-2011-garlic/SConstruct	2011-08-12 13:43:21 UTC (rev 39332)
@@ -512,12 +512,12 @@
                 
                 if 'locale' in dp or 'fonts' in dp:
                     datafileslist.append(os.path.join(dp,f))
-                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[1:]))    # skip bin/.blender
+                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[1:]))    # skip bin
                     datafilestargetlist.append(dir + os.sep + f)
 
                 else:
                     dotblendlist.append(os.path.join(dp, f))
-                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[1:]))    # skip bin/.blender
+                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[1:]))    # skip bin
                     dottargetlist.append(dir + os.sep + f)
                     
         dotblenderinstall = []

Modified: branches/soc-2011-garlic/po/zh_CN.po
===================================================================
--- branches/soc-2011-garlic/po/zh_CN.po	2011-08-12 13:41:10 UTC (rev 39331)
+++ branches/soc-2011-garlic/po/zh_CN.po	2011-08-12 13:43:21 UTC (rev 39332)
@@ -30,10 +30,9 @@
 "Project-Id-Version: Blender 2.58a\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-08-12 06:04+0800\n"
-"PO-Revision-Date: 2011-07-28 19:10+0800\n"
-"Last-Translator: congcong009 <congcong009 at gmail.com>\n"
-"Language-Team: BlenderCN( http://www.blendercn.org) translation team "
-"<blender-translation at googlegroups.com>\n"
+"PO-Revision-Date: 2011-08-12 21:39+0700\n"
+"Last-Translator: xiaoxiangquan <xiaoxiangquan at gmail.com>\n"
+"Language-Team: BlenderCN( http://www.blendercn.org) translation team <blender-translation at googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,9 +43,7 @@
 "X-Poedit-Country: CHINA\n"
 
 #: release/scripts/startup/bl_operators/animsys_update.py:696
-msgid ""
-"Update data paths from 2.56 and previous versions, modifying data paths of "
-"drivers and fcurves"
+msgid "Update data paths from 2.56 and previous versions, modifying data paths of drivers and fcurves"
 msgstr "更新了2.56及之前版本的数据路径,修改了驱动器和FCurves路径"
 
 #: release/scripts/startup/bl_operators/object.py:29
@@ -226,9 +223,7 @@
 msgstr "固定偏移量"
 
 #: release/scripts/startup/bl_operators/object.py:294
-msgid ""
-"Clamp the transformation to the distance each vertex moves in the original "
-"shape."
+msgid "Clamp the transformation to the distance each vertex moves in the original shape."
 msgstr "在转变时固定原形状各点间的运动距离"
 
 #: release/scripts/startup/bl_operators/object.py:512
@@ -257,9 +252,7 @@
 msgstr "品质"
 
 #: release/scripts/startup/bl_operators/object_align.py:351
-msgid ""
-"Enables high quality calculation of the bounding box for perfect results on "
-"complex shape meshes with rotation/scale (Slow)"
+msgid "Enables high quality calculation of the bounding box for perfect results on complex shape meshes with rotation/scale (Slow)"
 msgstr ""
 
 #: release/scripts/startup/bl_operators/object_quick_effects.py:284
@@ -9077,8 +9070,7 @@
 msgstr "恢复禁用的F-Curves"
 
 #: source/blender/editors/animation/anim_channels_edit.c:1717
-msgid ""
-"Clears 'disabled' tag from all F-Curves to get broken F-Curves working again"
+msgid "Clears 'disabled' tag from all F-Curves to get broken F-Curves working again"
 msgstr "清空所有F-Curves中禁用的标记,以使断开的F-Curves重新生效"
 
 #: source/blender/editors/animation/anim_channels_edit.c:1752
@@ -9309,9 +9301,7 @@
 msgstr "帧/秒显示模式切换"
 
 #: source/blender/editors/animation/anim_ops.c:338
-msgid ""
-"Toggle whether timing is displayed in frames or seconds for active timeline "
-"view"
+msgid "Toggle whether timing is displayed in frames or seconds for active timeline view"
 msgstr "为激活的时间线视图切换计时方式(帧或秒)"
 
 #: source/blender/editors/animation/drivers.c:539
@@ -9327,9 +9317,7 @@
 msgstr "插入关键帧"
 
 #: source/blender/editors/animation/keyframing.c:1147
-msgid ""
-"Insert keyframes on the current frame for all properties in the specified "
-"Keying Set"
+msgid "Insert keyframes on the current frame for all properties in the specified Keying Set"
 msgstr "在当前帧插入关键帧,包含指定关键帧设定的全部属性"
 
 #: source/blender/editors/animation/keyframing.c:1157
@@ -9363,9 +9351,7 @@
 msgstr "插入关键帧菜单"
 
 #: source/blender/editors/animation/keyframing.c:1200
-msgid ""
-"Insert Keyframes for specified Keying Set, with menu of available Keying "
-"Sets if undefined"
+msgid "Insert Keyframes for specified Keying Set, with menu of available Keying Sets if undefined"
 msgstr "若未定义,则插入关键帧到指定的关键帧设定,附菜单"
 
 #: source/blender/editors/animation/keyframing.c:1227
@@ -9377,9 +9363,7 @@
 msgstr "删除帧设定的关键帧"
 
 #: source/blender/editors/animation/keyframing.c:1294
-msgid ""
-"Delete keyframes on the current frame for all properties in the specified "
-"Keying Set"
+msgid "Delete keyframes on the current frame for all properties in the specified Keying Set"
 msgstr "为指定帧设定中的所有属性删除当前帧的关键帧"
 
 #: source/blender/editors/animation/keyframing.c:1364
@@ -9588,8 +9572,7 @@
 msgstr "点击-挤出"
 
 #: source/blender/editors/armature/editarmature.c:2400
-msgid ""
-"Create a new bone going from the last selected joint to the mouse position"
+msgid "Create a new bone going from the last selected joint to the mouse position"
 msgstr "在上一所选关节与鼠标坐标之间创建一段新骨骼"
 
 #: source/blender/editors/armature/editarmature.c:2667
@@ -9697,8 +9680,7 @@
 msgstr "切割次数"
 
 #: source/blender/editors/armature/editarmature.c:3677
-msgid ""
-"Change the direction that a chain of bones points in (head <-> tail swap)"
+msgid "Change the direction that a chain of bones points in (head <-> tail swap)"
 msgstr "改变骨骼链的方向(切换首尾)"
 
 #: source/blender/editors/armature/editarmature.c:3749
@@ -9738,8 +9720,7 @@
 msgstr "断开骨骼连接"
 
 #: source/blender/editors/armature/editarmature.c:3906
-msgid ""
-"Remove the parent-child relationship between selected bones and their parents"
+msgid "Remove the parent-child relationship between selected bones and their parents"
 msgstr "移除所选骨骼及其父级间的父子关系"
 
 #: source/blender/editors/armature/editarmature.c:3916
@@ -9762,9 +9743,7 @@
 
 #: source/blender/editors/armature/editarmature.c:3943
 #: source/blender/editors/armature/editarmature.c:5035
-msgid ""
-"Flip the selection status of bones (selected -> unselected, unselected -> "
-"selected)"
+msgid "Flip the selection status of bones (selected -> unselected, unselected -> selected)"
 msgstr "翻转骨骼的选择状态(选定项 -> 未选项,未选项 -> 选定项)"
 
 #: source/blender/editors/armature/editarmature.c:4001
@@ -9845,9 +9824,7 @@
 msgstr "清空姿势变换"
 
 #: source/blender/editors/armature/editarmature.c:5001
-msgid ""
-"Reset location, rotation, and scaling of selected bones to their default "
-"values"
+msgid "Reset location, rotation, and scaling of selected bones to their default values"
 msgstr "将所选骨骼的位置、旋转与缩放重置为默认值"
 
 #: source/blender/editors/armature/editarmature.c:5128
@@ -9915,9 +9892,7 @@
 
 #: source/blender/editors/armature/editarmature.c:5508
 #: source/blender/editors/armature/poseobject.c:1614
-msgid ""
-"Automatically renames the selected bones according to which side of the "
-"target axis they fall on"
+msgid "Automatically renames the selected bones according to which side of the target axis they fall on"
 msgstr "根据其倾向的目标轴向自动重命名所选骨骼"
 
 #: source/blender/editors/armature/editarmature.c:5519
@@ -10040,9 +10015,7 @@
 
 #: source/blender/editors/armature/poselib.c:1597
 #: source/blender/editors/armature/poselib.c:1620
-msgid ""
-"Index of the pose to apply (-2 for no change to pose, -1 for poselib active "
-"pose)"
+msgid "Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)"
 msgstr "要应用的姿势索引(-2则不改变姿势,-1则使用poselib中激活的姿势)"
 
 #: source/blender/editors/armature/poselib.c:1607
@@ -10191,8 +10164,7 @@
 msgstr "取消选择激活的骨骼组"
 
 #: source/blender/editors/armature/poseobject.c:1561
-msgid ""
-"Flips (and corrects) the axis suffixes of the the names of selected bones"
+msgid "Flips (and corrects) the axis suffixes of the the names of selected bones"
 msgstr "翻转(并修正)所选骨骼名称的轴后缀"
 
 #: source/blender/editors/armature/poseobject.c:1673
@@ -10253,9 +10225,7 @@
 msgstr "翻转四元数值"
 
 #: source/blender/editors/armature/poseobject.c:1973
-msgid ""
-"Flip quaternion values to achieve desired rotations, while maintaining the "
-"same orientations"
+msgid "Flip quaternion values to achieve desired rotations, while maintaining the same orientations"
 msgstr "翻转四元数值以达到期望的旋转结果,同时保持原始方位不变"
 
 #: source/blender/editors/armature/poseSlide.c:687
@@ -10312,9 +10282,7 @@
 msgstr "当保持时"
 
 #: source/blender/editors/armature/poseSlide.c:1200
-msgid ""
-"Propagate pose to all keyframes after current frame that don't change "
-"(Default behaviour)"
+msgid "Propagate pose to all keyframes after current frame that don't change (Default behaviour)"
 msgstr "将姿势传导至当前帧之后的所有未改变的关键帧(默认行为)"
 
 #: source/blender/editors/armature/poseSlide.c:1201
@@ -10334,8 +10302,7 @@
 msgstr "指定帧之前"
 
 #: source/blender/editors/armature/poseSlide.c:1203
-msgid ""
-"Propagate pose to all keyframes between current frame and 'Frame' property"
+msgid "Propagate pose to all keyframes between current frame and 'Frame' property"
 msgstr "将姿势传导至当前帧与'帧'属性值之间的所有关键帧"
 
 #: source/blender/editors/armature/poseSlide.c:1204
@@ -10343,14 +10310,11 @@
 msgstr "上一关键帧之前"
 
 #: source/blender/editors/armature/poseSlide.c:1204
-msgid ""
-"Propagate pose to all keyframes from current frame until no more are found"
+msgid "Propagate pose to all keyframes from current frame until no more are found"
 msgstr "将姿势从当前帧起向后传导至所有有效关键帧"
 
 #: source/blender/editors/armature/poseSlide.c:1205
-msgid ""
-"Propagate pose to all keyframes occurring on frames with Scene Markers after "
-"the current frame"
+msgid "Propagate pose to all keyframes occurring on frames with Scene Markers after the current frame"
 msgstr "将姿势传导至当前帧后的场景标记符所在的所有关键帧"
 
 #: source/blender/editors/armature/poseSlide.c:1209
@@ -10358,9 +10322,7 @@
 msgstr "传导姿势"
 
 #: source/blender/editors/armature/poseSlide.c:1211
-msgid ""
-"Copy selected aspects of the current pose to subsequent poses already "
-"keyframed"

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list