diff options
| -rw-r--r-- | src/3rdparty/libcroco/cr-input.c | 6 | ||||
| -rw-r--r-- | src/3rdparty/libcroco/cr-prop-list.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/libcroco/cr-sel-eng.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/libcroco/cr-statement.c | 12 | ||||
| -rw-r--r-- | src/3rdparty/libcroco/cr-style.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/libcroco/cr-tknzr.c | 2 | ||||
| -rw-r--r-- | src/extension/system.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-measure-segments.cpp | 2 | ||||
| -rw-r--r-- | src/ui/draw-anchor.h | 2 | ||||
| -rw-r--r-- | src/verbs.cpp | 2 |
10 files changed, 17 insertions, 17 deletions
diff --git a/src/3rdparty/libcroco/cr-input.c b/src/3rdparty/libcroco/cr-input.c index 732068aff..49000b1f5 100644 --- a/src/3rdparty/libcroco/cr-input.c +++ b/src/3rdparty/libcroco/cr-input.c @@ -231,8 +231,8 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) /*we reached eof */ loop = FALSE; } else { - /*a pb occured !! */ - cr_utils_trace_debug ("an io error occured"); + /*a pb occurred !! */ + cr_utils_trace_debug ("an io error occurred"); status = CR_ERROR; goto cleanup; } @@ -874,7 +874,7 @@ cr_input_peek_byte2 (CRInput const * a_this, gulong a_offset, gboolean * a_eof) *Gets the memory address of the byte located at a given offset *in the input stream. * - *Returns the address, otherwise NULL if an error occured. + *Returns the address, otherwise NULL if an error occurred. */ guchar * cr_input_get_byte_addr (CRInput * a_this, gulong a_offset) diff --git a/src/3rdparty/libcroco/cr-prop-list.c b/src/3rdparty/libcroco/cr-prop-list.c index dc575d6ff..5a61133f1 100644 --- a/src/3rdparty/libcroco/cr-prop-list.c +++ b/src/3rdparty/libcroco/cr-prop-list.c @@ -71,7 +71,7 @@ cr_prop_list_allocate (void) *Appends a property list to the current one. * *Returns the resulting prop list, or NULL if an error - *occured + *occurred */ CRPropList * cr_prop_list_append (CRPropList * a_this, CRPropList * a_to_append) diff --git a/src/3rdparty/libcroco/cr-sel-eng.c b/src/3rdparty/libcroco/cr-sel-eng.c index 9e35ad93f..0c1de39b6 100644 --- a/src/3rdparty/libcroco/cr-sel-eng.c +++ b/src/3rdparty/libcroco/cr-sel-eng.c @@ -1446,7 +1446,7 @@ sel_matches_node_real (CRSelEng * a_this, CRSimpleSel * a_sel, *case, *a_len is set to the actual number of ruleset found. *@return CR_BAD_PARAM_ERROR in case any of the given parameter are *bad (e.g null pointer). - *@return CR_ERROR if any other error occured. + *@return CR_ERROR if any other error occurred. */ static enum CRStatus cr_sel_eng_get_matched_rulesets_real (CRSelEng * a_this, diff --git a/src/3rdparty/libcroco/cr-statement.c b/src/3rdparty/libcroco/cr-statement.c index e31123aec..d064cd824 100644 --- a/src/3rdparty/libcroco/cr-statement.c +++ b/src/3rdparty/libcroco/cr-statement.c @@ -1210,14 +1210,14 @@ cr_statement_at_media_rule_parse_from_buf (const guchar * a_buf, parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf), a_enc, FALSE); if (!parser) { - cr_utils_trace_info ("Instanciation of the parser failed"); + cr_utils_trace_info ("Instantiation of the parser failed"); goto cleanup; } sac_handler = cr_doc_handler_new (); if (!sac_handler) { cr_utils_trace_info - ("Instanciation of the sac handler failed"); + ("Instantiation of the sac handler failed"); goto cleanup; } @@ -1396,7 +1396,7 @@ cr_statement_at_import_rule_parse_from_buf (const guchar * a_buf, parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf), a_encoding, FALSE); if (!parser) { - cr_utils_trace_info ("Instanciation of parser failed."); + cr_utils_trace_info ("Instantiation of parser failed."); goto cleanup; } @@ -1523,14 +1523,14 @@ cr_statement_at_page_rule_parse_from_buf (const guchar * a_buf, parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf), a_encoding, FALSE); if (!parser) { - cr_utils_trace_info ("Instanciation of the parser failed."); + cr_utils_trace_info ("Instantiation of the parser failed."); goto cleanup; } sac_handler = cr_doc_handler_new (); if (!sac_handler) { cr_utils_trace_info - ("Instanciation of the sac handler failed."); + ("Instantiation of the sac handler failed."); goto cleanup; } @@ -1639,7 +1639,7 @@ cr_statement_at_charset_rule_parse_from_buf (const guchar * a_buf, parser = cr_parser_new_from_buf ((guchar*)a_buf, strlen ((const char *) a_buf), a_encoding, FALSE); if (!parser) { - cr_utils_trace_info ("Instanciation of the parser failed."); + cr_utils_trace_info ("Instantiation of the parser failed."); goto cleanup; } diff --git a/src/3rdparty/libcroco/cr-style.c b/src/3rdparty/libcroco/cr-style.c index 2b865c248..ebc669c43 100644 --- a/src/3rdparty/libcroco/cr-style.c +++ b/src/3rdparty/libcroco/cr-style.c @@ -1528,7 +1528,7 @@ set_prop_font_size_from_value (CRStyle * a_style, CRTerm * a_value) a_style->font_size.sv.type = INHERITED_FONT_SIZE; } else { - cr_utils_trace_info ("Unknow value of font-size") ; + cr_utils_trace_info ("Unknown value of font-size") ; status = init_style_font_size_field (a_style); return CR_UNKNOWN_PROP_VAL_ERROR; } diff --git a/src/3rdparty/libcroco/cr-tknzr.c b/src/3rdparty/libcroco/cr-tknzr.c index 83f6ab3c0..10c81765b 100644 --- a/src/3rdparty/libcroco/cr-tknzr.c +++ b/src/3rdparty/libcroco/cr-tknzr.c @@ -524,7 +524,7 @@ cr_tknzr_parse_comment (CRTknzr * a_this, *Error code can be either CR_PARSING_ERROR if the string *parsed just doesn't *respect the production or another error if a - *lower level error occured. + *lower level error occurred. */ static enum CRStatus cr_tknzr_parse_unicode_escape (CRTknzr * a_this, diff --git a/src/extension/system.cpp b/src/extension/system.cpp index ea486ed80..412e5dcd4 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -278,7 +278,7 @@ save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension, } // test if the file exists and is writable - // the test only checks the file attributes and might pass where ACL does not allow to write + // the test only checks the file attributes and might pass where ACL does not allow writes if (Inkscape::IO::file_test(filename, G_FILE_TEST_EXISTS) && !Inkscape::IO::file_is_writable(filename)) { g_free(fileName); throw Output::file_read_only(); diff --git a/src/live_effects/lpe-measure-segments.cpp b/src/live_effects/lpe-measure-segments.cpp index 8768547e8..1bba6d2e3 100644 --- a/src/live_effects/lpe-measure-segments.cpp +++ b/src/live_effects/lpe-measure-segments.cpp @@ -188,7 +188,7 @@ LPEMeasureSegments::LPEMeasureSegments(LivePathEffectObject *lpeobject) : "That usually don't change much\n\n" "<b><big>Tips</big></b>\n" "<b><i>Style Dialog</i></b> Styling using XML editor to find appropriate classes or ID's\n" - "<b><i>Blacklists</i></b> This allow to hide some segments or projection steps to measure\n" + "<b><i>Blacklists</i></b> This allow hiding some segments or projection steps to measure\n" "<b><i>Multiple Measures</i></b> In the same object, in conjunction of blacklists, " "allow measures with different orientations or a extra projection \n" "<b><i>Set Defaults</i></b> Remember all LPE has it in the bottom")); diff --git a/src/ui/draw-anchor.h b/src/ui/draw-anchor.h index 5542b3bf6..b631a4893 100644 --- a/src/ui/draw-anchor.h +++ b/src/ui/draw-anchor.h @@ -30,7 +30,7 @@ class SPCurve; struct SPCanvasItem; /// The drawing anchor. -/// \todo Make this a regular knot, this will allow to set statusbar tips. +/// \todo Make this a regular knot, this will allow setting statusbar tips. struct SPDrawAnchor { Inkscape::UI::Tools::FreehandBase *dc; SPCurve *curve; diff --git a/src/verbs.cpp b/src/verbs.cpp index 37ec08ee4..e18ea71c7 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -3123,7 +3123,7 @@ Verb *Verb::_base_verbs[] = { new ZoomVerb(SP_VERB_VIEW_TOGGLE_SPLIT, "ViewSplitModeToggle", N_("Toggle _Split View Mode"), N_("Split canvas in 2 to show outline"), nullptr), - new ZoomVerb(SP_VERB_VIEW_TOGGLE_XRAY, "ViewXRayToggle", N_("Toggle _XRay Mode"), N_("XRay arround cursor"), + new ZoomVerb(SP_VERB_VIEW_TOGGLE_XRAY, "ViewXRayToggle", N_("Toggle _XRay Mode"), N_("XRay around cursor"), nullptr), new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-managed view"), |
