From 9352fe256ac312a66e7c5c941cc2ea92a75e9b71 Mon Sep 17 00:00:00 2001 From: JazzyNico Date: Wed, 26 May 2010 22:28:09 +0200 Subject: [PATCH] Consistency fix in the tools strings (badly places :). --- src/ui/tool/curve-drag-point.cpp | 8 ++++---- src/ui/tool/node-tool.cpp | 4 ++-- src/ui/tool/node.cpp | 28 ++++++++++++++-------------- src/ui/tool/transform-handle-set.cpp | 28 ++++++++++++++-------------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp index e761daf20..0e5805dda 100644 --- a/src/ui/tool/curve-drag-point.cpp +++ b/src/ui/tool/curve-drag-point.cpp @@ -164,19 +164,19 @@ Glib::ustring CurveDragPoint::_getTip(unsigned state) bool linear = first->front()->isDegenerate() && first.next()->back()->isDegenerate(); if (state_held_shift(state)) { return C_("Path segment tip", - "Shift: click to toggle segment selection"); + "Shift: click to toggle segment selection"); } if (state_held_control(state) && state_held_alt(state)) { return C_("Path segment tip", - "Ctrl+Alt: click to insert a node"); + "Ctrl+Alt: click to insert a node"); } if (linear) { return C_("Path segment tip", - "Linear segment: drag to convert to a Bezier segment, " + "Linear segment: drag to convert to a Bezier segment, " "doubleclick to insert node, click to select (more: Shift, Ctrl+Alt)"); } else { return C_("Path segment tip", - "Bezier segment: drag to shape the segment, doubleclick to insert node, " + "Bezier segment: drag to shape the segment, doubleclick to insert node, " "click to select (more: Shift, Ctrl+Alt)"); } } diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp index b5f420597..450ca96f0 100644 --- a/src/ui/tool/node-tool.cpp +++ b/src/ui/tool/node-tool.cpp @@ -534,11 +534,11 @@ void ink_node_tool_update_tip(InkNodeTool *nt, GdkEvent *event) if (state_held_shift(new_state)) { if (nt->_last_over) { nt->_node_message_context->set(Inkscape::NORMAL_MESSAGE, - C_("Node tool tip", "Shift: drag to add nodes to the selection, " + C_("Node tool tip", "Shift: drag to add nodes to the selection, " "click to toggle object selection")); } else { nt->_node_message_context->set(Inkscape::NORMAL_MESSAGE, - C_("Node tool tip", "Shift: drag to add nodes to the selection")); + C_("Node tool tip", "Shift: drag to add nodes to the selection")); } return; } diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp index 56e0ecff8..9c9c58ff1 100644 --- a/src/ui/tool/node.cpp +++ b/src/ui/tool/node.cpp @@ -357,21 +357,21 @@ Glib::ustring Handle::_getTip(unsigned state) } else { if (state_held_shift(state) && can_shift_rotate) { return C_("Path handle tip", - "Shift+Alt: preserve handle length and rotate both handles"); + "Shift+Alt: preserve handle length and rotate both handles"); } else { return C_("Path handle tip", - "Alt: preserve handle length while dragging"); + "Alt: preserve handle length while dragging"); } } } else { if (state_held_control(state)) { if (state_held_shift(state) && can_shift_rotate) { return format_tip(C_("Path handle tip", - "Shift+Ctrl: snap rotation angle to %g° increments and rotate both handles"), + "Shift+Ctrl: snap rotation angle to %g° increments and rotate both handles"), snap_increment_degrees()); } else { return format_tip(C_("Path handle tip", - "Ctrl: snap rotation angle to %g° increments, click to retract"), + "Ctrl: snap rotation angle to %g° increments, click to retract"), snap_increment_degrees()); } } else if (state_held_shift(state) && can_shift_rotate) { @@ -383,10 +383,10 @@ Glib::ustring Handle::_getTip(unsigned state) switch (_parent->type()) { case NODE_AUTO: return format_tip(C_("Path handle tip", - "Auto node handle: drag to convert to smooth node (%s)"), more); + "Auto node handle: drag to convert to smooth node (%s)"), more); default: return format_tip(C_("Path handle tip", - "%s: drag to shape the segment (%s)"), + "%s: drag to shape the segment (%s)"), handle_type_to_localized_string(_parent->type()), more); } } @@ -1141,21 +1141,21 @@ Glib::ustring Node::_getTip(unsigned state) "to %f° increments"), snap_increment_degrees()); }*/ return C_("Path node tip", - "Shift: drag out a handle, click to toggle selection"); + "Shift: drag out a handle, click to toggle selection"); } - return C_("Path node tip", "Shift: click to toggle selection"); + return C_("Path node tip", "Shift: click to toggle selection"); } if (state_held_control(state)) { if (state_held_alt(state)) { - return C_("Path node tip", "Ctrl+Alt: move along handle lines, click to delete node"); + return C_("Path node tip", "Ctrl+Alt: move along handle lines, click to delete node"); } return C_("Path node tip", - "Ctrl: move along axes, click to change node type"); + "Ctrl: move along axes, click to change node type"); } if (state_held_alt(state)) { - return C_("Path node tip", "Alt: sculpt nodes"); + return C_("Path node tip", "Alt: sculpt nodes"); } // No modifiers: assemble tip from node type @@ -1163,13 +1163,13 @@ Glib::ustring Node::_getTip(unsigned state) if (_selection.transformHandlesEnabled() && selected()) { if (_selection.size() == 1) { return format_tip(C_("Path node tip", - "%s: drag to shape the path (more: Shift, Ctrl, Alt)"), nodetype); + "%s: drag to shape the path (more: Shift, Ctrl, Alt)"), nodetype); } return format_tip(C_("Path node tip", - "%s: drag to shape the path, click to toggle scale/rotation handles (more: Shift, Ctrl, Alt)"), nodetype); + "%s: drag to shape the path, click to toggle scale/rotation handles (more: Shift, Ctrl, Alt)"), nodetype); } return format_tip(C_("Path node tip", - "%s: drag to shape the path, click to select only this node (more: Shift, Ctrl, Alt)"), nodetype); + "%s: drag to shape the path, click to select only this node (more: Shift, Ctrl, Alt)"), nodetype); } Glib::ustring Node::_getDragTip(GdkEventMotion */*event*/) diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp index 1af848b96..6b8fb4c11 100644 --- a/src/ui/tool/transform-handle-set.cpp +++ b/src/ui/tool/transform-handle-set.cpp @@ -134,21 +134,21 @@ protected: if (state_held_control(state)) { if (state_held_shift(state)) { return C_("Transform handle tip", - "Shift+Ctrl: scale uniformly about the rotation center"); + "Shift+Ctrl: scale uniformly about the rotation center"); } return C_("Transform handle tip", "Ctrl: scale uniformly"); } if (state_held_shift(state)) { if (state_held_alt(state)) { return C_("Transform handle tip", - "Shift+Alt: scale using an integer ratio about the rotation center"); + "Shift+Alt: scale using an integer ratio about the rotation center"); } - return C_("Transform handle tip", "Shift: scale from the rotation center"); + return C_("Transform handle tip", "Shift: scale from the rotation center"); } if (state_held_alt(state)) { - return C_("Transform handle tip", "Alt: scale using an integer ratio"); + return C_("Transform handle tip", "Alt: scale using an integer ratio"); } - return C_("Transform handle tip", "Scale handle: drag to scale the selection"); + return C_("Transform handle tip", "Scale handle: drag to scale the selection"); } virtual Glib::ustring _getDragTip(GdkEventMotion */*event*/) { @@ -308,16 +308,16 @@ protected: if (state_held_shift(state)) { if (state_held_control(state)) { return format_tip(C_("Transform handle tip", - "Shift+Ctrl: rotate around the opposite corner and snap " + "Shift+Ctrl: rotate around the opposite corner and snap " "angle to %f° increments"), snap_increment_degrees()); } - return C_("Transform handle tip", "Shift: rotate around the opposite corner"); + return C_("Transform handle tip", "Shift: rotate around the opposite corner"); } if (state_held_control(state)) { return format_tip(C_("Transform handle tip", - "Ctrl: snap angle to %f° increments"), snap_increment_degrees()); + "Ctrl: snap angle to %f° increments"), snap_increment_degrees()); } - return C_("Transform handle tip", "Rotation handle: drag to rotate " + return C_("Transform handle tip", "Rotation handle: drag to rotate " "the selection around the rotation center"); } @@ -416,17 +416,17 @@ protected: if (state_held_shift(state)) { if (state_held_control(state)) { return format_tip(C_("Transform handle tip", - "Shift+Ctrl: skew about the rotation center with snapping " + "Shift+Ctrl: skew about the rotation center with snapping " "to %f° increments"), snap_increment_degrees()); } - return C_("Transform handle tip", "Shift: skew about the rotation center"); + return C_("Transform handle tip", "Shift: skew about the rotation center"); } if (state_held_control(state)) { return format_tip(C_("Transform handle tip", - "Ctrl: snap skew angle to %f° increments"), snap_increment_degrees()); + "Ctrl: snap skew angle to %f° increments"), snap_increment_degrees()); } return C_("Transform handle tip", - "Skew handle: drag to skew (shear) selection about " + "Skew handle: drag to skew (shear) selection about " "the opposite handle"); } @@ -476,7 +476,7 @@ protected: virtual Glib::ustring _getTip(unsigned /*state*/) { return C_("Transform handle tip", - "Rotation center: drag to change the origin of transforms"); + "Rotation center: drag to change the origin of transforms"); } private: -- 2.30.2