From c24f33d954db23ca18de731dc8cacfcfc701cb75 Mon Sep 17 00:00:00 2001
From: buliabyak <buliabyak@users.sourceforge.net>
Date: Wed, 12 Apr 2006 22:24:42 +0000
Subject: [PATCH] renamed many verbs to more meaningful names, fixed a few
 inconsistencies, rearranged and commented keys/default.xml

---
 share/keys/default.xml | 482 +++++++++++++++++++++++++++++++----------
 src/menus-skeleton.h   |  26 +--
 src/verbs.cpp          |  60 +++--
 3 files changed, 408 insertions(+), 160 deletions(-)

diff --git a/share/keys/default.xml b/share/keys/default.xml
index 3c6568b5c..53b73623f 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -1,242 +1,492 @@
 <?xml version="1.0"?>
 <keys name="Inkscape default">
+
+<!--
+This is the default Inkscape keybindings. In each "bind" element:
+
+- The "key" attribute contains the key name. The names are the same as those in the
+<gdk/gdkkeysyms.h> header file but without the leading "GDK_". If you don't have GDK
+source locally, you can view that file at:
+
+  http://cvs.gnome.org/viewcvs/gtk%2B/gdk/gdkkeysyms.h?view=markup
+
+- The "modifiers" attribute contains a comma-separated list of modifiers, which can be
+one or more of: Ctrl, Shift, Alt.
+
+- The "action" attribute contains the name of the action. The complete list of actions
+(called "verbs") is in the file src/verbs.cpp in Inkscape source; there you can see
+brief descriptions of what each action does. One action may have multiple key bindings.
+
+- The "display" attribute controls whether this binding will be displayed in the menu
+and tooltips. Only one binding for each action may have this attribute.
+
+Note that the current file lists ALL Inkscape actions, even those that do not have any
+keys in the default mapping (those don't have "key" or "modifiers" attributes). You can
+assign any keys to these actions by adding "key" and "modifiers" attributes to them.
+
+In case of conflict, those bindings that come later override those before them. This
+file resides in the share/keys directory of your Inkscape installation, but you may also
+have another default.xml in your personal Inkscape profile directory (e.g. ~/.inkscape
+on Unix). The bindings in that personal file are added to (or, if there's a conflict,
+override) the bindings in the main default.xml.
+-->
+
+
+<!-- File -->
+
   <bind key="n" modifiers="Ctrl" action="FileNew" display="true"/>
   <bind key="N" modifiers="Ctrl" action="FileNew" />
+
   <bind key="o" modifiers="Ctrl" action="FileOpen" display="true"/>
   <bind key="O" modifiers="Ctrl" action="FileOpen" />
+
+  <bind action="FileRevert" />
+
   <bind key="s" modifiers="Ctrl" action="FileSave" display="true"/>
   <bind key="S" modifiers="Ctrl" action="FileSave" />
+
   <bind key="s" modifiers="Ctrl,Shift" action="FileSaveAs" display="true"/>
   <bind key="S" modifiers="Ctrl,Shift" action="FileSaveAs" />
+
   <bind key="p" modifiers="Ctrl" action="FilePrint" display="true"/>
   <bind key="P" modifiers="Ctrl" action="FilePrint" />
-  <bind key="F11" action="FullScreen" display="true"/>
-  <bind key="e" modifiers="Ctrl,Shift" action="FileExport" display="true"/>
-  <bind key="E" modifiers="Ctrl,Shift" action="FileExport" />
+
+  <bind action="FilePrintDirect" />
+
   <bind key="i" modifiers="Ctrl" action="FileImport" display="true"/>
   <bind key="I" modifiers="Ctrl" action="FileImport" />
-  <bind key="Tab" modifiers="Ctrl" action="FileNextDesktop" display="true"/>
-  <bind key="Tab" modifiers="Ctrl,Shift" action="FilePrevDesktop" display="true"/>
-  <bind key="ISO_Left_Tab" modifiers="Ctrl" action="FilePrevDesktop" />
-  <bind key="ISO_Left_Tab" modifiers="Ctrl,Shift" action="FilePrevDesktop" />
-  <bind key="w" modifiers="Ctrl" action="FileCloseView" display="true"/>
-  <bind key="W" modifiers="Ctrl" action="FileCloseView" display="true"/>
+
+  <bind key="e" modifiers="Ctrl,Shift" action="FileExport" display="true"/>
+  <bind key="E" modifiers="Ctrl,Shift" action="FileExport" />
+
+  <bind action="FileVacuum" />
+
+  <bind key="w" modifiers="Ctrl" action="FileClose" display="true"/>
+  <bind key="W" modifiers="Ctrl" action="FileClose" display="true"/>
+
   <bind key="q" modifiers="Ctrl" action="FileQuit" display="true"/>
   <bind key="Q" modifiers="Ctrl" action="FileQuit" display="true"/>
-  <bind key="F1" action="DrawSelect" display="true"/>
-  <bind key="s" action="DrawSelect" />
-  <bind key="S" action="DrawSelect" />
-  <bind key="F1" modifiers="Ctrl" action="DrawGradient" display="true"/>
-  <bind key="g" action="DrawGradient" />
-  <bind key="G" action="DrawGradient" />
-  <bind key="F2" action="DrawNode" display="true"/>
-  <bind key="n" action="DrawNode" />
-  <bind key="N" action="DrawNode" />
-  <bind key="F3" action="DrawZoom" display="true"/>
-  <bind key="z" action="DrawZoom" />
-  <bind key="Z" action="DrawZoom" />
-  <bind key="F4" action="DrawRect" display="true"/>
-  <bind key="r" action="DrawRect" />
-  <bind key="R" action="DrawRect" />
-  <bind key="F5" action="DrawArc" display="true"/>
-  <bind key="e" action="DrawArc" />
-  <bind key="E" action="DrawArc" />
-  <bind key="F6" action="DrawPencil" display="true"/>
-  <bind key="p" action="DrawPencil" />
-  <bind key="P" action="DrawPencil" />
-  <bind key="F6" modifiers="Shift" action="DrawPen" display="true"/>
-  <bind key="b" action="DrawPen" />
-  <bind key="B" action="DrawPen" />
-  <bind key="F6" modifiers="Ctrl" action="DrawCalligrphic" display="true"/>
-  <bind key="c" action="DrawCalligrphic" />
-  <bind key="C" action="DrawCalligrphic" />
-  <bind key="F7" action="DrawDropper" display="true"/>
-  <bind key="d" action="DrawDropper" />
-  <bind key="D" action="DrawDropper" />
-  <bind key="F8" action="DrawText" display="true"/>
-  <bind key="t" action="DrawText" />
-  <bind key="T" action="DrawText" />
-  <bind key="F9" action="DrawSpiral" display="true"/>
-  <bind key="i" action="DrawSpiral" />
-  <bind key="I" action="DrawSpiral" />
-  <bind key="F9" modifiers="Shift" action="DrawStar" />
-  <bind key="asterisk" modifiers="Shift" action="DrawStar" />
-  <bind key="asterisk" action="DrawStar" />
-  <bind key="KP_Multiply" action="DrawStar" display="true"/>
-  <bind key="F2" modifiers="Ctrl" action="DrawConnector" display="true"/>
-  <bind key="o" action="DrawConnector" />
-  <bind key="O" action="DrawConnector" />
+
+<!-- Tools -->
+
+  <bind key="F1" action="ToolSelector" display="true"/>
+  <bind key="s" action="ToolSelector" />
+  <bind key="S" action="ToolSelector" />
+
+  <bind action="SelectPrefs" />
+
+  <bind key="F2" action="ToolNode" display="true"/>
+  <bind key="n" action="ToolNode" />
+  <bind key="N" action="ToolNode" />
+
+  <bind action="NodePrefs" />
+
+  <bind key="F3" action="ToolZoom" display="true"/>
+  <bind key="z" action="ToolZoom" />
+  <bind key="Z" action="ToolZoom" />
+
+  <bind action="ZoomPrefs" />
+
+  <bind key="F4" action="ToolRect" display="true"/>
+  <bind key="r" action="ToolRect" />
+  <bind key="R" action="ToolRect" />
+
+  <bind action="RectPrefs" />
+
+  <bind key="F5" action="ToolArc" display="true"/>
+  <bind key="e" action="ToolArc" />
+  <bind key="E" action="ToolArc" />
+
+  <bind action="ArcPrefs" />
+
+  <bind key="F9" modifiers="Shift" action="ToolStar" />
+  <bind key="asterisk" modifiers="Shift" action="ToolStar" />
+  <bind key="asterisk" action="ToolStar" />
+  <bind key="KP_Multiply" action="ToolStar" display="true"/>
+
+  <bind action="StarPrefs" />
+
+  <bind key="F9" action="ToolSpiral" display="true"/>
+  <bind key="i" action="ToolSpiral" />
+  <bind key="I" action="ToolSpiral" />
+
+  <bind action="SpiralPrefs" />
+
+  <bind key="F6" action="ToolPencil" display="true"/>
+  <bind key="p" action="ToolPencil" />
+  <bind key="P" action="ToolPencil" />
+
+  <bind action="PencilPrefs" />
+
+  <bind key="F6" modifiers="Shift" action="ToolPen" display="true"/>
+  <bind key="b" action="ToolPen" />
+  <bind key="B" action="ToolPen" />
+
+  <bind action="PenPrefs" />
+
+  <bind key="F6" modifiers="Ctrl" action="ToolCalligrphic" display="true"/>
+  <bind key="c" action="ToolCalligrphic" />
+  <bind key="C" action="ToolCalligrphic" />
+
+  <bind action="CalligraphicPrefs" />
+
+  <bind key="F8" action="ToolText" display="true"/>
+  <bind key="t" action="ToolText" />
+  <bind key="T" action="ToolText" />
+
+  <bind action="TextPrefs" />
+
+  <bind key="F1" modifiers="Ctrl" action="ToolGradient" display="true"/>
+  <bind key="g" action="ToolGradient" />
+  <bind key="G" action="ToolGradient" />
+
+  <bind action="GradientPrefs" />
+
+  <bind key="F2" modifiers="Ctrl" action="ToolConnector" display="true"/>
+  <bind key="o" action="ToolConnector" />
+  <bind key="O" action="ToolConnector" />
+
+  <bind action="ConnectorPrefs" />
+
+  <bind key="F7" action="ToolDropper" display="true"/>
+  <bind key="d" action="ToolDropper" />
+  <bind key="D" action="ToolDropper" />
+
+  <bind action="DropperPrefs" />
+
+<!-- Zoom -->
+
   <bind key="plus" action="ZoomIn" display="true"/>
   <bind key="plus" modifiers="Shift" action="ZoomIn" />
   <bind key="equal" action="ZoomIn" />
   <bind key="KP_Add" action="ZoomIn" />
+
   <bind key="minus" action="ZoomOut" display="true"/>
   <bind key="KP_Subtract" action="ZoomOut" />
+
   <bind key="1" action="Zoom1:0" display="true"/>
-  <bind key="grave" action="ZoomPrev" display="true"/>
-  <bind key="grave" modifiers="Shift" action="ZoomNext" display="true"/>
-  <bind key="asciitilde" modifiers="Shift" action="ZoomNext" />
   <bind key="2" action="Zoom1:2" display="true"/>
   <bind key="3" action="ZoomSelection" display="true"/>
   <bind key="4" action="ZoomDrawing" display="true"/>
   <bind key="5" action="ZoomPage" display="true"/>
   <bind key="KP_5" action="ZoomPage" />
   <bind key="6" action="ZoomPageWidth" display="true"/>
+
   <bind key="e" modifiers="Ctrl" action="ZoomPageWidth" />
   <bind key="E" modifiers="Ctrl" action="ZoomPageWidth" />
+
+  <bind key="grave" modifiers="Shift" action="ZoomNext" display="true"/> <!-- ` -->
+  <bind key="asciitilde" modifiers="Shift" action="ZoomNext" /> <!-- ~ -->
+  <bind key="grave" action="ZoomPrev" display="true"/> <!-- ` -->
+
+<!-- View -->
+
+  <bind key="F11" action="FullScreen" display="true"/> 
+
+  <bind key="Tab" modifiers="Ctrl" action="NextWindow" display="true"/>
+  <bind key="ISO_Left_Tab" modifiers="Ctrl,Shift" action="NextWindow" />
+  <bind key="Tab" modifiers="Ctrl,Shift" action="PrevWindow" display="true"/>
+  <bind key="ISO_Left_Tab" modifiers="Ctrl" action="PrevWindow" />
+
   <bind key="r" modifiers="Ctrl" action="ToggleRulers" display="true"/>
   <bind key="R" modifiers="Ctrl" action="ToggleRulers" />
+
   <bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true"/>
   <bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
-  <bind key="bar" modifiers="Shift" action="ToggleGuides" />
+
+  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
   <bind key="bar" action="ToggleGuides" display="true"/>
-  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" />
+
+  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
   <bind key="numbersign" action="ToggleGrid" display="true"/>
+
+  <bind action="ViewNew"/>
+  <bind action="ViewNewPreview"/>
+  <bind action="ViewIconPreview"/>
+
+  <bind action="ViewModeNormal"/>
+  <bind action="ViewModeOutline"/>
+
+<!-- Edit -->
+
   <bind key="z" modifiers="Ctrl" action="EditUndo" display="true"/>
   <bind key="Z" modifiers="Ctrl" action="EditUndo" />
-  <bind key="y" modifiers="Ctrl" action="EditRedo" />
-  <bind key="Y" modifiers="Ctrl" action="EditRedo" />
-  <bind key="z" modifiers="Ctrl,Shift" action="EditRedo" display="true"/>
-  <bind key="Z" modifiers="Ctrl,Shift" action="EditRedo" />
   <bind key="y" modifiers="Ctrl,Shift" action="EditUndo" />
   <bind key="Y" modifiers="Ctrl,Shift" action="EditUndo" />
+
+  <bind key="z" modifiers="Ctrl,Shift" action="EditRedo" display="true"/>
+  <bind key="Z" modifiers="Ctrl,Shift" action="EditRedo" />
+  <bind key="y" modifiers="Ctrl" action="EditRedo" />
+  <bind key="Y" modifiers="Ctrl" action="EditRedo" />
+
   <bind key="x" modifiers="Ctrl" action="EditCut" display="true"/>
   <bind key="X" modifiers="Ctrl" action="EditCut" />
+
   <bind key="c" modifiers="Ctrl" action="EditCopy" display="true"/>
   <bind key="C" modifiers="Ctrl" action="EditCopy" />
+
   <bind key="v" modifiers="Ctrl" action="EditPaste" display="true"/>
   <bind key="V" modifiers="Ctrl" action="EditPaste" />
+
   <bind key="v" modifiers="Ctrl,Shift" action="EditPasteStyle" display="true"/>
   <bind key="V" modifiers="Ctrl,Shift" action="EditPasteStyle" />
+
   <bind key="v" modifiers="Ctrl,Alt" action="EditPasteInPlace" display="true"/>
   <bind key="V" modifiers="Ctrl,Alt" action="EditPasteInPlace" />
+
+  <bind action="EditPasteSize" />
+  <bind action="EditPasteWidth" />
+  <bind action="EditPasteHeight" />
+  <bind action="EditPasteSizeSeparately" />
+  <bind action="EditPasteWidthSeparately" />
+  <bind action="EditPasteHeightSeparately" />
+
   <bind key="Delete" action="EditDelete" display="true"/>
   <bind key="KP_Delete" action="EditDelete" />
   <bind key="BackSpace" action="EditDelete" />
+
   <bind key="d" modifiers="Ctrl" action="EditDuplicate" display="true"/>
   <bind key="D" modifiers="Ctrl" action="EditDuplicate" />
+
   <bind key="d" modifiers="Alt" action="EditClone" display="true"/>
   <bind key="D" modifiers="Alt" action="EditClone" />
+
   <bind key="d" modifiers="Alt,Shift" action="EditUnlinkClone" display="true"/>
   <bind key="D" modifiers="Alt,Shift" action="EditUnlinkClone" />
+
   <bind key="d" modifiers="Shift" action="EditCloneOriginal" display="true"/>
   <bind key="D" modifiers="Shift" action="EditCloneOriginal" />
-  <bind key="i" modifiers="Alt" action="EditTile" display="true"/>
-  <bind key="I" modifiers="Alt" action="EditTile" />
-  <bind key="i" modifiers="Alt,Shift" action="EditUnTile" display="true"/>
-  <bind key="I" modifiers="Alt,Shift" action="EditUnTile" />
-  <bind key="c" modifiers="Ctrl,Shift" action="ObjectToCurve" display="true"/>
-  <bind key="C" modifiers="Ctrl,Shift" action="ObjectToCurve" />
-  <bind key="w" modifiers="Alt" action="ObjectFlowText" display="true"/>
-  <bind key="W" modifiers="Alt" action="ObjectFlowText" />
-  <bind key="w" modifiers="Alt,Shift" action="ObjectUnFlowText" display="true"/>
-  <bind key="W" modifiers="Alt,Shift" action="ObjectUnFlowText" />
+
+  <bind key="a" modifiers="Ctrl" action="EditSelectAll" display="true"/>
+  <bind key="A" modifiers="Ctrl" action="EditSelectAll" />
+
+  <bind action="EditClearAll" />
+
+  <bind key="a" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" display="true"/>
+  <bind key="A" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" />
+
+  <bind key="exclam" action="EditInvert" display="true"/>
+  <bind key="exclam" modifiers="Shift" action="EditInvert" />
+
+  <bind key="exclam" modifiers="Alt" action="EditInvertInAllLayers" display="true"/>
+  <bind key="exclam" modifiers="Alt,Shift" action="EditInvertInAllLayers" />
+
+  <bind action="EditDeselect" /> <!-- FIXME: currently deselecting is bypassing the verb, so it's not bound to Esc as it should be -->
+
+<!-- Objects/selection -->
+
   <bind key="h" action="ObjectFlipHorizontally" display="true"/>
   <bind key="H" action="ObjectFlipHorizontally" />
+
   <bind key="v" action="ObjectFlipVertically" display="true"/>
   <bind key="V" action="ObjectFlipVertically" />
-  <bind key="Page_Up" modifiers="Ctrl,Shift" action="LayerRaise" display="true"/>
-  <bind key="KP_Page_Up" modifiers="Ctrl,Shift" action="LayerRaise" />
-  <bind key="Page_Down" modifiers="Ctrl,Shift" action="LayerLower" display="true"/>
-  <bind key="KP_Page_Down" modifiers="Ctrl,Shift" action="LayerLower" />
-  <bind key="Home" modifiers="Ctrl,Shift" action="LayerToTop" display="true"/>
-  <bind key="KP_Home" modifiers="Ctrl,Shift" action="LayerToTop" />
-  <bind key="End" modifiers="Ctrl,Shift" action="LayerToBottom" display="true"/>
-  <bind key="KP_End" modifiers="Ctrl,Shift" action="LayerToBottom" />
-  <bind key="Page_Up" modifiers="Shift" action="LayerMoveToNext" display="true"/>
-  <bind key="KP_Page_Up" modifiers="Shift" action="LayerMoveToNext" />
-  <bind key="Page_Down" modifiers="Shift" action="LayerMoveToPrev" display="true"/>
-  <bind key="KP_Page_Down" modifiers="Shift" action="LayerMoveToPrev" />
+
   <bind key="Home" action="SelectionToFront" display="true"/>
   <bind key="KP_Home" action="SelectionToFront" />
+
   <bind key="End" action="SelectionToBack" display="true"/>
   <bind key="KP_End" action="SelectionToBack" />
+
   <bind key="Page_Up" action="SelectionRaise" display="true"/>
   <bind key="KP_Page_Up" action="SelectionRaise" />
+
   <bind key="Page_Down" action="SelectionLower" display="true"/>
   <bind key="KP_Page_Down" action="SelectionLower" />
-  <bind key="a" modifiers="Ctrl" action="EditSelectAll" display="true"/>
-  <bind key="A" modifiers="Ctrl" action="EditSelectAll" />
-  <bind key="a" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" display="true"/>
-  <bind key="A" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" />
-  <bind key="exclam" action="EditInvert" display="true"/>
-  <bind key="exclam" modifiers="Shift" action="EditInvert" />
-  <bind key="exclam" modifiers="Alt" action="EditInvertInAllLayers" display="true"/>
-  <bind key="exclam" modifiers="Alt,Shift" action="EditInvertInAllLayers" />
+
   <bind key="g" modifiers="Ctrl" action="SelectionGroup" display="true"/>
   <bind key="G" modifiers="Ctrl" action="SelectionGroup" />
-  <bind key="u" modifiers="Ctrl" action="SelectionUnGroup" />
-  <bind key="U" modifiers="Ctrl" action="SelectionUnGroup" />
-  <bind key="g" modifiers="Ctrl,Shift" action="SelectionUnGroup" display="true"/>
-  <bind key="G" modifiers="Ctrl,Shift" action="SelectionUnGroup" />
   <bind key="u" modifiers="Ctrl,Shift" action="SelectionGroup" />
   <bind key="U" modifiers="Ctrl,Shift" action="SelectionGroup" />
+
+  <bind key="g" modifiers="Ctrl,Shift" action="SelectionUnGroup" display="true"/>
+  <bind key="G" modifiers="Ctrl,Shift" action="SelectionUnGroup" />
+  <bind key="u" modifiers="Ctrl" action="SelectionUnGroup" />
+  <bind key="U" modifiers="Ctrl" action="SelectionUnGroup" />
+
+  <bind key="b" modifiers="Alt" action="SelectionCreateBitmap" display="true"/>
+  <bind key="B" modifiers="Alt" action="SelectionCreateBitmap" />
+
+  <bind key="b" modifiers="Alt,Shift" action="SelectionTrace" display="true"/>
+  <bind key="B" modifiers="Alt,Shift" action="SelectionTrace" />
+
+  <bind key="i" modifiers="Alt" action="ObjectsToPattern" display="true"/>
+  <bind key="I" modifiers="Alt" action="ObjectsToPattern" />
+
+  <bind key="i" modifiers="Alt,Shift" action="ObjectsFromPattern" display="true"/>
+  <bind key="I" modifiers="Alt,Shift" action="ObjectsFromPattern" />
+
+  <bind action="ObjectSetMask" />
+  <bind action="ObjectUnSetMask" />
+
+  <bind action="ObjectSetClipPath" />
+  <bind action="ObjectUnSetClipPath" />
+
+  <!-- FIXME: currently these bypass the verbs, so the verbs are not bound to ctrl+[] as they should be -->
+  <bind action="ObjectRotate90" /> 
+  <bind action="ObjectRotate90CCW" /> 
+
+  <bind action="ObjectRemoveTransform" /> 
+
+<!-- Path -->
+
+  <bind key="c" modifiers="Ctrl,Shift" action="ObjectToPath" display="true"/>
+  <bind key="C" modifiers="Ctrl,Shift" action="ObjectToPath" />
+
+  <bind key="c" modifiers="Ctrl,Alt" action="StrokeToPath" display="true"/>
+  <bind key="C" modifiers="Ctrl,Alt" action="StrokeToPath" />
+
+  <bind key="k" modifiers="Ctrl" action="SelectionCombine" display="true"/>
+  <bind key="K" modifiers="Ctrl" action="SelectionCombine" />
+
+  <bind key="k" modifiers="Ctrl,Shift" action="SelectionBreakApart" display="true"/>
+  <bind key="K" modifiers="Ctrl,Shift" action="SelectionBreakApart" />
+
   <bind key="plus" modifiers="Ctrl" action="SelectionUnion" display="true"/>
   <bind key="KP_Add" modifiers="Ctrl" action="SelectionUnion" />
   <bind key="plus" modifiers="Ctrl,Shift" action="SelectionUnion" />
+
   <bind key="asterisk" modifiers="Ctrl" action="SelectionIntersect" display="true"/>
   <bind key="KP_Multiply" modifiers="Ctrl" action="SelectionIntersect" />
   <bind key="asterisk" modifiers="Ctrl,Shift" action="SelectionIntersect" />
+
   <bind key="minus" modifiers="Ctrl" action="SelectionDiff" display="true"/>
   <bind key="underscore" modifiers="Ctrl" action="SelectionDiff" />
   <bind key="underscore" modifiers="Ctrl,Shift" action="SelectionDiff" />
   <bind key="KP_Subtract" modifiers="Ctrl" action="SelectionDiff" />
   <bind key="minus" modifiers="Ctrl,Shift" action="SelectionDiff" />
-  <bind key="asciicircum" modifiers="Ctrl" action="SelectionSymDiff" display="true"/>
+
+  <bind key="asciicircum" modifiers="Ctrl" action="SelectionSymDiff" display="true"/> <!-- ^ -->
   <bind key="asciicircum" modifiers="Ctrl,Shift" action="SelectionSymDiff" />
+
   <bind key="slash" modifiers="Ctrl,Alt" action="SelectionCutPath" display="true"/>
   <bind key="slash" modifiers="Ctrl,Alt,Shift" action="SelectionCutPath" />
+
   <bind key="slash" modifiers="Ctrl" action="SelectionDivide" display="true"/>
   <bind key="slash" modifiers="Ctrl,Shift" action="SelectionDivide" />
+
   <bind key="parenright" modifiers="Ctrl" action="SelectionOffset" display="true"/>
   <bind key="parenright" modifiers="Ctrl,Shift" action="SelectionOffset" />
   <bind key="0" modifiers="Ctrl,Shift" action="SelectionOffset" />
+
   <bind key="parenright" modifiers="Alt" action="SelectionOffsetScreen" display="true"/>
   <bind key="0" modifiers="Alt" action="SelectionOffsetScreen" />
+
   <bind key="parenright" modifiers="Alt,Shift" action="SelectionOffsetScreen10" display="true"/>
   <bind key="0" modifiers="Alt,Shift" action="SelectionOffsetScreen10" />
+
   <bind key="parenleft" modifiers="Ctrl" action="SelectionInset" display="true"/>
   <bind key="parenleft" modifiers="Ctrl,Shift" action="SelectionInset" />
   <bind key="9" modifiers="Ctrl,Shift" action="SelectionInset" />
+
   <bind key="parenleft" modifiers="Alt" action="SelectionInsetScreen" display="true"/>
   <bind key="9" modifiers="Alt" action="SelectionInsetScreen" />
-  <bind key="parenleft" modifiers="Alt,Shift" action="SelectionInsetScreen" display="true"/>
-  <bind key="9" modifiers="Alt,Shift" action="SelectionInsetScreen" />
+
+  <bind key="parenleft" modifiers="Alt,Shift" action="SelectionInsetScreen10" display="true"/>
+  <bind key="9" modifiers="Alt,Shift" action="SelectionInsetScreen10" />
+
   <bind key="j" modifiers="Ctrl" action="SelectionDynOffset" display="true"/>
   <bind key="J" modifiers="Ctrl" action="SelectionDynOffset" />
+
   <bind key="j" modifiers="Ctrl,Alt" action="SelectionLinkedOffset" display="true"/>
   <bind key="J" modifiers="Ctrl,Alt" action="SelectionLinkedOffset" />
-  <bind key="c" modifiers="Ctrl,Alt" action="SelectionOutline" display="true"/>
-  <bind key="C" modifiers="Ctrl,Alt" action="SelectionOutline" />
+
   <bind key="l" modifiers="Ctrl" action="SelectionSimplify" display="true"/>
   <bind key="L" modifiers="Ctrl" action="SelectionSimplify" />
-  <bind key="b" modifiers="Alt" action="SelectionCreateBitmap" display="true"/>
-  <bind key="B" modifiers="Alt" action="SelectionCreateBitmap" />
-  <bind key="b" modifiers="Alt,Shift" action="SelectionTrace" display="true"/>
-  <bind key="B" modifiers="Alt,Shift" action="SelectionTrace" />
-  <bind key="k" modifiers="Ctrl" action="SelectionCombine" display="true"/>
-  <bind key="K" modifiers="Ctrl" action="SelectionCombine" />
-  <bind key="k" modifiers="Ctrl,Shift" action="SelectionBreakApart" display="true"/>
-  <bind key="K" modifiers="Ctrl,Shift" action="SelectionBreakApart" />
+
+  <bind action="SelectionReverse" />
+
+<!-- Text -->
+
+  <bind key="w" modifiers="Alt" action="ObjectFlowText" display="true"/>
+  <bind key="W" modifiers="Alt" action="ObjectFlowText" />
+
+  <bind key="w" modifiers="Alt,Shift" action="ObjectUnFlowText" display="true"/>
+  <bind key="W" modifiers="Alt,Shift" action="ObjectUnFlowText" />
+
+  <bind action="SelectionTextToPath" />
+  <bind action="SelectionTextFromPath" />
+
+  <bind action="ObjectFlowtextToText" />
+  <bind action="SelectionTextRemoveKerns" />
+
+<!-- Layers -->
+
+  <bind action="LayerNew" />
+  <bind action="LayerRename" />
+  <bind action="LayerNext" />
+  <bind action="LayerPrev" />
+  <bind action="LayerDelete" />
+
+  <bind key="Page_Up" modifiers="Ctrl,Shift" action="LayerRaise" display="true"/>
+  <bind key="KP_Page_Up" modifiers="Ctrl,Shift" action="LayerRaise" />
+
+  <bind key="Page_Down" modifiers="Ctrl,Shift" action="LayerLower" display="true"/>
+  <bind key="KP_Page_Down" modifiers="Ctrl,Shift" action="LayerLower" />
+
+  <bind key="Home" modifiers="Ctrl,Shift" action="LayerToTop" display="true"/>
+  <bind key="KP_Home" modifiers="Ctrl,Shift" action="LayerToTop" />
+
+  <bind key="End" modifiers="Ctrl,Shift" action="LayerToBottom" display="true"/>
+  <bind key="KP_End" modifiers="Ctrl,Shift" action="LayerToBottom" />
+
+  <bind key="Page_Up" modifiers="Shift" action="LayerMoveToNext" display="true"/>
+  <bind key="KP_Page_Up" modifiers="Shift" action="LayerMoveToNext" />
+
+  <bind key="Page_Down" modifiers="Shift" action="LayerMoveToPrev" display="true"/>
+  <bind key="KP_Page_Down" modifiers="Shift" action="LayerMoveToPrev" />
+
+<!-- Dialogs -->
+
   <bind key="x" modifiers="Ctrl,Shift" action="DialogXMLEditor" display="true"/>
   <bind key="X" modifiers="Ctrl,Shift" action="DialogXMLEditor" />
-  <bind key="d" modifiers="Ctrl,Shift" action="DialogNamedview" display="true"/>
-  <bind key="D" modifiers="Ctrl,Shift" action="DialogNamedview" />
+
+  <bind key="d" modifiers="Ctrl,Shift" action="DialogDocumentProperties" display="true"/>
+  <bind key="D" modifiers="Ctrl,Shift" action="DialogDocumentProperties" />
+
   <bind key="a" modifiers="Ctrl,Shift" action="DialogAlignDistribute" display="true"/>
   <bind key="A" modifiers="Ctrl,Shift" action="DialogAlignDistribute" />
-  <bind key="t" modifiers="Ctrl,Shift" action="Dialogtext" display="true"/>
-  <bind key="T" modifiers="Ctrl,Shift" action="Dialogtext" />
-  <bind key="p" modifiers="Ctrl,Shift" action="DialogDisplay" display="true"/>
-  <bind key="P" modifiers="Ctrl,Shift" action="DialogDisplay" />
+
+  <bind key="t" modifiers="Ctrl,Shift" action="DialogText" display="true"/>
+  <bind key="T" modifiers="Ctrl,Shift" action="DialogText" />
+
+  <bind key="p" modifiers="Ctrl,Shift" action="DialogPreferences" display="true"/>
+  <bind key="P" modifiers="Ctrl,Shift" action="DialogPreferences" />
+
   <bind key="f" modifiers="Ctrl,Shift" action="DialogFillStroke" display="true"/>
   <bind key="F" modifiers="Ctrl,Shift" action="DialogFillStroke" />
+
   <bind key="f" modifiers="Ctrl" action="DialogFind" display="true"/>
   <bind key="F" modifiers="Ctrl" action="DialogFind" />
+
   <bind key="m" modifiers="Ctrl,Shift" action="DialogTransform" display="true"/>
   <bind key="M" modifiers="Ctrl,Shift" action="DialogTransform" />
-  <bind key="o" modifiers="Ctrl,Shift" action="DialogItem" display="true"/>
-  <bind key="O" modifiers="Ctrl,Shift" action="DialogItem" />
+
+  <bind key="o" modifiers="Ctrl,Shift" action="DialogObjectProperties" display="true"/>
+  <bind key="O" modifiers="Ctrl,Shift" action="DialogObjectProperties" />
+
   <bind key="w" modifiers="Ctrl,Shift" action="DialogSwatches" display="true"/>
   <bind key="W" modifiers="Ctrl,Shift" action="DialogSwatches" />
+
+  <bind action="DialogMetadata" />
+  <bind action="DialogClonetiler" />
+  <bind action="DialogGridArrange" />
+  <bind action="DialogScript" />
+  <bind action="DialogDebug" />
+  <bind action="DialogInput" />
+
   <bind key="F12" action="DialogsToggle" display="true"/>
+
+<!-- Help -->
+
+  <bind action="HelpKeys" />
+  <bind action="HelpAboutExtensions" />
+  <bind action="HelpAboutMemory" />
+  <bind action="HelpAbout" />
+  <!-- There are also verbs for tutorials, if you really need them -->
+
+<!-- Effects -->
+
+  <bind action="EffectLast" />
+  <bind action="EffectLastPref" />
+
 </keys>
diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index ddb046bad..7ac6bd5ac 100644
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -43,12 +43,12 @@ static char const menus_skeleton[] =
 "       <separator/>\n"
 "       <verb verb-id=\"FileVacuum\" />\n"
 "       <separator/>\n"
-"       <verb verb-id=\"DialogNamedview\" />\n"
+"       <verb verb-id=\"DialogDocumentProperties\" />\n"
 "       <verb verb-id=\"DialogMetadata\" />\n"
-"       <verb verb-id=\"DialogDisplay\" />\n"
+"       <verb verb-id=\"DialogPreferences\" />\n"
 "       <verb verb-id=\"DialogInput\" />\n"
 "       <separator/>\n"
-"       <verb verb-id=\"FileCloseView\" />\n"
+"       <verb verb-id=\"FileClose\" />\n"
 "       <verb verb-id=\"FileQuit\" />\n"
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Edit") "\">\n"
@@ -74,7 +74,7 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"EditDuplicate\" />\n"
 "       <submenu name=\"" N_("Clo_ne") "\">\n"
 "           <verb verb-id=\"EditClone\" />\n"
-"           <verb verb-id=\"DialogsClonetiler\" />\n"
+"           <verb verb-id=\"DialogClonetiler\" />\n"
 "           <verb verb-id=\"EditUnlinkClone\" />\n"
 "           <verb verb-id=\"EditCloneOriginal\" />\n"
 "       </submenu>\n"
@@ -125,8 +125,8 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"DialogDebug\" />\n"
 "       <verb verb-id=\"DialogScript\" />\n"
 "       <separator/>\n"
-"       <verb verb-id=\"FilePrevDesktop\" />\n"
-"       <verb verb-id=\"FileNextDesktop\" />\n"
+"       <verb verb-id=\"PrevWindow\" />\n"
+"       <verb verb-id=\"NextWindow\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"ViewNew\" />\n"
 "       <verb verb-id=\"ViewIconPreview\" />\n"
@@ -151,7 +151,7 @@ static char const menus_skeleton[] =
 "   <submenu name=\"" N_("_Object") "\">\n"
 "       <verb verb-id=\"DialogFillStroke\" />\n"
 "       <verb verb-id=\"DialogSwatches\" />\n"
-"       <verb verb-id=\"DialogItem\" />\n"
+"       <verb verb-id=\"DialogObjectProperties\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionGroup\" />\n"
 "       <verb verb-id=\"SelectionUnGroup\" />\n"
@@ -165,8 +165,8 @@ static char const menus_skeleton[] =
 "           <verb verb-id=\"ObjectUnSetMask\" />\n"
 "       </submenu>\n"
 "       <submenu name=\"" N_("Patter_n") "\">\n"
-"           <verb verb-id=\"EditTile\" />\n"
-"           <verb verb-id=\"EditUnTile\" />\n"
+"           <verb verb-id=\"ObjectsToPattern\" />\n"
+"           <verb verb-id=\"ObjectsFromPattern\" />\n"
 "       </submenu>\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionRaise\" />\n"
@@ -181,11 +181,11 @@ static char const menus_skeleton[] =
 "       <separator/>\n"
 "       <verb verb-id=\"DialogTransform\" />\n"
 "       <verb verb-id=\"DialogAlignDistribute\" />\n"
-"       <verb verb-id=\"SelectionGridTile\" />\n"
+"       <verb verb-id=\"DialogGridArrange\" />\n"
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Path") "\">\n"
-"       <verb verb-id=\"ObjectToCurve\" />\n"
-"       <verb verb-id=\"SelectionOutline\" />\n"
+"       <verb verb-id=\"ObjectToPath\" />\n"
+"       <verb verb-id=\"StrokeToPath\" />\n"
 "       <verb verb-id=\"SelectionTrace\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionUnion\" />\n"
@@ -207,7 +207,7 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"SelectionReverse\" />\n"
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Text") "\">\n"
-"       <verb verb-id=\"Dialogtext\" />\n"
+"       <verb verb-id=\"DialogText\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionTextFromPath\" />\n"
 "       <verb verb-id=\"SelectionTextToPath\" />\n"
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 9cfe33dda..fb0b50c8e 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1877,11 +1877,11 @@ Verb *Verb::_base_verbs[] = {
                  N_("Import a bitmap or SVG image into this document"), "file_import"),
     new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."),
                  N_("Export this document or a selection as a bitmap image"), "file_export"),
-    new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "FileNextDesktop", N_("N_ext Window"),
+    new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"),
                  N_("Switch to the next document window"), "window_next"),
-    new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "FilePrevDesktop", N_("P_revious Window"),
+    new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"),
                  N_("Switch to the previous document window"), "window_previous"),
-    new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileCloseView", N_("_Close"),
+    new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileClose", N_("_Close"),
                  N_("Close this document window"), GTK_STOCK_CLOSE),
     new FileVerb(SP_VERB_FILE_QUIT, "FileQuit", N_("_Quit"), N_("Quit Inkscape"), GTK_STOCK_QUIT),
 
@@ -1923,10 +1923,10 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_CLONE_ORIGINAL, "EditCloneOriginal", N_("Select _Original"),
                  N_("Select the object to which the selected clone is linked"), NULL),
     // TRANSLATORS: Convert selection to a rectangle with tiled pattern fill
-    new EditVerb(SP_VERB_EDIT_TILE, "EditTile", N_("Objects to Patter_n"),
+    new EditVerb(SP_VERB_EDIT_TILE, "ObjectsToPattern", N_("Objects to Patter_n"),
                  N_("Convert selection to a rectangle with tiled pattern fill"), NULL),
     // TRANSLATORS: Extract objects from a tiled pattern fill
-    new EditVerb(SP_VERB_EDIT_UNTILE, "EditUnTile", N_("Pattern to _Objects"),
+    new EditVerb(SP_VERB_EDIT_UNTILE, "ObjectsFromPattern", N_("Pattern to _Objects"),
                  N_("Extract objects from a tiled pattern fill"), NULL),
     new EditVerb(SP_VERB_EDIT_CLEAR_ALL, "EditClearAll", N_("Clea_r All"),
                  N_("Delete all objects from document"), NULL),
@@ -1997,7 +1997,7 @@ Verb *Verb::_base_verbs[] = {
     new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN, "SelectionInsetScreen",
                       N_("I_nset Path by 1 px"),
                       N_("Inset selected paths by 1 px"), NULL),
-    new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN_10, "SelectionInsetScreen",
+    new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN_10, "SelectionInsetScreen10",
                       N_("I_nset Path by 10 px"),
                       N_("Inset selected paths by 10 px"), NULL),
     new SelectionVerb(SP_VERB_SELECTION_DYNAMIC_OFFSET, "SelectionDynOffset",
@@ -2006,7 +2006,7 @@ Verb *Verb::_base_verbs[] = {
                       N_("_Linked Offset"),
                       N_("Create a dynamic offset object linked to the original path"),
                       "linked_offset"),
-    new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "SelectionOutline", N_("_Stroke to Path"),
+    new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "StrokeToPath", N_("_Stroke to Path"),
                       N_("Convert selected object's stroke to paths"), "stroke_tocurve"),
     new SelectionVerb(SP_VERB_SELECTION_SIMPLIFY, "SelectionSimplify", N_("Si_mplify"),
                       N_("Simplify selected paths (remove extra nodes)"), "simplify"),
@@ -2023,7 +2023,7 @@ Verb *Verb::_base_verbs[] = {
     // Advanced tutorial for more info
     new SelectionVerb(SP_VERB_SELECTION_BREAK_APART, "SelectionBreakApart", N_("Break _Apart"),
                       N_("Break selected paths into subpaths"), "selection_break"),
-    new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "SelectionGridTile", N_("Gri_d Arrange..."),
+    new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Gri_d Arrange..."),
                       N_("Arrange selected objects in a grid pattern"), "grid_arrange"),
     /* Layer */
     new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."),
@@ -2054,9 +2054,9 @@ Verb *Verb::_base_verbs[] = {
                    N_("Rotate selection 90&#176; clockwise"), "object_rotate_90_CW"),
     new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CCW, "ObjectRotate90CCW", N_("Rotate 9_0&#176; CCW"),
                    N_("Rotate selection 90&#176; counter-clockwise"), "object_rotate_90_CCW"),
-    new ObjectVerb(SP_VERB_OBJECT_FLATTEN, "ObjectFlatten", N_("Remove _Transformations"),
+    new ObjectVerb(SP_VERB_OBJECT_FLATTEN, "ObjectRemoveTransform", N_("Remove _Transformations"),
                    N_("Remove transformations from object"), "object_reset"),
-    new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToCurve", N_("_Object to Path"),
+    new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToPath", N_("_Object to Path"),
                    N_("Convert selected object to path"), "object_tocurve"),
     new ObjectVerb(SP_VERB_OBJECT_FLOW_TEXT, "ObjectFlowText", N_("_Flow into Frame"),
                    N_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), NULL),
@@ -2080,33 +2080,33 @@ Verb *Verb::_base_verbs[] = {
                  N_("Remove clipping path from selection"), NULL),
 
     /* Tools */
-    new ContextVerb(SP_VERB_CONTEXT_SELECT, "DrawSelect", N_("Select"),
+    new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", N_("Select"),
                     N_("Select and transform objects"), "draw_select"),
-    new ContextVerb(SP_VERB_CONTEXT_NODE, "DrawNode", N_("Node Edit"),
+    new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", N_("Node Edit"),
                     N_("Edit path nodes or control handles"), "draw_node"),
-    new ContextVerb(SP_VERB_CONTEXT_RECT, "DrawRect", N_("Rectangle"),
+    new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", N_("Rectangle"),
                     N_("Create rectangles and squares"), "draw_rect"),
-    new ContextVerb(SP_VERB_CONTEXT_ARC, "DrawArc", N_("Ellipse"),
+    new ContextVerb(SP_VERB_CONTEXT_ARC, "ToolArc", N_("Ellipse"),
                     N_("Create circles, ellipses, and arcs"), "draw_arc"),
-    new ContextVerb(SP_VERB_CONTEXT_STAR, "DrawStar", N_("Star"),
+    new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", N_("Star"),
                     N_("Create stars and polygons"), "draw_star"),
-    new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "DrawSpiral", N_("Spiral"),
+    new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", N_("Spiral"),
                     N_("Create spirals"), "draw_spiral"),
-    new ContextVerb(SP_VERB_CONTEXT_PENCIL, "DrawPencil", N_("Pencil"),
+    new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", N_("Pencil"),
                     N_("Draw freehand lines"), "draw_freehand"),
-    new ContextVerb(SP_VERB_CONTEXT_PEN, "DrawPen", N_("Pen"),
+    new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", N_("Pen"),
                     N_("Draw Bezier curves and straight lines"), "draw_pen"),
-    new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "DrawCalligrphic", N_("Calligraphy"),
+    new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligrphic", N_("Calligraphy"),
                     N_("Draw calligraphic lines"), "draw_calligraphic"),
-    new ContextVerb(SP_VERB_CONTEXT_TEXT, "DrawText", N_("Text"),
+    new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", N_("Text"),
                     N_("Create and edit text objects"), "draw_text"),
-    new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "DrawGradient", N_("Gradient"),
+    new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", N_("Gradient"),
                     N_("Create and edit gradients"), "draw_gradient"),
-    new ContextVerb(SP_VERB_CONTEXT_ZOOM, "DrawZoom", N_("Zoom"),
+    new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"),
                     N_("Zoom in or out"), "draw_zoom"),
-    new ContextVerb(SP_VERB_CONTEXT_DROPPER, "DrawDropper", N_("Dropper"),
+    new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"),
                     N_("Pick averaged colors from image"), "draw_dropper"),
-    new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "DrawConnector", N_("Connector"),
+    new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", N_("Connector"),
                     N_("Create connectors"), "draw_connector"),
 
     /* Tool prefs */
@@ -2182,9 +2182,9 @@ Verb *Verb::_base_verbs[] = {
                  N_("Zoom to fit selection in window"), "zoom_select"),
 
     /* Dialogs */
-    new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogDisplay", N_("In_kscape Preferences..."),
+    new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("In_kscape Preferences..."),
                    N_("Edit global Inkscape preferences"), GTK_STOCK_PREFERENCES ),
-    new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogNamedview", N_("_Document Properties..."),
+    new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogDocumentProperties", N_("_Document Properties..."),
                    N_("Edit properties of this document (to be saved with the document)"), GTK_STOCK_PROPERTIES ),
     new DialogVerb(SP_VERB_DIALOG_METADATA, "DialogMetadata", N_("_Document Metadata..."),
                    N_("Edit document metadata (to be saved with the document)"), NULL ),
@@ -2197,7 +2197,7 @@ Verb *Verb::_base_verbs[] = {
                    N_("Precisely control objects' transformations"), "object_trans"),
     new DialogVerb(SP_VERB_DIALOG_ALIGN_DISTRIBUTE, "DialogAlignDistribute", N_("_Align and Distribute..."),
                    N_("Align and distribute objects"), "object_align"),
-    new DialogVerb(SP_VERB_DIALOG_TEXT, "Dialogtext", N_("_Text and Font..."),
+    new DialogVerb(SP_VERB_DIALOG_TEXT, "DialogText", N_("_Text and Font..."),
                    N_("View and select font family, font size and other text properties"), "object_font"),
     new DialogVerb(SP_VERB_DIALOG_XML_EDITOR, "DialogXMLEditor", N_("_XML Editor..."),
                    N_("View and edit the XML tree of the document"), "xml_editor"),
@@ -2210,9 +2210,9 @@ Verb *Verb::_base_verbs[] = {
     new DialogVerb(SP_VERB_DIALOG_TOGGLE, "DialogsToggle", N_("Show/Hide D_ialogs"),
                    N_("Show or hide all open dialogs"), "dialog_toggle"),
     // TRANSLATORS: "Tile Clones" means: "Create tiled clones"
-    new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogsClonetiler", N_("Create Tiled Clones..."),
+    new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogClonetiler", N_("Create Tiled Clones..."),
                    N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), NULL),
-    new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogItem", N_("_Object Properties..."),
+    new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogObjectProperties", N_("_Object Properties..."),
                    N_("Edit the ID, locked and visible status, and other object properties"), "dialog_item_properties"),
 #ifdef WITH_INKBOARD
     new DialogVerb(SP_VERB_DIALOG_WHITEBOARD_CONNECT, "DialogWhiteboardConnect",
@@ -2246,8 +2246,6 @@ Verb *Verb::_base_verbs[] = {
                  N_("Memory usage information"), NULL),
     new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"),
                  N_("Inkscape version, authors, license"), /*"help_about"*/"inkscape_options"),
-//    new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("Modifying or Redistributing Inkscape"),
-//                 N_("Show license to modify and/or redistribute Inkscape: GNU GPL"), NULL),
 
     /* Tutorials */
     new TutorialVerb(SP_VERB_TUTORIAL_BASIC, "TutorialsBasic", N_("Inkscape: _Basic"),
-- 
2.30.2