diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
commit | 9c42afb1c02cafa21632bd2e19b47c012a230368 (patch) | |
tree | 90d7e190e9ba59437f1e3e31337984a2200aa764 /source/blender/editors/animation/anim_channels_defines.c | |
parent | 5582d9fac13123397297db54a0478a63a1b75194 (diff) | |
parent | 8f5112f191e24aac86da7b70f461a50825e764da (diff) |
Merged changes in the trunk up to revision 40413.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 6137d7a4d70..92af51326a8 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -3148,21 +3148,21 @@ static void draw_setting_widget (bAnimContext *ac, bAnimListElem *ale, bAnimChan icon= ICON_VISIBLE_IPO_OFF; if (ale->type == ANIMTYPE_FCURVE) - tooltip= "Channel is visible in Graph Editor for editing."; + tooltip= "Channel is visible in Graph Editor for editing"; else - tooltip= "Channel(s) are visible in Graph Editor for editing."; + tooltip= "Channel(s) are visible in Graph Editor for editing"; break; case ACHANNEL_SETTING_EXPAND: /* expanded triangle */ //icon= ((enabled)? ICON_TRIA_DOWN : ICON_TRIA_RIGHT); icon= ICON_TRIA_RIGHT; - tooltip= "Make channels grouped under this channel visible."; + tooltip= "Make channels grouped under this channel visible"; break; case ACHANNEL_SETTING_SOLO: /* NLA Tracks only */ //icon= ((enabled)? ICON_LAYER_ACTIVE : ICON_LAYER_USED); icon= ICON_LAYER_USED; - tooltip= "NLA Track is the only one evaluated for the AnimData block it belongs to."; + tooltip= "NLA Track is the only one evaluated for the AnimData block it belongs to"; break; /* --- */ @@ -3171,7 +3171,7 @@ static void draw_setting_widget (bAnimContext *ac, bAnimListElem *ale, bAnimChan // TODO: what about when there's no protect needed? //icon= ((enabled)? ICON_LOCKED : ICON_UNLOCKED); icon= ICON_UNLOCKED; - tooltip= "Editability of keyframes for this channel."; + tooltip= "Editability of keyframes for this channel"; break; case ACHANNEL_SETTING_MUTE: /* muted speaker */ @@ -3179,9 +3179,9 @@ static void draw_setting_widget (bAnimContext *ac, bAnimListElem *ale, bAnimChan icon= ICON_MUTE_IPO_OFF; if (ale->type == ALE_FCURVE) - tooltip= "Does F-Curve contribute to result."; + tooltip= "Does F-Curve contribute to result"; else - tooltip= "Do channels contribute to result."; + tooltip= "Do channels contribute to result"; break; default: |