From 3a66119215c6701c659557af3e524ea9b22bda0e Mon Sep 17 00:00:00 2001 From: buliabyak Date: Sun, 26 Mar 2006 02:10:09 +0000 Subject: [PATCH] menu rearrange, tips copyedit --- src/interface.cpp | 4 +- src/menus-skeleton.h | 17 ++++--- src/verbs.cpp | 104 +++++++++++++++++++++---------------------- 3 files changed, 64 insertions(+), 61 deletions(-) diff --git a/src/interface.cpp b/src/interface.cpp index 26552d510..d332d6cb3 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -764,7 +764,7 @@ sp_ui_checkboxes_menus(GtkMenu *m, Inkscape::UI::View::View *view) // checkitem_toggled, checkitem_update, 0); sp_ui_menu_append_check_item_from_verb(m, view, _("Commands Bar"), _("Show or hide the Commands bar (under the menu)"), "commands", checkitem_toggled, checkitem_update, 0); - sp_ui_menu_append_check_item_from_verb(m, view, _("Tool Controls"), _("Show or hide the Tool Controls panel"), "toppanel", + sp_ui_menu_append_check_item_from_verb(m, view, _("Tool Controls Bar"), _("Show or hide the Tool Controls bar"), "toppanel", checkitem_toggled, checkitem_update, 0); sp_ui_menu_append_check_item_from_verb(m, view, _("_Toolbox"), _("Show or hide the main toolbox (on the left)"), "toolbox", checkitem_toggled, checkitem_update, 0); @@ -774,7 +774,7 @@ sp_ui_checkboxes_menus(GtkMenu *m, Inkscape::UI::View::View *view) checkitem_toggled, checkitem_update, Inkscape::Verb::get(SP_VERB_TOGGLE_SCROLLBARS)); sp_ui_menu_append_check_item_from_verb(m, view, _("_Statusbar"), _("Show or hide the statusbar (at the bottom of the window)"), "statusbar", checkitem_toggled, checkitem_update, 0); - sp_ui_menu_append_check_item_from_verb(m, view, _("_Panels"), _("Show or hide the panels"), "panels", + sp_ui_menu_append_check_item_from_verb(m, view, _("_Palette"), _("Show or hide the color palette"), "panels", checkitem_toggled, checkitem_update, 0); } diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 7d8a5803d..bb497245a 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -64,15 +64,14 @@ static char const menus_skeleton[] = " \n" " \n" " \n" -" \n" -" \n" -" \n" -" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" " \n" " \n" -" \n" -" \n" -" \n" " \n" " \n" " \n" @@ -157,6 +156,10 @@ static char const menus_skeleton[] = " \n" " \n" " \n" +" \n" +" \n" +" \n" +" \n" " \n" " \n" " \n" diff --git a/src/verbs.cpp b/src/verbs.cpp index 84da8703b..eb19eee25 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1833,42 +1833,42 @@ Verb *Verb::_base_verbs[] = { new Verb(SP_VERB_NONE, "None", N_("None"), N_("Does nothing"), NULL), /* File */ - new FileVerb(SP_VERB_FILE_NEW, "FileNew", N_("Default"), N_("Create new document from default template"), + new FileVerb(SP_VERB_FILE_NEW, "FileNew", N_("Default"), N_("Create new document from the default template"), GTK_STOCK_NEW ), new FileVerb(SP_VERB_FILE_OPEN, "FileOpen", N_("_Open..."), - N_("Open existing document"), GTK_STOCK_OPEN ), + N_("Open an existing document"), GTK_STOCK_OPEN ), new FileVerb(SP_VERB_FILE_REVERT, "FileRevert", N_("Re_vert"), N_("Revert to the last saved version of document (changes will be lost)"), GTK_STOCK_REVERT_TO_SAVED ), new FileVerb(SP_VERB_FILE_SAVE, "FileSave", N_("_Save"), N_("Save document"), GTK_STOCK_SAVE ), new FileVerb(SP_VERB_FILE_SAVE_AS, "FileSaveAs", N_("Save _As..."), - N_("Save document under new name"), GTK_STOCK_SAVE_AS ), + N_("Save document under a new name"), GTK_STOCK_SAVE_AS ), new FileVerb(SP_VERB_FILE_PRINT, "FilePrint", N_("_Print..."), N_("Print document"), GTK_STOCK_PRINT ), // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) - new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Vac_uum Defs"), N_("Remove unused predefined items from the <defs> of the document"), + new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Vac_uum Defs"), N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"), "file_vacuum" ), new FileVerb(SP_VERB_FILE_PRINT_DIRECT, "FilePrintDirect", N_("Print _Direct"), N_("Print directly without prompting to a file or pipe"), NULL ), new FileVerb(SP_VERB_FILE_PRINT_PREVIEW, "FilePrintPreview", N_("Print Previe_w"), N_("Preview document printout"), GTK_STOCK_PRINT_PREVIEW ), new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."), - N_("Import bitmap or SVG image into document"), "file_import"), + N_("Import a bitmap or SVG image into this document"), "file_import"), new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), - N_("Export document or selection as a bitmap image"), "file_export"), + 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"), N_("Switch to the next document window"), "window_next"), new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "FilePrevDesktop", N_("P_revious Window"), N_("Switch to the previous document window"), "window_previous"), new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileCloseView", N_("_Close"), - N_("Close window"), GTK_STOCK_CLOSE), + N_("Close this document window"), GTK_STOCK_CLOSE), new FileVerb(SP_VERB_FILE_QUIT, "FileQuit", N_("_Quit"), N_("Quit Inkscape"), GTK_STOCK_QUIT), /* Edit */ new EditVerb(SP_VERB_EDIT_UNDO, "EditUndo", N_("_Undo"), N_("Undo last action"), GTK_STOCK_UNDO), new EditVerb(SP_VERB_EDIT_REDO, "EditRedo", N_("_Redo"), - N_("Do again last undone action"), GTK_STOCK_REDO), + N_("Do again the last undone action"), GTK_STOCK_REDO), new EditVerb(SP_VERB_EDIT_CUT, "EditCut", N_("Cu_t"), N_("Cut selection to clipboard"), GTK_STOCK_CUT), new EditVerb(SP_VERB_EDIT_COPY, "EditCopy", N_("_Copy"), @@ -1876,24 +1876,24 @@ Verb *Verb::_base_verbs[] = { new EditVerb(SP_VERB_EDIT_PASTE, "EditPaste", N_("_Paste"), N_("Paste objects from clipboard to mouse point"), GTK_STOCK_PASTE), new EditVerb(SP_VERB_EDIT_PASTE_STYLE, "EditPasteStyle", N_("Paste _Style"), - N_("Apply style of the copied object to selection"), "selection_paste_style"), + N_("Apply the style of the copied object to selection"), "selection_paste_style"), new EditVerb(SP_VERB_EDIT_PASTE_IN_PLACE, "EditPasteInPlace", N_("Paste _In Place"), N_("Paste objects from clipboard to the original location"), "selection_paste_in_place"), new EditVerb(SP_VERB_EDIT_DELETE, "EditDelete", N_("_Delete"), N_("Delete selection"), GTK_STOCK_DELETE), new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"), N_("Duplicate selected objects"), "edit_duplicate"), - new EditVerb(SP_VERB_EDIT_CLONE, "EditClone", N_("Clo_ne"), - N_("Create a clone of selected object (a copy linked to the original)"), "edit_clone"), + new EditVerb(SP_VERB_EDIT_CLONE, "EditClone", N_("Create Clo_ne"), + N_("Create a clone (a copy linked to the original) of selected object"), "edit_clone"), new EditVerb(SP_VERB_EDIT_UNLINK_CLONE, "EditUnlinkClone", N_("Unlin_k Clone"), - N_("Cut the clone's link to its original"), "edit_unlink_clone"), + N_("Cut the selected clone's link to its original, turning it into a standalone object"), "edit_unlink_clone"), new EditVerb(SP_VERB_EDIT_CLONE_ORIGINAL, "EditCloneOriginal", N_("Select _Original"), - N_("Select the object to which the clone is linked"), NULL), + 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_("O_bjects to Pattern"), + new EditVerb(SP_VERB_EDIT_TILE, "EditTile", 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 Ob_jects"), + new EditVerb(SP_VERB_EDIT_UNTILE, "EditUnTile", 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), @@ -1932,19 +1932,19 @@ Verb *Verb::_base_verbs[] = { N_("Remove all manual kerns and glyph rotations from a text object"), NULL), new SelectionVerb(SP_VERB_SELECTION_UNION, "SelectionUnion", N_("_Union"), - N_("Union of selected objects"), "union"), + N_("Create union of selected paths"), "union"), new SelectionVerb(SP_VERB_SELECTION_INTERSECT, "SelectionIntersect", N_("_Intersection"), - N_("Intersection of selected objects"), "intersection"), + N_("Create intersection of selected paths"), "intersection"), new SelectionVerb(SP_VERB_SELECTION_DIFF, "SelectionDiff", N_("_Difference"), - N_("Difference of selected objects (bottom minus top)"), "difference"), + N_("Create difference of selected paths (bottom minus top)"), "difference"), new SelectionVerb(SP_VERB_SELECTION_SYMDIFF, "SelectionSymDiff", N_("E_xclusion"), - N_("Exclusive OR of selected objects"), "exclusion"), + N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), "exclusion"), new SelectionVerb(SP_VERB_SELECTION_CUT, "SelectionDivide", N_("Di_vision"), - N_("Cut the bottom object into pieces"), "division"), + N_("Cut the bottom path into pieces"), "division"), // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the // Advanced tutorial for more info new SelectionVerb(SP_VERB_SELECTION_SLICE, "SelectionCutPath", N_("Cut _Path"), - N_("Cut the bottom object's stroke into pieces, removing fill"), "cut_path"), + N_("Cut the bottom path's stroke into pieces, removing fill"), "cut_path"), // TRANSLATORS: "outset": expand a shape by offsetting the object's path, // i.e. by displacing it perpendicular to the path in each point. // See also the Advanced Tutorial for explanation. @@ -1974,14 +1974,14 @@ Verb *Verb::_base_verbs[] = { N_("Create a dynamic offset object linked to the original path"), "linked_offset"), new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "SelectionOutline", N_("_Stroke to Path"), - N_("Convert selected strokes to paths"), "stroke_tocurve"), + N_("Convert selected object's stroke to paths"), "stroke_tocurve"), new SelectionVerb(SP_VERB_SELECTION_SIMPLIFY, "SelectionSimplify", N_("Si_mplify"), - N_("Simplify selected paths by removing extra nodes"), "simplify"), + N_("Simplify selected paths (remove extra nodes)"), "simplify"), new SelectionVerb(SP_VERB_SELECTION_REVERSE, "SelectionReverse", N_("_Reverse"), - N_("Reverses the direction of selected paths; useful for flipping markers"), "selection_reverse"), + N_("Reverse the direction of selected paths (useful for flipping markers)"), "selection_reverse"), // TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) new SelectionVerb(SP_VERB_SELECTION_TRACE, "SelectionTrace", N_("_Trace Bitmap..."), - N_("Convert bitmap object to paths"), "selection_trace"), + N_("Create one or more paths from a bitmap by tracing it"), "selection_trace"), new SelectionVerb(SP_VERB_SELECTION_CREATE_BITMAP, "SelectionCreateBitmap", N_("_Make a Bitmap Copy"), N_("Export selection to a bitmap and insert it into document"), "selection_bitmap" ), new SelectionVerb(SP_VERB_SELECTION_COMBINE, "SelectionCombine", N_("_Combine"), @@ -1991,7 +1991,7 @@ Verb *Verb::_base_verbs[] = { 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..."), - N_("Arrange selection in grid pattern"), "grid_arrange"), + N_("Arrange selected objects in a grid pattern"), "grid_arrange"), /* Layer */ new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."), N_("Create a new layer"), "new_layer"), @@ -2024,18 +2024,18 @@ Verb *Verb::_base_verbs[] = { new ObjectVerb(SP_VERB_OBJECT_FLATTEN, "ObjectFlatten", N_("Remove _Transformations"), N_("Remove transformations from object"), "object_reset"), new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToCurve", N_("_Object to Path"), - N_("Convert selected objects to paths"), "object_tocurve"), + N_("Convert selected object to path"), "object_tocurve"), new ObjectVerb(SP_VERB_OBJECT_FLOW_TEXT, "ObjectFlowText", N_("_Flow into Frame"), - N_("Put text into frames"), NULL), + N_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), NULL), new ObjectVerb(SP_VERB_OBJECT_UNFLOW_TEXT, "ObjectUnFlowText", N_("_Unflow"), N_("Remove text from frame (creates a single-line text object)"), NULL), new ObjectVerb(SP_VERB_OBJECT_FLOWTEXT_TO_TEXT, "ObjectFlowtextToText", N_("_Convert to Text"), - N_("Convert flowed text to regular text objects (preserves appearance)"), NULL), + N_("Convert flowed text to regular text object (preserves appearance)"), NULL), new ObjectVerb(SP_VERB_OBJECT_FLIP_HORIZONTAL, "ObjectFlipHorizontally", - N_("Flip _Horizontal"), N_("Flips selected objects horizontally"), + N_("Flip _Horizontal"), N_("Flip selected objects horizontally"), "object_flip_hor"), new ObjectVerb(SP_VERB_OBJECT_FLIP_VERTICAL, "ObjectFlipVertically", - N_("Flip _Vertical"), N_("Flips selected objects vertically"), + N_("Flip _Vertical"), N_("Flip selected objects vertically"), "object_flip_ver"), new ObjectVerb(SP_VERB_OBJECT_SET_MASK, "ObjectSetMask", N_("_Set"), N_("Apply mask to selection (using the topmost object as mask)"), NULL), @@ -2111,8 +2111,8 @@ Verb *Verb::_base_verbs[] = { new ZoomVerb(SP_VERB_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), "zoom_out"), new ZoomVerb(SP_VERB_TOGGLE_RULERS, "ToggleRulers", N_("_Rulers"), N_("Show or hide the canvas rulers"), "rulers"), new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), "scrollbars"), - new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide grid"), "grid"), - new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides"), "guides"), + new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), "grid"), + new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), "guides"), new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"), "zoom_next"), new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"), @@ -2138,7 +2138,7 @@ Verb *Verb::_base_verbs[] = { N_("Switch to outline (wireframe) display mode"), NULL), new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview"), - N_("Open a window to preview items at different icon resolutions"), NULL/*"view_icon_preview"*/), + N_("Open a window to preview objects at different icon resolutions"), NULL/*"view_icon_preview"*/), new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"), N_("Zoom to fit page in window"), "zoom_page"), new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"), @@ -2150,24 +2150,24 @@ Verb *Verb::_base_verbs[] = { /* Dialogs */ new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogDisplay", N_("In_kscape Preferences..."), - N_("Global Inkscape preferences"), GTK_STOCK_PREFERENCES ), + N_("Edit global Inkscape preferences"), GTK_STOCK_PREFERENCES ), new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogNamedview", N_("_Document Properties..."), - N_("Preferences saved with the document"), GTK_STOCK_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_("Metadata saved with the document"), NULL ), + N_("Edit document metadata (to be saved with the document)"), NULL ), new DialogVerb(SP_VERB_DIALOG_FILL_STROKE, "DialogFillStroke", N_("_Fill and Stroke..."), - N_("Fill and Stroke dialog"), "fill_and_stroke"), + N_("Edit objects' style, such as color or stroke width"), "fill_and_stroke"), // TRANSLATORS: "Swatches" means: color samples new DialogVerb(SP_VERB_DIALOG_SWATCHES, "DialogSwatches", N_("S_watches..."), - N_("View color swatches"), GTK_STOCK_SELECT_COLOR), + N_("Select colors from a swatches palette"), GTK_STOCK_SELECT_COLOR), new DialogVerb(SP_VERB_DIALOG_TRANSFORM, "DialogTransform", N_("Transfor_m..."), - N_("Transform dialog"), "object_trans"), + N_("Precisely control objects' transformations"), "object_trans"), new DialogVerb(SP_VERB_DIALOG_ALIGN_DISTRIBUTE, "DialogAlignDistribute", N_("_Align and Distribute..."), - N_("Align and Distribute dialog"), "object_align"), + N_("Align and distribute objects"), "object_align"), new DialogVerb(SP_VERB_DIALOG_TEXT, "Dialogtext", N_("_Text and Font..."), - N_("Text and Font dialog"), "object_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_("XML Editor"), "xml_editor"), + N_("View and edit the XML tree of the document"), "xml_editor"), new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find..."), N_("Find objects in document"), GTK_STOCK_FIND ), new DialogVerb(SP_VERB_DIALOG_DEBUG, "DialogDebug", N_("_Messages..."), @@ -2175,12 +2175,12 @@ Verb *Verb::_base_verbs[] = { new DialogVerb(SP_VERB_DIALOG_SCRIPT, "DialogScript", N_("S_cripts..."), N_("Run scripts"), NULL), new DialogVerb(SP_VERB_DIALOG_TOGGLE, "DialogsToggle", N_("Show/Hide D_ialogs"), - N_("Show or hide all active dialogs"), "dialog_toggle"), + N_("Show or hide all open dialogs"), "dialog_toggle"), // TRANSLATORS: "Tile Clones" means: "Create tiled clones" - new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogsClonetiler", N_("Tile Clones..."), - N_("Create and arrange multiple clones of selection"), NULL), + new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogsClonetiler", 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..."), - N_("Object Properties dialog"), "dialog_item_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", N_("_Connect to Jabber server..."), N_("Connect to a Jabber server"), NULL), @@ -2200,17 +2200,17 @@ Verb *Verb::_base_verbs[] = { N_("Disconnect from _server"), "", NULL), #endif new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."), - N_("Configure extended input devices"), NULL), + N_("Configure extended input devices, such as a graphics tablet"), NULL), /* Help */ new HelpVerb(SP_VERB_HELP_KEYS, "HelpKeys", N_("_Keys and Mouse"), - N_("Key and mouse shortcuts reference"), "help_keys"), + N_("Keys and mouse shortcuts reference"), "help_keys"), new HelpVerb(SP_VERB_HELP_ABOUT_EXTENSIONS, "HelpAboutExtensions", N_("About E_xtensions"), - N_("About Extensions..."), NULL), + N_("Information on Inkscape extensions"), NULL), new HelpVerb(SP_VERB_HELP_MEMORY, "HelpAboutMemory", N_("About _Memory"), - N_("About Memory..."), NULL), + N_("Memory usage information"), NULL), new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"), - N_("About Inkscape"), /*"help_about"*/"inkscape_options"), + 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), -- 2.30.2