diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/menus-skeleton.h | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/menus-skeleton.h')
| -rw-r--r-- | src/menus-skeleton.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 459b3d378..f888555d2 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -16,7 +16,7 @@ static char const menus_skeleton[] = " <submenu name=\"" N_("_File") "\">\n" " <submenu name=\"" N_("_New") "\">\n" " <verb verb-id=\"FileNew\" />\n" -" <template-list/>\n" +" <verb verb-id=\"FileTemplates\" />\n" " </submenu>\n" " <verb verb-id=\"FileOpen\" />\n" " <recent-file-list/>\n" @@ -35,9 +35,7 @@ static char const menus_skeleton[] = " <verb verb-id=\"FileVacuum\" />\n" " <separator/>\n" " <verb verb-id=\"DialogDocumentProperties\" />\n" -" <verb verb-id=\"DialogMetadata\" />\n" -" <verb verb-id=\"DialogPreferences\" />\n" -" <verb verb-id=\"DialogInput\" />\n" +//" <verb verb-id=\"DialogMetadata\" />\n" " <separator/>\n" " <verb verb-id=\"FileClose\" />\n" " <verb verb-id=\"FileQuit\" />\n" @@ -78,11 +76,12 @@ static char const menus_skeleton[] = " <separator/>\n" " <verb verb-id=\"EditSelectAll\" />\n" " <verb verb-id=\"EditSelectAllInAllLayers\" />\n" -" <submenu name=\"" N_("Selec_t Same") "\">\n" +" <submenu name=\"" N_("Select Sa_me") "\">\n" " <verb verb-id=\"EditSelectSameFillStroke\" />\n" " <verb verb-id=\"EditSelectSameFillColor\" />\n" " <verb verb-id=\"EditSelectSameStrokeColor\" />\n" " <verb verb-id=\"EditSelectSameStrokeStyle\" />\n" +" <verb verb-id=\"EditSelectSameObjectType\" />\n" " </submenu>\n" " <verb verb-id=\"EditInvert\" />\n" " <verb verb-id=\"EditDeselect\" />\n" @@ -91,6 +90,9 @@ static char const menus_skeleton[] = " <verb verb-id=\"EditRemoveAllGuides\" />\n" " <separator/>\n" " <verb verb-id=\"DialogXMLEditor\" />\n" +" <separator/>\n" +" <verb verb-id=\"DialogInput\" />\n" +" <verb verb-id=\"DialogPreferences\" />\n" " </submenu>\n" " <submenu name=\"" N_("_View") "\">\n" " <submenu name=\"" N_("_Zoom") "\">\n" @@ -127,10 +129,9 @@ static char const menus_skeleton[] = //" <verb verb-id=\"DialogPrintColorsPreview\" />\n" " </submenu>\n" " <separator/>\n" -" <verb verb-id=\"ToggleGrid\" />\n" -" <verb verb-id=\"ToggleGuides\" />\n" -" <verb verb-id=\"ToggleSnapGlobal\" />\n" -" <verb verb-id=\"ViewCmsToggle\" />\n" +" <verb verb-id=\"ToggleGrid\" check=\"yes\" />\n" +" <verb verb-id=\"ToggleGuides\" check=\"yes\" />\n" +" <verb verb-id=\"ViewCmsToggle\" check=\"yes\" />\n" " <separator/>\n" " <submenu name=\"" N_("Sh_ow/Hide") "\">\n" " <objects-checkboxes/>\n" @@ -139,7 +140,6 @@ static char const menus_skeleton[] = " <separator/>\n" " <verb verb-id=\"DialogSwatches\" />\n" " <verb verb-id=\"DialogDebug\" />\n" -//" <verb verb-id=\"DialogScript\" />\n" " <separator/>\n" " <verb verb-id=\"PrevWindow\" />\n" " <verb verb-id=\"NextWindow\" />\n" @@ -155,20 +155,24 @@ static char const menus_skeleton[] = " </submenu>\n" " <submenu name=\"" N_("_Layer") "\">\n" " <verb verb-id=\"LayerNew\" />\n" -" <verb verb-id=\"LayerDuplicate\" />\n" " <verb verb-id=\"LayerRename\" />\n" " <separator/>\n" +" <verb verb-id=\"LayerToggleHide\" />\n" +" <verb verb-id=\"LayerToggleLock\" />\n" +" <separator/>\n" " <verb verb-id=\"LayerNext\" />\n" " <verb verb-id=\"LayerPrev\" />\n" " <separator/>\n" " <verb verb-id=\"LayerMoveToNext\" />\n" " <verb verb-id=\"LayerMoveToPrev\" />\n" +" <verb verb-id=\"LayerMoveTo\" />\n" " <separator/>\n" " <verb verb-id=\"LayerRaise\" />\n" " <verb verb-id=\"LayerLower\" />\n" " <verb verb-id=\"LayerToTop\" />\n" " <verb verb-id=\"LayerToBottom\" />\n" " <separator/>\n" +" <verb verb-id=\"LayerDuplicate\" />\n" " <verb verb-id=\"LayerDelete\" />\n" " <separator/>\n" " <verb verb-id=\"DialogLayers\" />\n" @@ -176,6 +180,7 @@ static char const menus_skeleton[] = " <submenu name=\"" N_("_Object") "\">\n" " <verb verb-id=\"DialogFillStroke\" />\n" " <verb verb-id=\"DialogObjectProperties\" />\n" +" <verb verb-id=\"DialogSymbols\" />\n" " <separator/>\n" " <verb verb-id=\"SelectionGroup\" />\n" " <verb verb-id=\"SelectionUnGroup\" />\n" @@ -216,6 +221,7 @@ static char const menus_skeleton[] = " <verb verb-id=\"ObjectToPath\" />\n" " <verb verb-id=\"StrokeToPath\" />\n" " <verb verb-id=\"SelectionTrace\" />\n" +" <verb verb-id=\"SelectionPixelArt\" />\n" " <separator/>\n" " <verb verb-id=\"SelectionUnion\" />\n" " <verb verb-id=\"SelectionDiff\" />\n" @@ -241,9 +247,7 @@ static char const menus_skeleton[] = " </submenu>\n" " <submenu name=\"" N_("_Text") "\">\n" " <verb verb-id=\"DialogText\" />\n" -#ifdef ENABLE_SVG_FONTS " <verb verb-id=\"DialogSVGFonts\" />\n" -#endif // ENABLE_SVG_FONTS " <verb verb-id=\"DialogGlyphs\" />\n" " <separator/>\n" " <verb verb-id=\"SelectionTextToPath\" />\n" @@ -271,11 +275,6 @@ static char const menus_skeleton[] = " <separator/>\n" " <effects-list/>\n" " </submenu>\n" -#ifdef WITH_INKBOARD -" <submenu name=\"" N_("Whiteboa_rd") "\">\n" -" <verb verb-id=\"DialogXmppClient\" />\n" -" </submenu>\n" -#endif " <submenu name=\"" N_("_Help") "\">\n" " <verb verb-id=\"org.inkscape.help.manual\" />\n" " <verb verb-id=\"org.inkscape.help.keys\" />\n" @@ -285,6 +284,7 @@ static char const menus_skeleton[] = " <verb verb-id=\"TutorialsShapes\" />\n" " <verb verb-id=\"TutorialsAdvanced\" />\n" " <verb verb-id=\"TutorialsTracing\" />\n" +" <verb verb-id=\"TutorialsTracingPixelArt\" />\n" " <verb verb-id=\"TutorialsCalligraphy\" />\n" " <verb verb-id=\"TutorialsInterpolate\" />\n" " <verb verb-id=\"TutorialsDesign\" />\n" |