diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-06-11 23:25:01 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-06-11 23:25:01 +0300 |
commit | 23df1a774b5b70e5108e2d1b1901d2a204ca1d9e (patch) | |
tree | 670e5658630b6c29056029685e7b6500debdc758 /source/blender/editors/transform/transform.c | |
parent | d665d128536cb7fc42e3796c0bd4529c1a391431 (diff) |
Fix/Cleanup: I18N: Bad usage of IFACE_ instead of TIP_.
Cheap tip: anything that is not "Camel Case" and/or that is more than
a few words long should use `TIP_` translation, not `IFACE_` one.
Also added several missing strings (including the one reported in D5056
by Jean First (@robbott), thanks).
Diffstat (limited to 'source/blender/editors/transform/transform.c')
-rw-r--r-- | source/blender/editors/transform/transform.c | 175 |
1 files changed, 85 insertions, 90 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 167ad6a76c0..9019b21997f 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -971,23 +971,23 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm /* Initialize */ switch (key_type) { case XKEY: - msg1 = IFACE_("along X"); - msg2 = IFACE_("along %s X"); - msg3 = IFACE_("locking %s X"); + msg1 = TIP_("along X"); + msg2 = TIP_("along %s X"); + msg3 = TIP_("locking %s X"); axis = 'X'; constraint_axis = CON_AXIS0; break; case YKEY: - msg1 = IFACE_("along Y"); - msg2 = IFACE_("along %s Y"); - msg3 = IFACE_("locking %s Y"); + msg1 = TIP_("along Y"); + msg2 = TIP_("along %s Y"); + msg3 = TIP_("locking %s Y"); axis = 'Y'; constraint_axis = CON_AXIS1; break; case ZKEY: - msg1 = IFACE_("along Z"); - msg2 = IFACE_("along %s Z"); - msg3 = IFACE_("locking %s Z"); + msg1 = TIP_("along Z"); + msg2 = TIP_("along %s Z"); + msg3 = TIP_("locking %s Z"); axis = 'Z'; constraint_axis = CON_AXIS2; break; @@ -1392,7 +1392,7 @@ int transformEvent(TransInfo *t, const wmEvent *event) /* exception for switching to dolly, or trackball, in camera view */ if (t->flag & T_CAMERA) { if (t->mode == TFM_TRANSLATION) { - setLocalConstraint(t, (CON_AXIS2), IFACE_("along local Z")); + setLocalConstraint(t, (CON_AXIS2), TIP_("along local Z")); } else if (t->mode == TFM_ROTATION) { restoreTransObjects(t); @@ -3383,7 +3383,7 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2])) BLI_snprintf(str, sizeof(str), - IFACE_("Bend Angle: %s Radius: %s Alt, Clamp %s"), + TIP_("Bend Angle: %s Radius: %s Alt, Clamp %s"), &c[0], &c[NUM_STR_REP_LEN], WM_bool_as_string(is_clamp)); @@ -3392,7 +3392,7 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2])) /* default header print */ BLI_snprintf(str, sizeof(str), - IFACE_("Bend Angle: %.3f Radius: %.4f, Alt, Clamp %s"), + TIP_("Bend Angle: %.3f Radius: %.4f, Alt, Clamp %s"), RAD2DEGF(values.angle), values.scale * data->warp_init_dist, WM_bool_as_string(is_clamp)); @@ -3622,13 +3622,13 @@ static void applyShear(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Shear: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Shear: %s %s"), c, t->proptext); } else { /* default header print */ BLI_snprintf(str, sizeof(str), - IFACE_("Shear: %.3f %s (Press X or Y to set shear axis)"), + TIP_("Shear: %.3f %s (Press X or Y to set shear axis)"), value, t->proptext); } @@ -3768,7 +3768,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ case 0: ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale: %s%s %s"), + TIP_("Scale: %s%s %s"), &tvec[0], t->con.text, t->proptext); @@ -3776,7 +3776,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ case 1: ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale: %s : %s%s %s"), + TIP_("Scale: %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], t->con.text, @@ -3785,7 +3785,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ case 2: ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale: %s : %s : %s%s %s"), + TIP_("Scale: %s : %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -3798,7 +3798,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ if (t->flag & T_2D_EDIT) { ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale X: %s Y: %s%s %s"), + TIP_("Scale X: %s Y: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], t->con.text, @@ -3807,7 +3807,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ else { ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale X: %s Y: %s Z: %s%s %s"), + TIP_("Scale X: %s Y: %s Z: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -3818,7 +3818,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } } @@ -4226,11 +4226,11 @@ static void applyToSphere(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("To Sphere: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("To Sphere: %s %s"), c, t->proptext); } else { /* default header print */ - BLI_snprintf(str, sizeof(str), IFACE_("To Sphere: %.4f %s"), ratio, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("To Sphere: %.4f %s"), ratio, t->proptext); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -4312,17 +4312,13 @@ static void headerRotation(TransInfo *t, char str[UI_MAX_DRAW_STR], float final) outputNumInput(&(t->num), c, &t->scene->unit); - ofs += BLI_snprintf(str + ofs, - UI_MAX_DRAW_STR - ofs, - IFACE_("Rot: %s %s %s"), - &c[0], - t->con.text, - t->proptext); + ofs += BLI_snprintf( + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_("Rot: %s %s %s"), &c[0], t->con.text, t->proptext); } else { ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Rot: %.2f%s %s"), + TIP_("Rot: %.2f%s %s"), RAD2DEGF(final), t->con.text, t->proptext); @@ -4330,7 +4326,7 @@ static void headerRotation(TransInfo *t, char str[UI_MAX_DRAW_STR], float final) if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } } @@ -4743,7 +4739,7 @@ static void applyTrackball(TransInfo *t, const int UNUSED(mval[2])) ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, - IFACE_("Trackball: %s %s %s"), + TIP_("Trackball: %s %s %s"), &c[0], &c[NUM_STR_REP_LEN], t->proptext); @@ -4751,7 +4747,7 @@ static void applyTrackball(TransInfo *t, const int UNUSED(mval[2])) else { ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, - IFACE_("Trackball: %.2f %.2f %s"), + TIP_("Trackball: %.2f %.2f %s"), RAD2DEGF(phi[0]), RAD2DEGF(phi[1]), t->proptext); @@ -4759,7 +4755,7 @@ static void applyTrackball(TransInfo *t, const int UNUSED(mval[2])) if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, sizeof(str) - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } #if 0 /* UNUSED */ @@ -5037,7 +5033,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ short chainlen = t->settings->autoik_chainlen; if (chainlen) { - BLI_snprintf(autoik, NUM_STR_REP_LEN, IFACE_("AutoIK-Len: %d"), chainlen); + BLI_snprintf(autoik, NUM_STR_REP_LEN, TIP_("AutoIK-Len: %d"), chainlen); } else { autoik[0] = '\0'; @@ -5111,7 +5107,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } if (t->spacetype == SPACE_NODE) { @@ -5119,9 +5115,8 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ if ((snode->flag & SNODE_SKIP_INSOFFSET) == 0) { const char *str_old = BLI_strdup(str); - const char *str_dir = (snode->insert_ofs_dir == SNODE_INSERTOFS_DIR_RIGHT) ? - IFACE_("right") : - IFACE_("left"); + const char *str_dir = (snode->insert_ofs_dir == SNODE_INSERTOFS_DIR_RIGHT) ? TIP_("right") : + TIP_("left"); char str_km[64]; WM_modalkeymap_items_to_string( @@ -5129,7 +5124,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ ofs += BLI_snprintf(str, UI_MAX_DRAW_STR, - IFACE_("Auto-offset set to %s - press %s to toggle direction | %s"), + TIP_("Auto-offset set to %s - press %s to toggle direction | %s"), str_dir, str_km, str_old); @@ -5345,7 +5340,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) t->values[0] = -distance; /* header print for NumInput */ - ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Shrink/Fatten:"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_("Shrink/Fatten:"), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); @@ -5369,7 +5364,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) } BLI_snprintf(str + ofs, sizeof(str) - ofs, - IFACE_(" or Alt) Even Thickness %s"), + TIP_(" or Alt) Even Thickness %s"), WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0)); /* done with header string */ @@ -5448,13 +5443,13 @@ static void applyTilt(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Tilt: %s° %s"), &c[0], t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Tilt: %s° %s"), &c[0], t->proptext); /* XXX For some reason, this seems needed for this op, else RNA prop is not updated... :/ */ t->values[0] = final; } else { - BLI_snprintf(str, sizeof(str), IFACE_("Tilt: %.2f° %s"), RAD2DEGF(final), t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Tilt: %.2f° %s"), RAD2DEGF(final), t->proptext); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5530,10 +5525,10 @@ static void applyCurveShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Shrink/Fatten: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Shrink/Fatten: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5615,10 +5610,10 @@ static void applyMaskShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Feather Shrink/Fatten: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Feather Shrink/Fatten: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Feather Shrink/Fatten: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Feather Shrink/Fatten: %3f"), ratio); } /* detect if no points have feather yet */ @@ -5728,10 +5723,10 @@ static void applyGPShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Shrink/Fatten: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Shrink/Fatten: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5810,10 +5805,10 @@ static void applyGPOpacity(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Opacity: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Opacity: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Opacity: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Opacity: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5885,12 +5880,12 @@ static void applyPushPull(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Push/Pull: %s%s %s"), c, t->con.text, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Push/Pull: %s%s %s"), c, t->con.text, t->proptext); } else { /* default header print */ BLI_snprintf( - str, sizeof(str), IFACE_("Push/Pull: %.4f%s %s"), distance, t->con.text, t->proptext); + str, sizeof(str), TIP_("Push/Pull: %.4f%s %s"), distance, t->con.text, t->proptext); } if (t->con.applyRot && t->con.mode & CON_APPLY) { @@ -5985,19 +5980,19 @@ static void applyBevelWeight(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); if (weight >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: +%s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Bevel Weight: +%s %s"), c, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Bevel Weight: %s %s"), c, t->proptext); } } else { /* default header print */ if (weight >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: +%.3f %s"), weight, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Bevel Weight: +%.3f %s"), weight, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: %.3f %s"), weight, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Bevel Weight: %.3f %s"), weight, t->proptext); } } @@ -6075,19 +6070,19 @@ static void applyCrease(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); if (crease >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Crease: +%s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Crease: +%s %s"), c, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Crease: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Crease: %s %s"), c, t->proptext); } } else { /* default header print */ if (crease >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Crease: +%.3f %s"), crease, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Crease: +%.3f %s"), crease, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Crease: %.3f %s"), crease, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Crease: %.3f %s"), crease, t->proptext); } } @@ -6166,12 +6161,12 @@ static void headerBoneSize(TransInfo *t, const float vec[3], char str[UI_MAX_DRA if (t->con.mode & CON_APPLY) { if (t->num.idx_max == 0) { BLI_snprintf( - str, UI_MAX_DRAW_STR, IFACE_("ScaleB: %s%s %s"), &tvec[0], t->con.text, t->proptext); + str, UI_MAX_DRAW_STR, TIP_("ScaleB: %s%s %s"), &tvec[0], t->con.text, t->proptext); } else { BLI_snprintf(str, UI_MAX_DRAW_STR, - IFACE_("ScaleB: %s : %s : %s%s %s"), + TIP_("ScaleB: %s : %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -6182,7 +6177,7 @@ static void headerBoneSize(TransInfo *t, const float vec[3], char str[UI_MAX_DRA else { BLI_snprintf(str, UI_MAX_DRAW_STR, - IFACE_("ScaleB X: %s Y: %s Z: %s%s %s"), + TIP_("ScaleB X: %s Y: %s Z: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -6304,10 +6299,10 @@ static void applyBoneEnvelope(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Envelope: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Envelope: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Envelope: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Envelope: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -8074,7 +8069,7 @@ static void applyEdgeSlide(TransInfo *t, const int UNUSED(mval[2])) t->values[0] = final; /* header string */ - ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Edge Slide: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_("Edge Slide: "), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); @@ -8084,13 +8079,13 @@ static void applyEdgeSlide(TransInfo *t, const int UNUSED(mval[2])) ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, "%.4f ", final); } ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("(E)ven: %s, "), WM_bool_as_string(use_even)); + str + ofs, sizeof(str) - ofs, TIP_("(E)ven: %s, "), WM_bool_as_string(use_even)); if (use_even) { ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("(F)lipped: %s, "), WM_bool_as_string(flipped)); + str + ofs, sizeof(str) - ofs, TIP_("(F)lipped: %s, "), WM_bool_as_string(flipped)); } ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); + str + ofs, sizeof(str) - ofs, TIP_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); /* done with header string */ /* do stuff here */ @@ -8685,7 +8680,7 @@ static void applyVertSlide(TransInfo *t, const int UNUSED(mval[2])) t->values[0] = final; /* header string */ - ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Vert Slide: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_("Vert Slide: "), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); @@ -8695,13 +8690,13 @@ static void applyVertSlide(TransInfo *t, const int UNUSED(mval[2])) ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, "%.4f ", final); } ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("(E)ven: %s, "), WM_bool_as_string(use_even)); + str + ofs, sizeof(str) - ofs, TIP_("(E)ven: %s, "), WM_bool_as_string(use_even)); if (use_even) { ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("(F)lipped: %s, "), WM_bool_as_string(flipped)); + str + ofs, sizeof(str) - ofs, TIP_("(F)lipped: %s, "), WM_bool_as_string(flipped)); } ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); + str + ofs, sizeof(str) - ofs, TIP_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); /* done with header string */ /* do stuff here */ @@ -8760,10 +8755,10 @@ static void applyBoneRoll(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Roll: %s"), &c[0]); + BLI_snprintf(str, sizeof(str), TIP_("Roll: %s"), &c[0]); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Roll: %.2f"), RAD2DEGF(final)); + BLI_snprintf(str, sizeof(str), TIP_("Roll: %.2f"), RAD2DEGF(final)); } /* set roll values */ @@ -8843,19 +8838,19 @@ static void applyBakeTime(TransInfo *t, const int mval[2]) outputNumInput(&(t->num), c, &t->scene->unit); if (time >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Time: +%s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Time: +%s %s"), c, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Time: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Time: %s %s"), c, t->proptext); } } else { /* default header print */ if (time >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Time: +%.3f %s"), time, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Time: +%.3f %s"), time, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Time: %.3f %s"), time, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Time: %.3f %s"), time, t->proptext); } } @@ -8927,7 +8922,7 @@ static void applyMirror(TransInfo *t, const int UNUSED(mval[2])) t->con.applySize(t, NULL, NULL, mat); } - BLI_snprintf(str, sizeof(str), IFACE_("Mirror%s"), t->con.text); + BLI_snprintf(str, sizeof(str), TIP_("Mirror%s"), t->con.text); FOREACH_TRANS_DATA_CONTAINER (t, tc) { TransData *td = tc->data; @@ -8971,10 +8966,10 @@ static void applyMirror(TransInfo *t, const int UNUSED(mval[2])) recalcData(t); if (t->flag & T_2D_EDIT) { - ED_area_status_text(t->sa, IFACE_("Select a mirror axis (X, Y)")); + ED_area_status_text(t->sa, TIP_("Select a mirror axis (X, Y)")); } else { - ED_area_status_text(t->sa, IFACE_("Select a mirror axis (X, Y, Z)")); + ED_area_status_text(t->sa, TIP_("Select a mirror axis (X, Y, Z)")); } } } @@ -9037,7 +9032,7 @@ static void applyAlign(TransInfo *t, const int UNUSED(mval[2])) recalcData(t); - ED_area_status_text(t->sa, IFACE_("Align")); + ED_area_status_text(t->sa, TIP_("Align")); } /** \} */ @@ -9082,7 +9077,7 @@ static void headerSeqSlide(TransInfo *t, const float val[2], char str[UI_MAX_DRA } ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_("Sequence Slide: %s%s, ("), &tvec[0], t->con.text); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_("Sequence Slide: %s%s, ("), &tvec[0], t->con.text); if (t->keymap) { wmKeyMapItem *kmi = WM_modalkeymap_find_propvalue(t->keymap, TFM_MODAL_TRANSLATE); @@ -9092,7 +9087,7 @@ static void headerSeqSlide(TransInfo *t, const float val[2], char str[UI_MAX_DRA } ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_(" or Alt) Expand to fit %s"), + TIP_(" or Alt) Expand to fit %s"), WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0)); } @@ -9353,11 +9348,11 @@ static void headerTimeTranslate(TransInfo *t, char str[UI_MAX_DRAW_STR]) } } - ofs += BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("DeltaX: %s"), &tvec[0]); + ofs += BLI_snprintf(str, UI_MAX_DRAW_STR, TIP_("DeltaX: %s"), &tvec[0]); if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } } @@ -9545,7 +9540,7 @@ static void headerTimeSlide(TransInfo *t, const float sval, char str[UI_MAX_DRAW BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f", val); } - BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("TimeSlide: %s"), &tvec[0]); + BLI_snprintf(str, UI_MAX_DRAW_STR, TIP_("TimeSlide: %s"), &tvec[0]); } static void applyTimeSlideValue(TransInfo *t, float sval) @@ -9703,7 +9698,7 @@ static void headerTimeScale(TransInfo *t, char str[UI_MAX_DRAW_STR]) BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f", t->values[0]); } - BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("ScaleX: %s"), &tvec[0]); + BLI_snprintf(str, UI_MAX_DRAW_STR, TIP_("ScaleX: %s"), &tvec[0]); } static void applyTimeScaleValue(TransInfo *t) |