diff --git a/INSTALL.in b/INSTALL.in index ed8f539002..7f251a8abc 100644 --- a/INSTALL.in +++ b/INSTALL.in @@ -201,7 +201,7 @@ help in that regard: * HEIC: e.g. libde265 and libx265 support (for respectively decoding and encoding of HEVC). * AVIF: e.g. libaom decoder and encoder (for AV1 encoding and - decoding), prefered over rav1e. + decoding), preferred over rav1e. * HEJ2: OpenJPEG (for JPEG2000 inside HEIF). If you don't compile libheif with the correct flags (see libheif @@ -489,5 +489,5 @@ reconfiguration: % ninja reconfigure Verify that the optional features you wanted are now shown as `true`, -otherwise follow similar advices than above to make sure they are +otherwise follow similar advice as above to make sure they are visible to your setup. diff --git a/app/actions/filters-actions.c b/app/actions/filters-actions.c index e0f3e8e6de..dd8b8d0237 100644 --- a/app/actions/filters-actions.c +++ b/app/actions/filters-actions.c @@ -824,7 +824,7 @@ filters_actions_setup (GimpActionGroup *group) * operations end up generating the same action name. Typically we * don't want a third-party operation called "my-op" to have the same * action name than "my_op" (which is to say that one will be - * overrided by the other). + * overridden by the other). */ g_free (action_name); action_name = g_strdup_printf ("filters-%s-%d", formatted_op_name, i++); diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c index 01c98ec26e..ad78ff059b 100644 --- a/app/actions/layers-commands.c +++ b/app/actions/layers-commands.c @@ -1764,7 +1764,7 @@ layers_mask_show_cmd_callback (GimpAction *action, { /* if switching "show mask" on, and any selected layer's * mask is already visible, bail out because that's - * exactly the logic we use in the ui for multile + * exactly the logic we use in the ui for multiple * visible layer masks. */ return; @@ -1815,7 +1815,7 @@ layers_mask_disable_cmd_callback (GimpAction *action, { /* if switching "disable mask" on, and any selected * layer's mask is already disabled, bail out because - * that's exactly the logic we use in the ui for multile + * that's exactly the logic we use in the ui for multiple * disabled layer masks. */ return; diff --git a/app/core/gimp-transform-resize.c b/app/core/gimp-transform-resize.c index 896b214e8b..85f5b96b7c 100644 --- a/app/core/gimp-transform-resize.c +++ b/app/core/gimp-transform-resize.c @@ -353,7 +353,7 @@ gimp_transform_resize_crop (const GimpVector2 *orig_points, if (r.area == 0) { - /* saveguard if something went wrong, adjust and give warning */ + /* safeguard if something went wrong, adjust and give warning */ gimp_transform_resize_adjust (orig_points, n_points, x1, y1, x2, y2); g_printerr ("no rectangle found by algorithm, no cropping done\n"); diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c index 9109976827..ac9f9959e6 100644 --- a/app/core/gimp-utils.c +++ b/app/core/gimp-utils.c @@ -605,7 +605,7 @@ gimp_get_fill_params (GimpContext *context, * @start_y: * @end_x: * @end_y: - * @n_snap_lines: Number evenly disributed lines to snap to. + * @n_snap_lines: Number evenly distributed lines to snap to. * @offset_angle: The angle by which to offset the lines, in degrees. * @xres: The horizontal resolution. * @yres: The vertical resolution. diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c index 5ed3bbf36c..57530a73da 100644 --- a/app/core/gimpbrushpipe.c +++ b/app/core/gimpbrushpipe.c @@ -271,7 +271,7 @@ gimp_brush_pipe_select_brush (GimpBrush *brush, break; case PIPE_SELECT_ANGULAR: - /* Coords angle is already nomalized, + /* Coords angle is already normalized, * offset by 90 degrees is still needed * because hoses were made PS compatible*/ ix = (gint) RINT ((1.0 - current_coords->direction + 0.25) * pipe->rank[i]) % pipe->rank[i]; diff --git a/app/core/gimpidtable.c b/app/core/gimpidtable.c index 2307ad50cf..6b4fef7f43 100644 --- a/app/core/gimpidtable.c +++ b/app/core/gimpidtable.c @@ -152,7 +152,7 @@ gimp_id_table_insert (GimpIdTable *id_table, gpointer data) * @data: The data to associate with the id * * Insert data in the id table with a specific ID. If data already - * exsts with the given ID, this function fails. + * exists with the given ID, this function fails. * * Returns: The used ID if successful, -1 if it was already in use. **/ diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index a1bb97c0ef..1a556c8e36 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -3012,7 +3012,7 @@ gimp_image_get_xcf_version (GimpImage *image, /* The blending space variant corresponding to SPACE_RGB_PERCEPTUAL in <3.0 * corresponds to R'G'B'A which is NON_LINEAR in babl. Perceptual in babl is * R~G~B~A, >= 3.0 the code, comments and usage matches the existing enum value - * as being NON_LINEAR and new layers created use the new interger value for + * as being NON_LINEAR and new layers created use the new integer value for * PERCEPTUAL. */ version = MAX (23, version); @@ -3166,7 +3166,7 @@ gimp_image_get_xcf_version (GimpImage *image, /* Note: user unit storage was changed in XCF 21, but we can still * easily save older XCF (we use the unit name for both singular and - * plural forms). Therefore we don't bump the XCF version unecessarily + * plural forms). Therefore we don't bump the XCF version unnecessarily * and don't add any test. */ diff --git a/app/dialogs/welcome-dialog.c b/app/dialogs/welcome-dialog.c index 1386c4f37f..cb11b18253 100644 --- a/app/dialogs/welcome-dialog.c +++ b/app/dialogs/welcome-dialog.c @@ -1382,7 +1382,7 @@ welcome_dialog_release_item_activated (GtkListBox *listbox, { GList *windows = gimp_get_image_windows (gimp); - /* Losing forcus on the welcome dialog on purpose for the main GUI + /* Losing focus on the welcome dialog on purpose for the main GUI * to be more readable. */ if (windows) diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c index 4f23115188..6327b7f1ec 100644 --- a/app/display/gimpdisplayshell-scale.c +++ b/app/display/gimpdisplayshell-scale.c @@ -246,7 +246,7 @@ gimp_display_shell_scale_get_image_size (GimpDisplayShell *shell, * @w: * @h: * - * Gets the screen-space boudning box of the image, after it has + * Gets the screen-space bounding box of the image, after it has * been transformed (i.e., scaled, rotated, and scrolled). **/ void @@ -290,7 +290,7 @@ gimp_display_shell_scale_get_image_bounds (GimpDisplayShell *shell, * @w: * @h: * - * Gets the screen-space boudning box of the image, after it has + * Gets the screen-space bounding box of the image, after it has * been scaled and scrolled, but before it has been rotated. **/ void @@ -320,7 +320,7 @@ gimp_display_shell_scale_get_image_unrotated_bounds (GimpDisplayShell *shell, * @w: * @h: * - * Gets the screen-space boudning box of the image content, after it has + * Gets the screen-space bounding box of the image content, after it has * been transformed (i.e., scaled, rotated, and scrolled). **/ void @@ -375,7 +375,7 @@ gimp_display_shell_scale_get_image_bounding_box (GimpDisplayShell *shell, * @w: * @h: * - * Gets the screen-space boudning box of the image content, after it has + * Gets the screen-space bounding box of the image content, after it has * been scaled and scrolled, but before it has been rotated. **/ void diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c index e271826994..07eabd803b 100644 --- a/app/display/gimpimagewindow.c +++ b/app/display/gimpimagewindow.c @@ -706,7 +706,7 @@ gimp_image_window_configure_event (GtkWidget *widget, if (GTK_WIDGET_CLASS (parent_class)->configure_event) GTK_WIDGET_CLASS (parent_class)->configure_event (widget, event); - /* If the window size has changed, make sure additoinal logic is run + /* If the window size has changed, make sure additional logic is run * in the display shell's size-allocate */ if (event->width != current_width || diff --git a/app/display/gimptoolpolygon.c b/app/display/gimptoolpolygon.c index ae5295b7c9..1d95342956 100644 --- a/app/display/gimptoolpolygon.c +++ b/app/display/gimptoolpolygon.c @@ -558,7 +558,7 @@ gimp_tool_polygon_fit_segment (GimpToolPolygon *polygon, dest_end = &dest_points[n_points - 1]; - /* Transate to origin */ + /* Translate to origin */ gimp_vector2_sub (&origo_translation_offset, &vector2_zero, &dest_points[0]); diff --git a/app/gui/icon-themes.c b/app/gui/icon-themes.c index 224f8fb3fb..e2a783cdec 100644 --- a/app/gui/icon-themes.c +++ b/app/gui/icon-themes.c @@ -220,7 +220,7 @@ icon_themes_current_prefer_symbolic (Gimp *gimp) * override the "prefer-symbolic-icons" property, not only to avoid * discrepancies, but even more to avoid weird cases where we end up using * icons from the system icon theme while the chosen theme has the right icon - * (yet simply not in the prefered style). See Issue #9410. + * (yet simply not in the preferred style). See Issue #9410. */ if (gtk_icon_theme_has_icon (icon_theme, GIMP_ICON_WILBER) && ! gtk_icon_theme_has_icon (icon_theme, GIMP_ICON_WILBER "-symbolic")) diff --git a/app/language.c b/app/language.c index c14fdf0f40..2d3cafed11 100644 --- a/app/language.c +++ b/app/language.c @@ -805,7 +805,7 @@ language_get_system_lang_id (void) #elif defined PLATFORM_OSX NSString *langs; - /* In macOS, the user sets a list of prefered languages and the + /* In macOS, the user sets a list of preferred languages and the * software respects this preference order. I.e. that just storing the * top-prefered lang would not be enough. What if GIMP didn't have * translations for it, then it would fallback to the second lang. If diff --git a/app/main.c b/app/main.c index 7ce100ef0c..00625dd9b0 100644 --- a/app/main.c +++ b/app/main.c @@ -1,4 +1,4 @@ -/* GIMP - The GNU Image Manipulation Program +/* GIMP - The GNU Image Manipulation Program * Copyright (C) 1995 Spencer Kimball and Peter Mattis * * This program is free software: you can redistribute it and/or modify @@ -475,7 +475,7 @@ gimp_early_configuration (void) if (user_gimprc) user_gimprc_file = g_file_new_for_commandline_arg (user_gimprc); - /* GimpEarlyRc is reponsible for reading "gimprc" files for the + /* GimpEarlyRc is responsible for reading "gimprc" files for the * sole purpose of getting some configuration data that is needed * in the early initialization phase */ @@ -761,10 +761,10 @@ main (int argc, /* The GIMP option group is just an empty option group, created for * the sole purpose of running a post-parse hook before any other of - * dependant libraries are run. This makes it possible to apply + * dependent libraries are run. This makes it possible to apply * options from configuration data obtained from "gimprc" files, * before other libraries have a chance to run some of their - * intialization code. + * initialization code. */ gimp_group = g_option_group_new ("gimp", "", "", NULL, NULL); g_option_group_set_parse_hooks (gimp_group, NULL, diff --git a/app/tests/test-tools.c b/app/tests/test-tools.c index aacfbf6bed..1eeb794415 100644 --- a/app/tests/test-tools.c +++ b/app/tests/test-tools.c @@ -398,7 +398,7 @@ crop_tool_can_crop (GimpTestFixture *fixture, gint cropped_w = 20; gint cropped_h = 30; - /* Fit display and pause and let it stabalize (two idlings seems to + /* Fit display and pause and let it stabilize (two idlings seems to * always be enough) */ gimp_ui_manager_activate_action (gimp_test_utils_get_ui_manager (gimp), diff --git a/app/widgets/gimpdashboard.c b/app/widgets/gimpdashboard.c index fdb955633a..2837a2c3fd 100644 --- a/app/widgets/gimpdashboard.c +++ b/app/widgets/gimpdashboard.c @@ -3319,7 +3319,7 @@ gimp_dashboard_field_to_string (GimpDashboard *dashboard, const FieldInfo *field_info = &group_info->fields[field]; const VariableInfo *variable_info = &variables[field_info->variable]; const VariableData *variable_data = &priv->variables[field_info->variable]; - /* Tranlators: "N/A" is an abbreviation for "not available" */ + /* Translators: "N/A" is an abbreviation for "not available" */ const gchar *str = C_("dashboard-value", "N/A"); gboolean static_str = TRUE; gboolean show_limit = TRUE; diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index c59afab04b..b67a2562e2 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -2011,7 +2011,7 @@ control_compress_left (GimpGradient *gradient, range_l = range_r = drag_seg; } - /* Calculate left bound for dragged hadle */ + /* Calculate left bound for dragged handle */ if (drag_seg == range_l) lbound = range_l->prev->left + 2.0 * EPSILON; diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c index b52d312d05..ecac03469c 100644 --- a/app/widgets/gimpitemtreeview.c +++ b/app/widgets/gimpitemtreeview.c @@ -2245,7 +2245,7 @@ gimp_item_tree_view_popover_button_press (GtkWidget *widget, /* Also immediately pass a release event at same position. * Without this, we get weird pointer as though a quick drag'n - * drop occured. + * drop occurred. */ new_event->type = GDK_BUTTON_RELEASE; gtk_main_do_event (new_event); diff --git a/app/widgets/gimpshortcutbutton.c b/app/widgets/gimpshortcutbutton.c index 2e5ce8c18d..fcc33311eb 100644 --- a/app/widgets/gimpshortcutbutton.c +++ b/app/widgets/gimpshortcutbutton.c @@ -386,7 +386,7 @@ gimp_shortcut_button_focus_out_event (GimpShortcutButton* button, gpointer user_data) { /* On losing focus, we untoggle, so we don't have to grab anything. - * Let's avoid cases with several shortcut buttons all grabing the + * Let's avoid cases with several shortcut buttons all grabbing the * same shortcuts for instance. */ if (button->priv->timer != 0) diff --git a/libgimp/gimpfileprocedure.c b/libgimp/gimpfileprocedure.c index 12cb2918a6..9da47d8fa7 100644 --- a/libgimp/gimpfileprocedure.c +++ b/libgimp/gimpfileprocedure.c @@ -28,7 +28,7 @@ * GimpFileProcedure: * * File procedures implement file support. They cannot be created directly. - * Instead, you will create an instance of one of the sublasses (such as export + * Instead, you will create an instance of one of the subclasses (such as export * or load procedures). This provides a common interface for file-related * functions on these objects. **/ diff --git a/libgimp/gimpresource.c b/libgimp/gimpresource.c index 78ab6fee09..064af208ad 100644 --- a/libgimp/gimpresource.c +++ b/libgimp/gimpresource.c @@ -36,9 +36,9 @@ * The GimpContext holds a user's current choice of resources. * The GIMP core has the *resource* data. * - * A resource has-a identifier. + * A resource has an identifier. * Currently the identifier is a string, sometimes called a name. - * The identifier is unique among instances(resource datas) loaded into GIMP. + * The identifier is unique among instances (resource data) loaded into GIMP. * * A user can change the set of resources installed with GIMP, * and edit or create new resources meaning datasets. diff --git a/libgimp/gimpvectorloadprocedure.c b/libgimp/gimpvectorloadprocedure.c index 87c9c6a4ba..f54c8234f6 100644 --- a/libgimp/gimpvectorloadprocedure.c +++ b/libgimp/gimpvectorloadprocedure.c @@ -414,7 +414,7 @@ gimp_vector_load_procedure_run (GimpProcedure *procedure, "pixel-density", resolution, NULL); /* In future, when we'll have vector layers, a vector load proc should be - * able to advertize when it can return a vector layer, and when so, we + * able to advertise when it can return a vector layer, and when so, we * can even bypass the dialog (by running non-interactively) and just use * the defaults, unless it's all bogus. */ diff --git a/libgimpbase/gimpunit.c b/libgimpbase/gimpunit.c index 71adc37aa8..97fbc96028 100644 --- a/libgimpbase/gimpunit.c +++ b/libgimpbase/gimpunit.c @@ -874,7 +874,7 @@ gimp_pixels_to_units (gdouble pixels, * gimp_units_to_pixels: * @value: value in units * @unit: unit of @value - * @resolution: resloution in DPI + * @resolution: resolution in DPI * * Converts a @value specified in @unit to pixels. * @@ -899,7 +899,7 @@ gimp_units_to_pixels (gdouble value, * gimp_units_to_points: * @value: value in units * @unit: unit of @value - * @resolution: resloution in DPI + * @resolution: resolution in DPI * * Converts a @value specified in @unit to points. * diff --git a/libgimpmodule/gimpmodule.h b/libgimpmodule/gimpmodule.h index 2233ef4360..fc480d161e 100644 --- a/libgimpmodule/gimpmodule.h +++ b/libgimpmodule/gimpmodule.h @@ -141,7 +141,7 @@ typedef const GimpModuleInfo * (* GimpModuleQueryFunc) (GTypeModule *module); * When this function is called, the module should register all the types * it implements with the passed @module. * - * Returns: Whether the registration was succesfull + * Returns: Whether the registration was successful **/ typedef gboolean (* GimpModuleRegisterFunc) (GTypeModule *module); diff --git a/pdb/README_NEW_PDB_PROC b/pdb/README_NEW_PDB_PROC index d04c8ae0f9..6537b868b0 100644 --- a/pdb/README_NEW_PDB_PROC +++ b/pdb/README_NEW_PDB_PROC @@ -407,7 +407,7 @@ we added a limitation on the range of the parameter. The lower limitation is a simple number, and the upper limitation is a constant macro (+GIMP_MAX_IMAGE_SIZE+) defined in https://gitlab.gnome.org/GNOME/gimp/tree/master/libgimpbase/gimplimits.h[libgimpbase/gimplimits.h]. -In order to make sure this constand will indeed be defined when parsing +In order to make sure this constant will indeed be defined when parsing this function, the file https://gitlab.gnome.org/GNOME/gimp/tree/master/libgimpbase/gimpbase.h[libgimpbase/gimpbase.h] (which includes diff --git a/po-plug-ins/meson.build b/po-plug-ins/meson.build index 1f12c0f781..6704be9c71 100644 --- a/po-plug-ins/meson.build +++ b/po-plug-ins/meson.build @@ -1,7 +1,7 @@ po_plug_ins_dir = meson.current_source_dir() i18n.gettext(gettext_package + '-std-plug-ins', preset: 'glib') -# Special-casing, we just reuse the same locale dictionnary for our demo +# Special-casing, we just reuse the same locale dictionary for our demo # extension. We could have separated the strings but just for the sake # of demo on code-side, it's simpler to do it this way. extension_i18n = 'org.gimp.extension.goat-exercises' diff --git a/themes/Default/gimp-gray.css b/themes/Default/gimp-gray.css index f70d65b987..5544c9193b 100644 --- a/themes/Default/gimp-gray.css +++ b/themes/Default/gimp-gray.css @@ -33,23 +33,23 @@ /* Background color for hovered items to "stick out". */ @define-color hover-color #bbbbbb; -/* Background color when we want widgets-in-widgets to differenciate. It +/* Background color when we want widgets-in-widgets to differentiate. It * will usually be "less extreme", i.e. darker on a light theme, or * lighter on a dark theme. */ @define-color widget-bg-color rgb(100,100,100); /* Color for selected items, in particular when their usual background - * color is @widget-bg-color or @bg-color. It will usually be ligher on + * color is @widget-bg-color or @bg-color. It will usually be lighter on * a light theme, or darker on a dark theme. */ @define-color selected-color #898989; /* Background color more extreme in the theme tendency, i.e. darker on a - * dark theme, ligther on a light theme. */ + * dark theme, lighter on a light theme. */ @define-color extreme-bg-color #898989; /* Color for a selected item to "stick out" when @extreme-bg-color is * used. It will usually be darker than @bg-color on a light theme, - * ligher on a dark theme. + * lighter on a dark theme. */ @define-color extreme-selected-color #656565; diff --git a/themes/Default/gimp-light.css b/themes/Default/gimp-light.css index 71d07d4c60..c091e5de88 100644 --- a/themes/Default/gimp-light.css +++ b/themes/Default/gimp-light.css @@ -26,23 +26,23 @@ /* Background color for hovered items to "stick out". */ @define-color hover-color rgb(250,250,250); -/* Background color when we want widgets-in-widgets to differenciate. It +/* Background color when we want widgets-in-widgets to differentiate. It * will usually be "less extreme", i.e. darker on a light theme, or * lighter on a dark theme. */ @define-color widget-bg-color rgb(220,220,220); /* Color for selected items, in particular when their usual background - * color is @widget-bg-color or @bg-color. It will usually be ligher on + * color is @widget-bg-color or @bg-color. It will usually be lighter on * a light theme, or darker on a dark theme. */ @define-color selected-color rgb(250,250,250); /* Background color more extreme in the theme tendency, i.e. darker on a - * dark theme, ligther on a light theme. */ + * dark theme, lighter on a light theme. */ @define-color extreme-bg-color rgb(250,250,250); /* Color for a selected item to "stick out" when @extreme-bg-color is * used. It will usually be darker than @bg-color on a light theme, - * ligher on a dark theme. + * lighter on a dark theme. */ @define-color extreme-selected-color rgb(220,220,220);