summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2010-05-26 20:28:09 +0000
committerJazzyNico <nicoduf@yahoo.fr>2010-05-26 20:28:09 +0000
commit4c99f48a83a1a74ab46bfeaa841e88196165447a (patch)
tree64671353db70f1194e3bf557ef9d3697398f0be8 /src
parenttemporary fix, to stop lpe clone freeze (diff)
downloadinkscape-4c99f48a83a1a74ab46bfeaa841e88196165447a.tar.gz
inkscape-4c99f48a83a1a74ab46bfeaa841e88196165447a.zip
Consistency fix in the tools strings (badly places :).
(bzr r9453)
Diffstat (limited to 'src')
-rw-r--r--src/ui/tool/curve-drag-point.cpp8
-rw-r--r--src/ui/tool/node-tool.cpp4
-rw-r--r--src/ui/tool/node.cpp28
-rw-r--r--src/ui/tool/transform-handle-set.cpp28
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",
- "<b>Shift:</b> click to toggle segment selection");
+ "<b>Shift</b>: click to toggle segment selection");
}
if (state_held_control(state) && state_held_alt(state)) {
return C_("Path segment tip",
- "<b>Ctrl+Alt:</b> click to insert a node");
+ "<b>Ctrl+Alt</b>: click to insert a node");
}
if (linear) {
return C_("Path segment tip",
- "<b>Linear segment:</b> drag to convert to a Bezier segment, "
+ "<b>Linear segment</b>: drag to convert to a Bezier segment, "
"doubleclick to insert node, click to select (more: Shift, Ctrl+Alt)");
} else {
return C_("Path segment tip",
- "<b>Bezier segment:</b> drag to shape the segment, doubleclick to insert node, "
+ "<b>Bezier segment</b>: 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", "<b>Shift:</b> drag to add nodes to the selection, "
+ C_("Node tool tip", "<b>Shift</b>: 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", "<b>Shift:</b> drag to add nodes to the selection"));
+ C_("Node tool tip", "<b>Shift</b>: 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",
- "<b>Shift+Alt:</b> preserve handle length and rotate both handles");
+ "<b>Shift+Alt</b>: preserve handle length and rotate both handles");
} else {
return C_("Path handle tip",
- "<b>Alt:</b> preserve handle length while dragging");
+ "<b>Alt</b>: 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",
- "<b>Shift+Ctrl:</b> snap rotation angle to %g° increments and rotate both handles"),
+ "<b>Shift+Ctrl</b>: snap rotation angle to %g° increments and rotate both handles"),
snap_increment_degrees());
} else {
return format_tip(C_("Path handle tip",
- "<b>Ctrl:</b> snap rotation angle to %g° increments, click to retract"),
+ "<b>Ctrl</b>: 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",
- "<b>Auto node handle:</b> drag to convert to smooth node (%s)"), more);
+ "<b>Auto node handle</b>: drag to convert to smooth node (%s)"), more);
default:
return format_tip(C_("Path handle tip",
- "<b>%s:</b> drag to shape the segment (%s)"),
+ "<b>%s</b>: 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",
- "<b>Shift:</b> drag out a handle, click to toggle selection");
+ "<b>Shift</b>: drag out a handle, click to toggle selection");
}
- return C_("Path node tip", "<b>Shift:</b> click to toggle selection");
+ return C_("Path node tip", "<b>Shift</b>: click to toggle selection");
}
if (state_held_control(state)) {
if (state_held_alt(state)) {
- return C_("Path node tip", "<b>Ctrl+Alt:</b> move along handle lines, click to delete node");
+ return C_("Path node tip", "<b>Ctrl+Alt</b>: move along handle lines, click to delete node");
}
return C_("Path node tip",
- "<b>Ctrl:</b> move along axes, click to change node type");
+ "<b>Ctrl</b>: move along axes, click to change node type");
}
if (state_held_alt(state)) {
- return C_("Path node tip", "<b>Alt:</b> sculpt nodes");
+ return C_("Path node tip", "<b>Alt</b>: 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",
- "<b>%s:</b> drag to shape the path (more: Shift, Ctrl, Alt)"), nodetype);
+ "<b>%s</b>: drag to shape the path (more: Shift, Ctrl, Alt)"), nodetype);
}
return format_tip(C_("Path node tip",
- "<b>%s:</b> drag to shape the path, click to toggle scale/rotation handles (more: Shift, Ctrl, Alt)"), nodetype);
+ "<b>%s</b>: drag to shape the path, click to toggle scale/rotation handles (more: Shift, Ctrl, Alt)"), nodetype);
}
return format_tip(C_("Path node tip",
- "<b>%s:</b> drag to shape the path, click to select only this node (more: Shift, Ctrl, Alt)"), nodetype);
+ "<b>%s</b>: 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",
- "<b>Shift+Ctrl:</b> scale uniformly about the rotation center");
+ "<b>Shift+Ctrl</b>: scale uniformly about the rotation center");
}
return C_("Transform handle tip", "<b>Ctrl:</b> scale uniformly");
}
if (state_held_shift(state)) {
if (state_held_alt(state)) {
return C_("Transform handle tip",
- "<b>Shift+Alt:</b> scale using an integer ratio about the rotation center");
+ "<b>Shift+Alt</b>: scale using an integer ratio about the rotation center");
}
- return C_("Transform handle tip", "<b>Shift:</b> scale from the rotation center");
+ return C_("Transform handle tip", "<b>Shift</b>: scale from the rotation center");
}
if (state_held_alt(state)) {
- return C_("Transform handle tip", "<b>Alt:</b> scale using an integer ratio");
+ return C_("Transform handle tip", "<b>Alt</b>: scale using an integer ratio");
}
- return C_("Transform handle tip", "<b>Scale handle:</b> drag to scale the selection");
+ return C_("Transform handle tip", "<b>Scale handle</b>: 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",
- "<b>Shift+Ctrl:</b> rotate around the opposite corner and snap "
+ "<b>Shift+Ctrl</b>: rotate around the opposite corner and snap "
"angle to %f° increments"), snap_increment_degrees());
}
- return C_("Transform handle tip", "<b>Shift:</b> rotate around the opposite corner");
+ return C_("Transform handle tip", "<b>Shift</b>: rotate around the opposite corner");
}
if (state_held_control(state)) {
return format_tip(C_("Transform handle tip",
- "<b>Ctrl:</b> snap angle to %f° increments"), snap_increment_degrees());
+ "<b>Ctrl</b>: snap angle to %f° increments"), snap_increment_degrees());
}
- return C_("Transform handle tip", "<b>Rotation handle:</b> drag to rotate "
+ return C_("Transform handle tip", "<b>Rotation handle</b>: 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",
- "<b>Shift+Ctrl:</b> skew about the rotation center with snapping "
+ "<b>Shift+Ctrl</b>: skew about the rotation center with snapping "
"to %f° increments"), snap_increment_degrees());
}
- return C_("Transform handle tip", "<b>Shift:</b> skew about the rotation center");
+ return C_("Transform handle tip", "<b>Shift</b>: skew about the rotation center");
}
if (state_held_control(state)) {
return format_tip(C_("Transform handle tip",
- "<b>Ctrl:</b> snap skew angle to %f° increments"), snap_increment_degrees());
+ "<b>Ctrl</b>: snap skew angle to %f° increments"), snap_increment_degrees());
}
return C_("Transform handle tip",
- "<b>Skew handle:</b> drag to skew (shear) selection about "
+ "<b>Skew handle</b>: 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",
- "<b>Rotation center:</b> drag to change the origin of transforms");
+ "<b>Rotation center</b>: drag to change the origin of transforms");
}
private: