Menubar: Fix translation of submenu names

* drop underscore from submenus' "name" attribute
  and extract for translation by default
* avoid crash for submenus missing a name
* fix ITS rules (only top-level menu names where extracted)

1 files changed, 23 insertions, 23 deletions

diff --git a/share/ui/menus.xml b/share/ui/menus.xml
index 3b42d0f5f..2fbf21768 100644
--- a/share/ui/menus.xml
+++ b/share/ui/menus.xml
@@ -3,7 +3,7 @@
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   show-icons="false">
 
-   <submenu _name="_File">
+   <submenu name="_File">
        <verb verb-id="FileNew" />
        <verb verb-id="FileTemplates" />
        <verb verb-id="FileOpen" />
@@ -29,7 +29,7 @@
        <verb verb-id="FileClose" />
        <verb verb-id="FileQuit" />
    </submenu>
-   <submenu _name="_Edit">
+   <submenu name="_Edit">
        <verb verb-id="EditUndo" />
        <verb verb-id="EditRedo" />
        <verb verb-id="DialogUndoHistory" />
@@ -39,7 +39,7 @@
        <verb verb-id="EditPaste" />
        <verb verb-id="EditPasteInPlace" />
        <verb verb-id="EditPasteStyle" />
-       <submenu _name="Paste Si_ze">
+       <submenu name="Paste Si_ze">
            <verb verb-id="EditPasteSize" />
            <verb verb-id="EditPasteWidth" />
            <verb verb-id="EditPasteHeight" />
@@ -51,7 +51,7 @@
        <verb verb-id="DialogFind" />
        <separator/>
        <verb verb-id="EditDuplicate" />
-       <submenu _name="Clo_ne">
+       <submenu name="Clo_ne">
            <verb verb-id="EditClone" />
            <verb verb-id="DialogClonetiler" />
            <verb verb-id="EditUnlinkClone" />
@@ -66,7 +66,7 @@
        <separator/>
        <verb verb-id="EditSelectAll" />
        <verb verb-id="EditSelectAllInAllLayers" />
-       <submenu _name="Select Sa_me">
+       <submenu name="Select Sa_me">
            <verb verb-id="EditSelectSameFillStroke" />
            <verb verb-id="EditSelectSameFillColor" />
            <verb verb-id="EditSelectSameStrokeColor" />
@@ -88,8 +88,8 @@
        <verb verb-id="DialogInput" />
        <verb verb-id="DialogPreferences" show-icons="true" />
    </submenu>
-   <submenu _name="_View">
-     <submenu _name="_Zoom">
+   <submenu name="_View">
+     <submenu name="_Zoom">
        <verb verb-id="ZoomIn" />
        <verb verb-id="ZoomOut" />
        <separator/>
@@ -106,7 +106,7 @@
        <verb verb-id="ZoomPrev" />
        <verb verb-id="ZoomNext" />
      </submenu>
-       <submenu _name="_Display Mode">
+       <submenu name="_Display Mode">
          <verb verb-id="ViewModeToggle"/>
          <verb verb-id="ViewModeNormal" radio="yes" default="yes"/>
          <verb verb-id="ViewModeNoFilters" radio="yes"/>
@@ -116,7 +116,7 @@
          <!--verb verb-id="ViewModePrintColorsPreview" radio="yes"/-->
          <!--verb verb-id="DialogPrintColorsPreview" /-->
        </submenu>
-       <submenu _name="_Color Display Mode">
+       <submenu name="_Color Display Mode">
          <verb verb-id="ViewColorModeToggle"/>
          <verb verb-id="ViewColorModeNormal" radio="yes" default="yes"/>
          <verb verb-id="ViewColorModeGrayscale" radio="yes"/>
@@ -124,7 +124,7 @@
          <!--verb verb-id="ViewColorModePrintColorsPreview" radio="yes"/-->
          <!--verb verb-id="DialogPrintColorsPreview" /-->
        </submenu>
-       <submenu _name="_Canvas Orientation">
+       <submenu name="_Canvas Orientation">
          <verb verb-id="FlipHorizontal"/>
          <verb verb-id="FlipVertical"/>
          <verb verb-id="FlipNone"/>
@@ -138,7 +138,7 @@
        <verb verb-id="ToggleGuides" check="yes" />
        <verb verb-id="ViewCmsToggle" check="yes" />
        <separator/>
-       <submenu _name="Sh_ow/Hide">
+       <submenu name="Sh_ow/Hide">
          <verb verb-id="ToggleCommandsToolbar" check="yes" />
          <verb verb-id="ToggleSnapToolbar"     check="yes" />
          <verb verb-id="ToggleToolToolbar"     check="yes" />
@@ -165,7 +165,7 @@
        <!-- Not quite ready to be in the menus.
          <verb verb-id="FocusToggle" /-->
    </submenu>
-   <submenu _name="_Layer">
+   <submenu name="_Layer">
        <verb verb-id="LayerNew" />
        <verb verb-id="LayerRename" />
        <separator/>
@@ -189,7 +189,7 @@
        <separator/>
        <verb verb-id="DialogLayers" />
    </submenu>
-   <submenu _name="_Object">
+   <submenu name="_Object">
        <verb verb-id="DialogObjects" />
        <separator/>
        <verb verb-id="DialogFillStroke" />
@@ -201,17 +201,17 @@
        <verb verb-id="SelectionUnGroup" />
        <verb verb-id="SelectionUnGroupPopSelection" />
        <separator/>
-       <submenu _name="Cli_p">
+       <submenu name="Cli_p">
            <verb verb-id="ObjectSetClipPath" />
            <verb verb-id="ObjectSetInverseClipPath" />
            <verb verb-id="ObjectUnSetClipPath" />
        </submenu>
-       <submenu _name="Mas_k">
+       <submenu name="Mas_k">
            <verb verb-id="ObjectSetMask" />
            <verb verb-id="ObjectSetInverseMask" />
            <verb verb-id="ObjectUnSetMask" />
        </submenu>
-       <submenu _name="Patter_n">
+       <submenu name="Patter_n">
            <verb verb-id="ObjectsToPattern" />
            <verb verb-id="ObjectsFromPattern" />
        </submenu>
@@ -236,10 +236,10 @@
        <verb verb-id="DialogArrange" />
        <verb verb-id="DialogPrototype" />
    </submenu>
-   <submenu _name="_Path">
+   <submenu name="_Path">
        <verb verb-id="ObjectToPath" />
        <verb verb-id="StrokeToPath" />
-       <verb verb-id="SelectionTrace" /> 
+       <verb verb-id="SelectionTrace" />
        <separator/>
        <verb verb-id="SelectionUnion"        show-icons="true" />
        <verb verb-id="SelectionDiff"         show-icons="true" />
@@ -263,7 +263,7 @@
        <verb verb-id="PasteLivePathEffect" />
        <verb verb-id="RemoveLivePathEffect" />
    </submenu>
-   <submenu _name="_Text">
+   <submenu name="_Text">
        <verb verb-id="DialogText" />
        <verb verb-id="DialogSVGFonts" />
        <verb verb-id="DialogGlyphs" />
@@ -279,23 +279,23 @@
        <separator/>
        <verb verb-id="DialogSpellcheck" />  <!-- depends on HAVE_ASPELL -->
    </submenu>
-   <submenu _name="Filter_s">
+   <submenu name="Filter_s">
        <filters-list/>
        <separator/>
        <verb verb-id="DialogFilterEffects" />
        <verb verb-id="RemoveFilter" />
    </submenu>
-   <submenu _name="Exte_nsions">
+   <submenu name="Exte_nsions">
        <verb verb-id="EffectLast" />
        <verb verb-id="EffectLastPref" />
        <separator/>
        <effects-list/>
    </submenu>
-   <submenu _name="_Help">
+   <submenu name="_Help">
        <verb verb-id="org.inkscape.help.manual" />
        <verb verb-id="org.inkscape.help.keys" />
        <verb verb-id="org.inkscape.help.askaquestion" />
-       <submenu _name="Tutorials">
+       <submenu name="Tutorials">
            <verb verb-id="TutorialsBasic" />
            <verb verb-id="TutorialsShapes" />
            <verb verb-id="TutorialsAdvanced" />